Compare commits
2 Commits
7538c6201b
...
nilmdb-2.2
| Author | SHA1 | Date | |
|---|---|---|---|
| 517b237636 | |||
| 07f138e0f4 |
@@ -246,7 +246,7 @@ class Fsck(object):
|
||||
|
||||
# Check that we can open bulkdata
|
||||
tab = nilmdb.server.bulkdata.Table(bulk)
|
||||
except FsckFormatError as e:
|
||||
except FsckFormatError:
|
||||
# If there are no files except _format, try deleting
|
||||
# the entire stream; this may remove metadata, but
|
||||
# it's probably unimportant.
|
||||
@@ -266,7 +266,6 @@ class Fsck(object):
|
||||
path, str(e))
|
||||
tab.close()
|
||||
|
||||
|
||||
def fix_row_overlap(self, sid, path, existing, new):
|
||||
# If the file rows (spos, epos) overlap in the interval table,
|
||||
# and the overlapping ranges look like this:
|
||||
@@ -293,7 +292,7 @@ class Fsck(object):
|
||||
raise FsckError(f"{path}: unfixable overlap")
|
||||
match = intv
|
||||
if match is None:
|
||||
err(f"no intervals overlapped in the right way\n")
|
||||
err("no intervals overlapped in the right way\n")
|
||||
raise FsckError(f"{path}: unfixable overlap")
|
||||
|
||||
# Truncate the file position
|
||||
@@ -569,8 +568,9 @@ class Fsck(object):
|
||||
if match.any():
|
||||
row = numpy.argmax(match)
|
||||
if ts[row+1] != 0:
|
||||
raise FsckError("%s: non-monotonic timestamp (%d -> %d)"
|
||||
" at row %d", path, ts[row], ts[row+1],
|
||||
raise FsckError(
|
||||
"%s: non-monotonic timestamp (%d -> %d) "
|
||||
"at row %d", path, ts[row], ts[row+1],
|
||||
row + start)
|
||||
|
||||
# Timestamp is zero and non-monotonic;
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user