umgeher/leveled
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Rename hashtree query

Browse source 
Naming is now confusing now we have TicTac Trees.  This query builds a
list of keys and hashes not a tree - so it was misleading anyaway.  Now
renamed hashlist_query.
This commit is contained in:
martinsumner 2017-06-16 12:38:49 +01:00
parent 7642aac2cc
commit f5dd154cee
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/leveled_bookie.erl
View file

@ -308,7 +308,7 @@ book_head(Pid, Bucket, Key, Tag) ->
%% {keylist, Tag, {FoldKeysFun, Acc}} -> list all keys with tag %% {keylist, Tag, {FoldKeysFun, Acc}} -> list all keys with tag
%% {keylist, Tag, Bucket, {FoldKeysFun, Acc}} -> list all keys within given %% {keylist, Tag, Bucket, {FoldKeysFun, Acc}} -> list all keys within given
%% bucket %% bucket
%% {hashtree_query, Tag, JournalCheck} -> return keys and hashes for all %% {hashlist_query, Tag, JournalCheck} -> return keys and hashes for all
%% objects with a given tag %% objects with a given tag
%% {foldobjects_bybucket, Tag, Bucket, FoldObjectsFun} -> fold over all objects %% {foldobjects_bybucket, Tag, Bucket, FoldObjectsFun} -> fold over all objects
%% in a given bucket %% in a given bucket
@ -531,9 +531,9 @@ handle_call({return_folder, FolderType}, _From, State) ->
{reply, {reply,
bucketkey_query(State, Tag, Bucket, {FoldKeysFun, Acc}), bucketkey_query(State, Tag, Bucket, {FoldKeysFun, Acc}),
State}; State};
{hashtree_query, Tag, JournalCheck} -> {hashlist_query, Tag, JournalCheck} ->
{reply, {reply,
hashtree_query(State, Tag, JournalCheck), hashlist_query(State, Tag, JournalCheck),
State}; State};
{foldheads_allkeys, Tag, FoldHeadsFun} -> {foldheads_allkeys, Tag, FoldHeadsFun} ->
{reply, {reply,
@ -818,7 +818,7 @@ index_query(State,
{async, Folder}. {async, Folder}.
hashtree_query(State, Tag, JournalCheck) -> hashlist_query(State, Tag, JournalCheck) ->
SnapType = case JournalCheck of SnapType = case JournalCheck of
false -> false ->
ledger; ledger;
@ -1484,7 +1484,7 @@ ttl_test() ->
ok = book_close(Bookie2), ok = book_close(Bookie2),
reset_filestructure(). reset_filestructure().
hashtree_query_test() -> hashlist_query_test() ->
RootPath = reset_filestructure(), RootPath = reset_filestructure(),
{ok, Bookie1} = book_start([{root_path, RootPath}, {ok, Bookie1} = book_start([{root_path, RootPath},
{max_journalsize, 1000000}, {max_journalsize, 1000000},
@ -1507,7 +1507,7 @@ hashtree_query_test() ->
ObjL2), ObjL2),
% Scan the store for the Bucket, Keys and Hashes % Scan the store for the Bucket, Keys and Hashes
{async, HTFolder} = book_returnfolder(Bookie1, {async, HTFolder} = book_returnfolder(Bookie1,
{hashtree_query, {hashlist_query,
?STD_TAG, ?STD_TAG,
false}), false}),
KeyHashList = HTFolder(), KeyHashList = HTFolder(),
@ -1522,7 +1522,7 @@ hashtree_query_test() ->
{max_journalsize, 200000}, {max_journalsize, 200000},
{cache_size, 500}]), {cache_size, 500}]),
{async, HTFolder2} = book_returnfolder(Bookie2, {async, HTFolder2} = book_returnfolder(Bookie2,
{hashtree_query, {hashlist_query,
?STD_TAG, ?STD_TAG,
false}), false}),
L0 = length(KeyHashList), L0 = length(KeyHashList),
@ -1532,7 +1532,7 @@ hashtree_query_test() ->
ok = book_close(Bookie2), ok = book_close(Bookie2),
reset_filestructure(). reset_filestructure().
hashtree_query_withjournalcheck_test() -> hashlist_query_withjournalcheck_test() ->
RootPath = reset_filestructure(), RootPath = reset_filestructure(),
{ok, Bookie1} = book_start([{root_path, RootPath}, {ok, Bookie1} = book_start([{root_path, RootPath},
{max_journalsize, 1000000}, {max_journalsize, 1000000},
@ -1546,12 +1546,12 @@ hashtree_query_withjournalcheck_test() ->
Future) end, Future) end,
ObjL1), ObjL1),
{async, HTFolder1} = book_returnfolder(Bookie1, {async, HTFolder1} = book_returnfolder(Bookie1,
{hashtree_query, {hashlist_query,
?STD_TAG, ?STD_TAG,
false}), false}),
KeyHashList = HTFolder1(), KeyHashList = HTFolder1(),
{async, HTFolder2} = book_returnfolder(Bookie1, {async, HTFolder2} = book_returnfolder(Bookie1,
{hashtree_query, {hashlist_query,
?STD_TAG, ?STD_TAG,
check_presence}), check_presence}),
?assertMatch(KeyHashList, HTFolder2()), ?assertMatch(KeyHashList, HTFolder2()),
@ -1572,7 +1572,7 @@ foldobjects_vs_hashtree_test() ->
Future) end, Future) end,
ObjL1), ObjL1),
{async, HTFolder1} = book_returnfolder(Bookie1, {async, HTFolder1} = book_returnfolder(Bookie1,
{hashtree_query, {hashlist_query,
?STD_TAG, ?STD_TAG,
false}), false}),
KeyHashList1 = lists:usort(HTFolder1()), KeyHashList1 = lists:usort(HTFolder1()),

6
test/end_to_end/recovery_SUITE.erl
View file

@ -190,13 +190,13 @@ aae_bustedjournal(_Config) ->
true = GetCount < HeadCount, true = GetCount < HeadCount,
{async, HashTreeF1} = leveled_bookie:book_returnfolder(Bookie2, {async, HashTreeF1} = leveled_bookie:book_returnfolder(Bookie2,
{hashtree_query, {hashlist_query,
?RIAK_TAG, ?RIAK_TAG,
false}), false}),
KeyHashList1 = HashTreeF1(), KeyHashList1 = HashTreeF1(),
20001 = length(KeyHashList1), 20001 = length(KeyHashList1),
{async, HashTreeF2} = leveled_bookie:book_returnfolder(Bookie2, {async, HashTreeF2} = leveled_bookie:book_returnfolder(Bookie2,
{hashtree_query, {hashlist_query,
?RIAK_TAG, ?RIAK_TAG,
check_presence}), check_presence}),
KeyHashList2 = HashTreeF2(), KeyHashList2 = HashTreeF2(),
@ -268,7 +268,7 @@ aae_bustedjournal(_Config) ->
length(KeyHashList5)]), length(KeyHashList5)]),
{async, HashTreeF6} = leveled_bookie:book_returnfolder(Bookie4, {async, HashTreeF6} = leveled_bookie:book_returnfolder(Bookie4,
{hashtree_query, {hashlist_query,
?RIAK_TAG, ?RIAK_TAG,
check_presence}), check_presence}),
KeyHashList6 = HashTreeF6(), KeyHashList6 = HashTreeF6(),