From 510b589edbf528c1409dc804d697986f686c73a9 Mon Sep 17 00:00:00 2001
From: Gregory Burd <greg@basho.com>
Date: Tue, 4 Dec 2012 14:28:20 -0500
Subject: [PATCH] Improve, extend the configuration prep code.

---
 src/wterl.erl | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/wterl.erl b/src/wterl.erl
index 35bebcd..a727e65 100644
--- a/src/wterl.erl
+++ b/src/wterl.erl
@@ -46,6 +46,7 @@
          session_drop/3,
          session_get/3,
          session_open/1,
+         session_open/2,
          session_put/4,
          session_rename/3,
          session_rename/4,
@@ -57,6 +58,7 @@
          session_upgrade/3,
          session_verify/2,
          session_verify/3,
+         config_value/3,
          config_to_bin/1,
          fold_keys/3,
          fold/3]).
@@ -119,11 +121,14 @@ conn_close_nif(_AsyncRef, _ConnRef) ->
     ?nif_stub.
 
 -spec session_open(connection()) -> {ok, session()} | {error, term()}.
+-spec session_open(connection(), config()) -> {ok, session()} | {error, term()}.
 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()}.
-session_open_nif(_AsyncRef, _ConnRef) ->
+-spec session_open_nif(reference(), connection(), config()) -> {ok, session()} | {error, term()}.
+session_open_nif(_AsyncRef, _ConnRef, _Config) ->
     ?nif_stub.
 
 -spec session_close(session()) -> ok | {error, term()}.
@@ -382,8 +387,10 @@ fold(Cursor, Fun, Acc, {ok, Key, Value}) ->
 %% Configuration type information.
 %%
 config_types() ->
-    [{cache_size, string},
+    [{block_compressor, string},
+     {cache_size, string},
      {create, bool},
+     {direct_io, map},
      {drop, list},
      {error_prefix, string},
      {eviction_target, integer},
@@ -393,13 +400,22 @@ config_types() ->
      {hazard_max, integer},
      {home_environment, bool},
      {home_environment_priv, bool},
+     {internal_page_max, string},
+     {isolation, string},
+     {key_type, string},
+     {leaf_page_max, string},
      {logging, bool},
+     {lsm_bloom_config, config},
+     {lsm_chunk_size, string},
      {multiprocess, bool},
      {name, string},
      {session_max, integer},
      {target, list},
      {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) ->
     try
@@ -408,8 +424,12 @@ config_encode(integer, Value) ->
         _:_ ->
             invalid
     end;
+config_encode(config, Value) ->
+    list_to_binary(["(", config_to_bin(Value, []), ")"]);
 config_encode(list, Value) ->
     list_to_binary(["(", string:join(Value, ","), ")"]);
+config_encode(map, Value) ->
+    list_to_binary(["[", string:join(Value, ","), "]"]);
 config_encode(string, Value) ->
     list_to_binary(Value);
 config_encode(bool, true) ->
@@ -421,9 +441,9 @@ config_encode(_Type, _Value) ->
 
 -spec config_to_bin(config_list()) -> config().
 config_to_bin(Opts) ->
-    config_to_bin(Opts, []).
+    iolist_to_binary([config_to_bin(Opts, []), <<"\0">>]).
 config_to_bin([], Acc) ->
-    iolist_to_binary([Acc, ?EMPTY_CONFIG]);
+    iolist_to_binary(Acc);
 config_to_bin([{Key, Value} | Rest], Acc) ->
     case lists:keysearch(Key, 1, config_types()) of
         {value, {Key, Type}} ->