From c10eaa75cb3d61657e8a7f0c53bf23b1a3e66ddd Mon Sep 17 00:00:00 2001 From: martinsumner Date: Tue, 20 Sep 2016 10:17:24 +0100 Subject: [PATCH] Dialyzer changes Some chnages to improve dialyzer pass rate --- .gitignore | 4 +++- .rebar/erlcinfo | Bin 0 -> 531 bytes ebin/eleveleddb.app | 11 ----------- rebar.lock | 1 + src/leveled_cdb.erl | 3 +-- src/leveled_clerk.erl | 20 +++++++++++--------- src/leveled_penciller.erl | 32 +++++++++++++++++--------------- 7 files changed, 33 insertions(+), 38 deletions(-) create mode 100644 .rebar/erlcinfo delete mode 100644 ebin/eleveleddb.app create mode 100644 rebar.lock diff --git a/.gitignore b/.gitignore index 1ef2775..26dc633 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -*.beam \ No newline at end of file +*.beam +/.eunit +/_build \ No newline at end of file diff --git a/.rebar/erlcinfo b/.rebar/erlcinfo new file mode 100644 index 0000000000000000000000000000000000000000..f883b7cc3e21883e73352197d3098883ab2bc41c GIT binary patch literal 531 zcmV+u0_^>RPyhf5b9i2@Rm)D}FcdWnuhJJy3j!ow5({QQA}XPZnOVeZCCn$Dd9pcqo}XLiYYa7lxq)$MUg}^_Q77 z%>qd-X{T#WNK-1Za?%cTk@P4PzRT$=?h!NwArkTr=Bw8+J_^$HrKu@B3@CX*7&ye47)`mZg zL0>25Io}It79tqURlXWgN0d|lBe{kP>435C>w6z0Y%xXvI*wX zlA;w$ocD|&s@)uVjuUkhZsX5ZKw38xY(rDk9K5-5P)A#QW80}D-H7NbT!Ck+FsSRv ztH9CIbJW^bs^h*K;j;QRTAQKX%7*Ds#ae}J@Y&^!YCSZ!K!d5*Zu3U{jB2vgyT{b} zjmx)rO@-tuuu1ZK{toabJM*7Y3@ZQt literal 0 HcmV?d00001 diff --git a/ebin/eleveleddb.app b/ebin/eleveleddb.app deleted file mode 100644 index 11d7f25..0000000 --- a/ebin/eleveleddb.app +++ /dev/null @@ -1,11 +0,0 @@ -{application,eleveleddb, - [{description,[]}, - {vsn,"1"}, - {registered,[]}, - {applications,[kernel,stdlib]}, - {mod,{eleveleddb_app,[]}}, - {env,[]}, - {modules,[eleveleddb_app,eleveleddb_sup,leveled_bookie, - leveled_cdb,leveled_clerk,leveled_inker, - leveled_iterator,leveled_penciller,leveled_rice, - leveled_sft]}]}. diff --git a/rebar.lock b/rebar.lock new file mode 100644 index 0000000..57afcca --- /dev/null +++ b/rebar.lock @@ -0,0 +1 @@ +[]. diff --git a/src/leveled_cdb.erl b/src/leveled_cdb.erl index ec807ea..3355153 100644 --- a/src/leveled_cdb.erl +++ b/src/leveled_cdb.erl @@ -1323,8 +1323,7 @@ getnextkey_inclemptyvalue_test() -> {_, Handle, P6} = get_nextkey(Handle, P5), {_, Handle, P7} = get_nextkey(Handle, P6), {_, Handle, P8} = get_nextkey(Handle, P7), - {LastKey, Info} = get_nextkey(Handle, P8), - ?assertMatch(nomorekeys, Info), + {LastKey, nomorekeys} = get_nextkey(Handle, P8), ?assertMatch("K1", LastKey), ok = file:delete("../test/hashtable2_test.cdb"). diff --git a/src/leveled_clerk.erl b/src/leveled_clerk.erl index 717455f..0197f7b 100644 --- a/src/leveled_clerk.erl +++ b/src/leveled_clerk.erl @@ -314,15 +314,17 @@ find_randomkeys(FList, Count, Source) -> K1 = leveled_bookie:strip_to_keyonly(KV1), P1 = choose_pid_toquery(FList, K1), FoundKV = leveled_sft:sft_get(P1, K1), - case FoundKV of - not_present -> - io:format("Failed to find ~w in ~w~n", [K1, P1]), - ?assertMatch(true, false); - _ -> - Found = leveled_bookie:strip_to_keyonly(FoundKV), - io:format("success finding ~w in ~w~n", [K1, P1]), - ?assertMatch(K1, Found) - end, + Check = case FoundKV of + not_present -> + io:format("Failed to find ~w in ~w~n", [K1, P1]), + error; + _ -> + Found = leveled_bookie:strip_to_keyonly(FoundKV), + io:format("success finding ~w in ~w~n", [K1, P1]), + ?assertMatch(K1, Found), + ok + end, + ?assertMatch(Check, ok), find_randomkeys(FList, Count - 1, Source). diff --git a/src/leveled_penciller.erl b/src/leveled_penciller.erl index 777baba..a3feeef 100644 --- a/src/leveled_penciller.erl +++ b/src/leveled_penciller.erl @@ -200,7 +200,7 @@ levelzero_snapshot = [] :: list(), memtable, backlog = false :: boolean(), - memtable_maxsize :: integer}). + memtable_maxsize :: integer()}). %%%============================================================================ @@ -945,20 +945,22 @@ simple_server_test() -> {ok, PCLr} = pcl_start(#penciller_options{root_path=RootPath, max_inmemory_tablesize=1000}), TopSQN = pcl_getstartupsequencenumber(PCLr), - case TopSQN of - 2001 -> - %% Last push not persisted - S3a = pcl_pushmem(PCL, [Key3]), - if S3a == pause -> timer:sleep(2000); true -> ok end; - 2002 -> - %% everything got persisted - ok; - _ -> - io:format("Unexpected sequence number on restart ~w~n", [TopSQN]), - ok = pcl_close(PCLr), - clean_testdir(RootPath), - ?assertMatch(true, false) - end, + Check = case TopSQN of + 2001 -> + %% Last push not persisted + S3a = pcl_pushmem(PCL, [Key3]), + if S3a == pause -> timer:sleep(2000); true -> ok end, + ok; + 2002 -> + %% everything got persisted + ok; + _ -> + io:format("Unexpected sequence number on restart ~w~n", [TopSQN]), + ok = pcl_close(PCLr), + clean_testdir(RootPath), + error + end, + ?assertMatch(Check, ok), R8 = pcl_fetch(PCLr, {o,"Bucket0001", "Key0001"}), R9 = pcl_fetch(PCLr, {o,"Bucket0002", "Key0002"}), R10 = pcl_fetch(PCLr, {o,"Bucket0003", "Key0003"}),