From 35c79aaa32b65d396bf384f576f58538249575a5 Mon Sep 17 00:00:00 2001
From: Ulf Wiger <ulf@wiger.net>
Date: Mon, 19 Oct 2020 10:46:02 +0200
Subject: [PATCH 1/5] WIP update deps, fix try-catch warning, for rocksdb 1.6.0

---
 rebar.config           | 10 ++++++----
 rebar.lock             | 13 ++++++++-----
 src/mnesia_rocksdb.erl |  4 ++--
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/rebar.config b/rebar.config
index 456a159..c8b781e 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,15 +1,17 @@
 %% -*- erlang -*-
+{minimum_otp_vsn, "21.0"}.
+
 {deps,
  [
-  {sext, "1.4.1"},
-  {rocksdb,"0.24.0"}
+  {sext, "1.8.0"},
+  {rocksdb,"1.6.0"}
  ]}.
 
 {profiles,
  [
   {test,
    [
-    {deps, [ {proper, "1.2.0"}
-           , {meck, "0.8.13"}]}
+    {deps, [ {proper, "1.3.0"}
+           , {meck, "0.9.0"}]}
    ]}
  ]}.
diff --git a/rebar.lock b/rebar.lock
index af8f10b..a049cf5 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -1,8 +1,11 @@
-{"1.1.0",
-[{<<"rocksdb">>,{pkg,<<"rocksdb">>,<<"0.24.0">>},0},
- {<<"sext">>,{pkg,<<"sext">>,<<"1.4.1">>},0}]}.
+{"1.2.0",
+[{<<"rocksdb">>,{pkg,<<"rocksdb">>,<<"1.6.0">>},0},
+ {<<"sext">>,{pkg,<<"sext">>,<<"1.8.0">>},0}]}.
 [
 {pkg_hash,[
- {<<"rocksdb">>, <<"1FC862628B95A0D3AF05FAB709858AC1FA4199C0722BC4652236B0949304A04D">>},
- {<<"sext">>, <<"14559B219FAF11F9EBA7A350DFFC69C966C668439C54947A42D67167002798C4">>}]}
+ {<<"rocksdb">>, <<"E3F7286987C901DA3286E38A676254CD575821DB00214B4745B94BB4BE82A1F3">>},
+ {<<"sext">>, <<"90A95B889F5C781B70BBCF44278B763148E313C376B60D87CE664CB1C1DD29B5">>}]},
+{pkg_hash_ext,[
+ {<<"rocksdb">>, <<"4DFA34F05B678207578488D14776705AC13A29425EB1A0CEFCA4A8BC16E8B53F">>},
+ {<<"sext">>, <<"BC6016CB8690BAF677EACACFE6E7CADFEC8DC7E286CBBED762F6CD55B0678E73">>}]}
 ].
diff --git a/src/mnesia_rocksdb.erl b/src/mnesia_rocksdb.erl
index 1411b27..a498664 100644
--- a/src/mnesia_rocksdb.erl
+++ b/src/mnesia_rocksdb.erl
@@ -457,8 +457,8 @@ close_table_(Alias, Tab) ->
 pp_stack() ->
     Trace = try throw(true)
             catch
-                _:_ ->
-                    case erlang:get_stacktrace() of
+                _:_:ST ->
+                    case ST of
                         [_|T] -> T;
                         [] -> []
                     end

From 2b96f189fd4b51db5348919287f99049308c3799 Mon Sep 17 00:00:00 2001
From: Ulf Wiger <ulf@wiger.net>
Date: Mon, 19 Oct 2020 11:26:49 +0200
Subject: [PATCH 2/5] Ensure compression (lz4) support when building from src

---
 rebar.config.script | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/rebar.config.script b/rebar.config.script
index 01c1b67..413b50d 100644
--- a/rebar.config.script
+++ b/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, []),

From d33d26277e0e76adf5fbc6c0d8b95b9ed994d977 Mon Sep 17 00:00:00 2001
From: Dincho Todorov <dincho@users.noreply.github.com>
Date: Fri, 23 Oct 2020 12:42:07 +0300
Subject: [PATCH 3/5] Use medium+ CI executor

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6b6d899..98b4c93 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,6 +5,7 @@ executors:
     docker:
       - image: aeternity/builder
         user: builder
+    resource_class: medium+
 
 jobs:
   build:

From dfd20b622b483e8b4094ee77d25014f196a8961a Mon Sep 17 00:00:00 2001
From: Dincho Todorov <dincho@users.noreply.github.com>
Date: Fri, 23 Oct 2020 15:45:31 +0300
Subject: [PATCH 4/5] Set cmake paralelism

---
 .circleci/config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 98b4c93..16fb810 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,7 +5,8 @@ executors:
     docker:
       - image: aeternity/builder
         user: builder
-    resource_class: medium+
+    environment:
+      ERLANG_ROCKSDB_BUILDOPTS: "-DWITH_BUNDLE_LZ4=ON -j2"
 
 jobs:
   build:

From 47435acc0077b1782b02e4a45252ecd01b9942a9 Mon Sep 17 00:00:00 2001
From: Dincho Todorov <dincho@users.noreply.github.com>
Date: Fri, 23 Oct 2020 15:47:29 +0300
Subject: [PATCH 5/5] Fix wrong rocksdb buildopts

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 16fb810..30860e9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ executors:
       - image: aeternity/builder
         user: builder
     environment:
-      ERLANG_ROCKSDB_BUILDOPTS: "-DWITH_BUNDLE_LZ4=ON -j2"
+      ERLANG_ROCKSDB_BUILDOPTS: "-j2"
 
 jobs:
   build: