X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fdb.cpp;h=33d88d4f369e2819a585a32fb771f99d8ffccef8;hb=6a2b68fa99bfd87e9b67edddef025b53188633ae;hp=13e3f6ee7174dc105df1de4136dff33c905e5bd0;hpb=ffe2343de3fe982cc52a449b13f01137819ed42d;p=nageru

diff --git a/futatabi/db.cpp b/futatabi/db.cpp
index 13e3f6e..33d88d4 100644
--- a/futatabi/db.cpp
+++ b/futatabi/db.cpp
@@ -3,6 +3,7 @@
 #include "frame.pb.h"
 
 #include <string>
+#include <unordered_set>
 
 using namespace std;
 
@@ -16,19 +17,23 @@ DB::DB(const string &filename)
 
 	sqlite3_exec(db, R"(
 		CREATE TABLE IF NOT EXISTS state (state BLOB);
-	)", nullptr, nullptr, nullptr);  // Ignore errors.
+	)",
+	             nullptr, nullptr, nullptr);  // Ignore errors.
 
 	sqlite3_exec(db, R"(
 		CREATE TABLE IF NOT EXISTS settings (settings BLOB);
-	)", nullptr, nullptr, nullptr);  // Ignore errors.
+	)",
+	             nullptr, nullptr, nullptr);  // Ignore errors.
 
 	sqlite3_exec(db, R"(
 		DROP TABLE file;
-	)", nullptr, nullptr, nullptr);  // Ignore errors.
+	)",
+	             nullptr, nullptr, nullptr);  // Ignore errors.
 
 	sqlite3_exec(db, R"(
 		DROP TABLE frame;
-	)", nullptr, nullptr, nullptr);  // Ignore errors.
+	)",
+	             nullptr, nullptr, nullptr);  // Ignore errors.
 
 	sqlite3_exec(db, R"(
 		CREATE TABLE IF NOT EXISTS filev2 (
@@ -37,7 +42,8 @@ DB::DB(const string &filename)
 			size BIGINT NOT NULL,
 			frames BLOB NOT NULL
 		);
-	)", nullptr, nullptr, nullptr);  // Ignore errors.
+	)",
+	             nullptr, nullptr, nullptr);  // Ignore errors.
 
 	sqlite3_exec(db, "PRAGMA journal_mode=WAL", nullptr, nullptr, nullptr);  // Ignore errors.
 	sqlite3_exec(db, "PRAGMA synchronous=NORMAL", nullptr, nullptr, nullptr);  // Ignore errors.
@@ -256,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.
@@ -301,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);
@@ -341,7 +327,8 @@ void DB::clean_unused_frame_files(const vector<string> &used_filenames)
 
 	ret = sqlite3_exec(db, R"(
 		CREATE TEMPORARY TABLE used_filenames ( filename VARCHAR NOT NULL PRIMARY KEY )
-	)", nullptr, nullptr, nullptr);
+	)",
+	                   nullptr, nullptr, nullptr);
 
 	if (ret != SQLITE_OK) {
 		fprintf(stderr, "CREATE TEMPORARY TABLE: %s\n", sqlite3_errmsg(db));
@@ -380,7 +367,8 @@ void DB::clean_unused_frame_files(const vector<string> &used_filenames)
 
 	ret = sqlite3_exec(db, R"(
 		DELETE FROM filev2 WHERE filename NOT IN ( SELECT filename FROM used_filenames )
-	)", nullptr, nullptr, nullptr);
+	)",
+	                   nullptr, nullptr, nullptr);
 
 	if (ret != SQLITE_OK) {
 		fprintf(stderr, "DELETE: %s\n", sqlite3_errmsg(db));
@@ -389,7 +377,8 @@ void DB::clean_unused_frame_files(const vector<string> &used_filenames)
 
 	ret = sqlite3_exec(db, R"(
 		DROP TABLE used_filenames
-	)", nullptr, nullptr, nullptr);
+	)",
+	                   nullptr, nullptr, nullptr);
 
 	if (ret != SQLITE_OK) {
 		fprintf(stderr, "DROP TABLE: %s\n", sqlite3_errmsg(db));