From e63db8dedc181092bdedc0dcdd796f6d6071ee90 Mon Sep 17 00:00:00 2001
From: Scott Lystig Fritchie <slfritchie@snookles.com>
Date: Mon, 28 Mar 2016 18:42:04 +0900
Subject: [PATCH] Fix read_chunk op in b_b driver

---
 include/machi.hrl                |  2 +-
 src/machi_basho_bench_driver.erl | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/include/machi.hrl b/include/machi.hrl
index 7974fd2..5fbd525 100644
--- a/include/machi.hrl
+++ b/include/machi.hrl
@@ -21,7 +21,7 @@
 %% @doc Now 4GiBytes, could be up to 64bit due to PB message limit of
 %% chunk size
 -define(DEFAULT_MAX_FILE_SIZE, ((1 bsl 32) - 1)).
--define(MINIMUM_OFFSET, 1024).
+-define(MINIMUM_OFFSET, 0).
 
 %% 0th draft of checksum typing with 1st byte.
 -define(CSUM_TAG_NONE, 0).                   % No csum provided by client
diff --git a/src/machi_basho_bench_driver.erl b/src/machi_basho_bench_driver.erl
index 4da9def..272fb49 100644
--- a/src/machi_basho_bench_driver.erl
+++ b/src/machi_basho_bench_driver.erl
@@ -60,6 +60,7 @@
 -export([new/1, run/4]).
 
 -record(m, {
+          id,
           conn,
           max_key
          }).
@@ -90,7 +91,7 @@ new(Id) ->
        true ->
             ok
     end,
-    {ok, #m{conn=Conn}}.
+    {ok, #m{id=Id, conn=Conn}}.
 
 run(append, KeyGen, ValueGen, #m{conn=Conn}=S) ->
     Prefix = KeyGen(),
@@ -114,7 +115,7 @@ run(read, KeyGen, _ValueGen, #m{conn=Conn, max_key=MaxKey}=S) ->
     Idx = KeyGen() rem MaxKey,
     %% {File, Offset, Size, _CSum} = ets:lookup_element(?ETS_TAB, Idx, 2),
     {File, Offset, Size} = ets:lookup_element(?ETS_TAB, Idx, 2),
-    case machi_cr_client:read_chunk(Conn, File, Offset, Size, undefined, ?THE_TIMEOUT) of
+    case machi_cr_client:read_chunk(Conn, undefined, File, Offset, Size, undefined, ?THE_TIMEOUT) of
         {ok, _Chunk} ->
             {ok, S};
         {error, _}=Err ->
@@ -141,12 +142,14 @@ load_ets_table(Conn, ETS) ->
          PosList = machi_csum_table:split_checksum_list_blob_decode(InfoBin),
          ?INFO("File ~s len PosList ~p\n", [File, length(PosList)]),
          StartKey = ets:update_counter(ETS, max_key, 0),
-         {_, Bytes} = lists:foldl(fun({Off,Sz,_CSum}, {K, Bs}) ->
-                                          V = {File, Off, Sz},
-                                          ets:insert(ETS, {K, V}),
-                                          {K + 1, Bs + Sz}
-                                  end, {StartKey, 0}, PosList),
-         ets:update_counter(ETS, max_key, length(PosList)),
+         {_, C, Bytes} = lists:foldl(fun({_Off,0,_CSum}, {_K, _C, _Bs}=Acc) ->
+                                             Acc;
+                                        ({Off,Sz,_CSum}, {K, C, Bs}) ->
+                                             V = {File, Off, Sz},
+                                             ets:insert(ETS, {K, V}),
+                                             {K + 1, C + 1, Bs + Sz}
+                                     end, {StartKey, 0, 0}, PosList),
+         ets:update_counter(ETS, max_key, C),
          ets:update_counter(ETS, total_bytes, Bytes)
      end || {_Size, File} <- Fs],
     ets:update_counter(?ETS_TAB, max_key, 0).