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

Fix issues with deprecated folders

Browse source 
They were deprecated for a reason
This commit is contained in:
Martin Sumner 2018-10-31 11:04:23 +00:00
parent 11627bbdd9
commit f0208e9b12
3 changed files with 43 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

41
test/end_to_end/iterator_SUITE.erl
View file

@ -529,30 +529,31 @@ multibucket_fold(_Config) ->
end, end,
FoldAccT = {FF, []}, FoldAccT = {FF, []},
{async, R1} = leveled_bookie:book_headfold(Bookie1, {async, R1} =
?RIAK_TAG, leveled_bookie:book_headfold(Bookie1,
{bucket_list, ?RIAK_TAG,
[{<<"Type1">>, <<"Bucket1">>}, {bucket_list,
{<<"Type2">>, <<"Bucket4">>}]}, [{<<"Type1">>, <<"Bucket1">>},
FoldAccT, {<<"Type2">>, <<"Bucket4">>}]},
false, FoldAccT,
true, false,
false), true,
false),
O1 = length(R1()), O1 = length(R1()),
io:format("Result R1 of length ~w~n", [O1]), io:format("Result R1 of length ~w~n", [O1]),
Q2 = {foldheads_bybucket, {async, R2} =
?RIAK_TAG, leveled_bookie:book_headfold(Bookie1,
[<<"Bucket2">>, <<"Bucket3">>], bucket_list, ?RIAK_TAG,
{fun(_B, _K, _PO, Acc) -> {bucket_list,
Acc +1 [<<"Bucket2">>,
end, <<"Bucket3">>]},
0}, {fun(_B, _K, _PO, Acc) ->
false, Acc +1
true, end,
false}, 0},
{async, R2} = leveled_bookie:book_returnfolder(Bookie1, Q2), false, true, false),
O2 = R2(), O2 = R2(),
io:format("Result R2 of ~w~n", [O2]), io:format("Result R2 of ~w~n", [O2]),

2
test/end_to_end/riak_SUITE.erl
View file

@ -182,7 +182,7 @@ test_singledelta_stores(BookA, BookB, TreeSize, DeltaKey) ->
all, all,
{fun head_tictac_foldfun/4, {fun head_tictac_foldfun/4,
{0, leveled_tictac:new_tree(test, TreeSize)}}, {0, leveled_tictac:new_tree(test, TreeSize)}},
false, false, false}, false, false, false, false, false},
DLs = check_tictacfold(BookA, BookB, DLs = check_tictacfold(BookA, BookB,
TicTacFolder, TicTacFolder,

36
test/end_to_end/tictac_SUITE.erl
View file

@ -156,14 +156,15 @@ many_put_compare(_Config) ->
[timer:now_diff(os:timestamp(), SWB0Obj)]), [timer:now_diff(os:timestamp(), SWB0Obj)]),
true = length(leveled_tictac:find_dirtyleaves(TreeA, TreeAObj0)) == 0, true = length(leveled_tictac:find_dirtyleaves(TreeA, TreeAObj0)) == 0,
FoldQ1 = {foldheads_bybucket, InitAccTree = leveled_tictac:new_tree(0, TreeSize),
o_rkv,
"Bucket",
all,
{FoldObjectsFun, leveled_tictac:new_tree(0, TreeSize)},
true, true, false},
{async, TreeAObjFolder1} = {async, TreeAObjFolder1} =
leveled_bookie:book_returnfolder(Bookie2, FoldQ1), leveled_bookie:book_headfold(Bookie2,
?RIAK_TAG,
{range, "Bucket", all},
{FoldObjectsFun,
InitAccTree},
true, true, false),
SWB1Obj = os:timestamp(), SWB1Obj = os:timestamp(),
TreeAObj1 = TreeAObjFolder1(), TreeAObj1 = TreeAObjFolder1(),
io:format("Build tictac tree via object fold with "++ io:format("Build tictac tree via object fold with "++
@ -184,21 +185,26 @@ many_put_compare(_Config) ->
fun(_Bucket, Key, Value, Acc) -> fun(_Bucket, Key, Value, Acc) ->
leveled_tictac:add_kv(Acc, Key, Value, AltExtractFun) leveled_tictac:add_kv(Acc, Key, Value, AltExtractFun)
end, end,
AltFoldQ0 = {foldheads_bybucket,
o_rkv,
"Bucket",
all,
{AltFoldObjectsFun, leveled_tictac:new_tree(0, TreeSize)},
false, true, false},
{async, TreeAAltObjFolder0} = {async, TreeAAltObjFolder0} =
leveled_bookie:book_returnfolder(Bookie2, AltFoldQ0), leveled_bookie:book_headfold(Bookie2,
?RIAK_TAG,
{range, "Bucket", all},
{AltFoldObjectsFun,
InitAccTree},
false, true, false),
SWB2Obj = os:timestamp(), SWB2Obj = os:timestamp(),
TreeAAltObj = TreeAAltObjFolder0(), TreeAAltObj = TreeAAltObjFolder0(),
io:format("Build tictac tree via object fold with no "++ io:format("Build tictac tree via object fold with no "++
"presence check and 200K objects and alt hash in ~w~n", "presence check and 200K objects and alt hash in ~w~n",
[timer:now_diff(os:timestamp(), SWB2Obj)]), [timer:now_diff(os:timestamp(), SWB2Obj)]),
{async, TreeBAltObjFolder0} = {async, TreeBAltObjFolder0} =
leveled_bookie:book_returnfolder(Bookie3, AltFoldQ0), leveled_bookie:book_headfold(Bookie3,
?RIAK_TAG,
{range, "Bucket", all},
{AltFoldObjectsFun,
InitAccTree},
false, true, false),
SWB3Obj = os:timestamp(), SWB3Obj = os:timestamp(),
TreeBAltObj = TreeBAltObjFolder0(), TreeBAltObj = TreeBAltObjFolder0(),
io:format("Build tictac tree via object fold with no "++ io:format("Build tictac tree via object fold with no "++