Merge pull request #16 from aeternity/uw-use-rocksdb-1.6.0

WIP update deps, fix try-catch warning, for rocksdb 1.6.0

.circleci/config.yml

@@ -5,6 +5,8 @@ executors:
     docker:
       - image: aeternity/builder
         user: builder
+    environment:
+      ERLANG_ROCKSDB_BUILDOPTS: "-j2"
 
 jobs:
   build:

rebar.config

@@ -1,15 +1,17 @@
 %% -*- erlang -*-
+{minimum_otp_vsn, "21.0"}.
+
 {deps,
  [
-  {sext, "1.4.1"},
+  {sext, "1.8.0"},
-  {rocksdb,"0.24.0"}
+  {rocksdb,"1.6.0"}
  ]}.
 
 {profiles,
  [
   {test,
    [
-    {deps, [ {proper, "1.2.0"}
+    {deps, [ {proper, "1.3.0"}
-           , {meck, "0.8.13"}]}
+           , {meck, "0.9.0"}]}
    ]}
  ]}.

rebar.config.script

@@ -1,4 +1,11 @@
 %% -*- erlang-mode -*-
+case os:getenv("ERLANG_ROCKSDB_OPTS") of
+    false ->
+        true = os:putenv("ERLANG_ROCKSDB_OPTS", "-DWITH_BUNDLE_LZ4=ON");
+    _ ->
+        %% If manually set, we assume it's throught through
+        skip
+end.
 case os:getenv("DEBUG") of
     "true" ->
 	Opts = proplists:get_value(erl_opts, CONFIG, []),

rebar.lock

@@ -1,8 +1,11 @@
-{"1.1.0",
+{"1.2.0",
-[{<<"rocksdb">>,{pkg,<<"rocksdb">>,<<"0.24.0">>},0},
+[{<<"rocksdb">>,{pkg,<<"rocksdb">>,<<"1.6.0">>},0},
- {<<"sext">>,{pkg,<<"sext">>,<<"1.4.1">>},0}]}.
+ {<<"sext">>,{pkg,<<"sext">>,<<"1.8.0">>},0}]}.
 [
 {pkg_hash,[
- {<<"rocksdb">>, <<"1FC862628B95A0D3AF05FAB709858AC1FA4199C0722BC4652236B0949304A04D">>},
+ {<<"rocksdb">>, <<"E3F7286987C901DA3286E38A676254CD575821DB00214B4745B94BB4BE82A1F3">>},
- {<<"sext">>, <<"14559B219FAF11F9EBA7A350DFFC69C966C668439C54947A42D67167002798C4">>}]}
+ {<<"sext">>, <<"90A95B889F5C781B70BBCF44278B763148E313C376B60D87CE664CB1C1DD29B5">>}]},
+{pkg_hash_ext,[
+ {<<"rocksdb">>, <<"4DFA34F05B678207578488D14776705AC13A29425EB1A0CEFCA4A8BC16E8B53F">>},
+ {<<"sext">>, <<"BC6016CB8690BAF677EACACFE6E7CADFEC8DC7E286CBBED762F6CD55B0678E73">>}]}
 ].

src/mnesia_rocksdb.erl

@@ -457,8 +457,8 @@ close_table_(Alias, Tab) ->
 pp_stack() ->
     Trace = try throw(true)
             catch
-                _:_ ->
+                _:_:ST ->
-                    case erlang:get_stacktrace() of
+                    case ST of
                         [_|T] -> T;
                         [] -> []
                     end