From ccc993383d93078cdf8a39a8042ba25d33b89c39 Mon Sep 17 00:00:00 2001 From: martinsumner Date: Sun, 11 Dec 2016 01:21:53 +0000 Subject: [PATCH] Stop second hash on fetch_head The bookie should magic_hash for fetch_head, and now passes the hash to the Penciller so second hash not required. --- src/leveled_bookie.erl | 23 +++++++++++++++-------- src/leveled_log.erl | 2 -- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/leveled_bookie.erl b/src/leveled_bookie.erl index 62892ec..412eec0 100644 --- a/src/leveled_bookie.erl +++ b/src/leveled_bookie.erl @@ -728,15 +728,22 @@ startup(InkerOpts, PencillerOpts) -> fetch_head(Key, Penciller, LedgerCache) -> - case leveled_skiplist:lookup(Key, LedgerCache#ledger_cache.skiplist) of - {value, Head} -> - Head; - none -> - case leveled_penciller:pcl_fetch(Penciller, Key) of - {Key, Head} -> + Hash = leveled_codec:magic_hash(Key), + if + Hash /= no_lookup -> + L0R = leveled_skiplist:lookup(Key, + Hash, + LedgerCache#ledger_cache.skiplist), + case L0R of + {value, Head} -> Head; - not_present -> - not_present + none -> + case leveled_penciller:pcl_fetch(Penciller, Key, Hash) of + {Key, Head} -> + Head; + not_present -> + not_present + end end end. diff --git a/src/leveled_log.erl b/src/leveled_log.erl index fa26555..a10e641 100644 --- a/src/leveled_log.erl +++ b/src/leveled_log.erl @@ -198,8 +198,6 @@ {"IC011", {info, "Not clearing filename ~s as modified delta is only ~w seconds"}}, - {"PM001", - {info, "Indexed new cache entry with total L0 cache size now ~w"}}, {"PM002", {info, "Completed dump of L0 cache to list of size ~w"}},