[GNUnet-SVN] r22283 - in gnunet/src: include namestore

[gnunet]

Author: grothoff
Date: 2012-06-26 00:36:56 +0200 (Tue, 26 Jun 2012)
New Revision: 22283

Modified:
   gnunet/src/include/gnunet_namestore_service.h
   gnunet/src/namestore/gnunet-namestore.c
   gnunet/src/namestore/gnunet-service-namestore.c
   gnunet/src/namestore/namestore.conf.in
   gnunet/src/namestore/namestore_api.c
   gnunet/src/namestore/plugin_namestore_postgres.c
   gnunet/src/namestore/test_namestore_api.c
   gnunet/src/namestore/test_namestore_api.conf
   gnunet/src/namestore/test_namestore_api_create.c
   gnunet/src/namestore/test_namestore_api_create_update.c
   gnunet/src/namestore/test_namestore_api_lookup.c
   gnunet/src/namestore/test_namestore_api_lookup_specific_type.c
   gnunet/src/namestore/test_namestore_api_put.c
   gnunet/src/namestore/test_namestore_api_remove.c
   gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
   gnunet/src/namestore/test_namestore_api_zone_iteration.c
   gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
   gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
   gnunet/src/namestore/test_namestore_api_zone_to_name.c
   gnunet/src/namestore/test_plugin_namestore.c
   gnunet/src/namestore/test_plugin_namestore_postgres.conf
Log:
trying to fix #2458, largely works

Modified: gnunet/src/include/gnunet_namestore_service.h
===================================================================
--- gnunet/src/include/gnunet_namestore_service.h       2012-06-25 22:07:37 UTC 
(rev 22282)
+++ gnunet/src/include/gnunet_namestore_service.h       2012-06-25 22:36:56 UTC 
(rev 22283)
@@ -108,10 +108,9 @@
  * resources).
  *
  * @param h handle to the namestore
- * @param drop set to GNUNET_YES to delete all data in namestore (!)
  */
 void
-GNUNET_NAMESTORE_disconnect (struct GNUNET_NAMESTORE_Handle *h, int drop);
+GNUNET_NAMESTORE_disconnect (struct GNUNET_NAMESTORE_Handle *h);
 
 
 /**

Modified: gnunet/src/namestore/gnunet-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-namestore.c     2012-06-25 22:07:37 UTC (rev 
22282)
+++ gnunet/src/namestore/gnunet-namestore.c     2012-06-25 22:36:56 UTC (rev 
22283)
@@ -126,7 +126,7 @@
 {
   if (NULL != ns)
   {
-    GNUNET_NAMESTORE_disconnect (ns, GNUNET_NO);
+    GNUNET_NAMESTORE_disconnect (ns);
     ns = NULL;
   }
   if (NULL != zone_pkey)

Modified: gnunet/src/namestore/gnunet-service-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-service-namestore.c     2012-06-25 22:07:37 UTC 
(rev 22282)
+++ gnunet/src/namestore/gnunet-service-namestore.c     2012-06-25 22:36:56 UTC 
(rev 22283)
@@ -1949,7 +1949,12 @@
 
   do
   {
-    GSN_database->iterate_records (GSN_database->cls, zone , NULL, 
proc->zi->offset, &zone_iteraterate_proc, proc);
+    if (GNUNET_SYSERR ==
+       GSN_database->iterate_records (GSN_database->cls, zone, NULL, 
proc->zi->offset, &zone_iteraterate_proc, proc))
+    {
+      GNUNET_break (0);
+      break;
+    }
     proc->zi->offset++;
   }
   while ((0 == proc->records_included) && (GNUNET_NO == 
proc->res_iteration_finished));

Modified: gnunet/src/namestore/namestore.conf.in
===================================================================
--- gnunet/src/namestore/namestore.conf.in      2012-06-25 22:07:37 UTC (rev 
22282)
+++ gnunet/src/namestore/namestore.conf.in      2012-06-25 22:36:56 UTC (rev 
22283)
@@ -18,14 +18,5 @@
 
 [namestore-postgres]
 CONFIG = connect_timeout=10; dbname=gnunet
+TEMPORARY_TABLE = NO
 
-[namestore-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
-# USER = gnunet
-# PASSWORD = 
-# HOST = localhost
-# PORT = 3306
-
-
-

Modified: gnunet/src/namestore/namestore_api.c
===================================================================
--- gnunet/src/namestore/namestore_api.c        2012-06-25 22:07:37 UTC (rev 
22282)
+++ gnunet/src/namestore/namestore_api.c        2012-06-25 22:36:56 UTC (rev 
22283)
@@ -1000,10 +1000,11 @@
 static void
 clean_up_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
+  struct GNUNET_NAMESTORE_Handle *h = cls;
   struct PendingMessage *p;
   struct GNUNET_NAMESTORE_QueueEntry *q;
   struct GNUNET_NAMESTORE_ZoneIterator *z;
-  struct GNUNET_NAMESTORE_Handle *h = cls;
+
   GNUNET_assert (h != NULL);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Cleaning up\n");
   while (NULL != (p = h->pending_head))
@@ -1011,19 +1012,16 @@
     GNUNET_CONTAINER_DLL_remove (h->pending_head, h->pending_tail, p);
     GNUNET_free (p);
   }
-
   while (NULL != (q = h->op_head))
   {
     GNUNET_CONTAINER_DLL_remove (h->op_head, h->op_tail, q);
     GNUNET_free (q);
   }
-
   while (NULL != (z = h->z_head))
   {
     GNUNET_CONTAINER_DLL_remove (h->z_head, h->z_tail, z);
     GNUNET_free (z);
   }
-
   if (NULL != h->client)
   {
     GNUNET_CLIENT_disconnect (h->client);
@@ -1044,10 +1042,9 @@
  * resources).
  *
  * @param h handle to the namestore
- * @param drop set to GNUNET_YES to delete all data in namestore (!)
  */
 void
