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

Fiddle with naming in query API

Browse source 
Was easier in the calling applictaion to switch between using and not using a list of the Query format was consistent between those two cases.
This commit is contained in:
Martin Sumner 2018-03-02 10:20:43 +00:00
parent c6b3fe78f4
commit 4bf6d3e73d
2 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/leveled_bookie.erl
View file

@ -928,21 +928,8 @@ get_runner(State,
leveled_runner:foldobjects_allkeys(SnapFun, Tag, FoldFun, sqn_order); leveled_runner:foldobjects_allkeys(SnapFun, Tag, FoldFun, sqn_order);
get_runner(State, get_runner(State,
{foldheads_bybucket, {foldheads_bybucket,
Tag, Bucket, KeyRange,
FoldFun,
JournalCheck, SnapPreFold, SegmentList}) ->
{StartKey, EndKey, SnapQ} = return_ledger_keyrange(Tag, Bucket, KeyRange),
SnapType = snaptype_by_presence(JournalCheck),
SnapFun = return_snapfun(State, SnapType, SnapQ, true, SnapPreFold),
leveled_runner:foldheads_bybucket(SnapFun,
Tag, Tag,
[{StartKey, EndKey}], BucketList, bucket_list,
FoldFun,
JournalCheck, SegmentList);
get_runner(State,
{foldheads_bybucketlist,
Tag,
BucketList,
FoldFun, FoldFun,
JournalCheck, SnapPreFold, SegmentList}) -> JournalCheck, SnapPreFold, SegmentList}) ->
KeyRangeFun = KeyRangeFun =
@ -957,6 +944,20 @@ get_runner(State,
lists:map(KeyRangeFun, BucketList), lists:map(KeyRangeFun, BucketList),
FoldFun, FoldFun,
JournalCheck, SegmentList); JournalCheck, SegmentList);
get_runner(State,
{foldheads_bybucket,
Tag,
Bucket, KeyRange,
FoldFun,
JournalCheck, SnapPreFold, SegmentList}) ->
{StartKey, EndKey, SnapQ} = return_ledger_keyrange(Tag, Bucket, KeyRange),
SnapType = snaptype_by_presence(JournalCheck),
SnapFun = return_snapfun(State, SnapType, SnapQ, true, SnapPreFold),
leveled_runner:foldheads_bybucket(SnapFun,
Tag,
[{StartKey, EndKey}],
FoldFun,
JournalCheck, SegmentList);
get_runner(State, get_runner(State,
{foldobjects_bybucket, {foldobjects_bybucket,
Tag, Bucket, KeyRange, Tag, Bucket, KeyRange,

8
test/end_to_end/iterator_SUITE.erl
View file

@ -511,9 +511,9 @@ multibucket_fold(_Config) ->
IndexGen, IndexGen,
<<"Bucket4">>), <<"Bucket4">>),
testutil:riakload(Bookie1, ObjL4), testutil:riakload(Bookie1, ObjL4),
Q1 = {foldheads_bybucketlist, Q1 = {foldheads_bybucket,
?RIAK_TAG, ?RIAK_TAG,
[<<"Bucket1">>, <<"Bucket4">>], [<<"Bucket1">>, <<"Bucket4">>], bucket_list,
fun(B, K, _PO, Acc) -> fun(B, K, _PO, Acc) ->
[{B, K}|Acc] [{B, K}|Acc]
end, end,
@ -524,9 +524,9 @@ multibucket_fold(_Config) ->
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_bybucketlist, Q2 = {foldheads_bybucket,
?RIAK_TAG, ?RIAK_TAG,
[<<"Bucket2">>, <<"Bucket3">>], [<<"Bucket2">>, <<"Bucket3">>], bucket_list,
{fun(_B, _K, _PO, Acc) -> {fun(_B, _K, _PO, Acc) ->
Acc +1 Acc +1
end, end,