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

Changes related to Riak 2.0 and an issue with how statistics were gathered from the backend #11

Merged
gburd merged 6 commits from gsb-2.0-fixes into master 2013-10-30 15:53:49 +00:00
Conversation 0 Commits 6 Files changed 8 +4 -4
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7d0ad2dce1 - Show all commits

2
src/riak_kv_wterl_backend.erl
View file

@ -411,7 +411,7 @@ establish_connection(Config, Type) ->
ConnectionOpts = ConnectionOpts =
orddict:from_list( orddict:from_list(
[ wterl:config_value(create, Config, true), [ wterl:config_value(create, Config, true),
wterl:config_value(sync, Config, false), wterl:config_value(checkpoint_sync, Config, false),
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_log, Config, [{wait, 600}]), % in seconds wterl:config_value(statistics_log, Config, [{wait, 600}]), % in seconds

6
src/wterl.erl
View file

@ -96,8 +96,8 @@ nif_stub_error(Line) ->
-spec init() -> ok | {error, any()}. -spec init() -> ok | {error, any()}.
init() -> init() ->
erlang:load_nif(filename:join([priv_dir(), atom_to_list(?MODULE)]), erlang:load_nif(filename:join([priv_dir(), atom_to_list(?MODULE)]),
[{wterl_vsn, "53307e8"}, [{wterl_vsn, "942e51b"},
{wiredtiger_vsn, "1.6.2-0-g07cb0a5"}]). {wiredtiger_vsn, "1.6.4-275-g9c44420"}]). %% TODO automate these
-spec connection_open(string(), config_list()) -> {ok, connection()} | {error, term()}. -spec connection_open(string(), config_list()) -> {ok, connection()} | {error, term()}.
-spec connection_open(string(), config_list(), config_list()) -> {ok, connection()} | {error, term()}. -spec connection_open(string(), config_list(), config_list()) -> {ok, connection()} | {error, term()}.
@ -456,6 +456,7 @@ config_to_bin([{Key, Value} | Rest], Acc) ->
[{block_compressor, {string, quoted}}, [{block_compressor, {string, quoted}},
{cache_size, string}, {cache_size, string},
{checkpoint, config}, {checkpoint, config},
{checkpoint_sync, bool},
{checksum, string}, {checksum, string},
{create, bool}, {create, bool},
{direct_io, list}, {direct_io, list},
@ -489,7 +490,6 @@ config_to_bin([{Key, Value} | Rest], Acc) ->
{raw, bool}, {raw, bool},
{session_max, integer}, {session_max, integer},
{statistics_log, config}, {statistics_log, config},
{sync, bool},
{target, {list, quoted}}, {target, {list, quoted}},
{to, string}, {to, string},
{transactional, bool}, {transactional, bool},