-GNUNET_NAMESTORE_disconnect (struct GNUNET_NAMESTORE_Handle *h, int drop)
+GNUNET_NAMESTORE_disconnect (struct GNUNET_NAMESTORE_Handle *h)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from namestore 
service\n");
   GNUNET_SCHEDULER_add_now (&clean_up_task, h);

Modified: gnunet/src/namestore/plugin_namestore_postgres.c
===================================================================
--- gnunet/src/namestore/plugin_namestore_postgres.c    2012-06-25 22:07:37 UTC 
(rev 22282)
+++ gnunet/src/namestore/plugin_namestore_postgres.c    2012-06-25 22:36:56 UTC 
(rev 22283)
@@ -113,8 +113,29 @@
                                         "namestore-postgres");
   if (NULL == plugin->dbh)
     return GNUNET_SYSERR;
-  res =
+  if (GNUNET_YES == 
+      GNUNET_CONFIGURATION_get_value_yesno (plugin->cfg,
+                                           "namestore-postgres",
+                                           "TEMPORARY_TABLE"))
+  {
+    res =
       PQexec (plugin->dbh,
+              "CREATE TEMPORARY TABLE ns091records ("
+             " zone_key BYTEA NOT NULL DEFAULT ''," 
+             " zone_delegation BYTEA NOT NULL DEFAULT ''," 
+             " zone_hash BYTEA NOT NULL DEFAULT ''," 
+             " record_count INTEGER NOT NULL DEFAULT 0,"
+             " record_data BYTEA NOT NULL DEFAULT '',"
+             " block_expiration_time BIGINT NOT NULL DEFAULT 0," 
+             " signature BYTEA NOT NULL DEFAULT '',"
+             " record_name TEXT NOT NULL DEFAULT ''," 
+             " record_name_hash BYTEA NOT NULL DEFAULT ''," 
+             " rvalue BIGINT NOT NULL DEFAULT 0"
+             ")" "WITH OIDS");
+  }
+  else
+    res =
+      PQexec (plugin->dbh,
               "CREATE TABLE ns091records ("
              " zone_key BYTEA NOT NULL DEFAULT ''," 
              " zone_delegation BYTEA NOT NULL DEFAULT ''," 
@@ -127,6 +148,7 @@
              " record_name_hash BYTEA NOT NULL DEFAULT ''," 
              " rvalue BIGINT NOT NULL DEFAULT 0"
              ")" "WITH OIDS");
