X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=schema.sql;h=850e6a9ace316196a494d7a91b77a95f7c21ceb0;hb=5b346a4689ac2c8458e30fd8752abd6e2f207c56;hp=e0f16a640c717e7af1152a18ab9ee73f31ed9e44;hpb=020917702127ad12881c8868bb649a685c561def;p=cumulus.git

diff --git a/schema.sql b/schema.sql
index e0f16a6..850e6a9 100644
--- a/schema.sql
+++ b/schema.sql
@@ -8,7 +8,8 @@ create table snapshots (
     snapshotid integer primary key,
     name text not null,
     scheme text,
-    timestamp real
+    timestamp real,
+    intent real
 );
 
 -- List of segments which have been created.
@@ -18,7 +19,8 @@ create table segments (
     path text,
     checksum text,
     mtime real,
-    size integer
+    size integer,
+    expire_time integer         -- snapshotid of latest snapshot when expired
 );
 
 -- Index of all blocks which have been stored, by checksum.
@@ -40,11 +42,13 @@ create table segments_used (
     segmentid integer not null,
     utilization real
 );
+create unique index segments_used_index
+    on segments_used(snapshotid, segmentid);
 
 -- Overall estimate of segment utilization, for all snapshots combined.
 create view segment_info as
-select segmentid, mtime, size, cast(size * utilization as integer) as used,
-       utilization
+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)