X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fdb.cpp;h=9c6748fb257ffaa439c21e0e0f510565b0fa77cc;hb=refs%2Fheads%2Fmaster;hp=33d88d4f369e2819a585a32fb771f99d8ffccef8;hpb=6a2b68fa99bfd87e9b67edddef025b53188633ae;p=nageru diff --git a/futatabi/db.cpp b/futatabi/db.cpp index 33d88d4..9c6748f 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"( @@ -20,11 +28,15 @@ DB::DB(const string &filename) )", nullptr, nullptr, nullptr); // Ignore errors. + 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); )", nullptr, nullptr, nullptr); // Ignore errors. + sqlite3_exec(db, "CREATE UNIQUE INDEX only_one_settings ON settings (1);", nullptr, nullptr, nullptr); // Ignore errors. + sqlite3_exec(db, R"( DROP TABLE file; )", @@ -57,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); @@ -65,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; @@ -89,40 +101,34 @@ 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); - } - - ret = sqlite3_exec(db, "DELETE FROM state", nullptr, nullptr, nullptr); - if (ret != SQLITE_OK) { - fprintf(stderr, "DELETE: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } sqlite3_stmt *stmt; - ret = sqlite3_prepare_v2(db, "INSERT INTO state VALUES (?)", -1, &stmt, 0); + ret = sqlite3_prepare_v2(db, "REPLACE INTO state VALUES (?)", -1, &stmt, 0); if (ret != SQLITE_OK) { - fprintf(stderr, "INSERT prepare: %s\n", sqlite3_errmsg(db)); - exit(1); + fprintf(stderr, "REPLACE prepare: %s\n", sqlite3_errmsg(db)); + abort(); } sqlite3_bind_blob(stmt, 1, serialized.data(), serialized.size(), SQLITE_STATIC); ret = sqlite3_step(stmt); if (ret == SQLITE_ROW) { - fprintf(stderr, "INSERT step: %s\n", sqlite3_errmsg(db)); - exit(1); + fprintf(stderr, "REPLACE step: %s\n", sqlite3_errmsg(db)); + abort(); } ret = sqlite3_finalize(stmt); if (ret != SQLITE_OK) { - fprintf(stderr, "INSERT finalize: %s\n", sqlite3_errmsg(db)); - exit(1); + fprintf(stderr, "REPLACE finalize: %s\n", sqlite3_errmsg(db)); + abort(); } ret = sqlite3_exec(db, "COMMIT", nullptr, nullptr, nullptr); if (ret != SQLITE_OK) { fprintf(stderr, "COMMIT: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } } @@ -134,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); @@ -142,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; @@ -166,40 +172,34 @@ 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); - } - - ret = sqlite3_exec(db, "DELETE FROM settings", nullptr, nullptr, nullptr); - if (ret != SQLITE_OK) { - fprintf(stderr, "DELETE: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } sqlite3_stmt *stmt; - ret = sqlite3_prepare_v2(db, "INSERT INTO settings VALUES (?)", -1, &stmt, 0); + ret = sqlite3_prepare_v2(db, "REPLACE INTO settings VALUES (?)", -1, &stmt, 0); if (ret != SQLITE_OK) { - fprintf(stderr, "INSERT prepare: %s\n", sqlite3_errmsg(db)); - exit(1); + fprintf(stderr, "REPLACE prepare: %s\n", sqlite3_errmsg(db)); + abort(); } sqlite3_bind_blob(stmt, 1, serialized.data(), serialized.size(), SQLITE_STATIC); ret = sqlite3_step(stmt); if (ret == SQLITE_ROW) { - fprintf(stderr, "INSERT step: %s\n", sqlite3_errmsg(db)); - exit(1); + fprintf(stderr, "REPLACE step: %s\n", sqlite3_errmsg(db)); + abort(); } ret = sqlite3_finalize(stmt); if (ret != SQLITE_OK) { - fprintf(stderr, "INSERT finalize: %s\n", sqlite3_errmsg(db)); - exit(1); + fprintf(stderr, "REPLACE finalize: %s\n", sqlite3_errmsg(db)); + abort(); } ret = sqlite3_exec(db, "COMMIT", nullptr, nullptr, nullptr); if (ret != SQLITE_OK) { fprintf(stderr, "COMMIT: %s\n", sqlite3_errmsg(db)); - exit(1); + abort(); } } @@ -211,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); @@ -222,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; @@ -244,6 +244,11 @@ vector DB::load_frame_file(const string &filename, frame.frame.pts = stream.pts(i); frame.frame.offset = stream.offset(i); frame.frame.size = stream.file_size(i); + if (i < stream.audio_size_size()) { + frame.frame.audio_size = stream.audio_size(i); + } else { + frame.frame.audio_size = 0; + } frames.push_back(frame); } } @@ -256,7 +261,7 @@ void DB::store_frame_file(const string &filename, size_t size, const vectormutable_pts()->Reserve(frames.size()); stream->mutable_offset()->Reserve(frames.size()); stream->mutable_file_size()->Reserve(frames.size()); + stream->mutable_audio_size()->Reserve(frames.size()); for (const FrameOnDiskAndStreamIdx &frame : frames) { if (frame.stream_idx != stream_idx) { continue; @@ -281,6 +287,7 @@ void DB::store_frame_file(const string &filename, size_t size, const vectoradd_pts(frame.frame.pts); stream->add_offset(frame.frame.offset); stream->add_file_size(frame.frame.size); + stream->add_audio_size(frame.frame.audio_size); } } string serialized; @@ -290,7 +297,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"( @@ -332,7 +339,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. @@ -340,7 +347,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) { @@ -349,20 +356,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"( @@ -372,7 +379,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"( @@ -382,13 +389,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(); } }