+
   if ((NULL == res) || ((PQresultStatus (res) != PGRES_COMMAND_OK) && (0 != 
strcmp ("42P07",    /* duplicate table */
                                                                                
     PQresultErrorField
                                                                                
     (res,
@@ -380,6 +402,7 @@
     LOG (GNUNET_ERROR_TYPE_DEBUG, 
         "Ending iteration (no more results)\n");
     PQclear (res);
+    iter (iter_cls, NULL, GNUNET_TIME_UNIT_ZERO_ABS, NULL, 0, NULL, NULL);
     return GNUNET_NO;
   }
   GNUNET_assert (1 == cnt);

Modified: gnunet/src/namestore/test_namestore_api.c
===================================================================
--- gnunet/src/namestore/test_namestore_api.c   2012-06-25 22:07:37 UTC (rev 
22282)
+++ gnunet/src/namestore/test_namestore_api.c   2012-06-25 22:36:56 UTC (rev 
22283)
@@ -58,7 +58,7 @@
 endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   if (nsh != NULL)
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
   nsh = NULL;
 
   if (privkey != NULL)
@@ -84,7 +84,7 @@
 
   if (nsh != NULL)
   {
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
     nsh = NULL;
   }
   res = 0;

Modified: gnunet/src/namestore/test_namestore_api.conf
===================================================================
--- gnunet/src/namestore/test_namestore_api.conf        2012-06-25 22:07:37 UTC 
(rev 22282)
+++ gnunet/src/namestore/test_namestore_api.conf        2012-06-25 22:36:56 UTC 
(rev 22283)
@@ -16,20 +16,13 @@
 BINARY = gnunet-service-namestore
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-DATABASE = sqlite
+DATABASE = postgres
 ZONEFILE_DIRECTORY = zonefiles
 
 [namestore-sqlite]
 FILENAME = $SERVICEHOME/namestore/sqlite_test.db
 
 [namestore-postgres]
-CONFIG = connect_timeout=10; dbname=gnunet
+CONFIG = connect_timeout=10; dbname=gnunetcheck
+TEMPORARY_TABLE = YES
 
-[namestore-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
-# USER = gnunet
-# PASSWORD = 
-# HOST = localhost
-# PORT = 3306
-

Modified: gnunet/src/namestore/test_namestore_api_create.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_create.c    2012-06-25 22:07:37 UTC 
(rev 22282)
+++ gnunet/src/namestore/test_namestore_api_create.c    2012-06-25 22:36:56 UTC 
(rev 22283)
@@ -79,7 +79,7 @@
 endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   if (nsh != NULL)
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
   nsh = NULL;
   if (privkey != NULL)
     GNUNET_CRYPTO_rsa_key_free (privkey);
@@ -103,7 +103,7 @@
     GNUNET_CRYPTO_rsa_key_free (privkey);
   privkey = NULL;
   if (nsh != NULL)
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
   nsh = NULL;
 }
 

Modified: gnunet/src/namestore/test_namestore_api_create_update.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_create_update.c     2012-06-25 
22:07:37 UTC (rev 22282)
+++ gnunet/src/namestore/test_namestore_api_create_update.c     2012-06-25 
22:36:56 UTC (rev 22283)
@@ -77,7 +77,7 @@
 endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   if (nsh != NULL)
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
   nsh = NULL;
   if (privkey != NULL)
     GNUNET_CRYPTO_rsa_key_free (privkey);
@@ -101,7 +101,7 @@
     GNUNET_CRYPTO_rsa_key_free (privkey);
   privkey = NULL;
   if (nsh != NULL)
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
   nsh = NULL;
 }
 

Modified: gnunet/src/namestore/test_namestore_api_lookup.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_lookup.c    2012-06-25 22:07:37 UTC 
(rev 22282)
+++ gnunet/src/namestore/test_namestore_api_lookup.c    2012-06-25 22:36:56 UTC 
(rev 22283)
@@ -70,7 +70,7 @@
 endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   if (nsh != NULL)
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
   nsh = NULL;
   if (privkey != NULL)
     GNUNET_CRYPTO_rsa_key_free (privkey);
@@ -96,7 +96,7 @@
     GNUNET_CRYPTO_rsa_key_free (privkey);
   privkey = NULL;
   if (nsh != NULL)
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
   nsh = NULL;
 }
 

Modified: gnunet/src/namestore/test_namestore_api_lookup_specific_type.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_lookup_specific_type.c      
2012-06-25 22:07:37 UTC (rev 22282)
+++ gnunet/src/namestore/test_namestore_api_lookup_specific_type.c      
2012-06-25 22:36:56 UTC (rev 22283)
@@ -73,7 +73,7 @@
 endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   if (nsh != NULL)
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
   nsh = NULL;
   if (privkey != NULL)
     GNUNET_CRYPTO_rsa_key_free (privkey);
@@ -102,7 +102,7 @@
     GNUNET_CRYPTO_rsa_key_free (privkey);
   privkey = NULL;
   if (nsh != NULL)
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
   nsh = NULL;
 }
 

Modified: gnunet/src/namestore/test_namestore_api_put.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_put.c       2012-06-25 22:07:37 UTC 
(rev 22282)
+++ gnunet/src/namestore/test_namestore_api_put.c       2012-06-25 22:36:56 UTC 
(rev 22283)
@@ -61,7 +61,7 @@
 endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   if (nsh != NULL)
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
   nsh = NULL;
 
   if (privkey != NULL)
@@ -90,7 +90,7 @@
   }
   if (nsh != NULL)
   {
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
     nsh = NULL;
   }
 }

