X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=localdb.cc;h=4683f4d83c567dca863fe42886a0a5f2ceac348b;hb=cac644d993d130efd8d29539de6557b18c9b737e;hp=9bd33d9337cbbb4ca391ebd95ac7ade354bcf449;hpb=534e35d886de4eb7b6022c0ecb4a804475c820ea;p=cumulus.git

diff --git a/localdb.cc b/localdb.cc
index 9bd33d9..4683f4d 100644
--- a/localdb.cc
+++ b/localdb.cc
@@ -26,8 +26,6 @@ void LocalDb::Open(const char *path, const char *snapshot_name)
 {
     int rc;
 
-    snapshot = snapshot_name;
-
     rc = sqlite3_open(path, &db);
     if (rc) {
         fprintf(stderr, "Can't open database: %s\n", sqlite3_errmsg(db));
@@ -41,6 +39,36 @@ void LocalDb::Open(const char *path, const char *snapshot_name)
         sqlite3_close(db);
         throw IOException("Error starting transaction");
     }
+
+    /* Insert this snapshot into the database, and determine the integer key
+     * which will be used to identify it. */
+    sqlite3_stmt *stmt;
+    static const char s[] =
+        "insert into snapshots(name, timestamp) "
+        "values (?, julianday('now'))";
+    const char *tail;
+
+    rc = sqlite3_prepare_v2(db, s, strlen(s), &stmt, &tail);
+    if (rc != SQLITE_OK) {
+        sqlite3_close(db);
+        throw IOException("Error adding snapshot");
+    }
+
+    sqlite3_bind_text(stmt, 1, snapshot_name, strlen(snapshot_name),
+                      SQLITE_TRANSIENT);
+
+    rc = sqlite3_step(stmt);
+    if (rc != SQLITE_DONE) {
+        sqlite3_close(db);
+        throw IOException("Database execution error!");
+    }
+
+    snapshotid = sqlite3_last_insert_rowid(db);
+    sqlite3_finalize(stmt);
+    if (snapshotid == 0) {
+        sqlite3_close(db);
+        throw IOException("Find snapshot id");
+    }
 }
 
 void LocalDb::Close()
@@ -53,13 +81,89 @@ void LocalDb::Close()
     sqlite3_close(db);
 }
 
