aboutsummaryrefslogtreecommitdiff
path: root/src/datastore
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-11-04 14:00:32 +0000
committerChristian Grothoff <christian@grothoff.org>2011-11-04 14:00:32 +0000
commit83b19539f4d322b43683f5838b72e9ec2c8e6073 (patch)
treed0ab9329fcbefe360d9d14e2ace21a6b3396dfe9 /src/datastore
parent28a2eb43281a1f08a67954f07beb9af3a9bc9a35 (diff)
downloadgnunet-83b19539f4d322b43683f5838b72e9ec2c8e6073.tar.gz
gnunet-83b19539f4d322b43683f5838b72e9ec2c8e6073.zip
curly wars / auto-indentation
Diffstat (limited to 'src/datastore')
-rw-r--r--src/datastore/plugin_datastore_sqlite.c30
-rw-r--r--src/datastore/test_datastore_api.c6
2 files changed, 15 insertions, 21 deletions
diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c
index 318c22cf5..6d3d56c02 100644
--- a/src/datastore/plugin_datastore_sqlite.c
+++ b/src/datastore/plugin_datastore_sqlite.c
@@ -325,41 +325,35 @@ database_setup (const struct GNUNET_CONFIGURATION_Handle *cfg,
325 &plugin->updRepl) != SQLITE_OK) || 325 &plugin->updRepl) != SQLITE_OK) ||
326 (sq_prepare 326 (sq_prepare
327 (plugin->dbh, 327 (plugin->dbh,
328 "SELECT type,prio,anonLevel,expire,hash,value,_ROWID_ " 328 "SELECT type,prio,anonLevel,expire,hash,value,_ROWID_ " "FROM gn090 "
329 "FROM gn090 "
330#if SQLITE_VERSION_NUMBER >= 3007000 329#if SQLITE_VERSION_NUMBER >= 3007000
331 "INDEXED BY idx_repl_rvalue " 330 "INDEXED BY idx_repl_rvalue "
332#endif 331#endif
333 "WHERE repl=?2 AND " 332 "WHERE repl=?2 AND " " (rvalue>=?1 OR "
334 " (rvalue>=?1 OR "
335 " NOT EXISTS (SELECT 1 FROM gn090 " 333 " NOT EXISTS (SELECT 1 FROM gn090 "
336#if SQLITE_VERSION_NUMBER >= 3007000 334#if SQLITE_VERSION_NUMBER >= 3007000
337 "INDEXED BY idx_repl_rvalue " 335 "INDEXED BY idx_repl_rvalue "
338#endif 336#endif
339 "WHERE repl=?2 AND rvalue>=?1 LIMIT 1) ) " 337 "WHERE repl=?2 AND rvalue>=?1 LIMIT 1) ) "
340 "ORDER BY rvalue ASC LIMIT 1", &plugin->selRepl) != SQLITE_OK) || 338 "ORDER BY rvalue ASC LIMIT 1", &plugin->selRepl) != SQLITE_OK) ||
341 (sq_prepare 339 (sq_prepare (plugin->dbh, "SELECT MAX(repl) FROM gn090"
342 (plugin->dbh, "SELECT MAX(repl) FROM gn090"
343#if SQLITE_VERSION_NUMBER >= 3007000 340#if SQLITE_VERSION_NUMBER >= 3007000
344 " INDEXED BY idx_repl_rvalue" 341 " INDEXED BY idx_repl_rvalue"
345#endif 342#endif
346 "", 343 "", &plugin->maxRepl) != SQLITE_OK) ||
347 &plugin->maxRepl) != SQLITE_OK) ||
348 (sq_prepare 344 (sq_prepare
349 (plugin->dbh, 345 (plugin->dbh,
350 "SELECT type,prio,anonLevel,expire,hash,value,_ROWID_ " 346 "SELECT type,prio,anonLevel,expire,hash,value,_ROWID_ " "FROM gn090 "
351 "FROM gn090 "
352#if SQLITE_VERSION_NUMBER >= 3007000 347#if SQLITE_VERSION_NUMBER >= 3007000
353 "INDEXED BY idx_expire " 348 "INDEXED BY idx_expire "
354#endif 349#endif
355 "WHERE NOT EXISTS (SELECT 1 FROM gn090 WHERE expire < ?1 LIMIT 1) OR (expire < ?1) " 350 "WHERE NOT EXISTS (SELECT 1 FROM gn090 WHERE expire < ?1 LIMIT 1) OR (expire < ?1) "
356 "ORDER BY expire ASC LIMIT 1", &plugin->selExpi) != SQLITE_OK) || 351 "ORDER BY expire ASC LIMIT 1", &plugin->selExpi) != SQLITE_OK) ||
357 (sq_prepare 352 (sq_prepare
358 (plugin->dbh, 353 (plugin->dbh,
359 "SELECT type,prio,anonLevel,expire,hash,value,_ROWID_ " 354 "SELECT type,prio,anonLevel,expire,hash,value,_ROWID_ " "FROM gn090 "
360 "FROM gn090 "
361#if SQLITE_VERSION_NUMBER >= 3007000 355#if SQLITE_VERSION_NUMBER >= 3007000
362 "INDEXED BY idx_anon_type_hash " 356 "INDEXED BY idx_anon_type_hash "
363#endif 357#endif
364 "WHERE (anonLevel = 0 AND type=?1) " 358 "WHERE (anonLevel = 0 AND type=?1) "
365 "ORDER BY hash DESC LIMIT 1 OFFSET ?2", 359 "ORDER BY hash DESC LIMIT 1 OFFSET ?2",
diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c
index b1dd0e5de..0309a6592 100644
--- a/src/datastore/test_datastore_api.c
+++ b/src/datastore/test_datastore_api.c
@@ -185,11 +185,11 @@ check_value (void *cls, const GNUNET_HashCode * key, size_t size,
185 if (NULL == key) 185 if (NULL == key)
186 { 186 {
187 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 187 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
188 "Value check failed (got NULL key) in %d/%d\n", 188 "Value check failed (got NULL key) in %d/%d\n", crc->phase,
189 crc->phase, crc->i); 189 crc->i);
190 crc->phase = RP_ERROR; 190 crc->phase = RP_ERROR;
191 GNUNET_SCHEDULER_add_continuation (&run_continuation, crc, 191 GNUNET_SCHEDULER_add_continuation (&run_continuation, crc,
192 GNUNET_SCHEDULER_REASON_PREREQ_DONE); 192 GNUNET_SCHEDULER_REASON_PREREQ_DONE);
193 return; 193 return;
194 } 194 }
195#if 0 195#if 0