X-Git-Url: http://git.vrable.net/?p=cumulus.git;a=blobdiff_plain;f=schema.sql;h=35b2c9d0c2cf16b96579e78d2720eb300ecb4d8c;hp=1c6e84e66fc2a07fd8ff1ec6b69bd5012dd5f74c;hb=f38dd9bcb0caffd3fc9126b05788c936690e8288;hpb=0347920b621a8feaf16d5f48f33bbe1b238fc896

diff --git a/schema.sql b/schema.sql
index 1c6e84e..35b2c9d 100644
--- a/schema.sql
+++ b/schema.sql
@@ -7,8 +7,9 @@
 create table snapshots (
     snapshotid integer primary key,
     name text not null,
-    scheme text,
-    timestamp real
+    scheme text not null,
+    timestamp real,
+    intent real
 );
 
 -- List of segments which have been created.
@@ -17,7 +18,9 @@ create table segments (
     segment text unique not null,
     path text,
     checksum text,
-    size integer
+    mtime real,
+    size integer,
+    expire_time integer         -- snapshotid of latest snapshot when expired
 );
 
 -- Index of all blocks which have been stored, by checksum.
@@ -33,17 +36,41 @@ create table block_index (
 create index block_content_index on block_index(checksum);
 create unique index block_name_index on block_index(segmentid, object);
 
+-- Checksums for the decomposition of blocks into even smaller chunks
+-- (variable-sized, but generally ~4 kB, and maximum 64 kB).  Chunk boundaries
+-- are determined based on the contents using Rabin fingerprints.  These
+-- checksums can be used for computing sub-file incrementals.
+--
+-- Each block stored in block_index may have an entry in the
+-- subblock_signatures table.  The signatures field is a binary blob consisting
+-- of a packed sequence of (chunk length [16-bit unsigned, big-endian],
+-- checksum [20 bytes if SHA-1]) tuples that should cover the entire block.
+--
+-- algorithm specifies the method used for computing break points as well as
+-- the hash function used, so that signatures can be discarded if the algorithm
+-- changes.  The current algorithm used is 'lbfs-4096/sha1', which specifies a
+-- target 4 kB block size with parameters set to match LBFS, and SHA-1 as the
+-- hash algorithm.
+create table subblock_signatures (
+    blockid integer primary key,
+    algorithm text not null,
+    signatures blob not null
+);
+
 -- Summary of segment utilization for each snapshots.
 create table segments_used (
     snapshotid integer not null,
     segmentid integer not null,
     utilization real
 );
+create unique index segments_used_index
+    on segments_used(snapshotid, segmentid);
 
--- Index tracking which blocks are used by which snapshots.
-create table snapshot_contents (
-    blockid integer,
-    snapshotid integer
-);
-create unique index snapshot_contents_unique
-    on snapshot_contents(blockid, snapshotid);
+-- Overall estimate of segment utilization, for all snapshots combined.
+create view segment_info as
+select segmentid, mtime, size, expire_time,
+       cast(size * utilization as integer) as used, utilization
+from segments join
+     (select segmentid, max(utilization) as utilization
+      from segments_used group by segmentid)
+using (segmentid);