From 595f9a463ecd2ac27ca807d4a072cae1283cf312 Mon Sep 17 00:00:00 2001 From: Scott Lystig Fritchie Date: Wed, 21 Oct 2015 15:46:24 +0900 Subject: [PATCH] Unexported funcs --- src/machi_basho_bench_driver.erl | 2 +- src/machi_chain_manager1.erl | 5 +++-- src/machi_chain_repair.erl | 2 +- src/machi_csum_table.erl | 6 ++++-- src/machi_yessir_client.erl | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/machi_basho_bench_driver.erl b/src/machi_basho_bench_driver.erl index 209e417..50f871f 100644 --- a/src/machi_basho_bench_driver.erl +++ b/src/machi_basho_bench_driver.erl @@ -136,7 +136,7 @@ load_ets_table(Conn, ETS) -> {ok, Fs} = machi_cr_client:list_files(Conn), [begin {ok, InfoBin} = machi_cr_client:checksum_list(Conn, File), - {PosList, _} = machi_flu1:split_checksum_list_blob_decode(InfoBin), + {PosList, _} = machi_csum_table:split_checksum_list_blob_decode(InfoBin), StartKey = ets:update_counter(ETS, max_key, 0), %% _EndKey = lists:foldl(fun({Off,Sz,CSum}, K) -> %% V = {File, Off, Sz, CSum}, diff --git a/src/machi_chain_manager1.erl b/src/machi_chain_manager1.erl index 0718aa4..fcf79ee 100644 --- a/src/machi_chain_manager1.erl +++ b/src/machi_chain_manager1.erl @@ -117,6 +117,8 @@ simple_chain_state_transition_is_sane/3, simple_chain_state_transition_is_sane/5, chain_state_transition_is_sane/6]). +-export([perhaps_call/5, % for partition simulator use w/machi_fitness + init_remember_down_list/0]). %% Exports so that EDoc docs generated for these internal funcs. -export([mk/3]). @@ -129,8 +131,7 @@ -export([test_calc_projection/2, test_write_public_projection/2, test_read_latest_public_projection/2]). --export([perhaps_call/5, % for partition simulator use w/machi_fitness - init_remember_down_list/0, update_remember_down_list/1, +-export([update_remember_down_list/1, get_remember_down_list/0]). -ifdef(EQC). diff --git a/src/machi_chain_repair.erl b/src/machi_chain_repair.erl index 946c4c7..6e38064 100644 --- a/src/machi_chain_repair.erl +++ b/src/machi_chain_repair.erl @@ -210,7 +210,7 @@ make_repair_directives(ConsistencyMode, RepairMode, File, Size, EpochID, Proxy, EpochID, File, ?LONG_TIMEOUT) of {ok, InfoBin} -> {Info, _} = - machi_flu1:split_checksum_list_blob_decode(InfoBin), + machi_csum_table:split_checksum_list_blob_decode(InfoBin), Info; {error, no_such_file} -> [] diff --git a/src/machi_csum_table.erl b/src/machi_csum_table.erl index 3ce391d..08d0923 100644 --- a/src/machi_csum_table.erl +++ b/src/machi_csum_table.erl @@ -5,14 +5,16 @@ all_trimmed/2, sync/1, calc_unwritten_bytes/1, + split_checksum_list_blob_decode/1, close/1, delete/1]). --export([encode_csum_file_entry/3, decode_csum_file_entry/1]). +-export([encode_csum_file_entry/3, encode_csum_file_entry_bin/3, + decode_csum_file_entry/1]). -include("machi.hrl"). -ifdef(TEST). --export([split_checksum_list_blob_decode/1, all/1]). +-export([all/1]). -endif. -record(machi_csum_table, diff --git a/src/machi_yessir_client.erl b/src/machi_yessir_client.erl index a833f74..a7cb75d 100644 --- a/src/machi_yessir_client.erl +++ b/src/machi_yessir_client.erl @@ -180,7 +180,7 @@ checksum_list(#yessir{name=Name,chunk_size=ChunkSize}, _EpochID, File) -> MaxOffset -> C = machi_util:make_tagged_csum(client_sha, make_csum(Name, ChunkSize)), - Cs = [machi_flu1:encode_csum_file_entry_bin(Offset, ChunkSize, C) || + Cs = [machi_csum_table:encode_csum_file_entry_bin(Offset, ChunkSize, C) || Offset <- lists:seq(?MINIMUM_OFFSET, MaxOffset, ChunkSize)], {ok, Cs} end.