[GNUnet-SVN] r30011 - gnunet/src/namestore

[gnunet]

Author: grothoff
Date: 2013-10-08 20:51:03 +0200 (Tue, 08 Oct 2013)
New Revision: 30011

Modified:
   gnunet/src/namestore/plugin_namestore_postgres.c
   gnunet/src/namestore/plugin_namestore_sqlite.c
Log:
-bump name to 97

Modified: gnunet/src/namestore/plugin_namestore_postgres.c
===================================================================
--- gnunet/src/namestore/plugin_namestore_postgres.c    2013-10-08 18:41:07 UTC 
(rev 30010)
+++ gnunet/src/namestore/plugin_namestore_postgres.c    2013-10-08 18:51:03 UTC 
(rev 30011)
@@ -80,11 +80,11 @@
 {
   /* create indices */
   if ( (GNUNET_OK !=
-       GNUNET_POSTGRES_exec (dbh, "CREATE INDEX ir_zone_name_rv ON 
ns091records (zone_hash,record_name_hash,rvalue)")) ||
+       GNUNET_POSTGRES_exec (dbh, "CREATE INDEX ir_query_hash ON ns096blocks 
(query,expiration_time)")) ||
        (GNUNET_OK !=
-       GNUNET_POSTGRES_exec (dbh, "CREATE INDEX ir_zone_delegation ON 
ns091records (zone_hash,zone_delegation)")) ||
+       GNUNET_POSTGRES_exec (dbh, "CREATE INDEX is_block_expiration ON 
ns096blocks (expiration_time)")) ||
        (GNUNET_OK !=
-       GNUNET_POSTGRES_exec (dbh, "CREATE INDEX ir_zone_rv ON ns091records 
(zone_hash,rvalue)")) ||
+       GNUNET_POSTGRES_exec (dbh, "CREATE INDEX is_pkey_reverse ON 
ns097records (zone_private_key,pkey)")) ||
        (GNUNET_OK !=
        GNUNET_POSTGRES_exec (dbh, "CREATE INDEX ir_zone ON ns091records 
(zone_hash)")) ||
        (GNUNET_OK !=
@@ -617,7 +617,7 @@
       GNUNET_POSTGRES_check_result (plugin->dbh, ret, PGRES_COMMAND_OK, 
"PQexecPrepared", "delete_zone"))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-               "Deleting zone failed!\n");             
+               "Deleting zone failed!\n");
     return;
   }
   PQclear (ret);

Modified: gnunet/src/namestore/plugin_namestore_sqlite.c
===================================================================
--- gnunet/src/namestore/plugin_namestore_sqlite.c      2013-10-08 18:41:07 UTC 
(rev 30010)
+++ gnunet/src/namestore/plugin_namestore_sqlite.c      2013-10-08 18:51:03 UTC 
(rev 30011)
@@ -158,13 +158,13 @@
        sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS ir_block_expiration ON 
ns096blocks (expiration_time)",
                      NULL, NULL, NULL)) ||
        (SQLITE_OK !=
-       sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS ir_pkey_reverse ON 
ns096records (zone_private_key,pkey)",
+       sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS ir_pkey_reverse ON 
ns097records (zone_private_key,pkey)",
                      NULL, NULL, NULL)) ||
        (SQLITE_OK !=
-       sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS ir_pkey_iter ON 
ns096records (zone_private_key,rvalue)",
+       sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS ir_pkey_iter ON 
ns097records (zone_private_key,rvalue)",
                      NULL, NULL, NULL)) ||
        (SQLITE_OK !=
-       sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS it_iter ON ns096records 
(rvalue)",
+       sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS it_iter ON ns097records 
(rvalue)",
                      NULL, NULL, NULL)) )
     LOG (GNUNET_ERROR_TYPE_ERROR,
         "Failed to create indices: %s\n", sqlite3_errmsg (dbh));
@@ -277,12 +277,12 @@
 
   CHECK (SQLITE_OK ==
          sq_prepare (plugin->dbh,
-                     "SELECT 1 FROM sqlite_master WHERE tbl_name = 
'ns096records'",
+                     "SELECT 1 FROM sqlite_master WHERE tbl_name = 
'ns097records'",
                      &stmt));
   if ((sqlite3_step (stmt) == SQLITE_DONE) &&
       (sqlite3_exec
        (plugin->dbh,
-        "CREATE TABLE ns096records ("
+        "CREATE TABLE ns097records ("
         " zone_private_key BLOB NOT NULL DEFAULT '',"
         " pkey BLOB,"
        " rvalue INT8 NOT NULL DEFAULT '',"
@@ -318,27 +318,27 @@
         &plugin->lookup_block) != SQLITE_OK) ||
       (sq_prepare
        (plugin->dbh,
-        "INSERT INTO ns096records (zone_private_key, pkey, rvalue, 
record_count, record_data, label)"
+        "INSERT INTO ns097records (zone_private_key, pkey, rvalue, 
record_count, record_data, label)"
        " VALUES (?, ?, ?, ?, ?, ?)",
         &plugin->store_records) != SQLITE_OK) ||
       (sq_prepare
        (plugin->dbh,
-        "DELETE FROM ns096records WHERE zone_private_key=? AND label=?",
+        "DELETE FROM ns097records WHERE zone_private_key=? AND label=?",
         &plugin->delete_records) != SQLITE_OK) ||
       (sq_prepare
        (plugin->dbh,
         "SELECT record_count,record_data,label"
-       " FROM ns096records WHERE zone_private_key=? AND pkey=?",
+       " FROM ns097records WHERE zone_private_key=? AND pkey=?",
         &plugin->zone_to_name) != SQLITE_OK) ||
       (sq_prepare
        (plugin->dbh,
        "SELECT record_count,record_data,label"
-       " FROM ns096records WHERE zone_private_key=? ORDER BY rvalue LIMIT 1 
OFFSET ?",
+       " FROM ns097records WHERE zone_private_key=? ORDER BY rvalue LIMIT 1 
OFFSET ?",
        &plugin->iterate_zone) != SQLITE_OK) ||
       (sq_prepare
        (plugin->dbh,
        "SELECT record_count,record_data,label,zone_private_key"
-       " FROM ns096records ORDER BY rvalue LIMIT 1 OFFSET ?",
+       " FROM ns097records ORDER BY rvalue LIMIT 1 OFFSET ?",
        &plugin->iterate_all_zones) != SQLITE_OK)
       )
   {