[GNUnet-SVN] r5139 - in GNUnet: doc src/applications/sqstore_mysql src/applications/sqstore_sqlite

[gnunet]

Author: grothoff
Date: 2007-06-24 04:04:59 -0600 (Sun, 24 Jun 2007)
New Revision: 5139

Modified:
   GNUnet/doc/README.mysql
   GNUnet/src/applications/sqstore_mysql/Makefile.am
   GNUnet/src/applications/sqstore_sqlite/sqlitetest3.c
Log:
update

Modified: GNUnet/doc/README.mysql
===================================================================
--- GNUnet/doc/README.mysql     2007-06-24 09:37:12 UTC (rev 5138)
+++ GNUnet/doc/README.mysql     2007-06-24 10:04:59 UTC (rev 5139)
@@ -15,6 +15,9 @@
    (gnunet-check cannot fix problems internal to the dbmgr!). 
    For example, we have seen several cases where power failure 
    has ruined a gdbm database beyond repair. 
+ + much faster (for one of the key benchmarks -- content migration
+   -- we have measure mysql taking 2s for an operation where
+   sqlite takes 150s).
 Cons 
  - Memory usage (Comment: "I have 1G and it never caused me trouble")
  - Manual setup

Modified: GNUnet/src/applications/sqstore_mysql/Makefile.am
===================================================================
--- GNUnet/src/applications/sqstore_mysql/Makefile.am   2007-06-24 09:37:12 UTC 
(rev 5138)
+++ GNUnet/src/applications/sqstore_mysql/Makefile.am   2007-06-24 10:04:59 UTC 
(rev 5139)
@@ -10,7 +10,8 @@
 
 check_PROGRAMS = \
   mysqltest \
-  mysqltest2 
+  mysqltest2 \
+  mysqltest3
 
 TESTS = $(check_PROGRAMS)
 
@@ -44,3 +45,10 @@
  $(top_builddir)/src/server/libgnunetcore.la  \
  $(top_builddir)/src/util/config_impl/libgnunetutil_config.la  \
  $(top_builddir)/src/util/libgnunetutil.la  
+
+mysqltest3_SOURCES = \
+ mysqltest3.c 
+mysqltest3_LDADD = \
+ $(top_builddir)/src/server/libgnunetcore.la  \
+ $(top_builddir)/src/util/config_impl/libgnunetutil_config.la  \
+ $(top_builddir)/src/util/libgnunetutil.la  

Modified: GNUnet/src/applications/sqstore_sqlite/sqlitetest3.c
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/sqlitetest3.c        2007-06-24 
09:37:12 UTC (rev 5138)
+++ GNUnet/src/applications/sqstore_sqlite/sqlitetest3.c        2007-06-24 
10:04:59 UTC (rev 5139)
@@ -47,12 +47,6 @@
  */
 #define PUT_10 (MAX_SIZE / 32 / 1024 / ITERATIONS)
 
-
-/**
- * Name of the database on disk.
- */
-#define DB_NAME "/tmp/gnunet-sqlite-sqstore-perf/data/fs/content/gnunet.dat"
-
 static unsigned long long stored_bytes;
 
 static unsigned long long stored_entries;
@@ -108,6 +102,8 @@
 iterateDummy(const HashCode512 * key,
             const Datastore_Value * val,
             void * cls) {
+  if (GNUNET_SHUTDOWN_TEST() == YES)
+    return SYSERR;
   return OK;
 }