From 8f068c1280f6e2bd6cfbdbf993bc5a7fcd5f7040 Mon Sep 17 00:00:00 2001 From: martinsumner Date: Mon, 7 Nov 2016 10:42:49 +0000 Subject: [PATCH] Fixup API to allow for Tags to be passed plus fixes to previous commits moving API functions into testutil --- src/leveled_bookie.erl | 2 ++ test/end_to_end/testutil.erl | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/leveled_bookie.erl b/src/leveled_bookie.erl index 1a0a0f3..b84f97f 100644 --- a/src/leveled_bookie.erl +++ b/src/leveled_bookie.erl @@ -139,7 +139,9 @@ book_tempput/7, book_delete/4, book_get/3, + book_get/4, book_head/3, + book_head/4, book_returnfolder/2, book_snapshotstore/3, book_snapshotledger/3, diff --git a/test/end_to_end/testutil.erl b/test/end_to_end/testutil.erl index 831369d..b49ab21 100644 --- a/test/end_to_end/testutil.erl +++ b/test/end_to_end/testutil.erl @@ -48,21 +48,21 @@ book_riakput(Pid, RiakObject, IndexSpecs) -> {Bucket, Key} = leveled_codec:riakto_keydetails(RiakObject), - leveled_book:book_put(Pid, Bucket, Key, RiakObject, IndexSpecs, ?RIAK_TAG). + leveled_bookie:book_put(Pid, Bucket, Key, RiakObject, IndexSpecs, ?RIAK_TAG). book_riakdelete(Pid, Bucket, Key, IndexSpecs) -> - leveled_book:book_put(Pid, Bucket, Key, delete, IndexSpecs, ?RIAK_TAG). + leveled_bookie:book_put(Pid, Bucket, Key, delete, IndexSpecs, ?RIAK_TAG). book_riakget(Pid, Bucket, Key) -> - leveled_book:book_get(Pid, Bucket, Key, ?RIAK_TAG). + leveled_bookie:book_get(Pid, Bucket, Key, ?RIAK_TAG). book_riakhead(Pid, Bucket, Key) -> - leveled_book:book_head(Pid, Bucket, Key, ?RIAK_TAG). + leveled_bookie:book_head(Pid, Bucket, Key, ?RIAK_TAG). riakload(Bookie, ObjectList) -> lists:foreach(fun({_RN, Obj, Spc}) -> - R = book_riakput(Bookie,Obj, Spc), + R = book_riakput(Bookie, Obj, Spc), case R of ok -> ok; pause -> timer:sleep(?SLOWOFFER_DELAY)