aboutsummaryrefslogtreecommitdiff
path: root/src/namestore
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-10-08 18:51:03 +0000
committerChristian Grothoff <christian@grothoff.org>2013-10-08 18:51:03 +0000
commit5049585e7942ad3fe3f8742832a2b4f76ec5a954 (patch)
tree85522f8496f593f56e7851e7516971ae2202e615 /src/namestore
parent2168e300fae74c5da28a2f3f57d67b7705f038a2 (diff)
downloadgnunet-5049585e7942ad3fe3f8742832a2b4f76ec5a954.tar.gz
gnunet-5049585e7942ad3fe3f8742832a2b4f76ec5a954.zip
-bump name to 97
Diffstat (limited to 'src/namestore')
-rw-r--r--src/namestore/plugin_namestore_postgres.c8
-rw-r--r--src/namestore/plugin_namestore_sqlite.c20
2 files changed, 14 insertions, 14 deletions
diff --git a/src/namestore/plugin_namestore_postgres.c b/src/namestore/plugin_namestore_postgres.c
index 92e3a8d8a..fe4280a3c 100644
--- a/src/namestore/plugin_namestore_postgres.c
+++ b/src/namestore/plugin_namestore_postgres.c
@@ -80,11 +80,11 @@ create_indices (PGconn * dbh)
80{ 80{
81 /* create indices */ 81 /* create indices */
82 if ( (GNUNET_OK != 82 if ( (GNUNET_OK !=
83 GNUNET_POSTGRES_exec (dbh, "CREATE INDEX ir_zone_name_rv ON ns091records (zone_hash,record_name_hash,rvalue)")) || 83 GNUNET_POSTGRES_exec (dbh, "CREATE INDEX ir_query_hash ON ns096blocks (query,expiration_time)")) ||
84 (GNUNET_OK != 84 (GNUNET_OK !=
85 GNUNET_POSTGRES_exec (dbh, "CREATE INDEX ir_zone_delegation ON ns091records (zone_hash,zone_delegation)")) || 85 GNUNET_POSTGRES_exec (dbh, "CREATE INDEX is_block_expiration ON ns096blocks (expiration_time)")) ||
86 (GNUNET_OK != 86 (GNUNET_OK !=
87 GNUNET_POSTGRES_exec (dbh, "CREATE INDEX ir_zone_rv ON ns091records (zone_hash,rvalue)")) || 87 GNUNET_POSTGRES_exec (dbh, "CREATE INDEX is_pkey_reverse ON ns097records (zone_private_key,pkey)")) ||
88 (GNUNET_OK != 88 (GNUNET_OK !=
89 GNUNET_POSTGRES_exec (dbh, "CREATE INDEX ir_zone ON ns091records (zone_hash)")) || 89 GNUNET_POSTGRES_exec (dbh, "CREATE INDEX ir_zone ON ns091records (zone_hash)")) ||
90 (GNUNET_OK != 90 (GNUNET_OK !=
@@ -617,7 +617,7 @@ namestore_postgres_delete_zone (void *cls,
617 GNUNET_POSTGRES_check_result (plugin->dbh, ret, PGRES_COMMAND_OK, "PQexecPrepared", "delete_zone")) 617 GNUNET_POSTGRES_check_result (plugin->dbh, ret, PGRES_COMMAND_OK, "PQexecPrepared", "delete_zone"))
618 { 618 {
619 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 619 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
620 "Deleting zone failed!\n"); 620 "Deleting zone failed!\n");
621 return; 621 return;
622 } 622 }
623 PQclear (ret); 623 PQclear (ret);
diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c
index bd32e3fd1..19fa86bf3 100644
--- a/src/namestore/plugin_namestore_sqlite.c
+++ b/src/namestore/plugin_namestore_sqlite.c
@@ -158,13 +158,13 @@ create_indices (sqlite3 * dbh)
158 sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS ir_block_expiration ON ns096blocks (expiration_time)", 158 sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS ir_block_expiration ON ns096blocks (expiration_time)",
159 NULL, NULL, NULL)) || 159 NULL, NULL, NULL)) ||
160 (SQLITE_OK != 160 (SQLITE_OK !=
161 sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS ir_pkey_reverse ON ns096records (zone_private_key,pkey)", 161 sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS ir_pkey_reverse ON ns097records (zone_private_key,pkey)",
162 NULL, NULL, NULL)) || 162 NULL, NULL, NULL)) ||
163 (SQLITE_OK != 163 (SQLITE_OK !=
164 sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS ir_pkey_iter ON ns096records (zone_private_key,rvalue)", 164 sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS ir_pkey_iter ON ns097records (zone_private_key,rvalue)",
165 NULL, NULL, NULL)) || 165 NULL, NULL, NULL)) ||
166 (SQLITE_OK != 166 (SQLITE_OK !=
167 sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS it_iter ON ns096records (rvalue)", 167 sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS it_iter ON ns097records (rvalue)",
168 NULL, NULL, NULL)) ) 168 NULL, NULL, NULL)) )
169 LOG (GNUNET_ERROR_TYPE_ERROR, 169 LOG (GNUNET_ERROR_TYPE_ERROR,
170 "Failed to create indices: %s\n", sqlite3_errmsg (dbh)); 170 "Failed to create indices: %s\n", sqlite3_errmsg (dbh));
@@ -277,12 +277,12 @@ database_setup (struct Plugin *plugin)
277 277
278 CHECK (SQLITE_OK == 278 CHECK (SQLITE_OK ==
279 sq_prepare (plugin->dbh, 279 sq_prepare (plugin->dbh,
280 "SELECT 1 FROM sqlite_master WHERE tbl_name = 'ns096records'", 280 "SELECT 1 FROM sqlite_master WHERE tbl_name = 'ns097records'",
281 &stmt)); 281 &stmt));
282 if ((sqlite3_step (stmt) == SQLITE_DONE) && 282 if ((sqlite3_step (stmt) == SQLITE_DONE) &&
283 (sqlite3_exec 283 (sqlite3_exec
284 (plugin->dbh, 284 (plugin->dbh,
285 "CREATE TABLE ns096records (" 285 "CREATE TABLE ns097records ("
286 " zone_private_key BLOB NOT NULL DEFAULT ''," 286 " zone_private_key BLOB NOT NULL DEFAULT '',"
287 " pkey BLOB," 287 " pkey BLOB,"
288 " rvalue INT8 NOT NULL DEFAULT ''," 288 " rvalue INT8 NOT NULL DEFAULT '',"
@@ -318,27 +318,27 @@ database_setup (struct Plugin *plugin)
318 &plugin->lookup_block) != SQLITE_OK) || 318 &plugin->lookup_block) != SQLITE_OK) ||
319 (sq_prepare 319 (sq_prepare
320 (plugin->dbh, 320 (plugin->dbh,
321 "INSERT INTO ns096records (zone_private_key, pkey, rvalue, record_count, record_data, label)" 321 "INSERT INTO ns097records (zone_private_key, pkey, rvalue, record_count, record_data, label)"
322 " VALUES (?, ?, ?, ?, ?, ?)", 322 " VALUES (?, ?, ?, ?, ?, ?)",
323 &plugin->store_records) != SQLITE_OK) || 323 &plugin->store_records) != SQLITE_OK) ||
324 (sq_prepare 324 (sq_prepare
325 (plugin->dbh, 325 (plugin->dbh,
326 "DELETE FROM ns096records WHERE zone_private_key=? AND label=?", 326 "DELETE FROM ns097records WHERE zone_private_key=? AND label=?",
327 &plugin->delete_records) != SQLITE_OK) || 327 &plugin->delete_records) != SQLITE_OK) ||
328 (sq_prepare 328 (sq_prepare
329 (plugin->dbh, 329 (plugin->dbh,
330 "SELECT record_count,record_data,label" 330 "SELECT record_count,record_data,label"
331 " FROM ns096records WHERE zone_private_key=? AND pkey=?", 331 " FROM ns097records WHERE zone_private_key=? AND pkey=?",
332 &plugin->zone_to_name) != SQLITE_OK) || 332 &plugin->zone_to_name) != SQLITE_OK) ||
333 (sq_prepare 333 (sq_prepare
334 (plugin->dbh, 334 (plugin->dbh,
335 "SELECT record_count,record_data,label" 335 "SELECT record_count,record_data,label"
336 " FROM ns096records WHERE zone_private_key=? ORDER BY rvalue LIMIT 1 OFFSET ?", 336 " FROM ns097records WHERE zone_private_key=? ORDER BY rvalue LIMIT 1 OFFSET ?",
337 &plugin->iterate_zone) != SQLITE_OK) || 337 &plugin->iterate_zone) != SQLITE_OK) ||
338 (sq_prepare 338 (sq_prepare
339 (plugin->dbh, 339 (plugin->dbh,
340 "SELECT record_count,record_data,label,zone_private_key" 340 "SELECT record_count,record_data,label,zone_private_key"
341 " FROM ns096records ORDER BY rvalue LIMIT 1 OFFSET ?", 341 " FROM ns097records ORDER BY rvalue LIMIT 1 OFFSET ?",
342 &plugin->iterate_all_zones) != SQLITE_OK) 342 &plugin->iterate_all_zones) != SQLITE_OK)
343 ) 343 )
344 { 344 {