[GNUnet-SVN] r484 - in GNUnet: . src/applications/sqstore_mysql src/applications/sqstore_sqlite

[grothoff]

Author: grothoff
Date: 2005-03-25 14:11:29 -0800 (Fri, 25 Mar 2005)
New Revision: 484

Modified:
   GNUnet/src/applications/sqstore_mysql/mysqltest.c
   GNUnet/src/applications/sqstore_sqlite/sqlitetest.c
   GNUnet/todo
Log:
concurrent iterator test

Modified: GNUnet/src/applications/sqstore_mysql/mysqltest.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysqltest.c   2005-03-24 22:28:39 UTC 
(rev 483)
+++ GNUnet/src/applications/sqstore_mysql/mysqltest.c   2005-03-25 22:11:29 UTC 
(rev 484)
@@ -80,6 +80,15 @@
 }
 
 
+static int iterateDelete(const HashCode512 * key,
+                      const Datastore_Value * val,
+                          SQstore_ServiceAPI * api) {
+  if (1 == api->del(key, val))
+       return OK;
+  else
+       return SYSERR;
+}
+
 static int priorityCheck(const HashCode512 * key,
                         const Datastore_Value * val,
                         int * closure) {
@@ -158,6 +167,13 @@
                                           (Datum_Iterator) &iterateDown,
                                           &i));
   ASSERT(0 == i);
+  ASSERT(128 == api->iterateExpirationTime(ANY_BLOCK,
+                                                                               
   (Datum_Iterator) &iterateDelete,
+                                                                               
   api));
+  ASSERT(0 == api->iterateExpirationTime(ANY_BLOCK,
+                                                                               
 (Datum_Iterator) &iterateDown,
+                                                                               
 &i));
+
   for (i=254;i>=0;i-=2) {
     memset(&key, 256-i, sizeof(HashCode512));
     value = initValue(i+1);

Modified: GNUnet/src/applications/sqstore_sqlite/sqlitetest.c
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/sqlitetest.c 2005-03-24 22:28:39 UTC 
(rev 483)
+++ GNUnet/src/applications/sqstore_sqlite/sqlitetest.c 2005-03-25 22:11:29 UTC 
(rev 484)
@@ -92,6 +92,15 @@
   return ret;
 }
 
+static int iterateDelete(const HashCode512 * key,
+                      const Datastore_Value * val,
+                          SQstore_ServiceAPI * api) {
+  if (1 == api->del(key, val))
+       return OK;
+  else
+       return SYSERR;
+}
+
 static int priorityCheck(const HashCode512 * key,
                         const Datastore_Value * val,
                         int * closure) {
@@ -163,22 +172,20 @@
   ASSERT(oldSize > api->getSize());
   i = 0;
   ASSERT(128 == api->iterateLowPriority(ANY_BLOCK,
-                                       (Datum_Iterator) &iterateUp,
-                                       &i));
+                                                                               
(Datum_Iterator) &iterateUp,
+                                                                               
&i));
   ASSERT(256 == i);
   ASSERT(128 == api->iterateExpirationTime(ANY_BLOCK,
-                                          (Datum_Iterator) &iterateDown,
-                                          &i));
+                                                                               
   (Datum_Iterator) &iterateDown,
+                                                                               
   &i));
   ASSERT(0 == i);
+  ASSERT(128 == api->iterateExpirationTime(ANY_BLOCK,
+                                                                               
   (Datum_Iterator) &iterateDelete,
+                                                                               
   api));
+  ASSERT(0 == api->iterateExpirationTime(ANY_BLOCK,
+                                                                               
 (Datum_Iterator) &iterateDown,
+                                                                               
 &i));
 
-  for (i=0;i<256;i+=2) {
-    memset(&key, 256-i, sizeof(HashCode512));
-    value = initValue(i);
-    ASSERT(1 == api->del(&key, value));
-    FREE(value);
-  }
-
-
   i = 42;
   value = initValue(i);
   memset(&key, 256-i, sizeof(HashCode512));
@@ -210,8 +217,8 @@
   api->del(&key,
           NULL);
   ASSERT(0 == api->iterateExpirationTime(ANY_BLOCK,
-                                        NULL,
-                                        NULL));
+                                                                               
 NULL,
+                                                                               
 NULL));
   api->drop();
   return OK;
  FAILURE:

Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2005-03-24 22:28:39 UTC (rev 483)
+++ GNUnet/todo 2005-03-25 22:11:29 UTC (rev 484)
@@ -1,7 +1,5 @@
 0.7.0pre1 [4'05] (aka "preview"):
 TESTING / TESTCASES:
-- uni-peer:
-  * sqlite: test concurrency with iterators
 - multi-peer: (see sessiontest.c and tbenchtest.c for templates)
   * gap
   * dht / gnunet-dht-join and gnunet-dht-query