[GNUnet-SVN] r16835 - gnunet/src/datastore

[gnunet]

Author: grothoff
Date: 2011-09-14 14:29:57 +0200 (Wed, 14 Sep 2011)
New Revision: 16835

Modified:
   gnunet/src/datastore/plugin_datastore_sqlite.c
Log:
use INDEXED BY only for sqlite >= 3.7

Modified: gnunet/src/datastore/plugin_datastore_sqlite.c
===================================================================
--- gnunet/src/datastore/plugin_datastore_sqlite.c      2011-09-14 12:20:29 UTC 
(rev 16834)
+++ gnunet/src/datastore/plugin_datastore_sqlite.c      2011-09-14 12:29:57 UTC 
(rev 16835)
@@ -326,23 +326,41 @@
       (sq_prepare
        (plugin->dbh,
         "SELECT type,prio,anonLevel,expire,hash,value,_ROWID_ "
-        "FROM gn090 INDEXED BY idx_repl_rvalue WHERE repl=?2 AND "
+        "FROM gn090 "
+#if SQLITE_VERSION_NUMBER >= 3007000
+       "INDEXED BY idx_repl_rvalue "
+#endif
+       "WHERE repl=?2 AND "
         " (rvalue>=?1 OR "
-        "  NOT EXISTS (SELECT 1 FROM gn090 INDEXED BY idx_repl_rvalue WHERE 
repl=?2 AND rvalue>=?1 LIMIT 1) ) "
+        "  NOT EXISTS (SELECT 1 FROM gn090 "
+#if SQLITE_VERSION_NUMBER >= 3007000
+       "INDEXED BY idx_repl_rvalue "
+#endif
+       "WHERE repl=?2 AND rvalue>=?1 LIMIT 1) ) "
         "ORDER BY rvalue ASC LIMIT 1", &plugin->selRepl) != SQLITE_OK) ||
       (sq_prepare
-       (plugin->dbh, "SELECT MAX(repl) FROM gn090 INDEXED BY idx_repl_rvalue",
+       (plugin->dbh, "SELECT MAX(repl) FROM gn090"
+#if SQLITE_VERSION_NUMBER >= 3007000
+       " INDEXED BY idx_repl_rvalue"
+#endif
+       "",
         &plugin->maxRepl) != SQLITE_OK) ||
       (sq_prepare
        (plugin->dbh,
         "SELECT type,prio,anonLevel,expire,hash,value,_ROWID_ "
-        "FROM gn090 INDEXED BY idx_expire "
+        "FROM gn090 "
+#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) "
         "ORDER BY expire ASC LIMIT 1", &plugin->selExpi) != SQLITE_OK) ||
       (sq_prepare
        (plugin->dbh,
         "SELECT type,prio,anonLevel,expire,hash,value,_ROWID_ "
-        "FROM gn090 INDEXED BY idx_anon_type_hash "
+        "FROM gn090 " 
+#if SQLITE_VERSION_NUMBER >= 3007000
+       "INDEXED BY idx_anon_type_hash " 
+#endif
         "WHERE (anonLevel = 0 AND type=?1) "
         "ORDER BY hash DESC LIMIT 1 OFFSET ?2",
         &plugin->selZeroAnon) != SQLITE_OK) ||