Fixed reporting of repackable size for .zip datasets. refs: #279

ARPA-SIMC · Nov 19, 2021 · 588f466 · 588f466
1 parent c040085
commit 588f466
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/arki/segment/dir.cc b/arki/segment/dir.cc
@@ -116,7 +116,7 @@ struct CheckBackend : public AppendCheckBackend
 
     size_t actual_end(off_t offset, size_t size) const override { return offset + 1; }
     size_t offset_end() const override { return scanner.max_sequence + 1; }
-    size_t compute_unindexed_space(const std::vector<Span> indexed_spans) const
+    size_t compute_unindexed_space(const std::vector<Span> indexed_spans) const override
     {
         // When this is called, all elements found in the index have already
         // been removed from scanner. We can just then add up what's left of

diff --git a/arki/segment/zip.cc b/arki/segment/zip.cc
@@ -100,6 +100,16 @@ struct CheckBackend : public AppendCheckBackend
     size_t actual_start(off_t offset, size_t size) const override { return offset - 1; }
     size_t actual_end(off_t offset, size_t size) const override { return offset; }
     size_t offset_end() const override { return max_sequence; }
+    size_t compute_unindexed_space(const std::vector<Span> indexed_spans) const override
+    {
+        // When this is called, all elements found in the index have already
+        // been removed from scanner. We can just then add up what's left of
+        // sizes in scanner
+        size_t res = 0;
+        for (const auto& i: on_disk)
+            res += i.second;
+        return res;
+    }
 
     State check_source(const types::source::Blob& source) override
     {