greg/wterl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compenstate for LSM config API changes

Browse source
This commit is contained in:
Gregory Burd 2013-12-09 12:54:58 -05:00
parent 08b2d18463
commit ea99493ea3
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/riak_kv_wterl_backend.erl
View file

@ -119,12 +119,14 @@ start(Partition, Config) ->
"lsm" -> "lsm" ->
[{internal_page_max, "128K"}, [{internal_page_max, "128K"},
{leaf_page_max, "16K"}, {leaf_page_max, "16K"},
{lsm_merge_threads, 2}, {lsm, [
{lsm_chunk_size, "100MB"}, {bloom_config, [{leaf_page_max, "8MB"}]},
{lsm_bloom_oldest, true} , {bloom_bit_count, 28},
{lsm_bloom_bit_count, 28}, {bloom_hash_count, 19},
{lsm_bloom_hash_count, 19}, {bloom_oldest, true},
{lsm_bloom_config, [{leaf_page_max, "8MB"}]} {chunk_size, "100MB"},
{merge_threads, 2}
]}
] ++ Compressor; ] ++ Compressor;
"table" -> "table" ->
Compressor Compressor
@ -422,6 +424,7 @@ establish_connection(Config, Type) ->
wterl:config_value(checkpoint, Config, CheckpointSetting), wterl:config_value(checkpoint, Config, CheckpointSetting),
wterl:config_value(session_max, Config, max_sessions(Config)), wterl:config_value(session_max, Config, max_sessions(Config)),
wterl:config_value(cache_size, Config, size_cache(RequestedCacheSize)), wterl:config_value(cache_size, Config, size_cache(RequestedCacheSize)),
wterl:config_value(statistics, Config, [ "fast", "clear"]),
wterl:config_value(statistics_log, Config, [{wait, 600}]), % in seconds wterl:config_value(statistics_log, Config, [{wait, 600}]), % in seconds
wterl:config_value(verbose, Config, [ "salvage", "verify" wterl:config_value(verbose, Config, [ "salvage", "verify"
% Note: for some unknown reason, if you add these additional % Note: for some unknown reason, if you add these additional

16
src/wterl.erl
View file

@ -454,10 +454,16 @@ config_to_bin([], Acc) ->
config_to_bin([{Key, Value} | Rest], Acc) -> config_to_bin([{Key, Value} | Rest], Acc) ->
ConfigTypes = ConfigTypes =
[{block_compressor, {string, quoted}}, [{block_compressor, {string, quoted}},
{bloom_bit_count, integer},
{bloom_config, config},
{bloom_hash_count, integer},
{bloom_newest, bool},
{bloom_oldest, bool},
{cache_size, string}, {cache_size, string},
{checkpoint, config}, {checkpoint, config},
{checkpoint_sync, bool}, {checkpoint_sync, bool},
{checksum, string}, {checksum, string},
{chunk_size, string},
{create, bool}, {create, bool},
{direct_io, list}, {direct_io, list},
{drop, list}, {drop, list},
@ -478,19 +484,15 @@ config_to_bin([{Key, Value} | Rest], Acc) ->
{key_type, string}, {key_type, string},
{leaf_page_max, string}, {leaf_page_max, string},
{log, config}, {log, config},
{lsm_bloom_bit_count, integer}, {lsm, config},
{lsm_bloom_config, config}, {merge_threads, integer},
{lsm_bloom_hash_count, integer},
{lsm_bloom_newest, bool},
{lsm_bloom_oldest, bool},
{lsm_chunk_size, string},
{lsm_merge_threads, integer},
{multiprocess, bool}, {multiprocess, bool},
{name, string}, {name, string},
{overwrite, bool}, {overwrite, bool},
{prefix_compression, bool}, {prefix_compression, bool},
{raw, bool}, {raw, bool},
{session_max, integer}, {session_max, integer},
{statistics, list},
{statistics_log, config}, {statistics_log, config},
{target, {list, quoted}}, {target, {list, quoted}},
{to, string}, {to, string},