umgeher/leveled
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Merge pull request #80 from project-fifo/dialyzer

Browse source 
Fix dialyzer warnings for newer erlang releases
This commit is contained in:
Martin Sumner 2017-07-31 21:42:50 +01:00 • committed by GitHub
commit 7f6f51efcd
9 changed files with 70 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

47
include/leveled.hrl
View file

@ -28,44 +28,44 @@
timestamp :: integer()}). timestamp :: integer()}).
-record(manifest_entry, -record(manifest_entry,
{start_key :: tuple(), {start_key :: tuple() | undefined,
end_key :: tuple(), end_key :: tuple() | undefined,
owner :: pid()|list(), owner :: pid()|list(),
filename :: string()}). filename :: string() | undefined}).
-record(cdb_options, -record(cdb_options,
{max_size :: integer(), {max_size :: integer() | undefined,
file_path :: string(), file_path :: string() | undefined,
waste_path :: string(), waste_path :: string() | undefined,
binary_mode = false :: boolean(), binary_mode = false :: boolean(),
sync_strategy = sync}). sync_strategy = sync}).
-record(inker_options, -record(inker_options,
{cdb_max_size :: integer(), {cdb_max_size :: integer() | undefined,
root_path :: string(), root_path :: string() | undefined,
cdb_options :: #cdb_options{}, cdb_options :: #cdb_options{} | undefined,
start_snapshot = false :: boolean(), start_snapshot = false :: boolean(),
source_inker :: pid(), source_inker :: pid() | undefined,
reload_strategy = [] :: list(), reload_strategy = [] :: list(),
waste_retention_period :: integer(), waste_retention_period :: integer() | undefined,
max_run_length}). max_run_length}).
-record(penciller_options, -record(penciller_options,
{root_path :: string(), {root_path :: string() | undefined,
max_inmemory_tablesize :: integer(), max_inmemory_tablesize :: integer() | undefined,
start_snapshot = false :: boolean(), start_snapshot = false :: boolean(),
snapshot_query, snapshot_query,
bookies_mem :: tuple(), bookies_mem :: tuple() | undefined,
source_penciller :: pid(), source_penciller :: pid() | undefined,
snapshot_longrunning = true :: boolean(), snapshot_longrunning = true :: boolean(),
levelzero_cointoss = false :: boolean()}). levelzero_cointoss = false :: boolean()}).
-record(iclerk_options, -record(iclerk_options,
{inker :: pid(), {inker :: pid() | undefined,
max_run_length :: integer(), max_run_length :: integer() | undefined,
cdb_options = #cdb_options{} :: #cdb_options{}, cdb_options = #cdb_options{} :: #cdb_options{},
waste_retention_period :: integer(), waste_retention_period :: integer() | undefined,
reload_strategy = [] :: list()}). reload_strategy = [] :: list()}).
-record(recent_aae, {filter :: whitelist|blacklist, -record(recent_aae, {filter :: whitelist|blacklist,
% the buckets list should either be a % the buckets list should either be a
@ -106,4 +106,3 @@
vclock, vclock,
updatemetadata=dict:store(clean, true, dict:new()), updatemetadata=dict:store(clean, true, dict:new()),
updatevalue :: term()}). updatevalue :: term()}).

14
src/leveled_bookie.erl
View file

@ -92,15 +92,15 @@
min_sqn = infinity :: integer()|infinity, min_sqn = infinity :: integer()|infinity,
max_sqn = 0 :: integer()}). max_sqn = 0 :: integer()}).
-record(state, {inker :: pid(), -record(state, {inker :: pid() | undefined,
penciller :: pid(), penciller :: pid() | undefined,
cache_size :: integer(), cache_size :: integer() | undefined,
recent_aae :: false|#recent_aae{}, recent_aae :: false | #recent_aae{} | undefined,
ledger_cache = #ledger_cache{}, ledger_cache = #ledger_cache{},
is_snapshot :: boolean(), is_snapshot :: boolean() | undefined,
slow_offer = false :: boolean(), slow_offer = false :: boolean(),
put_timing :: tuple(), put_timing :: tuple() | undefined,
get_timing :: tuple()}). get_timing :: tuple() | undefined}).
%%%============================================================================ %%%============================================================================

12
src/leveled_cdb.erl
View file

