diff options
| author | Christian Grothoff <christian@grothoff.org> | 2017-10-02 09:36:09 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2017-10-02 09:36:09 +0200 |
| commit | 73f3dbe65643956dd1d872730cdd08c71cd076c5 (patch) | |
| tree | 0183dd16ebc7fce573ee001dfe5396acd1affba2 /src/datastore | |
| parent | 0f225ed0304398350d7b51a2567b2dc595476f31 (diff) | |
| download | gnunet-73f3dbe65643956dd1d872730cdd08c71cd076c5.tar.gz gnunet-73f3dbe65643956dd1d872730cdd08c71cd076c5.zip | |
disconnect CADET only after client count hits zero
Diffstat (limited to 'src/datastore')
| -rw-r--r-- | src/datastore/plugin_datastore_sqlite.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c index 2d539cb19..cc56f5959 100644 --- a/src/datastore/plugin_datastore_sqlite.c +++ b/src/datastore/plugin_datastore_sqlite.c | |||
| @@ -355,40 +355,24 @@ database_setup (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
| 355 | (SQLITE_OK != | 355 | (SQLITE_OK != |
| 356 | sq_prepare (plugin->dbh, | 356 | sq_prepare (plugin->dbh, |
| 357 | "SELECT " RESULT_COLUMNS " FROM gn091 " | 357 | "SELECT " RESULT_COLUMNS " FROM gn091 " |
| 358 | #if SQLITE_VERSION_NUMBER >= 3007000 | ||
| 359 | "INDEXED BY idx_repl_rvalue " | ||
| 360 | #endif | ||
| 361 | "WHERE repl=?2 AND " " (rvalue>=?1 OR " | 358 | "WHERE repl=?2 AND " " (rvalue>=?1 OR " |
| 362 | " NOT EXISTS (SELECT 1 FROM gn091 " | 359 | " NOT EXISTS (SELECT 1 FROM gn091 " |
| 363 | #if SQLITE_VERSION_NUMBER >= 3007000 | ||
| 364 | "INDEXED BY idx_repl_rvalue " | ||
| 365 | #endif | ||
| 366 | "WHERE repl=?2 AND rvalue>=?1 LIMIT 1) ) " | 360 | "WHERE repl=?2 AND rvalue>=?1 LIMIT 1) ) " |
| 367 | "ORDER BY rvalue ASC LIMIT 1", | 361 | "ORDER BY rvalue ASC LIMIT 1", |
| 368 | &plugin->selRepl)) || | 362 | &plugin->selRepl)) || |
| 369 | (SQLITE_OK != | 363 | (SQLITE_OK != |
| 370 | sq_prepare (plugin->dbh, | 364 | sq_prepare (plugin->dbh, |
| 371 | "SELECT MAX(repl) FROM gn091" | 365 | "SELECT MAX(repl) FROM gn091", |
| 372 | #if SQLITE_VERSION_NUMBER >= 3007000 | ||
| 373 | " INDEXED BY idx_repl_rvalue" | ||
| 374 | #endif | ||
| 375 | "", | ||
| 376 | &plugin->maxRepl)) || | 366 | &plugin->maxRepl)) || |
| 377 | (SQLITE_OK != | 367 | (SQLITE_OK != |
| 378 | sq_prepare (plugin->dbh, | 368 | sq_prepare (plugin->dbh, |
| 379 | "SELECT " RESULT_COLUMNS " FROM gn091 " | 369 | "SELECT " RESULT_COLUMNS " FROM gn091 " |
| 380 | #if SQLITE_VERSION_NUMBER >= 3007000 | ||
| 381 | "INDEXED BY idx_expire " | ||
| 382 | #endif | ||
| 383 | "WHERE NOT EXISTS (SELECT 1 FROM gn091 WHERE expire < ?1 LIMIT 1) OR (expire < ?1) " | 370 | "WHERE NOT EXISTS (SELECT 1 FROM gn091 WHERE expire < ?1 LIMIT 1) OR (expire < ?1) " |
| 384 | "ORDER BY expire ASC LIMIT 1", | 371 | "ORDER BY expire ASC LIMIT 1", |
| 385 | &plugin->selExpi)) || | 372 | &plugin->selExpi)) || |
| 386 | (SQLITE_OK != | 373 | (SQLITE_OK != |
| 387 | sq_prepare (plugin->dbh, | 374 | sq_prepare (plugin->dbh, |
| 388 | "SELECT " RESULT_COLUMNS " FROM gn091 " | 375 | "SELECT " RESULT_COLUMNS " FROM gn091 " |
| 389 | #if SQLITE_VERSION_NUMBER >= 3007000 | ||
| 390 | "INDEXED BY idx_anon_type " | ||
| 391 | #endif | ||
| 392 | "WHERE _ROWID_ >= ? AND " | 376 | "WHERE _ROWID_ >= ? AND " |
| 393 | "anonLevel = 0 AND " | 377 | "anonLevel = 0 AND " |
| 394 | "type = ? " | 378 | "type = ? " |