from pysqlite2 import dbapi2 as sqlite3
# The largest supported snapshot format that can be understood.
-FORMAT_VERSION = (0, 6) # LBS Snapshot v0.6
+FORMAT_VERSION = (0, 8) # LBS Snapshot v0.8
# Maximum number of nested indirect references allowed in a snapshot.
MAX_RECURSION_DEPTH = 3
if m:
return ("zero", None, None, (0, int(m.group(1))))
- m = re.match(r"^([-0-9a-f]+)\/([0-9a-f]+)(\(\S+\))?(\[((\d+)\+)?(\d+)\])?$", refstr)
+ m = re.match(r"^([-0-9a-f]+)\/([0-9a-f]+)(\(\S+\))?(\[(((\d+)\+)?(\d+)|=(\d+))\])?$", refstr)
if not m: return
segment = m.group(1)
checksum = checksum.lstrip("(").rstrip(")")
if slice is not None:
- if m.group(5) is None:
+ if m.group(9) is not None:
+ # Size-assertion slice
+ slice = (0, int(m.group(9)), True)
+ elif m.group(6) is None:
# Abbreviated slice
- slice = (0, int(m.group(7)))
+ slice = (0, int(m.group(8)), False)
else:
- slice = (int(m.group(6)), int(m.group(7)))
+ slice = (int(m.group(7)), int(m.group(8)), False)
return (segment, object, checksum, slice)
raise ValueError
if slice is not None:
- (start, length) = slice
+ (start, length, exact) = slice
+ if exact and len(data) != length: raise ValueError
data = data[start:start+length]
if len(data) != length: raise IndexError
last_key = None
continue
- m = re.match(r"^(\w+):\s*(.*)$", l)
+ m = re.match(r"^([-\w]+):\s*(.*)$", l)
if m:
dict[m.group(1)] = m.group(2)
last_key = m.group(1)
where expire_time < ?)""",
(last_snapshotid,))
+ # Remove sub-block signatures for deleted objects.
+ cur.execute("""delete from subblock_signatures
+ where blockid not in
+ (select blockid from block_index)""")
+
# Segment cleaning.
class SegmentInfo(Struct): pass
info.mtime = row[3]
info.age_days = row[4]
- # If age is not available for whatever reason, treat it as 0.0.
+ # If data is not available for whatever reason, treat it as 0.0.
if info.age_days is None:
info.age_days = 0.0
+ if info.used_bytes is None:
+ info.used_bytes = 0.0
# Benefit calculation: u is the estimated fraction of each segment
# which is utilized (bytes belonging to objects still in use