From 51dbad95c089c16fae846ef885596d000385cece Mon Sep 17 00:00:00 2001 From: martinsumner Date: Mon, 21 Nov 2016 14:12:17 +0000 Subject: [PATCH] Change FoldBucketsFun to take just bucket FoldBucketsFun does not take keys should be a 2-arity function (Bucket, Acc). --- src/leveled_bookie.erl | 4 ++-- test/end_to_end/iterator_SUITE.erl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/leveled_bookie.erl b/src/leveled_bookie.erl index a09aabc..46b4a29 100644 --- a/src/leveled_bookie.erl +++ b/src/leveled_bookie.erl @@ -448,7 +448,7 @@ bucket_stats(State, Bucket, Tag) -> {async, Folder}. -binary_bucketlist(State, Tag, {FoldKeysFun, InitAcc}) -> +binary_bucketlist(State, Tag, {FoldBucketsFun, InitAcc}) -> % List buckets for tag, assuming bucket names are all binary type {ok, {LedgerSnapshot, LedgerCache}, @@ -462,7 +462,7 @@ binary_bucketlist(State, Tag, {FoldKeysFun, InitAcc}) -> LedgerSnapshot, []), ok = leveled_penciller:pcl_close(LedgerSnapshot), - lists:foldl(fun({B, K}, Acc) -> FoldKeysFun(B, K, Acc) end, + lists:foldl(fun({B, _K}, Acc) -> FoldBucketsFun(B, Acc) end, InitAcc, BucketAcc) end, diff --git a/test/end_to_end/iterator_SUITE.erl b/test/end_to_end/iterator_SUITE.erl index 1cab55a..4e3c41e 100644 --- a/test/end_to_end/iterator_SUITE.erl +++ b/test/end_to_end/iterator_SUITE.erl @@ -113,7 +113,7 @@ small_load_with2i(_Config) -> Total2 = Sum2(), true = Total2 == Total1, - FoldBucketsFun = fun(B, _K, Acc) -> sets:add_element(B, Acc) end, + FoldBucketsFun = fun(B, Acc) -> sets:add_element(B, Acc) end, % Should not find any buckets - as there is a non-binary bucket, and no % binary ones BucketListQuery = {binary_bucketlist, @@ -322,7 +322,7 @@ query_count(_Config) -> R9), testutil:check_forobject(Book4, TestObject), - FoldBucketsFun = fun(B, _K, Acc) -> sets:add_element(B, Acc) end, + FoldBucketsFun = fun(B, Acc) -> sets:add_element(B, Acc) end, BucketListQuery = {binary_bucketlist, ?RIAK_TAG, {FoldBucketsFun, sets:new()}},