From c5a154985f566899ce56d67429f1feacda7722e9 Mon Sep 17 00:00:00 2001 From: Marian Beermann Date: Sun, 30 Jul 2017 21:50:57 +0200 Subject: [PATCH] cache: adjust AdHocCache API (test_create_no_cache_sync) --- src/borg/cache.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/borg/cache.py b/src/borg/cache.py index c1c703326..d42022ed7 100644 --- a/src/borg/cache.py +++ b/src/borg/cache.py @@ -976,7 +976,7 @@ def memorize_file(self, path_hash, st, ids): def add_chunk(self, id, chunk, stats, overwrite=False, wait=True): assert not overwrite, 'AdHocCache does not permit overwrites — trying to use it for recreate?' if not self._txn_active: - self._begin_txn() + self.begin_txn() size = len(chunk) refcount = self.seen_chunk(id, size) if refcount: @@ -990,7 +990,7 @@ def add_chunk(self, id, chunk, stats, overwrite=False, wait=True): def seen_chunk(self, id, size=None): if not self._txn_active: - self._begin_txn() + self.begin_txn() entry = self.chunks.get(id, ChunkIndexEntry(0, None, None)) if entry.refcount and size and not entry.size: # The LocalCache has existing size information and uses *size* to make an effort at detecting collisions. @@ -1001,7 +1001,7 @@ def seen_chunk(self, id, size=None): def chunk_incref(self, id, stats, size=None): if not self._txn_active: - self._begin_txn() + self.begin_txn() count, _size, csize = self.chunks.incref(id) # When _size is 0 and size is not given, then this chunk has not been locally visited yet (seen_chunk with # size or add_chunk); we can't add references to those (size=0 is invalid) and generally don't try to. @@ -1012,7 +1012,7 @@ def chunk_incref(self, id, stats, size=None): def chunk_decref(self, id, stats, wait=True): if not self._txn_active: - self._begin_txn() + self.begin_txn() count, size, csize = self.chunks.decref(id) if count == 0: del self.chunks[id] @@ -1031,9 +1031,7 @@ def rollback(self): self._txn_active = False del self.chunks - # Private API - - def _begin_txn(self): + def begin_txn(self): self._txn_active = True # Explicitly set the initial hash table capacity to avoid performance issues # due to hash table "resonance".