@ -99,17 +99,17 @@
-define(DELETE_TIMEOUT, 10000). -define(DELETE_TIMEOUT, 10000).
-record(state, {hashtree, -record(state, {hashtree,
last_position :: integer(), last_position :: integer() | undefined,
last_key = empty, last_key = empty,
hash_index = {} :: tuple(), hash_index = {} :: tuple(),
filename :: string(), filename :: string() | undefined,
handle :: file:fd(), handle :: file:fd() | undefined,
max_size :: integer(), max_size :: integer() | undefined,
binary_mode = false :: boolean(), binary_mode = false :: boolean(),
delete_point = 0 :: integer(), delete_point = 0 :: integer(),
inker :: pid(), inker :: pid() | undefined,
deferred_delete = false :: boolean(), deferred_delete = false :: boolean(),
waste_path :: string(), waste_path :: string() | undefined,
sync_strategy = none}). sync_strategy = none}).
-type cdb_options() :: #cdb_options{}. -type cdb_options() :: #cdb_options{}.

20
src/leveled_iclerk.erl
View file

@ -104,17 +104,17 @@
-define(DEFAULT_WASTE_RETENTION_PERIOD, 86400). -define(DEFAULT_WASTE_RETENTION_PERIOD, 86400).
-define(INTERVALS_PER_HOUR, 4). -define(INTERVALS_PER_HOUR, 4).
-record(state, {inker :: pid(), -record(state, {inker :: pid() | undefined,
max_run_length :: integer(), max_run_length :: integer() | undefined,
cdb_options, cdb_options,
waste_retention_period :: integer(), waste_retention_period :: integer() | undefined,
waste_path :: string(), waste_path :: string() | undefined,
reload_strategy = ?DEFAULT_RELOAD_STRATEGY :: list()}). reload_strategy = ?DEFAULT_RELOAD_STRATEGY :: list()}).
-record(candidate, {low_sqn :: integer(), -record(candidate, {low_sqn :: integer() | undefined,
filename :: string(), filename :: string() | undefined,
journal :: pid(), journal :: pid() | undefined,
compaction_perc :: float()}). compaction_perc :: float() | undefined}).
%%%============================================================================ %%%============================================================================

10
src/leveled_inker.erl
View file

@ -128,15 +128,15 @@
-record(state, {manifest = [] :: list(), -record(state, {manifest = [] :: list(),
manifest_sqn = 0 :: integer(), manifest_sqn = 0 :: integer(),
journal_sqn = 0 :: integer(), journal_sqn = 0 :: integer(),
active_journaldb :: pid(), active_journaldb :: pid() | undefined,
pending_removals = [] :: list(), pending_removals = [] :: list(),
registered_snapshots = [] :: list(), registered_snapshots = [] :: list(),
root_path :: string(), root_path :: string() | undefined,
cdb_options :: #cdb_options{}, cdb_options :: #cdb_options{} | undefined,
clerk :: pid(), clerk :: pid() | undefined,
compaction_pending = false :: boolean(), compaction_pending = false :: boolean(),
is_snapshot = false :: boolean(), is_snapshot = false :: boolean(),
source_inker :: pid()}). source_inker :: pid() | undefined}).
-type inker_options() :: #inker_options{}. -type inker_options() :: #inker_options{}.

4
src/leveled_pclerk.erl
View file

@ -47,8 +47,8 @@
-define(MAX_TIMEOUT, 2000). -define(MAX_TIMEOUT, 2000).
-define(MIN_TIMEOUT, 200). -define(MIN_TIMEOUT, 200).
-record(state, {owner :: pid(), -record(state, {owner :: pid() | undefined,
root_path :: string(), root_path :: string() | undefined,
pending_deletions = dict:new() % OTP 16 does not like type pending_deletions = dict:new() % OTP 16 does not like type
}). }).

18
src/leveled_penciller.erl
View file

