diff options
author | Magnus Ahltorp <map@kth.se> | 2014-10-19 01:37:29 +0200 |
---|---|---|
committer | Magnus Ahltorp <map@kth.se> | 2014-10-24 15:36:35 +0200 |
commit | 80c8ef847d996af04ec677a79555d640733641f2 (patch) | |
tree | 6563a0d718122e3228a00028e048dec649c1d83f /src/db.erl | |
parent | 6f477e27dcbb8ecf24947d473186e8984cf87867 (diff) |
db:get_by_leaf_hash(): Return notfound instead of crashing when no entry could be found.
db:get_by_entry_hash(): Don't fetch index, isn't used and might not exist.
index:add(): Allow writes at exiting indicies.
Diffstat (limited to 'src/db.erl')
-rw-r--r-- | src/db.erl | 25 |
1 files changed, 19 insertions, 6 deletions
@@ -103,7 +103,12 @@ entry_for_leafhash(LeafHash) -> perm:readfile(entry_root_path(), LeafHash). index_for_leafhash(LeafHash) -> - binary_to_integer(perm:readfile(indexforhash_root_path(), LeafHash)). + case perm:readfile(indexforhash_root_path(), LeafHash) of + noentry -> + noentry; + Index -> + binary_to_integer(Index) + end. leafhash_for_index(Index) -> index:get(index_path(), Index). @@ -148,9 +153,17 @@ handle_call({get_by_index, Index}, _From, State) -> {reply, R, State}; handle_call({get_by_leaf_hash, LeafHash}, _From, State) -> - Entry = entry_for_leafhash(LeafHash), - Index = index_for_leafhash(LeafHash), - R = {Index, LeafHash, Entry}, + R = case entry_for_leafhash(LeafHash) of + noentry -> + notfound; + Entry -> + case index_for_leafhash(LeafHash) of + noentry -> + notfound; + Index -> + {Index, LeafHash, Entry} + end + end, {reply, R, State}; handle_call({get_by_entry_hash, EntryHash}, _From, State) -> @@ -159,7 +172,7 @@ handle_call({get_by_entry_hash, EntryHash}, _From, State) -> notfound; LeafHash -> Entry = entry_for_leafhash(LeafHash), - Index = index_for_leafhash(LeafHash), - {Index, LeafHash, Entry} + %% Don't fetch index, isn't used and might not exist + {notfetched, LeafHash, Entry} end, {reply, R, State}. |