+int64_t LocalDb::SegmentToId(const string &segment)
+{
+    int rc;
+    sqlite3_stmt *stmt;
+    static const char s1[] =
+        "insert or ignore into segments(segment) values (?);";
+    static const char s2[] =
+        "select segmentid from segments where segment = ?";
+    const char *tail;
+    int64_t result;
+
+    rc = sqlite3_prepare_v2(db, s1, strlen(s1), &stmt, &tail);
+    if (rc != SQLITE_OK) {
+        throw IOException("Find id by segment name");
+    }
+    sqlite3_bind_text(stmt, 1, segment.c_str(), segment.size(),
+                      SQLITE_TRANSIENT);
+    rc = sqlite3_step(stmt);
+    if (rc != SQLITE_DONE) {
+        throw IOException("Could not execute INSERT statement!");
+    }
+    sqlite3_finalize(stmt);
+
+    rc = sqlite3_prepare_v2(db, s2, strlen(s2), &stmt, &tail);
+    if (rc != SQLITE_OK) {
+        throw IOException("Find id by segment name");
+    }
+
+    sqlite3_bind_text(stmt, 1, segment.c_str(), segment.size(),
+                      SQLITE_TRANSIENT);
+
+    rc = sqlite3_step(stmt);
+    if (rc == SQLITE_DONE) {
+        throw IOException("No segment found by id");
+    } else if (rc == SQLITE_ROW) {
+        result = sqlite3_column_int64(stmt, 0);
+    } else {
+        throw IOException("Error executing find segment by id query");
+    }
+
+    sqlite3_finalize(stmt);
+
+    return result;
+}
+
+string LocalDb::IdToSegment(int64_t segmentid)
+{
+    int rc;
+    sqlite3_stmt *stmt;
+    static const char s[] =
+        "select segment from segments where segmentid = ?";
+    const char *tail;
+    string result;
+
+    rc = sqlite3_prepare_v2(db, s, strlen(s), &stmt, &tail);
+    if (rc != SQLITE_OK) {
+        throw IOException("Find segment by id");
+    }
+
+    sqlite3_bind_int64(stmt, 1, segmentid);
+
+    rc = sqlite3_step(stmt);
+    if (rc == SQLITE_DONE) {
+        throw IOException("No segment found by id");
+    } else if (rc == SQLITE_ROW) {
+        result = (const char *)sqlite3_column_text(stmt, 0);
+    } else {
+        throw IOException("Error executing find segment by id query");
+    }
+
+    sqlite3_finalize(stmt);
+
+    return result;
+}
+
 void LocalDb::StoreObject(const ObjectReference& ref,
                           const string &checksum, int64_t size)
 {
     int rc;
     sqlite3_stmt *stmt;
     static const char s[] =
-        "insert into block_index(segment, object, checksum, size, timestamp) "
+        "insert into "
+        "block_index(segmentid, object, checksum, size, timestamp) "
         "values (?, ?, ?, ?, julianday('now'))";
     const char *tail;
 
@@ -68,8 +172,7 @@ void LocalDb::StoreObject(const ObjectReference& ref,
         return;
     }
 
-    string seg = ref.get_segment();
-    sqlite3_bind_text(stmt, 1, seg.c_str(), seg.size(), SQLITE_TRANSIENT);
+    sqlite3_bind_int64(stmt, 1, SegmentToId(ref.get_segment()));
     string obj = ref.get_sequence();
     sqlite3_bind_text(stmt, 2, obj.c_str(), obj.size(), SQLITE_TRANSIENT);
     sqlite3_bind_text(stmt, 3, checksum.c_str(), checksum.size(),
@@ -89,8 +192,8 @@ ObjectReference LocalDb::FindObject(const string &checksum, int64_t size)
     int rc;
     sqlite3_stmt *stmt;
     static const char s[] =
-        "select segment, object from block_index "
-        "where checksum = ? and size = ?";
+        "select segmentid, object from block_index "
+        "where checksum = ? and size = ? and expired is null";
     const char *tail;
 
     ObjectReference ref;
@@ -107,7 +210,7 @@ ObjectReference LocalDb::FindObject(const string &checksum, int64_t size)
     rc = sqlite3_step(stmt);
     if (rc == SQLITE_DONE) {
     } else if (rc == SQLITE_ROW) {
-        ref = ObjectReference((const char *)sqlite3_column_text(stmt, 0),
+        ref = ObjectReference(IdToSegment(sqlite3_column_int64(stmt, 0)),
                               (const char *)sqlite3_column_text(stmt, 1));
     } else {
         fprintf(stderr, "Could not execute SELECT statement!\n");
@@ -118,14 +221,48 @@ ObjectReference LocalDb::FindObject(const string &checksum, int64_t size)
     return ref;
 }
 
+bool LocalDb::IsOldObject(const string &checksum, int64_t size)
+{
+    int rc;
+    sqlite3_stmt *stmt;
+    static const char s[] =
+        "select segmentid, object from block_index "
+        "where checksum = ? and size = ?";
+    const char *tail;
+
+    bool found = false;
+
+    rc = sqlite3_prepare_v2(db, s, strlen(s), &stmt, &tail);
+    if (rc != SQLITE_OK) {
+        return false;
+    }
+
+    sqlite3_bind_text(stmt, 1, checksum.c_str(), checksum.size(),
+                      SQLITE_TRANSIENT);
+    sqlite3_bind_int64(stmt, 2, size);
+
+    rc = sqlite3_step(stmt);
+    if (rc == SQLITE_DONE) {
+        found = false;
+    } else if (rc == SQLITE_ROW) {
+        found = true;
+    } else {
+        fprintf(stderr, "Could not execute SELECT statement!\n");
+    }
+
+    sqlite3_finalize(stmt);
+
+    return found;
+}
+
 void LocalDb::UseObject(const ObjectReference& ref)
 {
     int rc;
     sqlite3_stmt *stmt;
     static const char s[] =
-        "insert into snapshot_contents "
-        "select blockid, ? as snapshot from block_index "
-        "where segment = ? and object = ?";
+        "insert or ignore into snapshot_contents "
+        "select blockid, ? as snapshotid from block_index "
+        "where segmentid = ? and object = ?";
     const char *tail;
 
     rc = sqlite3_prepare_v2(db, s, strlen(s), &stmt, &tail);
@@ -133,10 +270,8 @@ void LocalDb::UseObject(const ObjectReference& ref)
         return;
     }
 
-    sqlite3_bind_text(stmt, 1, snapshot.c_str(), snapshot.size(),
-                      SQLITE_TRANSIENT);
-    string seg = ref.get_segment();
-    sqlite3_bind_text(stmt, 2, seg.c_str(), seg.size(), SQLITE_TRANSIENT);
+    sqlite3_bind_int64(stmt, 1, snapshotid);
+    sqlite3_bind_int64(stmt, 2, SegmentToId(ref.get_segment()));
     string obj = ref.get_sequence();
     sqlite3_bind_text(stmt, 3, obj.c_str(), obj.size(), SQLITE_TRANSIENT);