@ -223,25 +223,25 @@
ledger_sqn = 0 :: integer(), % The highest SQN added to L0 ledger_sqn = 0 :: integer(), % The highest SQN added to L0
root_path = "../test" :: string(), root_path = "../test" :: string(),
clerk :: pid(), clerk :: pid() | undefined,
levelzero_pending = false :: boolean(), levelzero_pending = false :: boolean(),
levelzero_constructor :: pid(), levelzero_constructor :: pid() | undefined,
levelzero_cache = [] :: list(), % a list of trees levelzero_cache = [] :: list(), % a list of trees
levelzero_size = 0 :: integer(), levelzero_size = 0 :: integer(),
levelzero_maxcachesize :: integer(), levelzero_maxcachesize :: integer() | undefined,
levelzero_cointoss = false :: boolean(), levelzero_cointoss = false :: boolean(),
levelzero_index, % An array levelzero_index, % An array
is_snapshot = false :: boolean(), is_snapshot = false :: boolean(),
snapshot_fully_loaded = false :: boolean(), snapshot_fully_loaded = false :: boolean(),
source_penciller :: pid(), source_penciller :: pid() | undefined,
levelzero_astree :: list(), levelzero_astree :: list() | undefined,
work_ongoing = false :: boolean(), % i.e. compaction work work_ongoing = false :: boolean(), % i.e. compaction work
work_backlog = false :: boolean(), % i.e. compaction work work_backlog = false :: boolean(), % i.e. compaction work
head_timing :: tuple()}). head_timing :: tuple() | undefined}).
-type penciller_options() :: #penciller_options{}. -type penciller_options() :: #penciller_options{}.
-type bookies_memory() :: {tuple()|empty_cache, -type bookies_memory() :: {tuple()|empty_cache,
@ -1269,9 +1269,7 @@ keyfolder({[{IMMKey, IMMVal}|NxIMMiterator], SSTiterator}, KeyRange,
generate_randomkeys({Count, StartSQN}) -> generate_randomkeys({Count, StartSQN}) ->
generate_randomkeys(Count, StartSQN, []); generate_randomkeys(Count, StartSQN, []).
generate_randomkeys(Count) ->
generate_randomkeys(Count, 0, []).
generate_randomkeys(0, _SQN, Acc) -> generate_randomkeys(0, _SQN, Acc) ->
lists:reverse(Acc); lists:reverse(Acc);
@ -1622,7 +1620,7 @@ foldwithimm_simple_test() ->
create_file_test() -> create_file_test() ->
{RP, Filename} = {"../test/", "new_file.sst"}, {RP, Filename} = {"../test/", "new_file.sst"},
ok = file:write_file(filename:join(RP, Filename), term_to_binary("hello")), ok = file:write_file(filename:join(RP, Filename), term_to_binary("hello")),
KVL = lists:usort(generate_randomkeys(10000)), KVL = lists:usort(generate_randomkeys({10000, 0})),
Tree = leveled_tree:from_orderedlist(KVL, ?CACHE_TYPE), Tree = leveled_tree:from_orderedlist(KVL, ?CACHE_TYPE),
FetchFun = fun(Slot) -> lists:nth(Slot, [Tree]) end, FetchFun = fun(Slot) -> lists:nth(Slot, [Tree]) end,
{ok, {ok,

2
src/leveled_pmanifest.erl
View file

@ -61,7 +61,7 @@
% an array of lists or trees representing the manifest % an array of lists or trees representing the manifest
manifest_sqn = 0 :: integer(), manifest_sqn = 0 :: integer(),
% The current manifest SQN % The current manifest SQN
snapshots :: list(), snapshots :: list() | undefined,
% A list of snaphots (i.e. clones) % A list of snaphots (i.e. clones)
min_snapshot_sqn = 0 :: integer(), min_snapshot_sqn = 0 :: integer(),
% The smallest snapshot manifest SQN in the snapshot % The smallest snapshot manifest SQN in the snapshot

8
src/leveled_sst.erl
View file

@ -117,7 +117,7 @@
-record(summary, {first_key :: tuple(), -record(summary, {first_key :: tuple(),
last_key :: tuple(), last_key :: tuple(),
index :: tuple(), index :: tuple() | undefined,
size :: integer(), size :: integer(),
max_sqn :: integer()}). max_sqn :: integer()}).
@ -129,9 +129,9 @@
%% extra copying. Files at the top of the tree yield, those lower down don't. %% extra copying. Files at the top of the tree yield, those lower down don't.
-record(state, {summary, -record(state, {summary,
handle :: file:fd(), handle :: file:fd() | undefined,
sst_timings :: tuple(), sst_timings :: tuple() | undefined,
penciller :: pid(), penciller :: pid() | undefined,
root_path, root_path,
filename, filename,
yield_blockquery = false :: boolean(), yield_blockquery = false :: boolean(),