X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=localdb.cc;h=251148b27711d1afed984bdf497ce3ad0b4da4d1;hb=2a08b08c0b0ddc64d0be49a3d8c503feb8b4058f;hp=5c1f7e55b2424015e525db895ac7f738b09d4dab;hpb=a4cf5f4d8df46fa00992a210d587cd824cedcb08;p=cumulus.git

diff --git a/localdb.cc b/localdb.cc
index 5c1f7e5..251148b 100644
--- a/localdb.cc
+++ b/localdb.cc
@@ -30,7 +30,7 @@ sqlite3_stmt *LocalDb::Prepare(const char *sql)
     int rc;
     const char *tail;
 
-    rc = sqlite3_prepare(db, sql, strlen(sql), &stmt, &tail);
+    rc = sqlite3_prepare_v2(db, sql, strlen(sql), &stmt, &tail);
     if (rc != SQLITE_OK) {
         throw IOException(string("Error preparing statement: ") + sql);
     }
@@ -38,6 +38,12 @@ sqlite3_stmt *LocalDb::Prepare(const char *sql)
     return stmt;
 }
 
+void LocalDb::ReportError(int rc)
+{
+    fprintf(stderr, "Result code: %d\n", rc);
+    fprintf(stderr, "Error message: %s\n", sqlite3_errmsg(db));
+}
+
 void LocalDb::Open(const char *path, const char *snapshot_name,
                    const char *snapshot_scheme)
 {
@@ -57,6 +63,8 @@ void LocalDb::Open(const char *path, const char *snapshot_name,
         throw IOException("Error starting transaction");
     }
 
+    sqlite3_extended_result_codes(db, 1);
+
     /* Insert this snapshot into the database, and determine the integer key
      * which will be used to identify it. */
     sqlite3_stmt *stmt = Prepare("insert into "
@@ -72,6 +80,7 @@ void LocalDb::Open(const char *path, const char *snapshot_name,
 
     rc = sqlite3_step(stmt);
     if (rc != SQLITE_DONE) {
+        ReportError(rc);
         sqlite3_close(db);
         throw IOException("Database execution error!");
     }
@@ -79,6 +88,7 @@ void LocalDb::Open(const char *path, const char *snapshot_name,
     snapshotid = sqlite3_last_insert_rowid(db);
     sqlite3_finalize(stmt);
     if (snapshotid == 0) {
+        ReportError(rc);
         sqlite3_close(db);
         throw IOException("Find snapshot id");
     }
@@ -89,7 +99,8 @@ void LocalDb::Close()
     int rc;
     rc = sqlite3_exec(db, "commit", NULL, NULL, NULL);
     if (rc != SQLITE_OK) {
-        fprintf(stderr, "Can't commit database!\n");
+        fprintf(stderr, "DATABASE ERROR: Can't commit database!\n");
+        ReportError(rc);
     }
     sqlite3_close(db);
 }
@@ -179,6 +190,7 @@ void LocalDb::StoreObject(const ObjectReference& ref,
     rc = sqlite3_step(stmt);
     if (rc != SQLITE_DONE) {
         fprintf(stderr, "Could not execute INSERT statement!\n");
+        ReportError(rc);
     }
 
     sqlite3_finalize(stmt);
@@ -203,6 +215,7 @@ ObjectReference LocalDb::FindObject(const string &checksum, int64_t size)
                               (const char *)sqlite3_column_text(stmt, 1));
     } else {
         fprintf(stderr, "Could not execute SELECT statement!\n");
+        ReportError(rc);
     }
 
     sqlite3_finalize(stmt);
@@ -210,14 +223,15 @@ ObjectReference LocalDb::FindObject(const string &checksum, int64_t size)
     return ref;
 }
 
-bool LocalDb::IsOldObject(const string &checksum, int64_t size, double *age)
+bool LocalDb::IsOldObject(const string &checksum, int64_t size, double *age,
+                          int *group)
 {
     int rc;
     sqlite3_stmt *stmt;
     bool found = false;
 
-    stmt = Prepare("select segmentid, object, timestamp from block_index "
-                   "where checksum = ? and size = ?");
+    stmt = Prepare("select segmentid, object, timestamp, expired "
+                   "from block_index where checksum = ? and size = ?");
     sqlite3_bind_text(stmt, 1, checksum.c_str(), checksum.size(),
                       SQLITE_TRANSIENT);
     sqlite3_bind_int64(stmt, 2, size);
@@ -228,8 +242,10 @@ bool LocalDb::IsOldObject(const string &checksum, int64_t size, double *age)
     } else if (rc == SQLITE_ROW) {
         found = true;
         *age = sqlite3_column_double(stmt, 2);
+        *group = sqlite3_column_int(stmt, 3);
     } else {
         fprintf(stderr, "Could not execute SELECT statement!\n");
+        ReportError(rc);
     }
 
     sqlite3_finalize(stmt);
@@ -258,6 +274,7 @@ bool LocalDb::IsAvailable(const ObjectReference &ref)
             found = true;
     } else {
         fprintf(stderr, "Could not execute SELECT statement!\n");
+        ReportError(rc);
     }
 
     sqlite3_finalize(stmt);
@@ -281,6 +298,7 @@ void LocalDb::UseObject(const ObjectReference& ref)
     rc = sqlite3_step(stmt);
     if (rc != SQLITE_DONE) {
         fprintf(stderr, "Could not execute INSERT statement!\n");
+        ReportError(rc);
     }
 
     sqlite3_finalize(stmt);
@@ -304,7 +322,48 @@ void LocalDb::SetSegmentChecksum(const std::string &segment,
     rc = sqlite3_step(stmt);
     if (rc != SQLITE_DONE) {
         fprintf(stderr, "Could not update segment checksum in database!\n");
+        ReportError(rc);
     }
 
     sqlite3_finalize(stmt);
 }
+
+bool LocalDb::GetSegmentChecksum(const string &segment,
+                                 string *seg_path,
+                                 string *seg_checksum)
+{
+    int rc;
+    sqlite3_stmt *stmt;
+    ObjectReference ref;
+    int found = false;
+
+    stmt = Prepare("select path, checksum from segments where segment = ?");
+    sqlite3_bind_text(stmt, 1, segment.c_str(), segment.size(),
+                      SQLITE_TRANSIENT);
+
+    rc = sqlite3_step(stmt);
+    if (rc == SQLITE_DONE) {
+    } else if (rc == SQLITE_ROW) {
+        found = true;
+        const char *val;
+
+        val = (const char *)sqlite3_column_text(stmt, 0);
+        if (val == NULL)
+            found = false;
+        else
+            *seg_path = val;
+
+        val = (const char *)sqlite3_column_text(stmt, 1);
+        if (val == NULL)
+            found = false;
+        else
+            *seg_checksum = val;
+    } else {
+        fprintf(stderr, "Could not execute SELECT statement!\n");
+        ReportError(rc);
+    }
+
+    sqlite3_finalize(stmt);
+
+    return found;
+}