basho · martinsumner · Jun 21, 2022 · Nov 17, 2021 · May 7, 2022 · May 8, 2022
diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml
@@ -17,18 +17,16 @@ jobs:
       fail-fast: false
       matrix:
         otp:
-          - "24.2.1.0"
-          - "23.3.4.11"
-          - "22.3.4.24"
+          - "24.3.4"
+          - "23.3.4.14"
+          - "22.3.4.26"
 
     container:
       image: erlang:${{ matrix.otp }}
 
     steps:
       - uses: actions/checkout@v2
       - name: Compile
-        run: ./rebar3 compile
-      - name: Run xref and dialyzer
-        run: ./rebar3 do xref, dialyzer
-      - name: Run eunit
-        run: ./rebar3 eunit
+        run: apt-get update && apt-get install -y cmake && make
+      - name: Run tests
+        run: apt-get update && apt-get install -y cmake libc6-dev && make check
diff --git a/Makefile b/Makefile
@@ -1,7 +1,12 @@
-.PHONY: compile rel cover test dialyzer
+.PHONY: compile rel cover test dialyzer get-deps
 REBAR=./rebar3
 
-compile:
+all: compile
+
+get-deps:
+	$(REBAR) get-deps
+
+compile: get-deps
 	$(REBAR) compile
 
 clean:
@@ -11,6 +16,7 @@ cover: test
 	$(REBAR) cover
 
 test: compile
+	$(MAKE) -C c_src test
 	$(REBAR) as test do eunit
 
 dialyzer:

diff --git a/README.md b/README.md
@@ -2,14 +2,11 @@
 
 [![Erlang CI Actions Status](https://github.com/basho/eleveldb/workflows/Erlang%20CI/badge.svg)](https://github.com/basho/eleveldb/actions)
 
-This repository follows the Basho standard for branch management 
-as of November 28, 2013.  The standard is found here:
+This project provides erlang bindings to a LevelDB datastore heavily optimised for [Riak workloads](https://github.com/basho/riak).  See the [Basho leveldb wiki](https://github.com/basho/leveldb/wiki) for a breakdown of the optimisations.
 
-https://github.com/basho/riak/wiki/Basho-repository-management
+No further work on optimising the underlying store is currently being undertaken, only minimal fixes necessary for platform compatability.  
 
-In summary, the "develop" branch contains the most recently reviewed
-engineering work.  The "master" branch contains the most recently
-released work, i.e. distributed as part of a Riak release.
+As an alternative, elrang bindings to RocksDB can be found as part of the [BarrellDB](https://gitlab.com/barrel-db/erlang-rocksdb) project.  For Riak-like workloads, especially with large objects, the pure-Erlang [Leveled store](https://github.com/martinsumner/leveled) is also available. 
 
 # Iterating Records
 

diff --git a/c_src/.gitignore b/c_src/.gitignore
@@ -0,0 +1 @@
+snappy-*.tar.gz
diff --git a/c_src/Makefile b/c_src/Makefile
@@ -0,0 +1,50 @@
+LEVELDB_VSN ?= "2.0.38"
+SNAPPY_VSN ?= "1.1.9"
+BASEDIR = $(shell pwd)
+
+LDFLAGS := $(LDFLAGS) -L$(BASEDIR)/system/lib
+LD_LIBRARY_PATH := $(BASEDIR)/system/lib:$(LD_LIBRARY_PATH)
+CFLAGS := $(CFLAGS) -I $(BASEDIR)/system/include -I. -I $(BASEDIR)/leveldb/include -fPIC
+CXXFLAGS := $(CXXFLAGS) -I $(BASEDIR)/system/include -I. -I $(BASEDIR)/leveldb/include -fPIC
+
+get-deps:
+	if [ ! -r snappy-$(SNAPPY_VSN).tar.gz ]; then \
+	    wget -O snappy-$(SNAPPY_VSN).tar.gz https://github.com/google/snappy/archive/refs/tags/$(SNAPPY_VSN).tar.gz; \
+	fi
+	if [ ! -d leveldb ]; then \
+	    git clone https://github.com/basho/leveldb && \
+	    (cd leveldb && git checkout $(LEVELDB_VSN)) && \
+	    (cd leveldb && git submodule update --init); \
+	fi
+
+compile: get-deps snappy ldb
+	cp leveldb/perf_dump leveldb/sst_rewrite leveldb/sst_scan leveldb/leveldb_repair ../priv
+
+ldb:
+	$(MAKE) LDFLAGS="$(LDFLAGS) -lsnappy" LD_LIBRARY_PATH="$(LD_LIBRARY_PATH)" -C leveldb all
+	$(MAKE) LDFLAGS="$(LDFLAGS) -lsnappy" LD_LIBRARY_PATH="$(LD_LIBRARY_PATH)" -C leveldb tools
+
+snappy: system/lib/libsnappy.a
+
+system/lib/libsnappy.a:
+	tar -xzf snappy-$(SNAPPY_VSN).tar.gz && \
+	(cd snappy-$(SNAPPY_VSN) && \
+	 git submodule update --init && \
+	 if [ -r autogen.sh ]; then \
+	   ./autogen.sh && ./configure --prefix=$(BASEDIR)/system && make && make install; \
+	 else \
+	   mkdir build && cd build && \
+	   mkdir -p $(BASEDIR)/system && \
+	   cmake -D SNAPPY_BUILD_TESTS=0 -D SNAPPY_BUILD_BENCHMARKS=0 \
+	         -D CMAKE_INSTALL_PREFIX=$(BASEDIR)/system \
+	     ..; \
+	  fi && \
+	  make && make install)
+	mv system/lib64 system/lib || true
+
+clean:
+	$(MAKE) -C leveldb clean
+	rm -rf system snappy-$(SNAPPY_VSN)/build
+
+test: compile
+	$(MAKE) CXXFLAGS="$(CXXFLAGS) -Wno-narrowing" LDFLAGS="$(LDFLAGS) -lsnappy -lpthread" LD_LIBRARY_PATH="$(LD_LIBRARY_PATH)" -C leveldb test
diff --git a/c_src/build_deps.sh b/c_src/build_deps.sh
diff --git a/c_src/snappy-1.0.4.tar.gz b/c_src/snappy-1.0.4.tar.gz
diff --git a/rebar.config b/rebar.config
@@ -32,7 +32,7 @@
              {"DRV_LDFLAGS", "$DRV_LDFLAGS c_src/leveldb/libleveldb.a c_src/system/lib/libsnappy.a -lstdc++"}
              ]}.
 
-{pre_hooks, [{'get-deps', "c_src/build_deps.sh get-deps"},
-             {compile, "c_src/build_deps.sh"}]}.
+{pre_hooks, [{'get-deps', "make -C c_src get-deps"},
+             {compile, "make -C c_src compile"}]}.
 
-{post_hooks, [{clean, "c_src/build_deps.sh clean"}]}.
+{post_hooks, [{clean, "make -C c_src clean"}]}.
diff --git a/rebar3 b/rebar3
diff --git a/tools.mk b/tools.mk