upgrade to badger/v3 (#78)

.github/workflows/edge.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v1
         with:
-          go-version: 1.14
+          go-version: 1.16
         id: go
       - name: Login to DockerHub Registry
         uses: docker/login-action@v1

.github/workflows/latest.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v1
         with:
-          go-version: 1.14
+          go-version: 1.16
         id: go
       - name: Login to DockerHub Registry
         uses: docker/login-action@v1

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v1
         with:
-          go-version: 1.14
+          go-version: 1.16
         id: go
       - name: Login to DockerHub Registry
         uses: docker/login-action@v1

.github/workflows/test.yml

@@ -5,21 +5,19 @@ env:
   GO111MODULE: "on"
 
 jobs:
-
   test:
     name: Run Tests
     runs-on: ubuntu-latest
     steps:
+      - name: Install Go
+        uses: actions/setup-go@v1
+        with:
+          go-version: 1.16
+        id: go
 
-    - name: Install Go
-      uses: actions/setup-go@v1
-      with:
-        go-version: 1.14
-      id: go
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v1
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v1
 
-    - name: Run tests
-      run: |
-        go test -race ./...
+      - name: Run tests
+        run: |
+          go test -race ./...

Dockerfile

@@ -6,6 +6,7 @@ ARG GOARCH="amd64"
 ENV GO111MODULE=${GO111MODULE}
 ENV GOOS=${GOOS}
 ENV GOARCH=${GOARCH}
+
 # GOPATH => /go
 RUN mkdir -p /go/src/talaria
 COPY . src/talaria

go.mod

@@ -1,6 +1,6 @@
 module github.com/kelindar/talaria
 
-go 1.14
+go 1.16
 
 require (
 	cloud.google.com/go v0.57.0 // indirect
@@ -17,8 +17,7 @@ require (
 	github.com/armon/go-metrics v0.3.3 // indirect
 	github.com/aws/aws-sdk-go v1.30.25
 	github.com/crphang/orc v0.0.6
-	github.com/dgraph-io/badger/v2 v2.0.1-rc1.0.20200626160443-3042e3776798
-	github.com/dgraph-io/ristretto v0.0.2 // indirect
+	github.com/dgraph-io/badger/v3 v3.2103.0
 	github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
 	github.com/dnaeon/go-vcr v1.0.1 // indirect
 	github.com/emitter-io/address v1.0.0

internal/storage/disk/disk.go

@@ -14,7 +14,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/dgraph-io/badger/v2"
+	"github.com/dgraph-io/badger/v3"
 	"github.com/grab/async"
 	"github.com/kelindar/talaria/internal/config"
 	"github.com/kelindar/talaria/internal/encoding/key"
@@ -72,11 +72,22 @@ func (s *Storage) Open(dir string, options config.Badger) error {
 
 	opts := badger.DefaultOptions(dir)
 
+	//WithNumLevelZeroTables().
+	//WithNumLevelZeroTablesStall()
+
 	switch options.Default {
 	case config.BadgerStorage:
-		opts = opts.WithMaxLevels(64 << 15).WithValueLogMaxEntries(5000).WithLevelOneSize(1 << 16).WithLevelSizeMultiplier(3).WithMaxLevels(25).WithSyncWrites(false)
+		opts = opts.WithMaxLevels(64 << 15).
+			WithValueLogMaxEntries(5000).
+			WithBaseLevelSize(1 << 16).
+			WithLevelSizeMultiplier(3).
+			WithMaxLevels(25).
+			WithSyncWrites(false)
 	case config.BadgerIngestion:
-		opts = opts.WithLevelOneSize(204800000).WithMaxLevels(3).WithSyncWrites(false)
+		opts = opts.
+			WithBaseLevelSize(204800000).
+			WithMaxLevels(3).
+			WithSyncWrites(false)
 	}
 
 	// Create the options
@@ -87,7 +98,7 @@ func (s *Storage) Open(dir string, options config.Badger) error {
 	// max size of lsm tree in bytes after which data is propagated to disk.
 	// The default is 64 MB.
 	if options.MaxTableSize != nil {
-		opts = opts.WithMaxTableSize(*options.MaxTableSize)
+		opts = opts.WithBaseTableSize(*options.MaxTableSize)
 	}
 
 	// ValueLogMaxEntries sets the maximum number of entries a value log file can hold approximately.
@@ -101,7 +112,7 @@ func (s *Storage) Open(dir string, options config.Badger) error {
 	// LevelOneSize sets the maximum total size for Level 1.
 	// The default value of LevelOneSize is 20MB.
 	if options.LevelOneSize != nil {
-		opts = opts.WithLevelOneSize(*options.LevelOneSize)
+		opts = opts.WithBaseLevelSize(*options.LevelOneSize)
 	}
 
 	// Maximum number of levels of compaction allowed in the LSM.
@@ -118,11 +129,6 @@ func (s *Storage) Open(dir string, options config.Badger) error {
 		opts = opts.WithLevelSizeMultiplier(*options.LevelSizeMultiplier)
 	}
 
-	// Truncate indicates whether value log files should be truncated to delete corrupt data, if any.
-	// This option is ignored when ReadOnly is true.
-	// The default value of Truncate is false.
-	opts = opts.WithTruncate(true)
-
 	opts = opts.WithLogger(&logger{s.monitor})
 	s.monitor.Info("opening badger with options %+v", opts)
 

internal/storage/disk/disk_test.go

@@ -13,7 +13,6 @@ import (
 	"time"
 
 	"github.com/kelindar/talaria/internal/config"
-
 	"github.com/kelindar/talaria/internal/encoding/key"
 	"github.com/kelindar/talaria/internal/monitor"
 	"github.com/stretchr/testify/assert"