X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fdb.cpp;h=636b63ea54b8faf5b7d414738ef8775fbdf6a455;hb=a3b76e5ad9493b0af08fdcbe6d6b689d91496f85;hp=1ad17cbfece33368742f5e08da29e8072156edb7;hpb=4a9e97065dade428e373a83618bc973cd93cbe52;p=nageru

diff --git a/futatabi/db.cpp b/futatabi/db.cpp
index 1ad17cb..636b63e 100644
--- a/futatabi/db.cpp
+++ b/futatabi/db.cpp
@@ -15,16 +15,28 @@ DB::DB(const string &filename)
 		exit(1);
 	}
 
+	// 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));
+		exit(1);
+	}
+
 	sqlite3_exec(db, R"(
 		CREATE TABLE IF NOT EXISTS state (state BLOB);
 	)",
 	             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;
 	)",
@@ -92,16 +104,10 @@ void DB::store_state(const StateProto &state)
 		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);
-	}
-
 	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));
+		fprintf(stderr, "REPLACE prepare: %s\n", sqlite3_errmsg(db));
 		exit(1);
 	}
 
@@ -109,13 +115,13 @@ void DB::store_state(const StateProto &state)
 
 	ret = sqlite3_step(stmt);
 	if (ret == SQLITE_ROW) {
-		fprintf(stderr, "INSERT step: %s\n", sqlite3_errmsg(db));
+		fprintf(stderr, "REPLACE step: %s\n", sqlite3_errmsg(db));
 		exit(1);
 	}
 
 	ret = sqlite3_finalize(stmt);
 	if (ret != SQLITE_OK) {
-		fprintf(stderr, "INSERT finalize: %s\n", sqlite3_errmsg(db));
+		fprintf(stderr, "REPLACE finalize: %s\n", sqlite3_errmsg(db));
 		exit(1);
 	}
 
@@ -169,16 +175,10 @@ void DB::store_settings(const SettingsProto &settings)
 		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);
-	}
-
 	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));
+		fprintf(stderr, "REPLACE prepare: %s\n", sqlite3_errmsg(db));
 		exit(1);
 	}
 
@@ -186,13 +186,13 @@ void DB::store_settings(const SettingsProto &settings)
 
 	ret = sqlite3_step(stmt);
 	if (ret == SQLITE_ROW) {
-		fprintf(stderr, "INSERT step: %s\n", sqlite3_errmsg(db));
+		fprintf(stderr, "REPLACE step: %s\n", sqlite3_errmsg(db));
 		exit(1);
 	}
 
 	ret = sqlite3_finalize(stmt);
 	if (ret != SQLITE_OK) {
-		fprintf(stderr, "INSERT finalize: %s\n", sqlite3_errmsg(db));
+		fprintf(stderr, "REPLACE finalize: %s\n", sqlite3_errmsg(db));
 		exit(1);
 	}
 
@@ -262,26 +262,6 @@ void DB::store_frame_file(const string &filename, size_t size, const vector<Fram
 	// Delete any existing instances with this filename.
 	sqlite3_stmt *stmt;
 
-	ret = sqlite3_prepare_v2(db, "DELETE FROM filev2 WHERE filename=?", -1, &stmt, 0);
-	if (ret != SQLITE_OK) {
-		fprintf(stderr, "DELETE prepare: %s\n", sqlite3_errmsg(db));
-		exit(1);
-	}
-
-	sqlite3_bind_text(stmt, 1, filename.data(), filename.size(), SQLITE_STATIC);
-
-	ret = sqlite3_step(stmt);
-	if (ret == SQLITE_ROW) {
-		fprintf(stderr, "DELETE step: %s\n", sqlite3_errmsg(db));
-		exit(1);
-	}
-
-	ret = sqlite3_finalize(stmt);
-	if (ret != SQLITE_OK) {
-		fprintf(stderr, "DELETE finalize: %s\n", sqlite3_errmsg(db));
-		exit(1);
-	}
-
 	// Create the protobuf blob for the new row.
 	FileContentsProto file_contents;
 	unordered_set<unsigned> seen_stream_idx;  // Usually only one.
@@ -307,7 +287,7 @@ void DB::store_frame_file(const string &filename, size_t size, const vector<Fram
 	file_contents.SerializeToString(&serialized);
 
 	// Insert the new row.
-	ret = sqlite3_prepare_v2(db, "INSERT INTO filev2 (filename, size, frames) VALUES (?, ?, ?)", -1, &stmt, 0);
+	ret = sqlite3_prepare_v2(db, "REPLACE INTO filev2 (filename, size, frames) VALUES (?, ?, ?)", -1, &stmt, 0);
 	if (ret != SQLITE_OK) {
 		fprintf(stderr, "INSERT prepare: %s\n", sqlite3_errmsg(db));
 		exit(1);
@@ -319,13 +299,13 @@ void DB::store_frame_file(const string &filename, size_t size, const vector<Fram
 
 	ret = sqlite3_step(stmt);
 	if (ret == SQLITE_ROW) {
-		fprintf(stderr, "INSERT step: %s\n", sqlite3_errmsg(db));
+		fprintf(stderr, "REPLACE step: %s\n", sqlite3_errmsg(db));
 		exit(1);
 	}
 
 	ret = sqlite3_finalize(stmt);
 	if (ret != SQLITE_OK) {
-		fprintf(stderr, "INSERT finalize: %s\n", sqlite3_errmsg(db));
+		fprintf(stderr, "REPLACE finalize: %s\n", sqlite3_errmsg(db));
 		exit(1);
 	}