Improve, extend the configuration prep code.
This commit is contained in:
parent
f002df1844
commit
510b589edb
1 changed files with 27 additions and 7 deletions
|
@ -46,6 +46,7 @@
|
||||||
session_drop/3,
|
session_drop/3,
|
||||||
session_get/3,
|
session_get/3,
|
||||||
session_open/1,
|
session_open/1,
|
||||||
|
session_open/2,
|
||||||
session_put/4,
|
session_put/4,
|
||||||
session_rename/3,
|
session_rename/3,
|
||||||
session_rename/4,
|
session_rename/4,
|
||||||
|
@ -57,6 +58,7 @@
|
||||||
session_upgrade/3,
|
session_upgrade/3,
|
||||||
session_verify/2,
|
session_verify/2,
|
||||||
session_verify/3,
|
session_verify/3,
|
||||||
|
config_value/3,
|
||||||
config_to_bin/1,
|
config_to_bin/1,
|
||||||
fold_keys/3,
|
fold_keys/3,
|
||||||
fold/3]).
|
fold/3]).
|
||||||
|
@ -119,11 +121,14 @@ conn_close_nif(_AsyncRef, _ConnRef) ->
|
||||||
?nif_stub.
|
?nif_stub.
|
||||||
|
|
||||||
-spec session_open(connection()) -> {ok, session()} | {error, term()}.
|
-spec session_open(connection()) -> {ok, session()} | {error, term()}.
|
||||||
|
-spec session_open(connection(), config()) -> {ok, session()} | {error, term()}.
|
||||||
session_open(ConnRef) ->
|
session_open(ConnRef) ->
|
||||||
?ASYNC_NIF_CALL(fun session_open_nif/2, [ConnRef]).
|
session_open(ConnRef, ?EMPTY_CONFIG).
|
||||||
|
session_open(ConnRef, Config) ->
|
||||||
|
?ASYNC_NIF_CALL(fun session_open_nif/3, [ConnRef, Config]).
|
||||||
|
|
||||||
-spec session_open_nif(reference(), connection()) -> {ok, session()} | {error, term()}.
|
-spec session_open_nif(reference(), connection(), config()) -> {ok, session()} | {error, term()}.
|
||||||
session_open_nif(_AsyncRef, _ConnRef) ->
|
session_open_nif(_AsyncRef, _ConnRef, _Config) ->
|
||||||
?nif_stub.
|
?nif_stub.
|
||||||
|
|
||||||
-spec session_close(session()) -> ok | {error, term()}.
|
-spec session_close(session()) -> ok | {error, term()}.
|
||||||
|
@ -382,8 +387,10 @@ fold(Cursor, Fun, Acc, {ok, Key, Value}) ->
|
||||||
%% Configuration type information.
|
%% Configuration type information.
|
||||||
%%
|
%%
|
||||||
config_types() ->
|
config_types() ->
|
||||||
[{cache_size, string},
|
[{block_compressor, string},
|
||||||
|
{cache_size, string},
|
||||||
{create, bool},
|
{create, bool},
|
||||||
|
{direct_io, map},
|
||||||
{drop, list},
|
{drop, list},
|
||||||
{error_prefix, string},
|
{error_prefix, string},
|
||||||
{eviction_target, integer},
|
{eviction_target, integer},
|
||||||
|
@ -393,13 +400,22 @@ config_types() ->
|
||||||
{hazard_max, integer},
|
{hazard_max, integer},
|
||||||
{home_environment, bool},
|
{home_environment, bool},
|
||||||
{home_environment_priv, bool},
|
{home_environment_priv, bool},
|
||||||
|
{internal_page_max, string},
|
||||||
|
{isolation, string},
|
||||||
|
{key_type, string},
|
||||||
|
{leaf_page_max, string},
|
||||||
{logging, bool},
|
{logging, bool},
|
||||||
|
{lsm_bloom_config, config},
|
||||||
|
{lsm_chunk_size, string},
|
||||||
{multiprocess, bool},
|
{multiprocess, bool},
|
||||||
{name, string},
|
{name, string},
|
||||||
{session_max, integer},
|
{session_max, integer},
|
||||||
{target, list},
|
{target, list},
|
||||||
{transactional, bool},
|
{transactional, bool},
|
||||||
{verbose, string}].
|
{verbose, map}].
|
||||||
|
|
||||||
|
config_value(Key, Config, Default) ->
|
||||||
|
{Key, app_helper:get_prop_or_env(Key, Config, wterl, Default)}.
|
||||||
|
|
||||||
config_encode(integer, Value) ->
|
config_encode(integer, Value) ->
|
||||||
try
|
try
|
||||||
|
@ -408,8 +424,12 @@ config_encode(integer, Value) ->
|
||||||
_:_ ->
|
_:_ ->
|
||||||
invalid
|
invalid
|
||||||
end;
|
end;
|
||||||
|
config_encode(config, Value) ->
|
||||||
|
list_to_binary(["(", config_to_bin(Value, []), ")"]);
|
||||||
config_encode(list, Value) ->
|
config_encode(list, Value) ->
|
||||||
list_to_binary(["(", string:join(Value, ","), ")"]);
|
list_to_binary(["(", string:join(Value, ","), ")"]);
|
||||||
|
config_encode(map, Value) ->
|
||||||
|
list_to_binary(["[", string:join(Value, ","), "]"]);
|
||||||
config_encode(string, Value) ->
|
config_encode(string, Value) ->
|
||||||
list_to_binary(Value);
|
list_to_binary(Value);
|
||||||
config_encode(bool, true) ->
|
config_encode(bool, true) ->
|
||||||
|
@ -421,9 +441,9 @@ config_encode(_Type, _Value) ->
|
||||||
|
|
||||||
-spec config_to_bin(config_list()) -> config().
|
-spec config_to_bin(config_list()) -> config().
|
||||||
config_to_bin(Opts) ->
|
config_to_bin(Opts) ->
|
||||||
config_to_bin(Opts, []).
|
iolist_to_binary([config_to_bin(Opts, []), <<"\0">>]).
|
||||||
config_to_bin([], Acc) ->
|
config_to_bin([], Acc) ->
|
||||||
iolist_to_binary([Acc, ?EMPTY_CONFIG]);
|
iolist_to_binary(Acc);
|
||||||
config_to_bin([{Key, Value} | Rest], Acc) ->
|
config_to_bin([{Key, Value} | Rest], Acc) ->
|
||||||
case lists:keysearch(Key, 1, config_types()) of
|
case lists:keysearch(Key, 1, config_types()) of
|
||||||
{value, {Key, Type}} ->
|
{value, {Key, Type}} ->
|
||||||
|
|
Loading…
Reference in a new issue