From ea99493ea3817770002bddb6e8cc99176e87f68c Mon Sep 17 00:00:00 2001
From: Gregory Burd <greg@basho.com>
Date: Mon, 9 Dec 2013 12:54:58 -0500
Subject: [PATCH] Compenstate for LSM config API changes

---
 src/riak_kv_wterl_backend.erl | 15 +++++++++------
 src/wterl.erl                 | 16 +++++++++-------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/riak_kv_wterl_backend.erl b/src/riak_kv_wterl_backend.erl
index 7f78bb2..51c1fa1 100644
--- a/src/riak_kv_wterl_backend.erl
+++ b/src/riak_kv_wterl_backend.erl
@@ -119,12 +119,14 @@ start(Partition, Config) ->
                     "lsm" ->
                         [{internal_page_max, "128K"},
                          {leaf_page_max, "16K"},
-			 {lsm_merge_threads, 2},
-                         {lsm_chunk_size, "100MB"},
-                         {lsm_bloom_oldest, true} ,
-                         {lsm_bloom_bit_count, 28},
-                         {lsm_bloom_hash_count, 19},
-                         {lsm_bloom_config, [{leaf_page_max, "8MB"}]}
+                         {lsm, [
+                             {bloom_config, [{leaf_page_max, "8MB"}]},
+                             {bloom_bit_count, 28},
+                             {bloom_hash_count, 19},
+                             {bloom_oldest, true},
+                             {chunk_size, "100MB"},
+                             {merge_threads, 2}
+                         ]}
                         ] ++ Compressor;
                     "table" ->
                         Compressor
@@ -422,6 +424,7 @@ establish_connection(Config, Type) ->
 		    wterl:config_value(checkpoint, Config, CheckpointSetting),
                     wterl:config_value(session_max, Config, max_sessions(Config)),
                     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(verbose, Config, [ "salvage", "verify"
                          % Note: for some unknown reason, if you add these additional
diff --git a/src/wterl.erl b/src/wterl.erl
index c27b082..3b81cfe 100644
--- a/src/wterl.erl
+++ b/src/wterl.erl
@@ -454,10 +454,16 @@ config_to_bin([], Acc) ->
 config_to_bin([{Key, Value} | Rest], Acc) ->
     ConfigTypes =
     [{block_compressor, {string, quoted}},
+     {bloom_bit_count, integer},
+     {bloom_config, config},
+     {bloom_hash_count, integer},
+     {bloom_newest, bool},
+     {bloom_oldest, bool},
      {cache_size, string},
      {checkpoint, config},
      {checkpoint_sync, bool},
      {checksum, string},
+     {chunk_size, string},
      {create, bool},
      {direct_io, list},
      {drop, list},
@@ -478,19 +484,15 @@ config_to_bin([{Key, Value} | Rest], Acc) ->
      {key_type, string},
      {leaf_page_max, string},
      {log, config},
-     {lsm_bloom_bit_count, integer},
-     {lsm_bloom_config, config},
-     {lsm_bloom_hash_count, integer},
-     {lsm_bloom_newest, bool},
-     {lsm_bloom_oldest, bool},
-     {lsm_chunk_size, string},
-     {lsm_merge_threads, integer},
+     {lsm, config},
+     {merge_threads, integer},
      {multiprocess, bool},
      {name, string},
      {overwrite, bool},
      {prefix_compression, bool},
      {raw, bool},
      {session_max, integer},
+     {statistics, list},
      {statistics_log, config},
      {target, {list, quoted}},
      {to, string},