From b6ae0e1af51850492c421ca8fcfc99756de50ef7 Mon Sep 17 00:00:00 2001
From: martinsumner <martin.sumner@adaptip.co.uk>
Date: Tue, 3 Jan 2017 13:03:59 +0000
Subject: [PATCH] Fix broken SST cache

---
 src/leveled_log.erl |  2 +-
 src/leveled_sst.erl | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/leveled_log.erl b/src/leveled_log.erl
index d57083c..5ee6dc0 100644
--- a/src/leveled_log.erl
+++ b/src/leveled_log.erl
@@ -433,7 +433,7 @@ sst_timing({N, SSTTimerD}, SW, TimerType) ->
     end.
 
 sst_keylist() ->
-    [summary_bloom, slot_cache, slot_bloom, slot_fetch].
+    [slot_cache, slot_bloom, slot_fetch].
 
 
 get_timing(undefined, SW, TimerType) ->
diff --git a/src/leveled_sst.erl b/src/leveled_sst.erl
index 2277249..80e71e4 100644
--- a/src/leveled_sst.erl
+++ b/src/leveled_sst.erl
@@ -303,12 +303,12 @@ reader({get_kv, LedgerKey, Hash}, _From, State) ->
     case {Result, Stage} of
         {not_present, _} ->
             {reply, Result, reader, UpdState#state{sst_timings = UpdTimings}};
-        {KV, slot_lookup_hit} ->
+        {_KV, slot_cache} ->
+            {reply, Result, reader, UpdState#state{sst_timings = UpdTimings}};
+        {KV, _} ->
             UpdCache = array:set(SlotID - 1, KV, State#state.lastfetch_cache),
             {reply, Result, reader, UpdState#state{lastfetch_cache = UpdCache,
-                                                    sst_timings = UpdTimings}};
-        _ ->
-            {reply, Result, reader, UpdState#state{sst_timings = UpdTimings}}
+                                                    sst_timings = UpdTimings}}
     end;
 reader({get_kvrange, StartKey, EndKey, ScanWidth}, _From, State) ->
     {reply,
@@ -1477,6 +1477,15 @@ simple_persisted_test() ->
                                                 1,
                                                 KVList1,
                                                 length(KVList1)),
+    SW0 = os:timestamp(),
+    lists:foreach(fun({K, V}) ->
+                        ?assertMatch({K, V}, sst_get(Pid, K))
+                        end,
+                    KVList1),
+    io:format(user,
+                "Checking for ~w keys (once) in file with cache hit took ~w "
+                    ++ "microseconds~n",
+                [length(KVList1), timer:now_diff(os:timestamp(), SW0)]),
     SW1 = os:timestamp(),
     lists:foreach(fun({K, V}) ->
                         ?assertMatch({K, V}, sst_get(Pid, K)),