Merge pull request #246 from rubanm/readthrough_keysfix

Read through store - do not query backing store when no cache miss
twitter · Dec 8, 2014 · def3906 · def3906
2 parents 7cb17e5 + b1f9fd3
commit def3906
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/storehaus-core/src/main/scala/com/twitter/storehaus/ReadThroughStore.scala b/storehaus-core/src/main/scala/com/twitter/storehaus/ReadThroughStore.scala
@@ -72,12 +72,17 @@ class ReadThroughStore[K, V](backingStore: ReadableStore[K, V], cache: Store[K,
         val hits = responses.filter { !_._2.isEmpty }
         val missedKeys = responses.filter { _._2.isEmpty }.keySet
 
-        FutureOps.mapCollect(backingStore.multiGet(missedKeys ++ failedKeys)).flatMap { storeResult =>
-          // write fetched keys to cache, best effort
-          mutex.acquire.flatMap { p =>
-            FutureOps.mapCollect(cache.multiPut(storeResult))(FutureCollector.bestEffort[(K1, Unit)])
-              .map { u => hits ++ storeResult }
-              .ensure { p.release }
+        val remaining = missedKeys ++ failedKeys
+        if (remaining.isEmpty) {
+          Future.value(hits) // no cache misses
+        } else {
+          FutureOps.mapCollect(backingStore.multiGet(remaining)).flatMap { storeResult =>
+            // write fetched keys to cache, best effort
+            mutex.acquire.flatMap { p =>
+              FutureOps.mapCollect(cache.multiPut(storeResult))(FutureCollector.bestEffort[(K1, Unit)])
+                .map { u => hits ++ storeResult }
+                .ensure { p.release }
+            }
           }
         }
       }