From f3fd983e01cb0af52708cf932d55b7ad29afad59 Mon Sep 17 00:00:00 2001
From: Matthew Rocklin <mrocklin@gmail.com>
Date: Tue, 18 Apr 2017 09:58:13 -0400
Subject: [PATCH 1/2] Add keep_slow option to Buffer

    keep_slow: bool, optional
        if true then we keep values in the slow dict rather than remove them.
        This can improve performance for repeated storage, but takes up
        more space.
---
 zict/buffer.py            | 20 ++++++++++++++----
 zict/tests/test_buffer.py | 44 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/zict/buffer.py b/zict/buffer.py
index 1df21c9..b0bf0d0 100644
--- a/zict/buffer.py
+++ b/zict/buffer.py
@@ -22,6 +22,10 @@ class Buffer(ZictBase):
     slow_to_fast_callbacks: list of callables
         These functions run every time data moves form the slow to the fast
         mapping.
+    keep_slow: bool, optional
+        if true then we keep values in the slow dict rather than remove them.
+        This can improve performance for repeated storage, but takes up
+        more space.
 
     Examples
     --------
@@ -36,11 +40,13 @@ class Buffer(ZictBase):
     LRU
     """
     def __init__(self, fast, slow, n, weight=lambda k, v: 1,
-                 fast_to_slow_callbacks=None, slow_to_fast_callbacks=None):
+                 fast_to_slow_callbacks=None, slow_to_fast_callbacks=None,
+                 keep_slow=False):
         self.fast = LRU(n, fast, weight=weight, on_evict=[self.fast_to_slow])
         self.slow = slow
         self.n = n
         self.weight = weight
+        self.keep_slow = keep_slow
         if callable(fast_to_slow_callbacks):
             fast_to_slow_callbacks = [fast_to_slow_callbacks]
         if callable(slow_to_fast_callbacks):
@@ -49,6 +55,8 @@ def __init__(self, fast, slow, n, weight=lambda k, v: 1,
         self.slow_to_fast_callbacks = slow_to_fast_callbacks or []
 
     def fast_to_slow(self, key, value):
+        if self.keep_slow and key in self.slow:
+            return
         self.slow[key] = value
         for cb in self.fast_to_slow_callbacks:
             cb(key, value)
@@ -57,7 +65,8 @@ def slow_to_fast(self, key):
         value = self.slow[key]
         # Avoid useless movement for heavy values
         if self.weight(key, value) <= self.n:
-            del self.slow[key]
+            if not self.keep_slow:
+                del self.slow[key]
             self.fast[key] = value
         for cb in self.slow_to_fast_callbacks:
             cb(key, value)
@@ -82,11 +91,14 @@ def __setitem__(self, key, value):
             self.slow[key] = value
 
     def __delitem__(self, key):
+        removed = False
         if key in self.fast:
             del self.fast[key]
-        elif key in self.slow:
+            removed = True
+        if (not removed or self.keep_slow) and key in self.slow:
             del self.slow[key]
-        else:
+            removed = True
+        if not removed:
             raise KeyError(key)
 
     def keys(self):
diff --git a/zict/tests/test_buffer.py b/zict/tests/test_buffer.py
index 95afad2..627a4f8 100644
--- a/zict/tests/test_buffer.py
+++ b/zict/tests/test_buffer.py
@@ -109,3 +109,47 @@ def s2f_cb(k, v):
     buff['x']
     assert f2s == ['x', 'y']
     assert s2f == ['x']
+
+
+def test_keep_slow():
+    a = {}
+    b = {}
+    buff = Buffer(a, b, n=2, keep_slow=True)
+
+    buff['x'] = 1
+    buff['y'] = 2
+    buff['z'] = 3
+
+    assert a == {'y': 2, 'z': 3}
+    assert b == {'x': 1}
+
+    buff['x']
+
+    assert a == {'x': 1, 'z': 3}
+    assert b == {'x': 1, 'y': 2}
+
+    del buff['x']
+
+    assert a == {'z': 3}
+    assert b == {'y': 2}
+
+    buff['x'] = 1
+    buff['w'] = 4
+
+    assert a == {'x': 1, 'w': 4}
+    assert b == {'y': 2, 'z': 3}
+
+    buff['x'] = 10
+
+    assert a == {'x': 10, 'w': 4}
+    assert b == {'y': 2, 'z': 3}
+
+    buff['y']
+
+    assert a == {'x': 10, 'y': 2}
+    assert b == {'y': 2, 'z': 3, 'w': 4}
+
+    buff['y'] = 12
+
+    assert a == {'x': 10, 'y': 12}
+    assert b == {'z': 3, 'w': 4}

From c77c1aeac26ee34036c67e86d4206e6ab20f3262 Mon Sep 17 00:00:00 2001
From: Matthew Rocklin <mrocklin@gmail.com>
Date: Tue, 18 Apr 2017 10:18:46 -0400
Subject: [PATCH 2/2] default keep_slow to True

---
 zict/buffer.py            | 2 +-
 zict/tests/test_buffer.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zict/buffer.py b/zict/buffer.py
index b0bf0d0..fa242f1 100644
--- a/zict/buffer.py
+++ b/zict/buffer.py
@@ -41,7 +41,7 @@ class Buffer(ZictBase):
     """
     def __init__(self, fast, slow, n, weight=lambda k, v: 1,
                  fast_to_slow_callbacks=None, slow_to_fast_callbacks=None,
-                 keep_slow=False):
+                 keep_slow=True):
         self.fast = LRU(n, fast, weight=weight, on_evict=[self.fast_to_slow])
         self.slow = slow
         self.n = n
diff --git a/zict/tests/test_buffer.py b/zict/tests/test_buffer.py
index 627a4f8..b98de18 100644
--- a/zict/tests/test_buffer.py
+++ b/zict/tests/test_buffer.py
@@ -7,7 +7,7 @@
 def test_simple():
     a = dict()
     b = dict()
-    buff = Buffer(a, b, n=10, weight=lambda k, v: v)
+    buff = Buffer(a, b, n=10, weight=lambda k, v: v, keep_slow=False)
 
     buff['x'] = 1
     buff['y'] = 2