From 4bf6d3e73de37143d74c85d2380ef60ec9d038dd Mon Sep 17 00:00:00 2001
From: Martin Sumner <martin.sumner@adaptip.co.uk>
Date: Fri, 2 Mar 2018 10:20:43 +0000
Subject: [PATCH] Fiddle with naming in query API

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.
---
 src/leveled_bookie.erl             | 31 +++++++++++++++---------------
 test/end_to_end/iterator_SUITE.erl |  8 ++++----
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/leveled_bookie.erl b/src/leveled_bookie.erl
index 3e9dbcc..fca1efb 100644
--- a/src/leveled_bookie.erl
+++ b/src/leveled_bookie.erl
@@ -927,22 +927,9 @@ get_runner(State,
     SnapFun = return_snapfun(State, store, undefined, true, SnapPreFold),
     leveled_runner:foldobjects_allkeys(SnapFun, Tag, FoldFun, sqn_order);
 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,
-            {foldheads_bybucketlist,
+            {foldheads_bybucket,
                 Tag, 
-                BucketList,
+                BucketList, bucket_list,
                 FoldFun,
                 JournalCheck, SnapPreFold, SegmentList}) ->
     KeyRangeFun = 
@@ -957,6 +944,20 @@ get_runner(State,
                                         lists:map(KeyRangeFun, BucketList),
                                         FoldFun,
                                         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,
             {foldobjects_bybucket, 
                 Tag, Bucket, KeyRange, 
diff --git a/test/end_to_end/iterator_SUITE.erl b/test/end_to_end/iterator_SUITE.erl
index 2c47610..3a235c7 100644
--- a/test/end_to_end/iterator_SUITE.erl
+++ b/test/end_to_end/iterator_SUITE.erl
@@ -511,9 +511,9 @@ multibucket_fold(_Config) ->
                                         IndexGen,
                                         <<"Bucket4">>),
     testutil:riakload(Bookie1, ObjL4),
-    Q1 = {foldheads_bybucketlist,
+    Q1 = {foldheads_bybucket,
                 ?RIAK_TAG, 
-                [<<"Bucket1">>, <<"Bucket4">>],
+                [<<"Bucket1">>, <<"Bucket4">>], bucket_list,
                 fun(B, K, _PO, Acc) ->
                     [{B, K}|Acc]
                 end,
@@ -524,9 +524,9 @@ multibucket_fold(_Config) ->
     O1 = length(R1()),
     io:format("Result R1 of length ~w~n", [O1]),
     
-    Q2 = {foldheads_bybucketlist,
+    Q2 = {foldheads_bybucket,
                 ?RIAK_TAG, 
-                [<<"Bucket2">>, <<"Bucket3">>],
+                [<<"Bucket2">>, <<"Bucket3">>], bucket_list,
                 {fun(_B, _K, _PO, Acc) ->
                         Acc +1
                     end,