From 66a84c0c12faf5469548fe0bf5ad39aa068ac458 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Borgstr=C3=B6m?= <jonas@borgstrom.se>
Date: Thu, 6 Mar 2014 12:05:22 +0100
Subject: [PATCH] check: Fix a check --repair issue and added more tests

---
 attic/repository.py           | 10 ++++++----
 attic/testsuite/repository.py | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/attic/repository.py b/attic/repository.py
index b3e31a63f..884278a5f 100644
--- a/attic/repository.py
+++ b/attic/repository.py
@@ -180,8 +180,8 @@ class Repository(object):
         segments = self.segments
         for segment in sorted(self.compact):
             if self.io.segment_exists(segment):
-                for tag, key, data in self.io.iter_objects(segment, include_data=True):
-                    if tag == TAG_PUT and self.index.get(key, (-1, -1))[0] == segment:
+                for tag, key, offset, data in self.io.iter_objects(segment, include_data=True):
+                    if tag == TAG_PUT and self.index.get(key, (-1, -1)) == (segment, offset):
                         new_segment, offset = self.io.write_put(key, data)
                         self.index[key] = new_segment, offset
                         segments.setdefault(new_segment, 0)
@@ -256,6 +256,8 @@ class Repository(object):
             transaction_id = self.get_index_transaction_id()
         if transaction_id is None:
             transaction_id = self.io.get_latest_segment()
+        if repair:
+            self.io.cleanup(transaction_id)
         segments_transaction_id = self.io.get_segments_transaction_id()
         self.get_index(None)
         for segment, filename in self.io.segment_iterator():
@@ -285,9 +287,9 @@ class Repository(object):
                         s, _ = self.index.pop(key)
                         self.segments[s] -= 1
                         self.compact.add(s)
-                        self.compact.add(segment)
                     except KeyError:
                         pass
+                    self.compact.add(segment)
                 elif tag == TAG_COMMIT:
                     continue
                 else:
@@ -503,7 +505,7 @@ class LoggedIO(object):
             if tag in (TAG_PUT, TAG_DELETE):
                 key = rest[:32]
             if include_data:
-                yield tag, key, rest[32:]
+                yield tag, key, offset, rest[32:]
             else:
                 yield tag, key, offset
             offset += size
diff --git a/attic/testsuite/repository.py b/attic/testsuite/repository.py
index 1236f4de9..af1aeb1f6 100644
--- a/attic/testsuite/repository.py
+++ b/attic/testsuite/repository.py
@@ -81,6 +81,14 @@ class RepositoryTestCase(RepositoryTestCaseBase):
         self.repository.rollback()
         self.assert_equal(self.repository.get(b'00000000000000000000000000000000'), b'foo')
 
+    def test_overwrite_in_same_transaction(self):
+        """Test cache consistency2
+        """
+        self.repository.put(b'00000000000000000000000000000000', b'foo')
+        self.repository.put(b'00000000000000000000000000000000', b'foo2')
+        self.repository.commit()
+        self.assert_equal(self.repository.get(b'00000000000000000000000000000000'), b'foo2')
+
     def test_single_kind_transactions(self):
         # put
         self.repository.put(b'00000000000000000000000000000000', b'foo')
@@ -294,6 +302,18 @@ class RepositoryCheckTestCase(RepositoryTestCaseBase):
         self.get_objects(4)
         self.assert_equal(set([1, 2, 3, 4, 5, 6]), self.list_objects())
 
+    def test_crash_before_compact(self):
+        self.repository.put(bytes(32), b'data')
+#        self.repository.commit()
+        self.repository.put(bytes(32), b'data2')
+        # Simulate a crash before compact
+        with patch.object(Repository, 'compact_segments') as compact:
+            self.repository.commit()
+            compact.assert_called_once()
+        self.reopen()
+        self.check(repair=True)
+        self.assert_equal(self.repository.get(bytes(32)), b'data2')
+
 
 class RemoteRepositoryTestCase(RepositoryTestCase):