From 5e6df539cbff9cec41b4527dd946b61913993a56 Mon Sep 17 00:00:00 2001 From: "Heinz N. Gies" Date: Mon, 31 Jul 2017 19:30:29 +0200 Subject: [PATCH 1/8] Cleanup dialyzer errrors in leveled_sst --- include/leveled.hrl | 10 +++++----- src/leveled_sst.erl | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/leveled.hrl b/include/leveled.hrl index 12b2d07..95d7d06 100644 --- a/include/leveled.hrl +++ b/include/leveled.hrl @@ -28,10 +28,10 @@ timestamp :: integer()}). -record(manifest_entry, - {start_key :: tuple(), - end_key :: tuple(), - owner :: pid()|list(), - filename :: string()}). + {start_key :: tuple() | undefined, + end_key :: tuple() | undefined, + owner :: pid()|list(), + filename :: string() | undefined}). -record(cdb_options, {max_size :: integer(), @@ -106,4 +106,4 @@ vclock, updatemetadata=dict:store(clean, true, dict:new()), updatevalue :: term()}). - \ No newline at end of file + diff --git a/src/leveled_sst.erl b/src/leveled_sst.erl index 6e2073a..83cb916 100644 --- a/src/leveled_sst.erl +++ b/src/leveled_sst.erl @@ -117,7 +117,7 @@ -record(summary, {first_key :: tuple(), last_key :: tuple(), - index :: tuple(), + index :: tuple() | undefined, size :: integer(), max_sqn :: integer()}). @@ -129,9 +129,9 @@ %% extra copying. Files at the top of the tree yield, those lower down don't. -record(state, {summary, - handle :: file:fd(), - sst_timings :: tuple(), - penciller :: pid(), + handle :: file:fd() | undefined, + sst_timings :: tuple() | undefined, + penciller :: pid() | undefined, root_path, filename, yield_blockquery = false :: boolean(), @@ -2057,4 +2057,4 @@ nonsense_coverage_test() -> ?assertMatch({reply, undefined, reader, #state{}}, handle_sync_event("hello", self(), reader, #state{})). --endif. \ No newline at end of file +-endif. From 858ee9a915bbd96ffed0c7ef9fdf1ad9aa643833 Mon Sep 17 00:00:00 2001 From: "Heinz N. Gies" Date: Mon, 31 Jul 2017 19:32:06 +0200 Subject: [PATCH 2/8] Cleanup dialyzer errrors in leveled_pmanifest --- src/leveled_pmanifest.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/leveled_pmanifest.erl b/src/leveled_pmanifest.erl index 29259cf..d32184a 100644 --- a/src/leveled_pmanifest.erl +++ b/src/leveled_pmanifest.erl @@ -61,7 +61,7 @@ % an array of lists or trees representing the manifest manifest_sqn = 0 :: integer(), % The current manifest SQN - snapshots :: list(), + snapshots :: list() | undefined, % A list of snaphots (i.e. clones) min_snapshot_sqn = 0 :: integer(), % The smallest snapshot manifest SQN in the snapshot @@ -1121,4 +1121,4 @@ snapshot_timeout_test() -> --endif. \ No newline at end of file +-endif. From 369bdece5f5bbc3e23669e5d7568cb92be427717 Mon Sep 17 00:00:00 2001 From: "Heinz N. Gies" Date: Mon, 31 Jul 2017 19:39:40 +0200 Subject: [PATCH 3/8] Cleanup dialyzer errrors in leveled_penciller --- include/leveled.hrl | 8 ++++---- src/leveled_penciller.erl | 18 ++++++++---------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/include/leveled.hrl b/include/leveled.hrl index 95d7d06..5c13d4c 100644 --- a/include/leveled.hrl +++ b/include/leveled.hrl @@ -51,12 +51,12 @@ max_run_length}). -record(penciller_options, - {root_path :: string(), - max_inmemory_tablesize :: integer(), + {root_path :: string() | undefined, + max_inmemory_tablesize :: integer() | undefined, start_snapshot = false :: boolean(), snapshot_query, - bookies_mem :: tuple(), - source_penciller :: pid(), + bookies_mem :: tuple() | undefined, + source_penciller :: pid() | undefined, snapshot_longrunning = true :: boolean(), levelzero_cointoss = false :: boolean()}). diff --git a/src/leveled_penciller.erl b/src/leveled_penciller.erl index 41e3732..e837b98 100644 --- a/src/leveled_penciller.erl +++ b/src/leveled_penciller.erl @@ -223,25 +223,25 @@ ledger_sqn = 0 :: integer(), % The highest SQN added to L0 root_path = "../test" :: string(), - clerk :: pid(), + clerk :: pid() | undefined, levelzero_pending = false :: boolean(), - levelzero_constructor :: pid(), + levelzero_constructor :: pid() | undefined, levelzero_cache = [] :: list(), % a list of trees levelzero_size = 0 :: integer(), - levelzero_maxcachesize :: integer(), + levelzero_maxcachesize :: integer() | undefined, levelzero_cointoss = false :: boolean(), levelzero_index, % An array is_snapshot = false :: boolean(), snapshot_fully_loaded = false :: boolean(), - source_penciller :: pid(), - levelzero_astree :: list(), + source_penciller :: pid() | undefined, + levelzero_astree :: list() | undefined, work_ongoing = 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 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) -> - generate_randomkeys(Count, 0, []). + generate_randomkeys(Count, StartSQN, []). generate_randomkeys(0, _SQN, Acc) -> lists:reverse(Acc); @@ -1622,7 +1620,7 @@ foldwithimm_simple_test() -> create_file_test() -> {RP, Filename} = {"../test/", "new_file.sst"}, 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), FetchFun = fun(Slot) -> lists:nth(Slot, [Tree]) end, {ok, From 44fd603474df9f252310958d1b44dbba44d0701c Mon Sep 17 00:00:00 2001 From: "Heinz N. Gies" Date: Mon, 31 Jul 2017 19:41:26 +0200 Subject: [PATCH 4/8] Cleanup dialyzer errrors in leveled_pclerk --- src/leveled_pclerk.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/leveled_pclerk.erl b/src/leveled_pclerk.erl index 2d942eb..7e1579a 100644 --- a/src/leveled_pclerk.erl +++ b/src/leveled_pclerk.erl @@ -47,8 +47,8 @@ -define(MAX_TIMEOUT, 2000). -define(MIN_TIMEOUT, 200). --record(state, {owner :: pid(), - root_path :: string(), +-record(state, {owner :: pid() | undefined, + root_path :: string() | undefined, pending_deletions = dict:new() % OTP 16 does not like type }). From eece25322201acd12208df4830bfd234da0feb6a Mon Sep 17 00:00:00 2001 From: "Heinz N. Gies" Date: Mon, 31 Jul 2017 19:47:58 +0200 Subject: [PATCH 5/8] Cleanup most dialyzer errrors in leveled_inker --- include/leveled.hrl | 12 ++++++------ src/leveled_inker.erl | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/leveled.hrl b/include/leveled.hrl index 5c13d4c..4e33c15 100644 --- a/include/leveled.hrl +++ b/include/leveled.hrl @@ -35,19 +35,19 @@ -record(cdb_options, {max_size :: integer(), - file_path :: string(), - waste_path :: string(), + file_path :: string() | undefined, + waste_path :: string() | undefined, binary_mode = false :: boolean(), sync_strategy = sync}). -record(inker_options, - {cdb_max_size :: integer(), - root_path :: string(), + {cdb_max_size :: integer() | undefined, + root_path :: string() | undefined, cdb_options :: #cdb_options{}, start_snapshot = false :: boolean(), - source_inker :: pid(), + source_inker :: pid() | undefined, reload_strategy = [] :: list(), - waste_retention_period :: integer(), + waste_retention_period :: integer() | undefined, max_run_length}). -record(penciller_options, diff --git a/src/leveled_inker.erl b/src/leveled_inker.erl index 69d9a3f..3472c13 100644 --- a/src/leveled_inker.erl +++ b/src/leveled_inker.erl @@ -128,15 +128,15 @@ -record(state, {manifest = [] :: list(), manifest_sqn = 0 :: integer(), journal_sqn = 0 :: integer(), - active_journaldb :: pid(), + active_journaldb :: pid() | undefined, pending_removals = [] :: list(), registered_snapshots = [] :: list(), - root_path :: string(), - cdb_options :: #cdb_options{}, - clerk :: pid(), + root_path :: string() | undefined, + cdb_options :: #cdb_options{} | undefined, + clerk :: pid() | undefined, compaction_pending = false :: boolean(), is_snapshot = false :: boolean(), - source_inker :: pid()}). + source_inker :: pid() | undefined}). -type inker_options() :: #inker_options{}. @@ -1073,4 +1073,4 @@ coverage_cheat_test() -> {noreply, _State0} = handle_info(timeout, #state{}), {ok, _State1} = code_change(null, #state{}, null). --endif. \ No newline at end of file +-endif. From e8ed7954cc67e239e1ef4c0e777dba01e1d014f9 Mon Sep 17 00:00:00 2001 From: "Heinz N. Gies" Date: Mon, 31 Jul 2017 19:53:01 +0200 Subject: [PATCH 6/8] Cleanup dialyzer errrors in leveled_iclerk --- include/leveled.hrl | 20 ++++++++++---------- src/leveled_iclerk.erl | 22 +++++++++++----------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/include/leveled.hrl b/include/leveled.hrl index 4e33c15..7274327 100644 --- a/include/leveled.hrl +++ b/include/leveled.hrl @@ -34,11 +34,11 @@ filename :: string() | undefined}). -record(cdb_options, - {max_size :: integer(), - file_path :: string() | undefined, - waste_path :: string() | undefined, - binary_mode = false :: boolean(), - sync_strategy = sync}). + {max_size :: integer() | undefined, + file_path :: string() | undefined, + waste_path :: string() | undefined, + binary_mode = false :: boolean(), + sync_strategy = sync}). -record(inker_options, {cdb_max_size :: integer() | undefined, @@ -61,11 +61,11 @@ levelzero_cointoss = false :: boolean()}). -record(iclerk_options, - {inker :: pid(), - max_run_length :: integer(), - cdb_options = #cdb_options{} :: #cdb_options{}, - waste_retention_period :: integer(), - reload_strategy = [] :: list()}). + {inker :: pid() | undefined, + max_run_length :: integer() | undefined, + cdb_options = #cdb_options{} :: #cdb_options{}, + waste_retention_period :: integer() | undefined, + reload_strategy = [] :: list()}). -record(recent_aae, {filter :: whitelist|blacklist, % the buckets list should either be a diff --git a/src/leveled_iclerk.erl b/src/leveled_iclerk.erl index 40211ea..b7b0f4d 100644 --- a/src/leveled_iclerk.erl +++ b/src/leveled_iclerk.erl @@ -104,17 +104,17 @@ -define(DEFAULT_WASTE_RETENTION_PERIOD, 86400). -define(INTERVALS_PER_HOUR, 4). --record(state, {inker :: pid(), - max_run_length :: integer(), - cdb_options, - waste_retention_period :: integer(), - waste_path :: string(), - reload_strategy = ?DEFAULT_RELOAD_STRATEGY :: list()}). +-record(state, {inker :: pid() | undefined, + max_run_length :: integer() | undefined, + cdb_options, + waste_retention_period :: integer() | undefined, + waste_path :: string() | undefined, + reload_strategy = ?DEFAULT_RELOAD_STRATEGY :: list()}). --record(candidate, {low_sqn :: integer(), - filename :: string(), - journal :: pid(), - compaction_perc :: float()}). +-record(candidate, {low_sqn :: integer() | undefined, + filename :: string() | undefined, + journal :: pid() | undefined, + compaction_perc :: float() | undefined}). %%%============================================================================ @@ -967,4 +967,4 @@ coverage_cheat_test() -> {reply, not_supported, _State2} = handle_call(null, null, #state{}), terminate(error, #state{}). --endif. \ No newline at end of file +-endif. From 8717d42ffeb8eebdda5d75883804e5162d3bf92e Mon Sep 17 00:00:00 2001 From: "Heinz N. Gies" Date: Mon, 31 Jul 2017 19:55:09 +0200 Subject: [PATCH 7/8] Cleanup dialyzer errrors in leveled_cdb --- src/leveled_cdb.erl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/leveled_cdb.erl b/src/leveled_cdb.erl index e1d6948..a39f345 100644 --- a/src/leveled_cdb.erl +++ b/src/leveled_cdb.erl @@ -99,17 +99,17 @@ -define(DELETE_TIMEOUT, 10000). -record(state, {hashtree, - last_position :: integer(), + last_position :: integer() | undefined, last_key = empty, hash_index = {} :: tuple(), - filename :: string(), - handle :: file:fd(), - max_size :: integer(), + filename :: string() | undefined, + handle :: file:fd() | undefined, + max_size :: integer() | undefined, binary_mode = false :: boolean(), delete_point = 0 :: integer(), - inker :: pid(), + inker :: pid() | undefined, deferred_delete = false :: boolean(), - waste_path :: string(), + waste_path :: string() | undefined, sync_strategy = none}). -type cdb_options() :: #cdb_options{}. From 379e33ba8430a7a2db7b1e6858c7b7ef3a224837 Mon Sep 17 00:00:00 2001 From: "Heinz N. Gies" Date: Mon, 31 Jul 2017 19:58:56 +0200 Subject: [PATCH 8/8] Cleanup dialyzer errrors in leveled_bookie --- include/leveled.hrl | 3 +-- src/leveled_bookie.erl | 14 +++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/include/leveled.hrl b/include/leveled.hrl index 7274327..e3ed9c7 100644 --- a/include/leveled.hrl +++ b/include/leveled.hrl @@ -43,7 +43,7 @@ -record(inker_options, {cdb_max_size :: integer() | undefined, root_path :: string() | undefined, - cdb_options :: #cdb_options{}, + cdb_options :: #cdb_options{} | undefined, start_snapshot = false :: boolean(), source_inker :: pid() | undefined, reload_strategy = [] :: list(), @@ -106,4 +106,3 @@ vclock, updatemetadata=dict:store(clean, true, dict:new()), updatevalue :: term()}). - diff --git a/src/leveled_bookie.erl b/src/leveled_bookie.erl index 2881a87..9df2e3c 100644 --- a/src/leveled_bookie.erl +++ b/src/leveled_bookie.erl @@ -92,15 +92,15 @@ min_sqn = infinity :: integer()|infinity, max_sqn = 0 :: integer()}). --record(state, {inker :: pid(), - penciller :: pid(), - cache_size :: integer(), - recent_aae :: false|#recent_aae{}, +-record(state, {inker :: pid() | undefined, + penciller :: pid() | undefined, + cache_size :: integer() | undefined, + recent_aae :: false | #recent_aae{} | undefined, ledger_cache = #ledger_cache{}, - is_snapshot :: boolean(), + is_snapshot :: boolean() | undefined, slow_offer = false :: boolean(), - put_timing :: tuple(), - get_timing :: tuple()}). + put_timing :: tuple() | undefined, + get_timing :: tuple() | undefined}). %%%============================================================================