X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fdb.cpp;h=6764f84ce54aad90d1e82df50c5862d243b270da;hb=9ffd4f03f314cc6e0254449593def95c9bc203d6;hp=75fc6f2c85f1a382519d4d595c1266d120fcf523;hpb=bc3fa9eedf79a34faa2e6bbf57a555bfeb51ec1d;p=nageru diff --git a/futatabi/db.cpp b/futatabi/db.cpp index 75fc6f2..6764f84 100644 --- a/futatabi/db.cpp +++ b/futatabi/db.cpp @@ -12,7 +12,15 @@ DB::DB(const string &filename) int ret = sqlite3_open(filename.c_str(), &db); if (ret != SQLITE_OK) { fprintf(stderr, "%s: %s\n", filename.c_str(), sqlite3_errmsg(db)); - exit(1); + abort(); + } + + // Set an effectively infinite timeout for waiting for write locks; + // if we get SQLITE_LOCKED, we just exit out, so this is much better. + ret = sqlite3_busy_timeout(db, 3600000); + if (ret != SQLITE_OK) { + fprintf(stderr, "sqlite3_busy_timeout: %s\n", sqlite3_errmsg(db)); + abort(); } sqlite3_exec(db, R"( @@ -23,7 +31,7 @@ DB::DB(const string &filename) sqlite3_exec(db, "CREATE UNIQUE INDEX only_one_state ON state (1);", nullptr, nullptr, nullptr); // Ignore errors. sqlite3_exec(db, R"( - CREATE TABLE IF NOT EXISTS settings (settings BLOB, uniqifier NOT NULL DEFAULT 1 UNIQUE); + CREATE TABLE IF NOT EXISTS settings (settings BLOB); )", nullptr, nullptr, nullptr); // Ignore errors. @@ -61,7 +69,7 @@ StateProto DB::get_state() int ret = sqlite3_prepare_v2(db, "SELECT state FROM state", -1, &stmt, 0); if (ret != SQLITE_OK) { fprintf(stderr, "SELECT prepare: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } ret = sqlite3_step(stmt); @@ -69,17 +77,17 @@ StateProto DB::get_state() bool ok = state.ParseFromArray(sqlite3_column_blob(stmt, 0), sqlite3_column_bytes(stmt, 0)); if (!ok) { fprintf(stderr, "State in database is corrupted!\n"); - exit(1); + abort(); } } else if (ret != SQLITE_DONE) { fprintf(stderr, "SELECT step: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } ret = sqlite3_finalize(stmt); if (ret != SQLITE_OK) { fprintf(stderr, "SELECT finalize: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } return state; @@ -93,14 +101,14 @@ void DB::store_state(const StateProto &state) int ret = sqlite3_exec(db, "BEGIN", nullptr, nullptr, nullptr); if (ret != SQLITE_OK) { fprintf(stderr, "BEGIN: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } sqlite3_stmt *stmt; ret = sqlite3_prepare_v2(db, "REPLACE INTO state VALUES (?)", -1, &stmt, 0); if (ret != SQLITE_OK) { fprintf(stderr, "REPLACE prepare: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } sqlite3_bind_blob(stmt, 1, serialized.data(), serialized.size(), SQLITE_STATIC); @@ -108,19 +116,19 @@ void DB::store_state(const StateProto &state) ret = sqlite3_step(stmt); if (ret == SQLITE_ROW) { fprintf(stderr, "REPLACE step: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } ret = sqlite3_finalize(stmt); if (ret != SQLITE_OK) { fprintf(stderr, "REPLACE finalize: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } ret = sqlite3_exec(db, "COMMIT", nullptr, nullptr, nullptr); if (ret != SQLITE_OK) { fprintf(stderr, "COMMIT: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } } @@ -132,7 +140,7 @@ SettingsProto DB::get_settings() int ret = sqlite3_prepare_v2(db, "SELECT settings FROM settings", -1, &stmt, 0); if (ret != SQLITE_OK) { fprintf(stderr, "SELECT prepare: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } ret = sqlite3_step(stmt); @@ -140,17 +148,17 @@ SettingsProto DB::get_settings() bool ok = settings.ParseFromArray(sqlite3_column_blob(stmt, 0), sqlite3_column_bytes(stmt, 0)); if (!ok) { fprintf(stderr, "State in database is corrupted!\n"); - exit(1); + abort(); } } else if (ret != SQLITE_DONE) { fprintf(stderr, "SELECT step: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } ret = sqlite3_finalize(stmt); if (ret != SQLITE_OK) { fprintf(stderr, "SELECT finalize: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } return settings; @@ -164,14 +172,14 @@ void DB::store_settings(const SettingsProto &settings) int ret = sqlite3_exec(db, "BEGIN", nullptr, nullptr, nullptr); if (ret != SQLITE_OK) { fprintf(stderr, "BEGIN: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } sqlite3_stmt *stmt; ret = sqlite3_prepare_v2(db, "REPLACE INTO settings VALUES (?)", -1, &stmt, 0); if (ret != SQLITE_OK) { fprintf(stderr, "REPLACE prepare: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } sqlite3_bind_blob(stmt, 1, serialized.data(), serialized.size(), SQLITE_STATIC); @@ -179,19 +187,19 @@ void DB::store_settings(const SettingsProto &settings) ret = sqlite3_step(stmt); if (ret == SQLITE_ROW) { fprintf(stderr, "REPLACE step: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } ret = sqlite3_finalize(stmt); if (ret != SQLITE_OK) { fprintf(stderr, "REPLACE finalize: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } ret = sqlite3_exec(db, "COMMIT", nullptr, nullptr, nullptr); if (ret != SQLITE_OK) { fprintf(stderr, "COMMIT: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } } @@ -203,7 +211,7 @@ vector DB::load_frame_file(const string &filename, int ret = sqlite3_prepare_v2(db, "SELECT frames FROM filev2 WHERE filename=? AND size=?", -1, &stmt, 0); if (ret != SQLITE_OK) { fprintf(stderr, "SELECT prepare: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } sqlite3_bind_text(stmt, 1, filename.data(), filename.size(), SQLITE_STATIC); @@ -214,17 +222,17 @@ vector DB::load_frame_file(const string &filename, bool ok = file_contents.ParseFromArray(sqlite3_column_blob(stmt, 0), sqlite3_column_bytes(stmt, 0)); if (!ok) { fprintf(stderr, "Frame list in database is corrupted!\n"); - exit(1); + abort(); } } else if (ret != SQLITE_DONE) { fprintf(stderr, "SELECT step: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } ret = sqlite3_finalize(stmt); if (ret != SQLITE_OK) { fprintf(stderr, "SELECT finalize: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } vector frames; @@ -248,7 +256,7 @@ void DB::store_frame_file(const string &filename, size_t size, const vector &used_filenames) int ret = sqlite3_exec(db, "BEGIN", nullptr, nullptr, nullptr); if (ret != SQLITE_OK) { fprintf(stderr, "BEGIN: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } ret = sqlite3_exec(db, R"( @@ -324,7 +332,7 @@ void DB::clean_unused_frame_files(const vector &used_filenames) if (ret != SQLITE_OK) { fprintf(stderr, "CREATE TEMPORARY TABLE: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } // Insert the new rows. @@ -332,7 +340,7 @@ void DB::clean_unused_frame_files(const vector &used_filenames) ret = sqlite3_prepare_v2(db, "INSERT INTO used_filenames (filename) VALUES (?)", -1, &stmt, 0); if (ret != SQLITE_OK) { fprintf(stderr, "INSERT prepare: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } for (const string &filename : used_filenames) { @@ -341,20 +349,20 @@ void DB::clean_unused_frame_files(const vector &used_filenames) ret = sqlite3_step(stmt); if (ret == SQLITE_ROW) { fprintf(stderr, "INSERT step: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } ret = sqlite3_reset(stmt); if (ret == SQLITE_ROW) { fprintf(stderr, "INSERT reset: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } } ret = sqlite3_finalize(stmt); if (ret != SQLITE_OK) { fprintf(stderr, "INSERT finalize: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } ret = sqlite3_exec(db, R"( @@ -364,7 +372,7 @@ void DB::clean_unused_frame_files(const vector &used_filenames) if (ret != SQLITE_OK) { fprintf(stderr, "DELETE: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } ret = sqlite3_exec(db, R"( @@ -374,13 +382,13 @@ void DB::clean_unused_frame_files(const vector &used_filenames) if (ret != SQLITE_OK) { fprintf(stderr, "DROP TABLE: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } // Commit. ret = sqlite3_exec(db, "COMMIT", nullptr, nullptr, nullptr); if (ret != SQLITE_OK) { fprintf(stderr, "COMMIT: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } }