aboutsummaryrefslogtreecommitdiff
path: root/src/datastore/plugin_datastore_postgres.c
diff options
context:
space:
mode:
authorgrothoff <grothoff@140774ce-b5e7-0310-ab8b-a85725594a96>2010-08-26 12:14:19 +0000
committergrothoff <grothoff@140774ce-b5e7-0310-ab8b-a85725594a96>2010-08-26 12:14:19 +0000
commit8697958580025b1baa3eccf009b8c9ddc4198ad4 (patch)
tree78447d0f1853f0a32a5f96b26143f0a3554d4f9d /src/datastore/plugin_datastore_postgres.c
parent0efddb762da24786ebc9c41aac3cae5162f9c071 (diff)
fixes
git-svn-id: https://gnunet.org/svn/gnunet@12740 140774ce-b5e7-0310-ab8b-a85725594a96
Diffstat (limited to 'src/datastore/plugin_datastore_postgres.c')
-rw-r--r--src/datastore/plugin_datastore_postgres.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/src/datastore/plugin_datastore_postgres.c b/src/datastore/plugin_datastore_postgres.c
index b4540828aa..9473bbbed3 100644
--- a/src/datastore/plugin_datastore_postgres.c
+++ b/src/datastore/plugin_datastore_postgres.c
@@ -523,11 +523,13 @@ postgres_plugin_put (void *cls,
return GNUNET_SYSERR;
PQclear (ret);
plugin->payload += size;
+#if DEBUG_POSTGRES
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
"postgres",
"Stored %u bytes in database, new payload is %llu\n",
(unsigned int) size,
(unsigned long long) plugin->payload);
+#endif
return GNUNET_OK;
}
@@ -561,10 +563,12 @@ postgres_next_request_cont (void *next_cls,
if ( (GNUNET_YES == nrc->end_it) ||
(nrc->count == nrc->total) )
{
+#if DEBUG_POSTGRES
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
"postgres",
"Ending iteration (%s)\n",
(GNUNET_YES == nrc->end_it) ? "client requested it" : "completed result set");
+#endif
nrc->iter (nrc->iter_cls,
NULL, NULL, 0, NULL, 0, 0, 0,
GNUNET_TIME_UNIT_ZERO_ABS, 0);
@@ -592,9 +596,11 @@ postgres_next_request_cont (void *next_cls,
nrc->pname,
__LINE__))
{
+#if DEBUG_POSTGRES
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
"postgres",
"Ending iteration (postgres error)\n");
+#endif
nrc->iter (nrc->iter_cls,
NULL, NULL, 0, NULL, 0, 0, 0,
GNUNET_TIME_UNIT_ZERO_ABS, 0);
@@ -605,9 +611,11 @@ postgres_next_request_cont (void *next_cls,
if (0 == PQntuples (res))
{
/* no result */
+#if DEBUG_POSTGRES
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
"postgres",
"Ending iteration (no more results)\n");
+#endif
nrc->iter (nrc->iter_cls,
NULL, NULL, 0, NULL, 0, 0, 0,
GNUNET_TIME_UNIT_ZERO_ABS, 0);
@@ -659,11 +667,13 @@ postgres_next_request_cont (void *next_cls,
nrc->blast_rowid = htonl (rowid);
nrc->count++;
+#if DEBUG_POSTGRES
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
"postgres",
"Found result of size %u bytes and type %u in database\n",
(unsigned int) size,
(unsigned int) type);
+#endif
iret = nrc->iter (nrc->iter_cls,
nrc,
&key,
@@ -677,27 +687,33 @@ postgres_next_request_cont (void *next_cls,
PQclear (res);
if (iret == GNUNET_SYSERR)
{
+#if DEBUG_POSTGRES
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
"postgres",
"Ending iteration (client error)\n");
+#endif
return;
}
if (iret == GNUNET_NO)
{
if (GNUNET_OK == delete_by_rowid (plugin, rowid))
{
+#if DEBUG_POSTGRES
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
"postgres",
"Deleting %u bytes from database, current payload is %llu\n",
(unsigned int) size,
(unsigned long long) plugin->payload);
+#endif
GNUNET_assert (plugin->payload >= size);
plugin->payload -= size;
+#if DEBUG_POSTGRES
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
"postgres",
"Deleted %u bytes from database, new payload is %llu\n",
(unsigned int) size,
(unsigned long long) plugin->payload);
+#endif
}
}
}
@@ -1048,8 +1064,6 @@ postgres_plugin_get (void *cls,
return;
}
nrc->total = GNUNET_ntohll (*(const unsigned long long *) PQgetvalue (ret, 0, 0));
- fprintf (stderr, "Total number of results: %llu\n",
- (unsigned long long) nrc->total);
PQclear (ret);
if (nrc->total == 0)
{