From a14941a1222c24ffe5570d40ffe396b25f5d993e Mon Sep 17 00:00:00 2001 From: Martin Sumner Date: Mon, 4 Jun 2018 10:57:37 +0100 Subject: [PATCH] Fix unexported types file:location not exported? --- src/leveled_bookie.erl | 2 +- src/leveled_cdb.erl | 9 +++++---- src/leveled_codec.erl | 5 +++-- src/leveled_ebloom.erl | 2 ++ src/leveled_inker.erl | 2 +- src/leveled_pmem.erl | 2 ++ src/leveled_runner.erl | 3 ++- src/leveled_sst.erl | 6 +++--- 8 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/leveled_bookie.erl b/src/leveled_bookie.erl index 4e4cd30..10a960f 100644 --- a/src/leveled_bookie.erl +++ b/src/leveled_bookie.erl @@ -1322,7 +1322,7 @@ fetch_head(Key, Penciller, LedgerCache) -> -spec preparefor_ledgercache(leveled_codec:journal_key_tag()|null, leveled_codec:ledger_key()|?DUMMY, integer(), any(), integer(), - leveled_codec:key_changes(), + leveled_codec:journal_keychanges(), book_state()) -> {integer()|no_lookup, integer(), diff --git a/src/leveled_cdb.erl b/src/leveled_cdb.erl index 6ec3b55..e31d289 100644 --- a/src/leveled_cdb.erl +++ b/src/leveled_cdb.erl @@ -140,6 +140,7 @@ -type cdb_options() :: #cdb_options{}. -type cdb_timings() :: no_timing|#cdb_timings{}. -type hashtable_index() :: tuple(). +-type file_location() :: integer()|eof. @@ -1183,8 +1184,8 @@ extract_key_value_check(Handle, Position, BinaryMode) -> end. --spec startup_scan_over_file(fle:io_device(), file:location()) - -> {file:location(), any()}. +-spec startup_scan_over_file(file:io_device(), file_location()) + -> {file_location(), any()}. %% @doc %% Scan through the file until there is a failure to crc check an input, and %% at that point return the position and the key dictionary scanned so far @@ -1207,8 +1208,8 @@ startup_filter(Key, _ValueAsBin, Position, {Hashtree, _LastKey}, _ExtractFun) -> {loop, {put_hashtree(Key, Position, Hashtree), Key}}. --spec scan_over_file(file:io_device(), file:location(), fun(), any(), any()) - -> {file:location(), any()}. +-spec scan_over_file(file:io_device(), file_location(), fun(), any(), any()) + -> {file_location(), any()}. %% Scan for key changes - scan over file returning applying FilterFun %% The FilterFun should accept as input: %% - Key, ValueBin, Position, Accumulator, Fun (to extract values from Binary) diff --git a/src/leveled_codec.erl b/src/leveled_codec.erl index fac2222..1635bc4 100644 --- a/src/leveled_codec.erl +++ b/src/leveled_codec.erl @@ -101,10 +101,11 @@ {integer(), journal_key_tag(), ledger_key()}. -type compression_method() :: lz4|native. --type journal_keychanges() :: - {list(), infinity|integer()}. % {KeyChanges, TTL} -type index_specs() :: list({add|remove, any(), any()}). +-type journal_keychanges() :: + {index_specs(), infinity|integer()}. % {KeyChanges, TTL} + -type segment_list() :: list(integer())|false. diff --git a/src/leveled_ebloom.erl b/src/leveled_ebloom.erl index fc68834..91d8879 100644 --- a/src/leveled_ebloom.erl +++ b/src/leveled_ebloom.erl @@ -23,6 +23,8 @@ -type bloom() :: binary(). +-export_type([bloom/0]). + %%%============================================================================ %%% API %%%============================================================================ diff --git a/src/leveled_inker.erl b/src/leveled_inker.erl index 790ed65..631db81 100644 --- a/src/leveled_inker.erl +++ b/src/leveled_inker.erl @@ -174,7 +174,7 @@ ink_start(InkerOpts) -> -spec ink_put(pid(), leveled_codec:ledger_key(), any(), - leveled_codec:key_changes()) -> + leveled_codec:journal_keychanges()) -> {ok, integer(), integer()}. %% @doc %% PUT an object into the journal, returning the sequence number for the PUT diff --git a/src/leveled_pmem.erl b/src/leveled_pmem.erl index d4cc6aa..96e3124 100644 --- a/src/leveled_pmem.erl +++ b/src/leveled_pmem.erl @@ -46,6 +46,8 @@ % -type index_array() :: array:array(). -type index_array() :: any(). % To live with OTP16 +-export_type([index_array/0]). + %%%============================================================================ %%% API %%%============================================================================ diff --git a/src/leveled_runner.erl b/src/leveled_runner.erl index 37f7163..b8b34dc 100644 --- a/src/leveled_runner.erl +++ b/src/leveled_runner.erl @@ -43,7 +43,8 @@ -define(CHECKJOURNAL_PROB, 0.2). -type key_range() - :: {leveled_codec:leveled_key(), leveled_codec:leveled_key()}. + :: {leveled_codec:ledger_key()|null, + leveled_codec:ledger_key()|null}. -type fun_and_acc() :: {fun(), any()}. diff --git a/src/leveled_sst.erl b/src/leveled_sst.erl index 42de6b8..589bdb2 100644 --- a/src/leveled_sst.erl +++ b/src/leveled_sst.erl @@ -138,7 +138,7 @@ -type press_methods() :: lz4|native|none. -type range_endpoint() - :: all|leveled_codec:leveled_key(). + :: all|leveled_codec:ledger_key(). -type slot_pointer() :: {pointer, pid(), integer(), range_endpoint(), range_endpoint()}. -type sst_pointer() @@ -441,8 +441,8 @@ sst_deleteconfirmed(Pid) -> gen_fsm:send_event(Pid, close). -spec sst_checkready(pid()) -> {ok, string(), - leveled_codec:leveled_key(), - leveled_codec:leveled_key()}. + leveled_codec:ledger_key(), + leveled_codec:ledger_key()}. %% @doc %% If a file has been set to be built, check that it has been built. Returns %% the filename and the {startKey, EndKey} for the manifest.