[GNUnet-SVN] r3616 - GNUnet/src/applications/sqstore_mysql

[grothoff]

Author: grothoff
Date: 2006-11-02 13:49:20 -0800 (Thu, 02 Nov 2006)
New Revision: 3616

Modified:
   GNUnet/src/applications/sqstore_mysql/mysql.c
   GNUnet/src/applications/sqstore_mysql/mysqltest2.c
Log:
minor improvements

Modified: GNUnet/src/applications/sqstore_mysql/mysql.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysql.c       2006-11-02 20:13:27 UTC 
(rev 3615)
+++ GNUnet/src/applications/sqstore_mysql/mysql.c       2006-11-02 21:49:20 UTC 
(rev 3616)
@@ -532,6 +532,8 @@
   MUTEX_LOCK(dbhI.DATABASE_Lock_);
 
   mysql_query(dbhI.dbf,
+             "SET AUTOCOMMIT = 0"); 
+  mysql_query(dbhI.dbf,
              "SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED");
   if (type==0) {
     typestr[0] = '\0';
@@ -623,6 +625,8 @@
     return SYSERR;
   MUTEX_LOCK(dbhI.DATABASE_Lock_);
   mysql_query(dbhI.dbf,
+             "SET AUTOCOMMIT = 0");
+  mysql_query(dbhI.dbf,
              "SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED");
   if (type==0) {
     typestr[0] = 0;

Modified: GNUnet/src/applications/sqstore_mysql/mysqltest2.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysqltest2.c  2006-11-02 20:13:27 UTC 
(rev 3615)
+++ GNUnet/src/applications/sqstore_mysql/mysqltest2.c  2006-11-02 21:49:20 UTC 
(rev 3616)
@@ -82,7 +82,7 @@
  * at 90% wait, 10% CPU).  This is with MySQL 5.0.
  *
  */
-#define MAX_SIZE 1024LL * 1024 * 1024 * 4
+#define MAX_SIZE 1024LL * 1024 * 16
 
 /**
  * Report progress outside of major reports? Should probably be YES if
@@ -105,7 +105,7 @@
  * PUT_10 put operations); we report full status every
  * 10 iterations.  Abort with CTRL-C.
  */
-#define ITERATIONS 1000000
+#define ITERATIONS 100
 
 /**
  * Name of the database on disk.  FIXME!
@@ -227,11 +227,9 @@
 #if REPORT_ID
           "\n"
 #endif
-          "Useful %llu, API %llu (API-Useful: %lld/%.2f), disk %llu (%.2f%%) / 
%lluk ops / %llu ops/s\n",
+          "Useful %llu, API %llu, disk %llu (%.2f%%) / %lluk ops / %llu 
ops/s\n",
           stored_bytes / 1024,  /* used size in k */
           api->getSize() / 1024, /* API-reported size in k */
-          (stored_bytes - api->getSize()) / 1024, /* difference between 
reported and used */
-          1.0 * (stored_bytes - api->getSize()) / (stored_entries * 
sizeof(Datastore_Value)), /* relative to number of entries (should be equal to 
internal overhead per entry) */
           size / 1024, /* disk size in kb */
           (100.0 * size / stored_bytes) - 100, /* overhead */
           (stored_ops * 2 - stored_entries) / 1024, /* total operations (in k) 
*/