[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] branch master updated: [datastore] Remove unused i
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] branch master updated: [datastore] Remove unused indicies from sqlite |
Date: |
Mon, 05 Jun 2017 14:50:16 +0200 |
This is an automated email from the git hooks/post-receive script.
david-barksdale pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new 57866fe5f [datastore] Remove unused indicies from sqlite
57866fe5f is described below
commit 57866fe5f37a8cf2d43f8839a2f2b18e986acb81
Author: David Barksdale <address@hidden>
AuthorDate: Mon Jun 5 07:46:41 2017 -0500
[datastore] Remove unused indicies from sqlite
*** The table name was changed ***
Users will need to dump and re-import their sqlite databases with
gnunet-datastore -d and -i.
---
src/datastore/plugin_datastore_sqlite.c | 52 +++++++++++++--------------------
1 file changed, 20 insertions(+), 32 deletions(-)
diff --git a/src/datastore/plugin_datastore_sqlite.c
b/src/datastore/plugin_datastore_sqlite.c
index cdadfb87d..77b8409cd 100644
--- a/src/datastore/plugin_datastore_sqlite.c
+++ b/src/datastore/plugin_datastore_sqlite.c
@@ -186,31 +186,19 @@ create_indices (sqlite3 * dbh)
{
/* create indices */
if ((SQLITE_OK !=
- sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS idx_hash ON gn090
(hash)",
+ sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS idx_hash ON gn091
(hash)",
NULL, NULL, NULL)) ||
(SQLITE_OK !=
sqlite3_exec (dbh,
- "CREATE INDEX IF NOT EXISTS idx_expire_repl ON gn090
(expire ASC,repl DESC)",
+ "CREATE INDEX IF NOT EXISTS idx_anon_type ON gn091
(anonLevel ASC,type)",
NULL, NULL, NULL)) ||
(SQLITE_OK !=
sqlite3_exec (dbh,
- "CREATE INDEX IF NOT EXISTS idx_comb ON gn090 (anonLevel
ASC,expire ASC,prio,type,hash)",
+ "CREATE INDEX IF NOT EXISTS idx_expire ON gn091 (expire
ASC)",
NULL, NULL, NULL)) ||
(SQLITE_OK !=
sqlite3_exec (dbh,
- "CREATE INDEX IF NOT EXISTS idx_anon_type_hash ON gn090
(anonLevel ASC,type,hash)",
- NULL, NULL, NULL)) ||
- (SQLITE_OK !=
- sqlite3_exec (dbh,
- "CREATE INDEX IF NOT EXISTS idx_expire ON gn090 (expire
ASC)",
- NULL, NULL, NULL)) ||
- (SQLITE_OK !=
- sqlite3_exec (dbh,
- "CREATE INDEX IF NOT EXISTS idx_repl_rvalue ON gn090
(repl,rvalue)",
- NULL, NULL, NULL)) ||
- (SQLITE_OK !=
- sqlite3_exec (dbh,
- "CREATE INDEX IF NOT EXISTS idx_repl ON gn090 (repl
DESC)",
+ "CREATE INDEX IF NOT EXISTS idx_repl_rvalue ON gn091
(repl,rvalue)",
NULL, NULL, NULL)))
GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "sqlite",
"Failed to create indices: %s\n", sqlite3_errmsg (dbh));
@@ -315,7 +303,7 @@ database_setup (const struct GNUNET_CONFIGURATION_Handle
*cfg,
/* We have to do it here, because otherwise precompiling SQL might fail */
CHECK (SQLITE_OK ==
sq_prepare (plugin->dbh,
- "SELECT 1 FROM sqlite_master WHERE tbl_name = 'gn090'",
+ "SELECT 1 FROM sqlite_master WHERE tbl_name = 'gn091'",
&stmt));
/* FIXME: SQLite does not have unsigned integers! This is ok for the type
column because
@@ -327,7 +315,7 @@ database_setup (const struct GNUNET_CONFIGURATION_Handle
*cfg,
sqlite3_step (stmt)) &&
(SQLITE_OK !=
sqlite3_exec (plugin->dbh,
- "CREATE TABLE gn090 ("
+ "CREATE TABLE gn091 ("
" repl INT4 NOT NULL DEFAULT 0,"
" type INT4 NOT NULL DEFAULT 0,"
" prio INT4 NOT NULL DEFAULT 0,"
@@ -353,7 +341,7 @@ database_setup (const struct GNUNET_CONFIGURATION_Handle
*cfg,
#define RESULT_COLUMNS "repl, type, prio, anonLevel, expire, hash, value,
_ROWID_"
if ( (SQLITE_OK !=
sq_prepare (plugin->dbh,
- "UPDATE gn090 "
+ "UPDATE gn091 "
"SET prio = prio + ?, "
"repl = repl + ?, "
"expire = MAX(expire, ?) "
@@ -361,16 +349,16 @@ database_setup (const struct GNUNET_CONFIGURATION_Handle
*cfg,
&plugin->update)) ||
(SQLITE_OK !=
sq_prepare (plugin->dbh,
- "UPDATE gn090 " "SET repl = MAX (0, repl - 1) WHERE
_ROWID_ = ?",
+ "UPDATE gn091 " "SET repl = MAX (0, repl - 1) WHERE
_ROWID_ = ?",
&plugin->updRepl)) ||
(SQLITE_OK !=
sq_prepare (plugin->dbh,
- "SELECT " RESULT_COLUMNS " FROM gn090 "
+ "SELECT " RESULT_COLUMNS " FROM gn091 "
#if SQLITE_VERSION_NUMBER >= 3007000
"INDEXED BY idx_repl_rvalue "
#endif
"WHERE repl=?2 AND " " (rvalue>=?1 OR "
- " NOT EXISTS (SELECT 1 FROM gn090 "
+ " NOT EXISTS (SELECT 1 FROM gn091 "
#if SQLITE_VERSION_NUMBER >= 3007000
"INDEXED BY idx_repl_rvalue "
#endif
@@ -379,7 +367,7 @@ database_setup (const struct GNUNET_CONFIGURATION_Handle
*cfg,
&plugin->selRepl)) ||
(SQLITE_OK !=
sq_prepare (plugin->dbh,
- "SELECT MAX(repl) FROM gn090"
+ "SELECT MAX(repl) FROM gn091"
#if SQLITE_VERSION_NUMBER >= 3007000
" INDEXED BY idx_repl_rvalue"
#endif
@@ -387,18 +375,18 @@ database_setup (const struct GNUNET_CONFIGURATION_Handle
*cfg,
&plugin->maxRepl)) ||
(SQLITE_OK !=
sq_prepare (plugin->dbh,
- "SELECT " RESULT_COLUMNS " FROM gn090 "
+ "SELECT " RESULT_COLUMNS " FROM gn091 "
#if SQLITE_VERSION_NUMBER >= 3007000
"INDEXED BY idx_expire "
#endif
- "WHERE NOT EXISTS (SELECT 1 FROM gn090 WHERE expire < ?1
LIMIT 1) OR (expire < ?1) "
+ "WHERE NOT EXISTS (SELECT 1 FROM gn091 WHERE expire < ?1
LIMIT 1) OR (expire < ?1) "
"ORDER BY expire ASC LIMIT 1",
&plugin->selExpi)) ||
(SQLITE_OK !=
sq_prepare (plugin->dbh,
- "SELECT " RESULT_COLUMNS " FROM gn090 "
+ "SELECT " RESULT_COLUMNS " FROM gn091 "
#if SQLITE_VERSION_NUMBER >= 3007000
- "INDEXED BY idx_anon_type_hash "
+ "INDEXED BY idx_anon_type "
#endif
"WHERE _ROWID_ >= ? AND "
"anonLevel = 0 AND "
@@ -407,12 +395,12 @@ database_setup (const struct GNUNET_CONFIGURATION_Handle
*cfg,
&plugin->selZeroAnon)) ||
(SQLITE_OK !=
sq_prepare (plugin->dbh,
- "INSERT INTO gn090 (repl, type, prio, anonLevel, expire,
rvalue, hash, vhash, value) "
+ "INSERT INTO gn091 (repl, type, prio, anonLevel, expire,
rvalue, hash, vhash, value) "
"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
&plugin->insertContent)) ||
(SQLITE_OK !=
sq_prepare (plugin->dbh,
- "SELECT " RESULT_COLUMNS " FROM gn090 "
+ "SELECT " RESULT_COLUMNS " FROM gn091 "
"WHERE _ROWID_ >= ? AND "
"(rvalue >= ? OR 0 = ?) AND "
"(hash = ? OR 0 = ?) AND "
@@ -421,11 +409,11 @@ database_setup (const struct GNUNET_CONFIGURATION_Handle
*cfg,
&plugin->get)) ||
(SQLITE_OK !=
sq_prepare (plugin->dbh,
- "DELETE FROM gn090 WHERE _ROWID_ = ?",
+ "DELETE FROM gn091 WHERE _ROWID_ = ?",
&plugin->delRow)) ||
(SQLITE_OK !=
sq_prepare (plugin->dbh,
- "DELETE FROM gn090 "
+ "DELETE FROM gn091 "
"WHERE hash = ? AND "
"value = ? ",
&plugin->remove)) ||
@@ -1137,7 +1125,7 @@ sqlite_plugin_get_keys (void *cls,
GNUNET_assert (NULL != proc);
if (SQLITE_OK !=
sq_prepare (plugin->dbh,
- "SELECT hash FROM gn090",
+ "SELECT hash FROM gn091",
&stmt))
{
LOG_SQLITE (plugin,
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [gnunet] branch master updated: [datastore] Remove unused indicies from sqlite,
gnunet <=