Merge pull request #4302 from aeternity/4139-rocksdb

Update rocksdb

.circleci/config/parameters/@parameters.yml

@@ -28,7 +28,7 @@ rebar_cache_key:
 
 build_cache_version:
   type: string
-  default: "v5"
+  default: "v6"
 
 build_nix_cache_key:
   type: string

Dockerfile

@@ -20,10 +20,11 @@ RUN apt-get -qq update \
     && rm -rf /var/lib/apt/lists/*
 
 # Install shared rocksdb code from builder container
-COPY --from=builder /usr/local/lib/librocksdb.so.6.13.3 /usr/local/lib/
-RUN ln -fs librocksdb.so.6.13.3 /usr/local/lib/librocksdb.so.6.13 \
-    && ln -fs librocksdb.so.6.13.3 /usr/local/lib/librocksdb.so.6 \
-    && ln -fs librocksdb.so.6.13.3 /usr/local/lib/librocksdb.so \
+
+COPY --from=builder /usr/local/lib/librocksdb.so.7.10.2 /usr/local/lib/
+RUN ln -fs librocksdb.so.7.10.2 /usr/local/lib/librocksdb.so.7.10 \
+    && ln -fs librocksdb.so.7.10.2 /usr/local/lib/librocksdb.so.7 \
+    && ln -fs librocksdb.so.7.10.2 /usr/local/lib/librocksdb.so \
     && ldconfig
 
 # Deploy application code from builder container

Makefile

@@ -263,7 +263,7 @@ eunit-latest: eunit-$(LATEST_PROTOCOL)
 all-tests: eunit-$(LATEST_PROTOCOL) ct-$(LATEST_PROTOCOL)
 
 docker: dockerignore-check
-	@docker pull aeternity/builder:otp21
+	@docker pull aeternity/builder:focal-otp24
 	@docker build -t aeternity/aeternity:local .
 
 dockerignore-check: | .gitignore .dockerignore

rebar.config

@@ -64,7 +64,7 @@
         % The rocksdb dependencies are removed on win32 to reduce build times,
         % because they are currently not working on win32.
         {mnesia_rocksdb, {git, "https://github.com/aeternity/mnesia_rocksdb.git",
-                         {ref, "0aecf5e"}}},
+                         {ref, "296813e"}}},
 
         {aeminer, {git, "https://github.com/aeternity/aeminer.git",
                   {ref, "c6b6a6d"}}},

rebar.lock

@@ -101,7 +101,7 @@
   0},
  {<<"mnesia_rocksdb">>,
   {git,"https://github.com/aeternity/mnesia_rocksdb.git",
-      {ref,"0aecf5ef0192c9d130b9b0aabd8656d27d278815"}},
+      {ref,"296813ef7b83bb4cddda19ac5df1759a98e77875"}},
   0},
  {<<"nat">>,
   {git,"https://github.com/aeternity/erlang-nat.git",
@@ -119,8 +119,8 @@
   0},
  {<<"rfc3339">>,{pkg,<<"rfc3339">>,<<"0.2.2">>},1},
  {<<"rocksdb">>,
-  {git,"https://gitlab.com/seanhinde/erlang-rocksdb.git",
-      {ref,"9ae378391ffc94200bde24efcd7a4921eba688d0"}},
+  {git,"https://gitlab.com/barrel-db/erlang-rocksdb.git",
+      {ref,"fced5f637de7991c5948e28414ba3790b0476c4b"}},
   1},
  {<<"setup">>,{pkg,<<"setup">>,<<"2.1.1">>},0},
  {<<"sext">>,{pkg,<<"sext">>,<<"1.8.0">>},0},