projects
/
cumulus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hypens are allowed as key names in RFC822-style data.
[cumulus.git]
/
lbs.py
diff --git
a/lbs.py
b/lbs.py
index
4224cf9
..
507b9e1
100644
(file)
--- a/
lbs.py
+++ b/
lbs.py
@@
-263,7
+263,7
@@
def parse(lines, terminate=None):
last_key = None
continue
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)
if m:
dict[m.group(1)] = m.group(2)
last_key = m.group(1)
@@
-541,6
+541,11
@@
class LocalDatabase:
where expire_time < ?)""",
(last_snapshotid,))
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
# Segment cleaning.
class SegmentInfo(Struct): pass
@@
-564,7
+569,8
@@
class LocalDatabase:
cur = self.cursor()
segments = []
cur.execute("""select segmentid, used, size, mtime,
cur = self.cursor()
segments = []
cur.execute("""select segmentid, used, size, mtime,
- julianday('now') - mtime as age from segment_info""")
+ julianday('now') - mtime as age from segment_info
+ where expire_time is null""")
for row in cur:
info = self.SegmentInfo()
info.id = row[0]
for row in cur:
info = self.SegmentInfo()
info.id = row[0]