Modified: gnunet/src/namestore/test_namestore_api_remove.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_remove.c    2012-06-25 22:07:37 UTC 
(rev 22282)
+++ gnunet/src/namestore/test_namestore_api_remove.c    2012-06-25 22:36:56 UTC 
(rev 22283)
@@ -74,7 +74,7 @@
 endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   if (nsh != NULL)
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
   nsh = NULL;
   if (privkey != NULL)
     GNUNET_CRYPTO_rsa_key_free (privkey);
@@ -100,7 +100,7 @@
     GNUNET_CRYPTO_rsa_key_free (privkey);
   privkey = NULL;
   if (nsh != NULL)
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
   nsh = NULL;
 }
 

Modified: gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c        
2012-06-25 22:07:37 UTC (rev 22282)
+++ gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c        
2012-06-25 22:36:56 UTC (rev 22283)
@@ -74,7 +74,7 @@
 endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   if (nsh != NULL)
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
   nsh = NULL;
   if (privkey != NULL)
     GNUNET_CRYPTO_rsa_key_free (privkey);
@@ -101,7 +101,7 @@
     GNUNET_CRYPTO_rsa_key_free (privkey);
   privkey = NULL;
   if (nsh != NULL)
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
   nsh = NULL;
 }
 

Modified: gnunet/src/namestore/test_namestore_api_zone_iteration.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_iteration.c    2012-06-25 
22:07:37 UTC (rev 22282)
+++ gnunet/src/namestore/test_namestore_api_zone_iteration.c    2012-06-25 
22:36:56 UTC (rev 22283)
@@ -90,7 +90,7 @@
   }
 
   if (nsh != NULL)
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
   nsh = NULL;
 
   GNUNET_free_non_null(sig_1);
@@ -172,7 +172,7 @@
     GNUNET_free (s_rd_3);
   }
   if (nsh != NULL)
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
   nsh = NULL;
 }
 

Modified: gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c      
2012-06-25 22:07:37 UTC (rev 22282)
+++ gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c      
2012-06-25 22:36:56 UTC (rev 22283)
@@ -90,7 +90,7 @@
   }
 
   if (nsh != NULL)
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
   nsh = NULL;
   GNUNET_free_non_null(sig_1);
   GNUNET_free_non_null(sig_2);
@@ -167,7 +167,7 @@
     GNUNET_free (s_rd_3);
   }
   if (nsh != NULL)
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
   nsh = NULL;
 }
 

Modified: gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c       
2012-06-25 22:07:37 UTC (rev 22282)
+++ gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c       
2012-06-25 22:36:56 UTC (rev 22283)
@@ -88,7 +88,7 @@
     stopiteration_task = GNUNET_SCHEDULER_NO_TASK;
   }
   if (nsh != NULL)
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
   nsh = NULL;
   GNUNET_free_non_null(sig_1);
   GNUNET_free_non_null(sig_2);
@@ -165,7 +165,7 @@
     GNUNET_free (s_rd_3);
   }
   if (nsh != NULL)
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
   nsh = NULL;
   if (returned_records == 1)
     res = 0;

Modified: gnunet/src/namestore/test_namestore_api_zone_to_name.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_to_name.c      2012-06-25 
22:07:37 UTC (rev 22282)
+++ gnunet/src/namestore/test_namestore_api_zone_to_name.c      2012-06-25 
22:36:56 UTC (rev 22283)
@@ -70,7 +70,7 @@
 endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   if (nsh != NULL)
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
   nsh = NULL;
   if (privkey != NULL)
     GNUNET_CRYPTO_rsa_key_free (privkey);
@@ -91,7 +91,7 @@
     GNUNET_CRYPTO_rsa_key_free (privkey);
   privkey = NULL;
   if (nsh != NULL)
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
   nsh = NULL;
 }
 

Modified: gnunet/src/namestore/test_plugin_namestore.c
===================================================================
--- gnunet/src/namestore/test_plugin_namestore.c        2012-06-25 22:07:37 UTC 
(rev 22282)
+++ gnunet/src/namestore/test_plugin_namestore.c        2012-06-25 22:36:56 UTC 
(rev 22283)
@@ -187,9 +187,7 @@
             "Failed to initialize namestore.  Database likely not setup, 
skipping test.\n");
     return;
   }
-
   put_record (nsp, 1);
-
   get_record (nsp, 1);
 
   memset (&zone_key, 1, sizeof (zone_key));

Modified: gnunet/src/namestore/test_plugin_namestore_postgres.conf
===================================================================
--- gnunet/src/namestore/test_plugin_namestore_postgres.conf    2012-06-25 
22:07:37 UTC (rev 22282)
+++ gnunet/src/namestore/test_plugin_namestore_postgres.conf    2012-06-25 
22:36:56 UTC (rev 22283)
@@ -1,2 +1,3 @@
 [datacache-postgres]
 CONFIG = connect_timeout=10; dbname=gnunetcheck
+TEMPORARY_TABLE = YES