X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=localdb.cc;h=077c927e524041a4010e33fc58f09aa219318582;hb=f1f817df56ce99ea544569635698df55d72bd1ee;hp=c0ad7d68cfbab8f0fd21593cad6e73167462ecc1;hpb=4a312a9c567e5acae9f58587287795e0f7b0cd6c;p=cumulus.git

diff --git a/localdb.cc b/localdb.cc
index c0ad7d6..077c927 100644
--- a/localdb.cc
+++ b/localdb.cc
@@ -46,7 +46,7 @@ void LocalDb::ReportError(int rc)
 }
 
 void LocalDb::Open(const char *path, const char *snapshot_name,
-                   const char *snapshot_scheme)
+                   const char *snapshot_scheme, double intent)
 {
     int rc;
 
@@ -69,8 +69,8 @@ void LocalDb::Open(const char *path, const char *snapshot_name,
     /* Insert this snapshot into the database, and determine the integer key
      * which will be used to identify it. */
     sqlite3_stmt *stmt = Prepare("insert into "
-                                 "snapshots(name, scheme, timestamp) "
-                                 "values (?, ?, julianday('now'))");
+                                 "snapshots(name, scheme, timestamp, intent) "
+                                 "values (?, ?, julianday('now'), ?)");
     sqlite3_bind_text(stmt, 1, snapshot_name, strlen(snapshot_name),
                       SQLITE_TRANSIENT);
     if (snapshot_scheme == NULL)
@@ -78,6 +78,7 @@ void LocalDb::Open(const char *path, const char *snapshot_name,
     else
         sqlite3_bind_text(stmt, 2, snapshot_scheme, strlen(snapshot_scheme),
                           SQLITE_TRANSIENT);
+    sqlite3_bind_double(stmt, 3, intent);
 
     rc = sqlite3_step(stmt);
     if (rc != SQLITE_DONE) {
@@ -124,14 +125,21 @@ void LocalDb::Close()
     int rc;
 
     /* Summarize the snapshot_refs table into segments_used. */
-    sqlite3_stmt *stmt = Prepare("insert into segments_used "
-                                 "select ? as snapshotid, segmentid, "
-                                 "cast(used as real) / size as utilization "
-                                 "from "
-                                 "(select segmentid, sum(size) as used "
-                                 "from snapshot_refs group by segmentid) "
-                                 "join segments using (segmentid)");
+    sqlite3_stmt *stmt = Prepare(
+        "insert or replace into segments_used "
+        "select ? as snapshotid, segmentid, max(utilization) from ("
+        "    select segmentid, cast(used as real) / size as utilization "
+        "    from "
+        "    (select segmentid, sum(size) as used from snapshot_refs "
+        "       group by segmentid) "
+        "    join segments using (segmentid) "
+        "  union "
+        "    select segmentid, utilization from segments_used "
+        "    where snapshotid = ? "
+        ") group by segmentid"
+    );
     sqlite3_bind_int64(stmt, 1, snapshotid);
+    sqlite3_bind_int64(stmt, 2, snapshotid);
     rc = sqlite3_step(stmt);
     if (rc != SQLITE_OK && rc != SQLITE_DONE) {
         ReportError(rc);
@@ -238,6 +246,17 @@ void LocalDb::StoreObject(const ObjectReference& ref,
     }
 
     sqlite3_finalize(stmt);
+
+    if (age != 0.0) {
+        stmt = Prepare("update segments "
+                       "set mtime = coalesce(max(mtime, ?), ?) "
+                       "where segmentid = ?");
+        sqlite3_bind_double(stmt, 1, age);
+        sqlite3_bind_double(stmt, 2, age);
+        sqlite3_bind_int64(stmt, 3, SegmentToId(ref.get_segment()));
+        rc = sqlite3_step(stmt);
+        sqlite3_finalize(stmt);
+    }
 }
 
 ObjectReference LocalDb::FindObject(const string &checksum, int64_t size)
@@ -257,6 +276,7 @@ ObjectReference LocalDb::FindObject(const string &checksum, int64_t size)
     } else if (rc == SQLITE_ROW) {
         ref = ObjectReference(IdToSegment(sqlite3_column_int64(stmt, 0)),
                               (const char *)sqlite3_column_text(stmt, 1));
+        ref.set_range(0, size);
     } else {
         fprintf(stderr, "Could not execute SELECT statement!\n");
         ReportError(rc);
@@ -304,6 +324,11 @@ bool LocalDb::IsAvailable(const ObjectReference &ref)
     sqlite3_stmt *stmt;
     bool found = false;
 
+    // Special objects (such as the zero object) aren't stored in segments, and
+    // so are always available.
+    if (!ref.is_normal())
+        return true;
+
     stmt = Prepare("select count(*) from block_index "
                    "where segmentid = ? and object = ? and expired is null");
     sqlite3_bind_int64(stmt, 1, SegmentToId(ref.get_segment()));
@@ -331,6 +356,9 @@ void LocalDb::UseObject(const ObjectReference& ref)
     int rc;
     sqlite3_stmt *stmt;
 
+    if (!ref.is_normal())
+        return;
+
     stmt = Prepare("insert or ignore into snapshot_refs "
                    "select segmentid, object, size from block_index "
                    "where segmentid = ? and object = ?");
@@ -347,22 +375,43 @@ void LocalDb::UseObject(const ObjectReference& ref)
     sqlite3_finalize(stmt);
 }
 
+void LocalDb::UseSegment(const std::string &segment, double utilization)
+{
+    int rc;
+    sqlite3_stmt *stmt;
+
+    stmt = Prepare("insert or replace "
+                   "into segments_used(snapshotid, segmentid, utilization) "
+                   "values (?, ?, ?)");
+    sqlite3_bind_int64(stmt, 1, snapshotid);
+    sqlite3_bind_int64(stmt, 2, SegmentToId(segment));
+    sqlite3_bind_double(stmt, 3, utilization);
+
+    rc = sqlite3_step(stmt);
+    if (rc != SQLITE_DONE) {
+        fprintf(stderr, "Could not insert segment use record!\n");
+        ReportError(rc);
+    }
+
+    sqlite3_finalize(stmt);
+}
+
 void LocalDb::SetSegmentChecksum(const std::string &segment,
                                  const std::string &path,
-                                 const std::string &checksum)
+                                 const std::string &checksum,
+                                 int size)
 {
     int rc;
     sqlite3_stmt *stmt;
 
-    stmt = Prepare("update segments set path = ?, checksum = ?, "
-                   "size = (select sum(size) from block_index "
-                   "        where segmentid = ?) "
+    stmt = Prepare("update segments set path = ?, checksum = ?, size = ?, "
+                   "mtime = coalesce(mtime, julianday('now')) "
                    "where segmentid = ?");
     sqlite3_bind_text(stmt, 1, path.c_str(), path.size(),
                       SQLITE_TRANSIENT);
     sqlite3_bind_text(stmt, 2, checksum.c_str(), checksum.size(),
                       SQLITE_TRANSIENT);
-    sqlite3_bind_int64(stmt, 3, SegmentToId(segment));
+    sqlite3_bind_int64(stmt, 3, size);
     sqlite3_bind_int64(stmt, 4, SegmentToId(segment));
 
     rc = sqlite3_step(stmt);