CCACHE-7: Adds eviction method to FIFOCache

zamaterian · Dec 9, 2011 · 094363f · 094363f
1 parent 7be1589
commit 094363f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/main/clojure/clojure/core/cache.clj b/src/main/clojure/clojure/core/cache.clj
@@ -113,6 +113,10 @@
     (recur (dissoc m (first ks)) (next ks))
     m))
 
+(defn- prune-queue [q ks]
+  (into clojure.lang.PersistentQueue/EMPTY
+        (filter (complement (set ks)) q)))
+
 (defcache FIFOCache [cache q limit]
   CacheProtocol
   (lookup [_ item]
@@ -126,9 +130,13 @@
       (FIFOCache. (-> cache (dissoc k) (assoc item result))
                   (-> q pop (conj item))
                   limit)))
-  (evict [_ key]
+  (evict [this key]
     (let [v (get cache key ::miss)]
-      nil))
+      (if (= v ::miss)
+        this
+        (FIFOCache. (dissoc cache key)
+                    (prune-queue q [key])
+                    limit))))
   (seed [_ base]
     (let [{dropping :dropping
            q :queue} (describe-layout base limit)]

diff --git a/src/test/clojure/clojure/core/cache/tests.clj b/src/test/clojure/clojure/core/cache/tests.clj
@@ -101,7 +101,7 @@
     (do-ilookup-tests (FIFOCache. small-map clojure.lang.PersistentQueue/EMPTY 2)))
   (testing "assoc and dissoc for FifoCache"
     (do-assoc (FIFOCache. {} clojure.lang.PersistentQueue/EMPTY 2))
-    #_(do-dissoc (FIFOCache. {:a 1 :b 2} clojure.lang.PersistentQueue/EMPTY 2)))
+    (do-dissoc (FIFOCache. {:a 1 :b 2} clojure.lang.PersistentQueue/EMPTY 2)))
   (testing "that get and cascading gets work for FifoCache"
     (do-getting (FIFOCache. big-map clojure.lang.PersistentQueue/EMPTY 2)))
   (testing "that finding works for FifoCache"