Merge remote-tracking branch 'refs/remotes/origin/mas-sstblock-i42' into mas-sstblockv2-i42

This commit is contained in:
martinsumner 2017-03-13 21:09:13 +00:00
commit 4f0622d2ac
3 changed files with 2 additions and 4 deletions

View file

@ -267,7 +267,7 @@
{"SST05",
{warn, "Rename rogue filename ~s to ~s"}},
{"SST06",
{info, "File ~s has been set for delete"}},
{debug, "File ~s has been set for delete"}},
{"SST07",
{info, "Exit called and now clearing ~s"}},
{"SST08",

View file

@ -369,7 +369,6 @@ handle_call({push_mem, {PushedTree, PushedIdx, MinSQN, MaxSQN}},
State#state.work_backlog]),
{reply, returned, State};
false ->
leveled_log:log("P0018", [ok, false, false]),
gen_server:reply(From, ok),
{noreply,
update_levelzero(State#state.levelzero_size,

View file

@ -72,8 +72,7 @@
-define(COMPRESSION_LEVEL, 1).
-define(BINARY_SETTINGS, [{compressed, ?COMPRESSION_LEVEL}]).
% -define(LEVEL_BLOOM_BITS, [{0, 8}, {1, 10}, {2, 8}, {default, 6}]).
-define(MERGE_SCANWIDTH, 16).
-define(INDEX_MARKER_WIDTH, 16).
-define(MERGE_SCANWIDTH, 4).
-define(DISCARD_EXT, ".discarded").
-define(DELETE_TIMEOUT, 10000).
-define(TREE_TYPE, idxt).