Use pebble as the main backend

Makefile

@@ -13,8 +13,8 @@ gen:
 	go generate ./...
 
 test:
-	go test -tags=debug -timeout=1m -cover ./...
+	go test -timeout=1m -cover ./...
-	cd cmd/genji && go test -tags=debug -cover -timeout=1m ./...
+	cd cmd/genji && go test -cover -timeout=1m ./...
 
 testnodebug:
 	go test -cover -timeout=1m ./...

README.md

@@ -24,7 +24,7 @@ Checkout the [SQL documentation](https://genji.dev/docs/genji-sql), the [Go doc]
 ## Features
 
 -   **Optional schemas**: Genji tables are schemaless, but it is possible to add constraints on any field to ensure the coherence of data within a table.
--   **On-disk or in memory**: It is possible to store data on disk or in ram. Genji relies on [Badger](https://github.com/dgraph-io/badger) to manage data.
+-   **On-disk or in memory**: It is possible to store data on disk or in ram. Genji relies on [Pebble](https://github.com/cockroachdb/pebble) to manage data.
 -   **Transaction support**: Read-only and read/write transactions are supported by default.
 -   **SQL and Documents**: Genji mixes the best of both worlds by combining powerful SQL commands with JSON.
 -   **Easy to use, easy to learn**: Genji was designed for simplicity in mind. It is really easy to insert and read documents of any shape.

cmd/genji/commands/app.go

@@ -14,13 +14,6 @@ func NewApp() *cli.App {
 	app.Name = "Genji"
 	app.Usage = "Shell for the Genji database"
 	app.EnableBashCompletion = true
-	app.Flags = []cli.Flag{
-		&cli.StringFlag{
-			Name:    "encryption-key",
-			Aliases: []string{"k"},
-			Usage:   "encryption key, badger only",
-		},
-	}
 
 	app.Commands = []*cli.Command{
 		NewInsertCommand(),
@@ -32,17 +25,10 @@ func NewApp() *cli.App {
 
 	// Root command
 	app.Action = func(c *cli.Context) error {
-		var opts dbutil.DBOptions
-
 		dbpath := c.Args().First()
 
-		k := c.String("encryption-key")
-		if k != "" {
-			opts.EncryptionKey = k
-		}
-
 		if dbutil.CanReadFromStandardInput() {
-			db, err := dbutil.OpenDB(c.Context, dbpath, opts)
+			db, err := dbutil.OpenDB(c.Context, dbpath)
 			if err != nil {
 				return err
 			}
@@ -52,8 +38,7 @@ func NewApp() *cli.App {
 		}
 
 		return shell.Run(c.Context, &shell.Options{
-			DBPath:        dbpath,
+			DBPath: dbpath,
-			EncryptionKey: k,
 		})
 	}
 

cmd/genji/commands/bench.go

@@ -90,7 +90,7 @@ in the same transaction, use -t`,
 
 		path := c.String("path")
 
-		db, err := dbutil.OpenDB(c.Context, path, dbutil.DBOptions{})
+		db, err := dbutil.OpenDB(c.Context, path)
 		if err != nil {
 			return err
 		}

cmd/genji/commands/dump.go

@@ -41,11 +41,6 @@ $ genji dump -f dump.sql my.db`,
 				Aliases: []string{"t"},
 				Usage:   "name of the table, it must already exist. Defaults to all tables.",
 			},
-			&cli.StringFlag{
-				Name:    "encryption-key",
-				Aliases: []string{"k"},
-				Usage:   "encryption key, badger only",
-			},
 		},
 	}
 
@@ -57,9 +52,7 @@ $ genji dump -f dump.sql my.db`,
 			return errors.New(cmd.UsageText)
 		}
 
-		k := c.String("encryption-key")
+		db, err := dbutil.OpenDB(c.Context, dbPath)
-
-		db, err := dbutil.OpenDB(c.Context, dbPath, dbutil.DBOptions{EncryptionKey: k})
 		if err != nil {
 			return err
 		}

cmd/genji/commands/insert.go

@@ -59,25 +59,18 @@ $ curl https://api.github.com/repos/genjidb/genji/issues | genji insert --db myd
 				Required: false,
 				Value:    false,
 			},
-			&cli.StringFlag{
-				Name:    "encryption-key",
-				Aliases: []string{"k"},
-				Usage:   "encryption key, badger only",
-			},
 		},
 		Action: func(c *cli.Context) error {
 			dbPath := c.String("db")
 			table := c.String("table")
 			args := c.Args().Slice()
 
-			k := c.String("encryption-key")
+			return runInsertCommand(c.Context, dbPath, table, c.Bool("auto"), args)
-
-			return runInsertCommand(c.Context, dbPath, table, c.Bool("auto"), k, args)
 		},
 	}
 }
 
-func runInsertCommand(ctx context.Context, dbPath, table string, auto bool, eKey string, args []string) error {
+func runInsertCommand(ctx context.Context, dbPath, table string, auto bool, args []string) error {
 	generatedName := "data_" + strconv.FormatInt(time.Now().Unix(), 10)
 	createTable := false
 	if table == "" && auto {
@@ -89,7 +82,7 @@ func runInsertCommand(ctx context.Context, dbPath, table string, auto bool, eKey
 		dbPath = generatedName
 	}
 
-	db, err := dbutil.OpenDB(ctx, dbPath, dbutil.DBOptions{EncryptionKey: eKey})
+	db, err := dbutil.OpenDB(ctx, dbPath)
 	if err != nil {
 		return err
 	}

cmd/genji/commands/restore.go

@@ -17,16 +17,8 @@ func NewRestoreCommand() (cmd *cli.Command) {
 		Description: `The restore command can restore a database from a text file.
 
 	$ genji restore dump.sql mydb`,
-		Flags: []cli.Flag{
+		Flags: []cli.Flag{},
-			&cli.StringFlag{
-				Name:    "encryption-key",
-				Aliases: []string{"k"},
-				Usage:   "encryption key, badger only",
-			},
-		},
 		Action: func(c *cli.Context) error {
-			k := c.String("encryption-key")
-
 			if c.Args().Len() != 2 {
 				return errors.New(cmd.UsageText)
 			}
@@ -46,7 +38,7 @@ func NewRestoreCommand() (cmd *cli.Command) {
 			}
 			defer file.Close()
 
-			db, err := dbutil.OpenDB(c.Context, dbPath, dbutil.DBOptions{EncryptionKey: k})
+			db, err := dbutil.OpenDB(c.Context, dbPath)
 			if err != nil {
 				return err
 			}

cmd/genji/dbutil/db.go

@@ -2,43 +2,14 @@ package dbutil
 
 import (
 	"context"
-	"strings"
 
-	"github.com/cockroachdb/errors"
-	"github.com/dgraph-io/badger/v3"
 	"github.com/genjidb/genji"
-	"github.com/genjidb/genji/internal/kv"
 )
 
-type DBOptions struct {
-	EncryptionKey string
-}
-
 // OpenDB opens a database at the given path.
-func OpenDB(ctx context.Context, dbPath string, opts DBOptions) (*genji.DB, error) {
+func OpenDB(ctx context.Context, dbPath string) (*genji.DB, error) {
-	var (
-		ng  *kv.Engine
-		err error
-	)
-
-	opt := badger.DefaultOptions(dbPath).WithLogger(nil)
 	if dbPath == "" {
-		opt = opt.WithInMemory(true)
+		dbPath = ":memory:"
 	}
-
+	return genji.Open(dbPath)
-	if opts.EncryptionKey != "" {
-		opt.EncryptionKey = []byte(opts.EncryptionKey)
-		opt.IndexCacheSize = 100 << 20
-	}
-
-	ng, err = kv.NewEngine(opt)
-	if err != nil && strings.HasPrefix(err.Error(), "Cannot acquire directory lock") {
-		return nil, errors.New("database is locked")
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	return genji.New(ctx, ng)
 }

cmd/genji/go.mod

@@ -6,7 +6,6 @@ require (
 	github.com/agnivade/levenshtein v1.1.1
 	github.com/c-bata/go-prompt v0.2.6
 	github.com/cockroachdb/errors v1.8.6
-	github.com/dgraph-io/badger/v3 v3.2103.2
 	github.com/genjidb/genji v0.15.0
 	github.com/stretchr/testify v1.7.0
 	github.com/urfave/cli/v2 v2.3.0
@@ -15,22 +14,17 @@ require (
 )
 
 require (
+	github.com/DataDog/zstd v1.4.5 // indirect
 	github.com/buger/jsonparser v1.1.1 // indirect
-	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f // indirect
+	github.com/cockroachdb/pebble v0.0.0-20220121171514-176f9fbf0e97 // indirect
 	github.com/cockroachdb/redact v1.1.3 // indirect
 	github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/dgraph-io/ristretto v0.1.0 // indirect
-	github.com/dustin/go-humanize v1.0.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/glog v1.0.0 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/flatbuffers v2.0.5+incompatible // indirect
 	github.com/google/go-cmp v0.5.7 // indirect
 	github.com/klauspost/compress v1.14.1 // indirect
 	github.com/kr/pretty v0.3.0 // indirect
@@ -45,11 +39,9 @@ require (
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/rogpeppe/go-internal v1.8.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	go.opencensus.io v0.23.0 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
-	golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba // indirect
+	golang.org/x/exp v0.0.0-20200513190911-00229845015e // indirect
 	golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )
 

cmd/genji/go.sum

@@ -1,12 +1,14 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/CloudyKit/fastprinter v0.0.0-20170127035650-74b38d55f37a/go.mod h1:EFZQ978U7x8IRnstaskI3IysnWY5Ao3QgZUKOXlsAdw=
 github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mod h1:HPYO+50pSWkPoj9Q/eq0aRGByCL6ScRlUmiEX5Zgm+w=
+github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ=
+github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
 github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
 github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7/go.mod h1:6E6s8o2AE4KhCrqr6GRJjdC/gNfTdxkIXvuGZZda2VM=
-github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
-github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0=
 github.com/agnivade/levenshtein v1.1.1 h1:QY8M92nrzkmr798gCo3kmMyqXFzdQVpxLlGPRBij0P8=
 github.com/agnivade/levenshtein v1.1.1/go.mod h1:veldBMzWxcCG2ZvUTKD2kJNRdCk5hVbJomOvKkmgYbo=
@@ -20,8 +22,6 @@ github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx2
 github.com/c-bata/go-prompt v0.2.6 h1:POP+nrHE+DfLYx370bedwNhsqmpCUynWPxuHi0C5vZI=
 github.com/c-bata/go-prompt v0.2.6/go.mod h1:/LMAke8wD2FsNu9EXNdHxNLbd9MedkPnCdfpU9wwHfY=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
-github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
 github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -30,16 +30,21 @@ github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGX
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cockroachdb/datadriven v1.0.0/go.mod h1:5Ib8Meh+jk1RlHIXej6Pzevx/NLlNvQB9pmSBZErGA4=
 github.com/cockroachdb/errors v1.6.1/go.mod h1:tm6FTP5G81vwJ5lC0SizQo374JNCOPrHyXGitRJoDqM=
+github.com/cockroachdb/errors v1.8.1/go.mod h1:qGwQn6JmZ+oMjuLwjWzUNqblqk0xl4CVV3SQbGwK7Ac=
 github.com/cockroachdb/errors v1.8.6 h1:Am9evxl/po3RzpokemQvq7S7Cd0mxv24xy0B/trlQF4=
 github.com/cockroachdb/errors v1.8.6/go.mod h1:hOm5fabihW+xEyY1kuypGwqT+Vt7rafg04ytBtIpeIQ=
 github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
 github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f h1:6jduT9Hfc0njg5jJ1DdKCFPdMBrp/mdZfCpa5h+WM74=
 github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
+github.com/cockroachdb/pebble v0.0.0-20220121171514-176f9fbf0e97 h1:AInKQ2XlxUOEVNR8mmwFqjW9W+sQPTfGQhf+EaaG8SI=
+github.com/cockroachdb/pebble v0.0.0-20220121171514-176f9fbf0e97/go.mod h1:buxOO9GBtOcq1DiXDpIPYrmxY020K2A8lOrwno5FetU=
+github.com/cockroachdb/redact v1.0.8/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
 github.com/cockroachdb/redact v1.1.1/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
 github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ=
 github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
 github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 h1:IKgmqgMQlVJIZj19CdocBeSfSaiCbEBZGKODaixqtHM=
 github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk0R8eg+OTkcqI6baNH4xAkpiYVvQ=
+github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
 github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
@@ -53,18 +58,11 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgraph-io/badger v1.6.0 h1:DshxFxZWXUcO0xX476VJC07Xsr6ZCBVRHKZ93Oh7Evo=
 github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
-github.com/dgraph-io/badger/v3 v3.2103.2 h1:dpyM5eCJAtQCBcMCZcT4UBZchuTJgCywerHHgmxfxM8=
-github.com/dgraph-io/badger/v3 v3.2103.2/go.mod h1:RHo4/GmYcKKh5Lxu63wLEMHJ70Pac2JqZRYGhlyAo2M=
-github.com/dgraph-io/ristretto v0.1.0 h1:Jv3CGQHp9OjuMBSne1485aDpUkTKEcUqF+jm/LuerPI=
-github.com/dgraph-io/ristretto v0.1.0/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu6v9Vcb3Q9ug=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA=
 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48 h1:fRzb/w+pyskVMQ+UbP35JkH8yB7MYb4q/qhBarqZE6g=
 github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA=
-github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -79,11 +77,13 @@ github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4/go.mod h1:T9YF2M40nI
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc=
+github.com/ghemawat/stream v0.0.0-20171120220530-696b145b53b9/go.mod h1:106OIgooyS7OzLDOpUGgm9fA3bQENb/cFSyyBmMoJDs=
 github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
 github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM=
 github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98=
 github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
 github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
@@ -96,12 +96,6 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ=
-github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
-github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -114,24 +108,17 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
-github.com/google/flatbuffers v1.12.1/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
-github.com/google/flatbuffers v2.0.5+incompatible h1:ANsW0idDAXIY+mNHzIHxWRfabV2x5LUEEIIWcwsYgB8=
-github.com/google/flatbuffers v2.0.5+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
@@ -165,7 +152,7 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.9.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
-github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
+github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.14.1 h1:hLQYb23E8/fO+1u53d02A97a8UnsddcvYzq4ERRU4ds=
 github.com/klauspost/compress v1.14.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
@@ -197,7 +184,6 @@ github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
 github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/mattn/go-tty v0.0.3 h1:5OfyWorkyO7xP52Mq7tB36ajHDG5OHrmBGIS/DtakQI=
 github.com/mattn/go-tty v0.0.3/go.mod h1:ihxohKRERHTVzN+aSVRwACLCeqIoZAWpoICkkvrWyR0=
 github.com/mattn/go-tty v0.0.4 h1:NVikla9X8MN0SQAqCYzpGyXv0jY7MNl3HOWD2dkle7E=
 github.com/mattn/go-tty v0.0.4/go.mod h1:u5GGXBtZU6RQoKV8gY5W6UhMudbR5vXnUe7j3pxse28=
@@ -233,7 +219,6 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
 github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
@@ -248,9 +233,6 @@ github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNX
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
-github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
@@ -285,9 +267,6 @@ github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZ
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
-go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
-go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
 go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
@@ -299,11 +278,18 @@ golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20200513190911-00229845015e h1:rMqLP+9XLy+LdbCXHjJHAmTfXCr93W7oruWA6Hq1Alc=
+golang.org/x/exp v0.0.0-20200513190911-00229845015e/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -321,11 +307,8 @@ golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba h1:6u6sik+bn/y7vILcYkK3iwTBWN7WtBvB0+SZswQnbf8=
-golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -340,11 +323,12 @@ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -356,25 +340,21 @@ golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200918174421-af09f7315aff/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210909193231-528a39cd75f3/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -386,6 +366,7 @@ golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
@@ -398,18 +379,15 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
 google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
@@ -422,8 +400,6 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=

cmd/genji/shell/command.go

@@ -68,7 +68,7 @@ var commands = []command{
 	},
 	{
 		Name:        ".save",
-		Options:     "[badger] [filename]",
+		Options:     "[filename]",
 		DisplayName: ".save",
 		Description: "Save database content in the specified file.",
 	},
@@ -170,7 +170,7 @@ func runIndexesCmd(db *genji.DB, tableName string, w io.Writer) error {
 // If a path already exists, existing values in the target database will be overwritten.
 func runSaveCmd(ctx context.Context, db *genji.DB, dbPath string) error {
 	// Open the new database
-	otherDB, err := dbutil.OpenDB(ctx, dbPath, dbutil.DBOptions{})
+	otherDB, err := dbutil.OpenDB(ctx, dbPath)
 	if err != nil {
 		return err
 	}

cmd/genji/shell/command_test.go

@@ -5,14 +5,11 @@ import (
 	"context"
 	"io/ioutil"
 	"os"
-	"path/filepath"
 	"testing"
 
-	"github.com/dgraph-io/badger/v3"
 	"github.com/genjidb/genji"
 	"github.com/genjidb/genji/cmd/genji/dbutil"
 	"github.com/genjidb/genji/document"
-	"github.com/genjidb/genji/internal/kv"
 	"github.com/genjidb/genji/internal/testutil/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -99,69 +96,47 @@ func TestSaveCommand(t *testing.T) {
 	assert.NoError(t, err)
 	defer os.RemoveAll(dir)
 
-	tests := []struct {
+	db, err := genji.Open(":memory:")
-		engine string
+	assert.NoError(t, err)
-		path   string
+	defer db.Close()
-	}{
+
-		{"badger", filepath.Join(dir, "/badger")},
+	err = db.Exec(`
+		CREATE TABLE test (a DOUBLE);
+		CREATE INDEX idx_a_b ON test (a, b);
+	`)
+	assert.NoError(t, err)
+	err = db.Exec("INSERT INTO test (a, b) VALUES (?, ?)", 1, 2)
+	assert.NoError(t, err)
+	err = db.Exec("INSERT INTO test (a, b) VALUES (?, ?)", 2, 2)
+	assert.NoError(t, err)
+	err = db.Exec("INSERT INTO test (a, b) VALUES (?, ?)", 3, 2)
+	assert.NoError(t, err)
+
+	// save the dummy database
+	err = runSaveCmd(context.Background(), db, dir)
+	assert.NoError(t, err)
+
+	db, err = genji.Open(dir)
+	assert.NoError(t, err)
+	defer db.Close()
+
+	// ensure that the data is present
+	doc, err := db.QueryDocument("SELECT * FROM test")
+	assert.NoError(t, err)
+
+	var res struct {
+		A int
+		B int
 	}
+	err = document.StructScan(doc, &res)
+	assert.NoError(t, err)
 
-	for _, tt := range tests {
+	require.Equal(t, 1, res.A)
-		t.Cleanup(func() {
+	require.Equal(t, 2, res.B)
-			os.RemoveAll(tt.path)
-		})
 
-		t.Run(tt.engine+"/OK", func(t *testing.T) {
+	// ensure that the index has been created
-			db, err := genji.Open(":memory:")
+	indexes, err := dbutil.ListIndexes(context.Background(), db, "")
-			assert.NoError(t, err)
+	assert.NoError(t, err)
-			defer db.Close()
+	require.Len(t, indexes, 1)
-
+	require.Equal(t, "idx_a_b", indexes[0])
-			err = db.Exec(`
-				CREATE TABLE test (a DOUBLE);
-				CREATE INDEX idx_a_b ON test (a, b);
-			`)
-			assert.NoError(t, err)
-			err = db.Exec("INSERT INTO test (a, b) VALUES (?, ?)", 1, 2)
-			assert.NoError(t, err)
-			err = db.Exec("INSERT INTO test (a, b) VALUES (?, ?)", 2, 2)
-			assert.NoError(t, err)
-			err = db.Exec("INSERT INTO test (a, b) VALUES (?, ?)", 3, 2)
-			assert.NoError(t, err)
-
-			// save the dummy database
-			err = runSaveCmd(context.Background(), db, tt.path)
-			assert.NoError(t, err)
-
-			if tt.engine == "badger" {
-				ng, err := kv.NewEngine(badger.DefaultOptions(tt.path).WithLogger(nil))
-				assert.NoError(t, err)
-				db, err = genji.New(context.Background(), ng)
-				assert.NoError(t, err)
-			} else {
-				db, err = genji.Open(tt.path)
-				assert.NoError(t, err)
-			}
-			defer db.Close()
-
-			// ensure that the data is present
-			doc, err := db.QueryDocument("SELECT * FROM test")
-			assert.NoError(t, err)
-
-			var res struct {
-				A int
-				B int
-			}
-			err = document.StructScan(doc, &res)
-			assert.NoError(t, err)
-
-			require.Equal(t, 1, res.A)
-			require.Equal(t, 2, res.B)
-
-			// ensure that the index has been created
-			indexes, err := dbutil.ListIndexes(context.Background(), db, "")
-			assert.NoError(t, err)
-			require.Len(t, indexes, 1)
-			require.Equal(t, "idx_a_b", indexes[0])
-		})
-	}
 }

cmd/genji/shell/shell.go

@@ -62,8 +62,6 @@ type Options struct {
 	// Path of the database directory that will be created.
 	// If empty, the database will be in-memory.
 	DBPath string
-
-	EncryptionKey string
 }
 
 // Run a shell.
@@ -76,7 +74,7 @@ func Run(ctx context.Context, opts *Options) error {
 
 	sh.opts = opts
 
-	db, err := dbutil.OpenDB(ctx, sh.opts.DBPath, dbutil.DBOptions{EncryptionKey: opts.EncryptionKey})
+	db, err := dbutil.OpenDB(ctx, sh.opts.DBPath)
 	if err != nil {
 		return err
 	}
@@ -91,7 +89,12 @@ func Run(ctx context.Context, opts *Options) error {
 	if opts.DBPath == "" {
 		fmt.Println("Opened an in-memory database.")
 	} else {
-		fmt.Printf("On-disk database using Badger engine at path %s.\n", opts.DBPath)
+		// check if the directory exists
+		if _, err := os.Stat(opts.DBPath); os.IsNotExist(err) {
+			fmt.Printf("Creating an on-disk database at path %s.\n", opts.DBPath)
+		} else {
+			fmt.Printf("Opened an on-disk database using at path %s.\n", opts.DBPath)
+		}
 	}
 
 	defer func() {

db.go

@@ -10,7 +10,8 @@ import (
 	"fmt"
 
 	"github.com/cockroachdb/errors"
-	"github.com/dgraph-io/badger/v3"
+	"github.com/cockroachdb/pebble"
+	"github.com/cockroachdb/pebble/vfs"
 	"github.com/genjidb/genji/document"
 	errs "github.com/genjidb/genji/errors"
 	"github.com/genjidb/genji/internal/database"
@@ -64,16 +65,14 @@ func New(ctx context.Context, ng *kv.Engine) (*DB, error) {
 // If path is equal to ":memory:" it will open an in-memory database,
 // otherwise it will create an on-disk database using the BoltDB engine.
 func Open(path string) (*DB, error) {
-	var inMemory bool
+	var opts pebble.Options
 
 	if path == ":memory:" {
-		inMemory = true
+		opts.FS = vfs.NewMem()
 		path = ""
 	}
 
-	opts := badger.DefaultOptions(path).WithLogger(nil).WithInMemory(inMemory)
+	ng, err := kv.NewEngine(path, &opts)
-
-	ng, err := kv.NewEngine(opts)
 	if err != nil {
 		return nil, err
 	}

go.mod

@@ -5,36 +5,28 @@ go 1.17
 require (
 	github.com/buger/jsonparser v1.1.1
 	github.com/cockroachdb/errors v1.8.6
-	github.com/dgraph-io/badger/v3 v3.2103.2
+	github.com/cockroachdb/pebble v0.0.0-20220121171514-176f9fbf0e97
 	github.com/google/go-cmp v0.5.7
 	github.com/stretchr/testify v1.7.0
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 )
 
 require (
-	github.com/cespare/xxhash v1.1.0 // indirect
+	github.com/DataDog/zstd v1.4.5 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f // indirect
 	github.com/cockroachdb/redact v1.1.3 // indirect
 	github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/dgraph-io/ristretto v0.1.0 // indirect
-	github.com/dustin/go-humanize v1.0.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/glog v1.0.0 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/flatbuffers v2.0.5+incompatible // indirect
 	github.com/klauspost/compress v1.14.1 // indirect
 	github.com/kr/pretty v0.3.0 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rogpeppe/go-internal v1.6.1 // indirect
-	go.opencensus.io v0.23.0 // indirect
+	golang.org/x/exp v0.0.0-20200513190911-00229845015e // indirect
-	golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba // indirect
 	golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )

go.sum

@@ -1,12 +1,14 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/CloudyKit/fastprinter v0.0.0-20170127035650-74b38d55f37a/go.mod h1:EFZQ978U7x8IRnstaskI3IysnWY5Ao3QgZUKOXlsAdw=
 github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mod h1:HPYO+50pSWkPoj9Q/eq0aRGByCL6ScRlUmiEX5Zgm+w=
+github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ=
+github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
 github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
 github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7/go.mod h1:6E6s8o2AE4KhCrqr6GRJjdC/gNfTdxkIXvuGZZda2VM=
-github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
-github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0=
 github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
@@ -14,8 +16,6 @@ github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go
 github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
 github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
-github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
 github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -24,16 +24,21 @@ github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGX
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cockroachdb/datadriven v1.0.0/go.mod h1:5Ib8Meh+jk1RlHIXej6Pzevx/NLlNvQB9pmSBZErGA4=
 github.com/cockroachdb/errors v1.6.1/go.mod h1:tm6FTP5G81vwJ5lC0SizQo374JNCOPrHyXGitRJoDqM=
+github.com/cockroachdb/errors v1.8.1/go.mod h1:qGwQn6JmZ+oMjuLwjWzUNqblqk0xl4CVV3SQbGwK7Ac=
 github.com/cockroachdb/errors v1.8.6 h1:Am9evxl/po3RzpokemQvq7S7Cd0mxv24xy0B/trlQF4=
 github.com/cockroachdb/errors v1.8.6/go.mod h1:hOm5fabihW+xEyY1kuypGwqT+Vt7rafg04ytBtIpeIQ=
 github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
 github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f h1:6jduT9Hfc0njg5jJ1DdKCFPdMBrp/mdZfCpa5h+WM74=
 github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
+github.com/cockroachdb/pebble v0.0.0-20220121171514-176f9fbf0e97 h1:AInKQ2XlxUOEVNR8mmwFqjW9W+sQPTfGQhf+EaaG8SI=
+github.com/cockroachdb/pebble v0.0.0-20220121171514-176f9fbf0e97/go.mod h1:buxOO9GBtOcq1DiXDpIPYrmxY020K2A8lOrwno5FetU=
+github.com/cockroachdb/redact v1.0.8/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
 github.com/cockroachdb/redact v1.1.1/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
 github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ=
 github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
 github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 h1:IKgmqgMQlVJIZj19CdocBeSfSaiCbEBZGKODaixqtHM=
 github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk0R8eg+OTkcqI6baNH4xAkpiYVvQ=
+github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
 github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
@@ -43,16 +48,9 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgraph-io/badger v1.6.0 h1:DshxFxZWXUcO0xX476VJC07Xsr6ZCBVRHKZ93Oh7Evo=
 github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
-github.com/dgraph-io/badger/v3 v3.2103.2 h1:dpyM5eCJAtQCBcMCZcT4UBZchuTJgCywerHHgmxfxM8=
-github.com/dgraph-io/badger/v3 v3.2103.2/go.mod h1:RHo4/GmYcKKh5Lxu63wLEMHJ70Pac2JqZRYGhlyAo2M=
-github.com/dgraph-io/ristretto v0.1.0 h1:Jv3CGQHp9OjuMBSne1485aDpUkTKEcUqF+jm/LuerPI=
-github.com/dgraph-io/ristretto v0.1.0/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu6v9Vcb3Q9ug=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA=
 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
-github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -67,11 +65,13 @@ github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4/go.mod h1:T9YF2M40nI
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc=
+github.com/ghemawat/stream v0.0.0-20171120220530-696b145b53b9/go.mod h1:106OIgooyS7OzLDOpUGgm9fA3bQENb/cFSyyBmMoJDs=
 github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
 github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM=
 github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98=
 github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
 github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
@@ -84,12 +84,6 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ=
-github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
-github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -102,24 +96,17 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
-github.com/google/flatbuffers v1.12.1/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
-github.com/google/flatbuffers v2.0.5+incompatible h1:ANsW0idDAXIY+mNHzIHxWRfabV2x5LUEEIIWcwsYgB8=
-github.com/google/flatbuffers v2.0.5+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
@@ -153,7 +140,7 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.9.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
-github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
+github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.14.1 h1:hLQYb23E8/fO+1u53d02A97a8UnsddcvYzq4ERRU4ds=
 github.com/klauspost/compress v1.14.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
@@ -208,9 +195,6 @@ github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNX
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
-github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
@@ -243,20 +227,24 @@ github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZ
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
-go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
-go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20200513190911-00229845015e h1:rMqLP+9XLy+LdbCXHjJHAmTfXCr93W7oruWA6Hq1Alc=
+golang.org/x/exp v0.0.0-20200513190911-00229845015e/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -274,11 +262,8 @@ golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba h1:6u6sik+bn/y7vILcYkK3iwTBWN7WtBvB0+SZswQnbf8=
-golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -293,34 +278,31 @@ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210909193231-528a39cd75f3/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -332,6 +314,7 @@ golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
@@ -344,18 +327,15 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
 google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
@@ -368,8 +348,6 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=

internal/database/catalogstore/store.go

@@ -1,7 +1,6 @@
 package catalogstore
 
 import (
-	"fmt"
 	"strings"
 
 	"github.com/cockroachdb/errors"
@@ -15,7 +14,6 @@ import (
 func LoadCatalog(tx *database.Transaction, c *database.Catalog) error {
 	tables, indexes, sequences, err := loadCatalogStore(tx, c.CatalogTable)
 	if err != nil {
-		fmt.Println(1, err)
 		return err
 	}
 
@@ -44,8 +42,6 @@ func LoadCatalog(tx *database.Transaction, c *database.Catalog) error {
 		var seqList []database.Sequence
 		seqList, err = loadSequences(tx, c, sequences)
 		if err != nil {
-			fmt.Println(2, err)
-
 			return err
 		}
 
@@ -81,7 +77,6 @@ func loadSequences(tx *database.Transaction, c *database.Catalog, info []databas
 		if err == nil {
 			v := v.V().(int64)
 			currentValue = &v
-
 		}
 
 		sequences[i] = database.NewSequence(&info[i], currentValue)

internal/database/index.go

@@ -85,7 +85,7 @@ func (idx *Index) Exists(vs []types.Value) (bool, tree.Key, error) {
 	var found bool
 	var dKey tree.Key
 
-	err = idx.Tree.Iterate(seek, false, func(k tree.Key, v types.Value) error {
+	err = idx.Tree.IterateOnRange(&tree.Range{Min: seek, Max: seek}, false, func(k tree.Key, v types.Value) error {
 		if len(seek) > len(k) {
 			return errStop
 		}
@@ -178,7 +178,7 @@ func (idx *Index) IterateOnRange(rng *tree.Range, reverse bool, fn func(key tree
 }
 
 func (idx *Index) Iterate(reverse bool, fn func(key tree.Key) error) error {
-	return idx.Tree.Iterate(nil, reverse, idx.iterator(func(itmKey tree.Key, key tree.Key) error {
+	return idx.Tree.IterateOnRange(nil, reverse, idx.iterator(func(itmKey tree.Key, key tree.Key) error {
 		return fn(key)
 	}))
 }

internal/kv/engine.go

@@ -1,18 +1,19 @@
-// package kv implements a Badger kv.
+// package kv implements a Pebble kv.
 package kv
 
 import (
 	"bytes"
 	"context"
 	"fmt"
+	"io"
 	"math/rand"
 	"os"
 	"path/filepath"
 	"time"
 
 	"github.com/cockroachdb/errors"
-	"github.com/dgraph-io/badger/v3"
+	"github.com/cockroachdb/pebble"
-	"github.com/dgraph-io/badger/v3/options"
+	"github.com/cockroachdb/pebble/vfs"
 )
 
 const (
@@ -40,20 +41,22 @@ var (
 	ErrKeyNotFound = errors.New("key not found")
 )
 
-// Engine represents a Badger kv.
+// Engine represents a Pebble kv.
 type Engine struct {
-	DB *badger.DB
+	DB   *pebble.DB
+	opts *pebble.Options
 }
 
-// NewEngine creates a Badger kv. It takes the same argument as Badger's Open function.
+// NewEngine creates a Pebble kv engine. It takes the same argument as Pebble's Open function.
-func NewEngine(opt badger.Options) (*Engine, error) {
+func NewEngine(path string, opts *pebble.Options) (*Engine, error) {
-	db, err := badger.Open(opt)
+	db, err := pebble.Open(path, opts)
 	if err != nil {
 		return nil, err
 	}
 
 	return &Engine{
-		DB: db,
+		DB:   db,
+		opts: opts,
 	}, nil
 }
 
@@ -62,7 +65,7 @@ type TxOptions struct {
 	Writable bool
 }
 
-// Begin creates a transaction using Badger's transaction API.
+// Begin creates a transaction using Pebble's batch API.
 func (e *Engine) Begin(ctx context.Context, opts TxOptions) (*Transaction, error) {
 	select {
 	case <-ctx.Done():
@@ -70,12 +73,16 @@ func (e *Engine) Begin(ctx context.Context, opts TxOptions) (*Transaction, error
 	default:
 	}
 
-	tx := e.DB.NewTransaction(opts.Writable)
+	var batch *pebble.Batch
+
+	if opts.Writable {
+		batch = e.DB.NewIndexedBatch()
+	}
 
 	return &Transaction{
 		ctx:      ctx,
 		ng:       e,
-		tx:       tx,
+		batch:    batch,
 		writable: opts.Writable,
 	}, nil
 }
@@ -83,25 +90,33 @@ func (e *Engine) Begin(ctx context.Context, opts TxOptions) (*Transaction, error
 func (e *Engine) NewTransientStore(ctx context.Context) (*TransientStore, error) {
 	// build engine with fast options
 
-	inMemory := e.DB.Opts().InMemory
+	var inMemory bool
-	var opt badger.Options
+	if e.opts != nil {
-	if inMemory {
+		_, inMemory = e.opts.FS.(*vfs.MemFS)
-		opt = badger.DefaultOptions("").WithInMemory(true)
-	} else {
-		opt = badger.DefaultOptions(filepath.Join(os.TempDir(), fmt.Sprintf(".genji-transient-%d", time.Now().Unix()+rand.Int63())))
 	}
-	opt.Compression = options.None
-	opt.MetricsEnabled = false
-	opt.Logger = nil
-	opt.DetectConflicts = false
 
-	db, err := badger.OpenManaged(opt)
+	opt := pebble.Options{
+		DisableWAL: true,
+	}
+
+	var path string
+	if inMemory {
+		opt.FS = vfs.NewMem()
+	} else {
+		path = filepath.Join(os.TempDir(), fmt.Sprintf(".genji-transient-%d", time.Now().Unix()+rand.Int63()))
+
+	}
+	opt.Logger = nil
+
+	db, err := pebble.Open(path, &opt)
 	if err != nil {
 		return nil, err
 	}
 
 	s := TransientStore{
-		DB: db,
+		DB:    db,
+		Path:  path,
+		batch: db.NewIndexedBatch(),
 	}
 
 	err = s.Reset()
@@ -112,23 +127,25 @@ func (e *Engine) NewTransientStore(ctx context.Context) (*TransientStore, error)
 	return &s, nil
 }
 
-// Close the engine and underlying Badger database.
+// Close the engine and underlying Pebble database.
 func (e *Engine) Close() error {
 	return e.DB.Close()
 }
 
-// A Transaction uses Badger's transactions.
+// A Transaction uses Pebble's batches.
 type Transaction struct {
 	ctx       context.Context
 	ng        *Engine
-	tx        *badger.Txn
+	batch     *pebble.Batch
 	writable  bool
 	discarded bool
 }
 
 // Rollback the transaction. Can be used safely after commit.
 func (t *Transaction) Rollback() error {
-	t.tx.Discard()
+	if t.writable {
+		_ = t.batch.Close()
+	}
 
 	if t.discarded {
 		return errors.WithStack(ErrTransactionDiscarded)
@@ -163,7 +180,9 @@ func (t *Transaction) Commit() error {
 
 	t.discarded = true
 
-	return t.tx.Commit()
+	defer t.batch.Close()
+
+	return t.batch.Commit(&pebble.WriteOptions{Sync: true})
 }
 
 func buildStoreKey(name []byte) []byte {
@@ -195,22 +214,32 @@ func (t *Transaction) GetStore(name []byte) (*Store, error) {
 
 	key := buildStoreKey(name)
 
-	_, err := t.tx.Get(key)
+	var closer io.Closer
+	var err error
+	if t.writable {
+		_, closer, err = t.batch.Get(key)
+	} else {
+		_, closer, err = t.ng.DB.Get(key)
+	}
 	if err != nil {
-		if errors.Is(err, badger.ErrKeyNotFound) {
+		if errors.Is(err, pebble.ErrNotFound) {
 			return nil, errors.WithStack(ErrStoreNotFound)
 		}
 
 		return nil, err
 	}
+	err = closer.Close()
+	if err != nil {
+		return nil, err
+	}
 
 	pkey := buildStorePrefixKey(name)
 
 	return &Store{
 		ctx:      t.ctx,
 		ng:       t.ng,
-		tx:       t.tx,
+		tx:       t,
-		prefix:   pkey,
+		Prefix:   pkey,
 		writable: t.writable,
 		name:     name,
 	}, nil
@@ -230,15 +259,16 @@ func (t *Transaction) CreateStore(name []byte) error {
 	}
 
 	key := buildStoreKey(name)
-	_, err := t.tx.Get(key)
+	_, closer, err := t.batch.Get(key)
 	if err == nil {
+		_ = closer.Close()
 		return errors.WithStack(ErrStoreAlreadyExists)
 	}
-	if !errors.Is(err, badger.ErrKeyNotFound) {
+	if !errors.Is(err, pebble.ErrNotFound) {
 		return err
 	}
 
-	return t.tx.Set(key, nil)
+	return t.batch.Set(key, nil, nil)
 }
 
 // DropStore deletes the store and all its keys.
@@ -263,8 +293,8 @@ func (t *Transaction) DropStore(name []byte) error {
 		return err
 	}
 
-	err = t.tx.Delete(buildStoreKey([]byte(name)))
+	err = t.batch.Delete(buildStoreKey([]byte(name)), nil)
-	if errors.Is(err, badger.ErrKeyNotFound) {
+	if errors.Is(err, pebble.ErrNotFound) {
 		return errors.WithStack(ErrStoreNotFound)
 	}
 

internal/kv/engine_test.go

@@ -8,7 +8,6 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/dgraph-io/badger/v3"
 	"github.com/genjidb/genji"
 	"github.com/genjidb/genji/document"
 	"github.com/genjidb/genji/internal/kv"
@@ -19,15 +18,11 @@ import (
 )
 
 func builder(t testing.TB) *kv.Engine {
-	dir, cleanup := tempDir(t)
+	dir := tempDir(t)
-	opts := badger.DefaultOptions(filepath.Join(dir, "badger"))
-	opts.Logger = nil
 
-	ng, err := kv.NewEngine(opts)
+	ng, err := kv.NewEngine(filepath.Join(dir, "pebble"), nil)
 	assert.NoError(t, err)
 
-	t.Cleanup(cleanup)
-
 	return ng
 }
 
@@ -43,9 +38,7 @@ func TestEngine(t *testing.T) {
 func getValue(t *testing.T, st *kv.Store, key []byte) []byte {
 	v, err := st.Get([]byte(key))
 	assert.NoError(t, err)
-	buf, err := v.ValueCopy(nil)
+	return v
-	assert.NoError(t, err)
-	return buf
 }
 
 // TestTransactionCommitRollback runs a list of tests to verify Commit and Rollback
@@ -601,259 +594,6 @@ func storeBuilderWithContext(ctx context.Context, t testing.TB) (*kv.Store, func
 	}
 }
 
-// TestStoreIterator verifies Iterator behaviour.
-func TestStoreIterator(t *testing.T) {
-	t.Run("Should not fail with no documents", func(t *testing.T) {
-		fn := func(t *testing.T, reverse bool) {
-			st, cleanup := storeBuilder(t)
-			defer cleanup()
-
-			it := st.Iterator(kv.IteratorOptions{Reverse: reverse})
-			defer it.Close()
-			i := 0
-
-			for it.Seek(nil); it.Valid(); it.Next() {
-				i++
-			}
-			assert.NoError(t, it.Err())
-			require.Zero(t, i)
-		}
-		t.Run("Reverse: false", func(t *testing.T) {
-			fn(t, false)
-		})
-		t.Run("Reverse: true", func(t *testing.T) {
-			fn(t, true)
-		})
-	})
-
-	t.Run("Should stop the iteration if context canceled", func(t *testing.T) {
-		ctx, cancel := context.WithCancel(context.Background())
-		defer cancel()
-
-		st, cleanup := storeBuilderWithContext(ctx, t)
-		defer cleanup()
-
-		for i := 1; i <= 10; i++ {
-			err := st.Put([]byte{uint8(i)}, []byte{uint8(i + 20)})
-			assert.NoError(t, err)
-		}
-
-		it := st.Iterator(kv.IteratorOptions{})
-		defer it.Close()
-
-		cancel()
-
-		var i int
-		for it.Seek(nil); it.Valid(); it.Next() {
-			i++
-		}
-		assert.ErrorIs(t, it.Err(), context.Canceled)
-		require.Zero(t, i)
-	})
-
-	t.Run("With no pivot, should iterate over all documents in order", func(t *testing.T) {
-		st, cleanup := storeBuilder(t)
-		defer cleanup()
-
-		for i := 1; i <= 10; i++ {
-			err := st.Put([]byte{uint8(i)}, []byte{uint8(i + 20)})
-			assert.NoError(t, err)
-		}
-
-		var i uint8 = 1
-		var count int
-		it := st.Iterator(kv.IteratorOptions{})
-		defer it.Close()
-
-		for it.Seek(nil); it.Valid(); it.Next() {
-			item := it.Item()
-			k := item.Key()
-			v, _ := item.ValueCopy(nil)
-			require.Equal(t, []byte{i}, k)
-			require.Equal(t, []byte{i + 20}, v)
-			i++
-			count++
-		}
-		assert.NoError(t, it.Err())
-
-		require.Equal(t, count, 10)
-	})
-
-	t.Run("With no pivot, should iterate over all documents in reverse order", func(t *testing.T) {
-		st, cleanup := storeBuilder(t)
-		defer cleanup()
-
-		for i := 1; i <= 10; i++ {
-			err := st.Put([]byte{uint8(i)}, []byte{uint8(i + 20)})
-			assert.NoError(t, err)
-		}
-
-		var i uint8 = 10
-		var count int
-		it := st.Iterator(kv.IteratorOptions{Reverse: true})
-		defer it.Close()
-
-		for it.Seek(nil); it.Valid(); it.Next() {
-			item := it.Item()
-			k := item.Key()
-			v, _ := item.ValueCopy(nil)
-			require.Equal(t, []byte{i}, k)
-			require.Equal(t, []byte{i + 20}, v)
-			i--
-			count++
-		}
-		assert.NoError(t, it.Err())
-		require.Equal(t, 10, count)
-	})
-
-	t.Run("With pivot, should iterate over some documents in order", func(t *testing.T) {
-		st, cleanup := storeBuilder(t)
-		defer cleanup()
-
-		for i := 1; i <= 10; i++ {
-			err := st.Put([]byte{uint8(i)}, []byte{uint8(i + 20)})
-			assert.NoError(t, err)
-		}
-
-		var i uint8 = 4
-		var count int
-		it := st.Iterator(kv.IteratorOptions{})
-		defer it.Close()
-
-		for it.Seek([]byte{i}); it.Valid(); it.Next() {
-			item := it.Item()
-			k := item.Key()
-			v, _ := item.ValueCopy(nil)
-			require.Equal(t, []byte{i}, k)
-			require.Equal(t, []byte{i + 20}, v)
-			i++
-			count++
-		}
-		assert.NoError(t, it.Err())
-		require.Equal(t, 7, count)
-	})
-
-	t.Run("With pivot, should iterate over some documents in reverse order", func(t *testing.T) {
-		st, cleanup := storeBuilder(t)
-		defer cleanup()
-
-		for i := 1; i <= 10; i++ {
-			err := st.Put([]byte{uint8(i)}, []byte{uint8(i + 20)})
-			assert.NoError(t, err)
-		}
-
-		var i uint8 = 4
-		var count int
-		it := st.Iterator(kv.IteratorOptions{Reverse: true})
-		defer it.Close()
-
-		for it.Seek([]byte{i}); it.Valid(); it.Next() {
-			item := it.Item()
-			k := item.Key()
-			v, _ := item.ValueCopy(nil)
-			require.Equal(t, []byte{i}, k)
-			require.Equal(t, []byte{i + 20}, v)
-			i--
-			count++
-		}
-		assert.NoError(t, it.Err())
-		require.Equal(t, 4, count)
-	})
-
-	t.Run("If pivot not found, should start from the next item", func(t *testing.T) {
-		st, cleanup := storeBuilder(t)
-		defer cleanup()
-
-		err := st.Put([]byte{1}, []byte{1})
-		assert.NoError(t, err)
-
-		err = st.Put([]byte{3}, []byte{3})
-		assert.NoError(t, err)
-
-		called := false
-		it := st.Iterator(kv.IteratorOptions{})
-		defer it.Close()
-
-		for it.Seek([]byte{2}); it.Valid(); it.Next() {
-			item := it.Item()
-			k := item.Key()
-			v, _ := item.ValueCopy(nil)
-			require.Equal(t, []byte{3}, k)
-			require.Equal(t, []byte{3}, v)
-			called = true
-		}
-		assert.NoError(t, it.Err())
-
-		require.True(t, called)
-	})
-
-	t.Run("With reverse true, if pivot not found, should start from the previous item", func(t *testing.T) {
-		st, cleanup := storeBuilder(t)
-		defer cleanup()
-
-		err := st.Put([]byte{1}, []byte{1})
-		assert.NoError(t, err)
-
-		err = st.Put([]byte{3}, []byte{3})
-		assert.NoError(t, err)
-
-		called := false
-		it := st.Iterator(kv.IteratorOptions{Reverse: true})
-		defer it.Close()
-
-		for it.Seek([]byte{2}); it.Valid(); it.Next() {
-			item := it.Item()
-			k := item.Key()
-			v, _ := item.ValueCopy(nil)
-			require.Equal(t, []byte{1}, k)
-			require.Equal(t, []byte{1}, v)
-			called = true
-		}
-		assert.NoError(t, it.Err())
-		require.True(t, called)
-	})
-
-	t.Run("With reverse true, one key in the store, and no pivot, should return that key", func(t *testing.T) {
-		st, cleanup := storeBuilder(t)
-		defer cleanup()
-
-		k := []byte{0xFF, 0xFF, 0xFF, 0xFF}
-		err := st.Put(k, []byte{1})
-		assert.NoError(t, err)
-
-		it := st.Iterator(kv.IteratorOptions{Reverse: true})
-		defer it.Close()
-
-		it.Seek(nil)
-
-		assert.NoError(t, it.Err())
-		require.True(t, it.Valid())
-		require.Equal(t, it.Item().Key(), k)
-	})
-
-	t.Run("Iterating while deleting current key should work", func(t *testing.T) {
-		st, cleanup := storeBuilder(t)
-		defer cleanup()
-
-		for i := 0; i < 50; i++ {
-			err := st.Put([]byte{byte(i)}, []byte{byte(i)})
-			assert.NoError(t, err)
-		}
-
-		i := 0
-		it := st.Iterator(kv.IteratorOptions{})
-		defer it.Close()
-
-		for it.Seek(nil); it.Valid() && i < 50; it.Next() {
-			require.Equal(t, []byte{byte(i)}, it.Item().Key())
-
-			err := st.Delete([]byte{byte(i)})
-			assert.NoError(t, err)
-			i++
-		}
-	})
-}
-
 // TestStorePut verifies Put behaviour.
 func TestStorePut(t *testing.T) {
 	t.Run("Should insert data", func(t *testing.T) {
@@ -994,11 +734,11 @@ func TestStoreDelete(t *testing.T) {
 		require.Equal(t, []byte("FOO"), v)
 
 		// the deleted key must not appear on iteration
-		it := st.Iterator(kv.IteratorOptions{})
+		it := st.Iterator(nil)
 		defer it.Close()
 		i := 0
-		for it.Seek(nil); it.Valid(); it.Next() {
+		for it.First(); it.Valid(); it.Next() {
-			require.Equal(t, []byte("foo"), it.Item().Key())
+			require.Equal(t, []byte("foo"), kv.TrimPrefix(it.Key(), st.Prefix))
 			i++
 		}
 		require.Equal(t, 1, i)
@@ -1083,10 +823,10 @@ func TestStoreTruncate(t *testing.T) {
 		err = st.Truncate()
 		assert.NoError(t, err)
 
-		it := st.Iterator(kv.IteratorOptions{})
+		it := st.Iterator(nil)
 		defer it.Close()
-		it.Seek(nil)
+		it.First()
-		assert.NoError(t, it.Err())
+		assert.NoError(t, it.Error())
 		require.False(t, it.Valid())
 	})
 
@@ -1325,15 +1065,15 @@ func TestTransient(t *testing.T) {
 	ts, err := ng.NewTransientStore(context.Background())
 	assert.NoError(t, err)
 
-	dir := ts.DB.Opts().Dir
+	dir := ts.Path
 
 	err = ts.Put([]byte("foo"), []byte("bar"))
 	assert.NoError(t, err)
 
-	it := ts.Iterator(kv.IteratorOptions{})
+	it := ts.Iterator(nil)
 	defer it.Close()
 
-	it.Seek([]byte("foo"))
+	it.SeekGE([]byte("foo"))
 	require.True(t, it.Valid())
 
 	err = ts.Drop(context.Background())
@@ -1343,11 +1083,12 @@ func TestTransient(t *testing.T) {
 	require.True(t, os.IsNotExist(err))
 }
 
-func tempDir(t testing.TB) (string, func()) {
+func tempDir(t testing.TB) string {
 	dir, err := ioutil.TempDir("", "genji")
 	assert.NoError(t, err)
 
-	return dir, func() {
+	t.Cleanup(func() {
 		os.RemoveAll(dir)
-	}
+	})
+	return dir
 }

internal/kv/example_test.go

@@ -1,32 +0,0 @@
-package kv_test
-
-import (
-	"context"
-	"io/ioutil"
-	"log"
-	"os"
-	"path/filepath"
-
-	"github.com/dgraph-io/badger/v3"
-	"github.com/genjidb/genji"
-	"github.com/genjidb/genji/internal/kv"
-)
-
-func Example() {
-	dir, err := ioutil.TempDir("", "badger")
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer os.RemoveAll(dir)
-
-	ng, err := kv.NewEngine(badger.DefaultOptions(filepath.Join(dir, "badger")))
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	db, err := genji.New(context.Background(), ng)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer db.Close()
-}

internal/kv/store.go

@@ -1,20 +1,19 @@
 package kv
 
 import (
-	"bytes"
 	"context"
+	"io"
 	"os"
 
 	"github.com/cockroachdb/errors"
-
+	"github.com/cockroachdb/pebble"
-	"github.com/dgraph-io/badger/v3"
 )
 
 type Store struct {
 	ctx      context.Context
 	ng       *Engine
-	tx       *badger.Txn
+	tx       *Transaction
-	prefix   []byte
+	Prefix   []byte
 	writable bool
 	name     []byte
 }
@@ -25,7 +24,7 @@ type Store struct {
 // from the rest of the prexix and to ensure
 // we can quickly access the latest key of the store
 // by replacing 0 by anything bigger.
-func buildKey(prefix, k []byte) []byte {
+func BuildKey(prefix, k []byte) []byte {
 	key := make([]byte, 0, len(prefix)+2+len(k))
 	key = append(key, prefix...)
 	key = append(key, separator)
@@ -34,6 +33,10 @@ func buildKey(prefix, k []byte) []byte {
 	return key
 }
 
+func TrimPrefix(k []byte, prefix []byte) []byte {
+	return k[len(prefix)+2:]
+}
+
 // Put stores a key value pair. If it already exists, it overrides it.
 func (s *Store) Put(k, v []byte) error {
 	select {
@@ -54,29 +57,42 @@ func (s *Store) Put(k, v []byte) error {
 		return errors.New("cannot store empty value")
 	}
 
-	return s.tx.Set(buildKey(s.prefix, k), v)
+	return s.tx.batch.Set(BuildKey(s.Prefix, k), v, nil)
 }
 
 // Get returns a value associated with the given key. If not found, returns ErrKeyNotFound.
-func (s *Store) Get(k []byte) (*Item, error) {
+func (s *Store) Get(k []byte) ([]byte, error) {
 	select {
 	case <-s.ctx.Done():
 		return nil, s.ctx.Err()
 	default:
 	}
 
-	it, err := s.tx.Get(buildKey(s.prefix, k))
+	var closer io.Closer
+	var err error
+	var value []byte
+	if s.tx.writable {
+		value, closer, err = s.tx.batch.Get(BuildKey(s.Prefix, k))
+	} else {
+		value, closer, err = s.ng.DB.Get(BuildKey(s.Prefix, k))
+	}
 	if err != nil {
-		if errors.Is(err, badger.ErrKeyNotFound) {
+		if errors.Is(err, pebble.ErrNotFound) {
 			return nil, errors.WithStack(ErrKeyNotFound)
 		}
 
 		return nil, err
 	}
 
-	return &Item{
+	cp := make([]byte, len(value))
-		item: it,
+	copy(cp, value)
-	}, nil
+
+	err = closer.Close()
+	if err != nil {
+		return nil, err
+	}
+
+	return cp, nil
 }
 
 // Delete a record by key. If not found, returns ErrKeyNotFound.
@@ -91,17 +107,21 @@ func (s *Store) Delete(k []byte) error {
 		return ErrTransactionReadOnly
 	}
 
-	key := buildKey(s.prefix, k)
+	key := BuildKey(s.Prefix, k)
-	_, err := s.tx.Get(key)
+	_, closer, err := s.tx.batch.Get(key)
 	if err != nil {
-		if errors.Is(err, badger.ErrKeyNotFound) {
+		if errors.Is(err, pebble.ErrNotFound) {
 			return errors.WithStack(ErrKeyNotFound)
 		}
 
 		return err
 	}
+	err = closer.Close()
+	if err != nil {
+		return err
+	}
 
-	return s.tx.Delete(key)
+	return s.tx.batch.Delete(key, nil)
 }
 
 // Truncate deletes all the records of the store.
@@ -116,17 +136,29 @@ func (s *Store) Truncate() error {
 		return ErrTransactionReadOnly
 	}
 
-	_, err := s.tx.Get(buildStoreKey(s.name))
+	_, closer, err := s.tx.batch.Get(buildStoreKey(s.name))
-	if errors.Is(err, badger.ErrKeyNotFound) {
+	if err != nil {
-		return errors.WithStack(ErrStoreNotFound)
+		if errors.Is(err, pebble.ErrNotFound) {
+			return errors.WithStack(ErrKeyNotFound)
+		}
+
+		return err
+	}
+	err = closer.Close()
+	if err != nil {
+		return err
 	}
 
-	it := s.tx.NewIterator(badger.DefaultIteratorOptions)
+	prefix := buildStorePrefixKey(s.name)
+
+	it := s.tx.batch.NewIter(&pebble.IterOptions{
+		LowerBound: prefix,
+		UpperBound: append(prefix, 0xff),
+	})
 	defer it.Close()
 
-	prefix := buildStorePrefixKey(s.name)
+	for it.SeekGE(prefix); it.Valid(); it.Next() {
-	for it.Seek(prefix); it.ValidForPrefix(prefix); it.Next() {
+		err = s.tx.batch.Delete(it.Key(), nil)
-		err = s.tx.Delete(it.Item().Key())
 		if err != nil {
 			return err
 		}
@@ -135,123 +167,28 @@ func (s *Store) Truncate() error {
 	return nil
 }
 
-// IteratorOptions is used to configure an iterator upon creation.
+func (s *Store) Iterator(opts *pebble.IterOptions) *pebble.Iterator {
-type IteratorOptions struct {
+	if opts == nil {
-	Reverse bool
+		lowerBound := BuildKey(s.Prefix, nil)
-}
+		upperBound := BuildKey(s.Prefix, nil)
-
+		upperBound[len(s.Prefix)] = 0xff
-// Iterator uses a Badger iterator with default options.
+		opts = &pebble.IterOptions{
-// Only one iterator is allowed per read-write transaction.
+			LowerBound: lowerBound,
-func (s *Store) Iterator(opts IteratorOptions) *Iterator {
+			UpperBound: upperBound,
-	prefix := buildKey(s.prefix, nil)
-
-	opt := badger.DefaultIteratorOptions
-	opt.Prefix = prefix
-	opt.Reverse = opts.Reverse
-	// by default we iterate over the keys only
-	// and lazily load the values
-	opt.PrefetchValues = false
-	it := s.tx.NewIterator(opt)
-
-	return &Iterator{
-		ctx:         s.ctx,
-		storePrefix: s.prefix,
-		prefix:      prefix,
-		it:          it,
-		reverse:     opts.Reverse,
-		item:        Item{prefix: prefix},
-	}
-}
-
-type Iterator struct {
-	ctx         context.Context
-	transient   bool
-	prefix      []byte
-	storePrefix []byte
-	it          *badger.Iterator
-	reverse     bool
-	item        Item
-	err         error
-}
-
-func (it *Iterator) buildKey(pivot []byte) []byte {
-	if it.transient {
-		return pivot
-	}
-
-	return buildKey(it.storePrefix, pivot)
-}
-
-func (it *Iterator) Seek(pivot []byte) {
-	select {
-	case <-it.ctx.Done():
-		it.err = it.ctx.Err()
-		return
-	default:
-	}
-
-	var seek []byte
-
-	// if pivot is nil and reverse is true,
-	// seek the largest key by replacing 0
-	// by anything bigger, here 255
-	if len(pivot) == 0 && it.reverse {
-		seek = it.buildKey(pivot)
-		if len(seek) == 0 {
-			seek = []byte{255}
-		} else {
-			seek[len(seek)-1] = 255
 		}
-	} else {
-		seek = it.buildKey(pivot)
 	}
-
+	if s.tx.writable {
-	it.it.Seek(seek)
+		return s.tx.batch.NewIter(opts)
-}
+	} else {
-
+		return s.ng.DB.NewIter(opts)
-func (it *Iterator) Valid() bool {
+	}
-	return it.it.ValidForPrefix(it.prefix) && it.err == nil
-}
-
-func (it *Iterator) Next() {
-	it.it.Next()
-}
-
-func (it *Iterator) Err() error {
-	return it.err
-}
-
-func (it *Iterator) Item() *Item {
-	it.item.item = it.it.Item()
-
-	return &it.item
-}
-
-func (it *Iterator) Close() error {
-	it.it.Close()
-	return nil
-}
-
-type Item struct {
-	item   *badger.Item
-	prefix []byte
-}
-
-func (i *Item) Key() []byte {
-	return bytes.TrimPrefix(i.item.Key(), i.prefix)
-}
-
-func (i *Item) ValueCopy(buf []byte) ([]byte, error) {
-	return i.item.ValueCopy(buf)
 }
 
 // A TransientStore is an implementation of the *kv.Store interface.
 type TransientStore struct {
-	DB *badger.DB
+	DB    *pebble.DB
-	tx *badger.Txn
+	Path  string
-
+	batch *pebble.Batch
-	hasCommitted bool
-	commitCount  uint64
 }
 
 // Put stores a key value pair. If it already exists, it overrides it.
@@ -264,80 +201,39 @@ func (s *TransientStore) Put(k, v []byte) error {
 		return errors.New("cannot store empty value")
 	}
 
-	err := s.tx.Set(k, v)
+	if s.batch == nil {
-	if err != badger.ErrTxnTooBig {
+		s.batch = s.DB.NewIndexedBatch()
-		return err
 	}
 
-	// commit the transaction and start a new one
+	return s.batch.Set(k, v, nil)
-	err = s.tx.CommitAt(s.commitCount, func(e error) {})
-	if err != nil {
-		return err
-	}
-	s.hasCommitted = true
-
-	s.commitCount++
-
-	s.tx = s.DB.NewTransactionAt(s.commitCount, true)
-	return s.tx.Set(k, v)
 }
 
-// Get returns a value associated with the given key. If not found, returns ErrKeyNotFound.
+func (s *TransientStore) Iterator(opts *pebble.IterOptions) *pebble.Iterator {
-func (s *TransientStore) Get(k []byte) (*Item, error) {
+	return s.batch.NewIter(opts)
-	panic("not implemented")
-}
-
-// Delete a record by key. If not found, returns ErrKeyNotFound.
-func (s *TransientStore) Delete(k []byte) error {
-	panic("not implemented")
-}
-
-// Truncate deletes all the records of the store.
-func (s *TransientStore) Truncate() error {
-	panic("not implemented")
-}
-
-// Iterator uses a Badger iterator with default options.
-// Only one iterator is allowed per read-write transaction.
-func (s *TransientStore) Iterator(opts IteratorOptions) *Iterator {
-	opt := badger.DefaultIteratorOptions
-	opt.Reverse = opts.Reverse
-	opt.PrefetchValues = false
-
-	it := s.tx.NewIterator(opt)
-
-	return &Iterator{
-		transient: true,
-		ctx:       context.TODO(),
-		it:        it,
-		reverse:   opts.Reverse,
-		item:      Item{},
-	}
 }
 
 // Drop releases any resource (files, memory, etc.) used by a transient store.
 func (s *TransientStore) Drop(ctx context.Context) error {
+	if s.batch != nil {
+		_ = s.batch.Close()
+	}
+
 	_ = s.DB.Close()
 
-	err := os.RemoveAll(s.DB.Opts().Dir)
+	err := os.RemoveAll(s.Path)
 	if err != nil {
 		return err
 	}
 
-	s.tx = nil
+	s.batch = nil
 	s.DB = nil
 	return nil
 }
 
 // Reset resets the transient store to be reused.
 func (s *TransientStore) Reset() error {
-	if s.tx != nil {
+	if s.batch != nil {
-		s.tx.Discard()
+		s.batch.Reset()
 	}
-
-	s.commitCount = 1
-	s.hasCommitted = false
-	s.tx = s.DB.NewTransactionAt(1, true)
-
 	return nil
 }

internal/query/statement/reindex_test.go

@@ -73,7 +73,7 @@ func TestReIndex(t *testing.T) {
 				}
 
 				i := 0
-				err = idx.Tree.Iterate(nil, false, func(tree.Key, types.Value) error {
+				err = idx.Tree.IterateOnRange(nil, false, func(tree.Key, types.Value) error {
 					i++
 					return nil
 				})

internal/sql/parser/insert.go

@@ -3,6 +3,7 @@ package parser
 import (
 	"fmt"
 
+	"github.com/cockroachdb/errors"
 	"github.com/genjidb/genji/internal/database"
 	"github.com/genjidb/genji/internal/expr"
 	"github.com/genjidb/genji/internal/query/statement"
@@ -22,7 +23,7 @@ func (p *Parser) parseInsertStatement() (*statement.InsertStmt, error) {
 	// Parse table name
 	stmt.TableName, err = p.parseIdent()
 	if err != nil {
-		pErr := err.(*ParseError)
+		pErr := errors.UnwrapAll(err).(*ParseError)
 		pErr.Expected = []string{"table_name"}
 		return nil, pErr
 	}

internal/stream/docs.go

@@ -504,7 +504,7 @@ func (op *DocsTempTreeSortOperator) Iterate(in *environment.Environment, fn func
 	var newEnv environment.Environment
 	newEnv.SetOuter(in)
 
-	return tr.Iterate(nil, op.Desc, func(k tree.Key, v types.Value) error {
+	return tr.IterateOnRange(nil, op.Desc, func(k tree.Key, v types.Value) error {
 		kv, err := k.Decode()
 		if err != nil {
 			return err

internal/stream/docs_test.go

@@ -2,7 +2,6 @@ package stream_test
 
 import (
 	"encoding/json"
-	"fmt"
 	"testing"
 
 	"github.com/genjidb/genji/document"
@@ -356,14 +355,12 @@ func TestTempTreeSort(t *testing.T) {
 			err := s.Iterate(&env, func(env *environment.Environment) error {
 				d, ok := env.GetDocument()
 				require.True(t, ok)
-				fmt.Printf("%v\n", types.NewDocumentValue(d))
 
 				fb := document.NewFieldBuffer()
 				fb.Copy(d)
 				got = append(got, fb)
 				return nil
 			})
-			fmt.Println("-----")
 
 			if test.fails {
 				assert.Error(t, err)

internal/stream/stream.go

@@ -188,7 +188,7 @@ func (it *UnionOperator) Iterate(in *environment.Environment, fn func(out *envir
 	newEnv.SetOuter(in)
 
 	// iterate over the temporary index
-	return temp.Iterate(nil, false, func(key tree.Key, _ types.Value) error {
+	return temp.IterateOnRange(nil, false, func(key tree.Key, _ types.Value) error {
 		kv, err := key.Decode()
 		if err != nil {
 			return err

internal/testutil/db.go

@@ -4,7 +4,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/dgraph-io/badger/v3"
+	"github.com/cockroachdb/pebble"
+	"github.com/cockroachdb/pebble/vfs"
 	"github.com/genjidb/genji/internal/database"
 	"github.com/genjidb/genji/internal/database/catalogstore"
 	"github.com/genjidb/genji/internal/environment"
@@ -20,14 +21,9 @@ import (
 func NewEngine(t testing.TB) *kv.Engine {
 	t.Helper()
 
-	opts := badger.DefaultOptions("").WithLogger(nil).WithInMemory(true)
+	ng, err := kv.NewEngine("", &pebble.Options{FS: vfs.NewMem()})
-
-	ng, err := kv.NewEngine(opts)
 	assert.NoError(t, err)
 
-	t.Cleanup(func() {
-		ng.Close()
-	})
 	return ng
 }
 

internal/tree/key.go

@@ -2,6 +2,7 @@ package tree
 
 import (
 	"bytes"
+	"strings"
 
 	"github.com/cockroachdb/errors"
 	"github.com/genjidb/genji/document"
@@ -75,3 +76,16 @@ func (a Keys) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
 func (a Keys) Less(i, j int) bool {
 	return bytes.Compare(a[i], a[j]) < 0
 }
+
+func (a Keys) String() string {
+	var buf strings.Builder
+
+	for i, k := range a {
+		if i > 0 {
+			buf.WriteByte(',')
+		}
+		buf.WriteString(k.String())
+	}
+
+	return buf.String()
+}

internal/tree/tree.go

@@ -3,7 +3,7 @@ package tree
 import (
 	"bytes"
 
-	"github.com/cockroachdb/errors"
+	"github.com/cockroachdb/pebble"
 	"github.com/genjidb/genji/internal/kv"
 	"github.com/genjidb/genji/types"
 	"github.com/genjidb/genji/types/encoding"
@@ -69,12 +69,12 @@ func (t *Tree) Get(key Key) (types.Value, error) {
 	}
 
 	var v Value
-	item, err := t.Store.Get(key)
+	vv, err := t.Store.Get(key)
 	if err != nil {
 		return nil, err
 	}
 
-	v.item = item
+	v.encoded = vv
 
 	return &v, nil
 }
@@ -98,50 +98,6 @@ func (t *Tree) Truncate() error {
 	return t.Store.Truncate()
 }
 
-// Iterate over the tree.
-// If the pivot is nil and reverse is false, it iterates from the lowest key onwards.
-// If the pivot is nil and reverse if true, it iterates from the highest key downwards.
-// If the pivot is not nil, it seeks that key in the tree before iterating over
-// anything equal, and higher or lower depending on if reverse is false or true.
-func (t *Tree) Iterate(pivot Key, reverse bool, fn func(Key, types.Value) error) error {
-	var seek []byte
-
-	if pivot != nil {
-		seek = pivot
-		if reverse {
-			seek = append(seek, encoding.ArrayValueDelim, 0xFF)
-		}
-	}
-
-	return t.iterateRaw(seek, reverse, fn)
-}
-
-func (t *Tree) iterateRaw(seek []byte, reverse bool, fn func(Key, types.Value) error) error {
-	var it *kv.Iterator
-
-	if t.TransientStore != nil {
-		it = t.TransientStore.Iterator(kv.IteratorOptions{Reverse: reverse})
-	} else {
-		it = t.Store.Iterator(kv.IteratorOptions{Reverse: reverse})
-	}
-	defer it.Close()
-
-	var value Value
-
-	for it.Seek(seek); it.Valid(); it.Next() {
-		i := it.Item()
-		value.item = i
-		value.v = nil
-
-		err := fn(i.Key(), &value)
-		if err != nil {
-			return err
-		}
-	}
-
-	return it.Err()
-}
-
 // IterateOnRange iterates on all keys that are in the given range.
 // Depending on the direction, the range is translated to the following table:
 // | SQL   | Range            | Direction | Seek    | End     |
@@ -157,71 +113,120 @@ func (t *Tree) iterateRaw(seek []byte, reverse bool, fn func(Key, types.Value) e
 // | < 10  | Max: 10, Excl    | DESC      | 10      | nil     |
 // | <= 10 | Max: 10          | DESC      | 10+0xFF | nil     |
 func (t *Tree) IterateOnRange(rng *Range, reverse bool, fn func(Key, types.Value) error) error {
-	var err error
-
 	var start, end []byte
 
-	if rng != nil {
+	if rng == nil {
+		rng = &Range{}
+	}
+
+	if !rng.Exclusive {
+		if rng.Min == nil {
+			start = t.buildFirstKey()
+		} else {
+			start = t.buildStartKeyInclusive(rng.Min)
+		}
+		if rng.Max == nil {
+			end = t.buildLastKey()
+		} else {
+			end = t.buildEndKeyInclusive(rng.Max)
+		}
+	} else {
+		if rng.Min == nil {
+			start = t.buildFirstKey()
+		} else {
+			start = t.buildStartKeyExclusive(rng.Min)
+		}
+		if rng.Max == nil {
+			end = t.buildLastKey()
+		} else {
+			end = t.buildEndKeyExclusive(rng.Max)
+		}
+	}
+
+	var it *pebble.Iterator
+	opts := pebble.IterOptions{
+		LowerBound: start,
+		UpperBound: end,
+	}
+	if t.TransientStore != nil {
+		it = t.TransientStore.Iterator(&opts)
+	} else {
+		it = t.Store.Iterator(&opts)
+	}
+	defer it.Close()
+
+	if !reverse {
+		it.First()
+	} else {
+		it.Last()
+	}
+
+	var value Value
+
+	for it.Valid() {
+		value.encoded = it.Value()
+		value.v = nil
+
+		err := fn(bytes.TrimPrefix(it.Key(), t.buildKey(nil)), &value)
+		if err != nil {
+			return err
+		}
+
 		if !reverse {
-			start = rng.Min
+			it.Next()
-			if start != nil && rng.Exclusive {
-				start = append(start, encoding.ArrayValueDelim, 0xFF)
-			}
-			end = rng.Max
 		} else {
-			start = rng.Max
+			it.Prev()
-			if start != nil && !rng.Exclusive {
-				start = append(start, encoding.ArrayValueDelim, 0xFF)
-			}
-			end = rng.Min
 		}
 	}
 
-	if end == nil {
+	return it.Error()
-		return t.iterateRaw(start, reverse, fn)
-	}
-
-	err = t.iterateRaw(start, reverse, func(k Key, v types.Value) error {
-		cmpWith := k
-
-		if len(cmpWith) > len(end) {
-			cmpWith = cmpWith[:len(end)]
-		}
-
-		cmp := bytes.Compare(cmpWith, end)
-		if rng.Exclusive {
-			if !reverse && cmp >= 0 {
-				return errStop
-			}
-			if reverse && cmp <= 0 {
-				return errStop
-			}
-		} else {
-			if !reverse && cmp > 0 {
-				return errStop
-			}
-			if reverse && cmp < 0 {
-				return errStop
-			}
-		}
-
-		return fn(k, v)
-	})
-	if err == errStop {
-		err = nil
-	}
-
-	return err
 }
 
-var errStop = errors.New("stop")
+func (t *Tree) buildKey(key Key) []byte {
+	if t.Store != nil {
+		return kv.BuildKey(t.Store.Prefix, key)
+	}
+
+	return key
+}
+
+func (t *Tree) buildFirstKey() []byte {
+	return t.buildKey(nil)
+}
+
+func (t *Tree) buildLastKey() []byte {
+	k := t.buildKey(nil)
+	if len(k) == 0 {
+		return []byte{0xFF}
+	}
+
+	k[len(k)-1] = 0xff
+	return k
+}
+
+func (t *Tree) buildStartKeyInclusive(key []byte) []byte {
+	return t.buildKey(key)
+}
+
+func (t *Tree) buildStartKeyExclusive(key []byte) []byte {
+	return append(t.buildKey(key), encoding.ArrayValueDelim, 0xFF)
+}
+
+func (t *Tree) buildEndKeyInclusive(key []byte) []byte {
+	k := t.buildKey(key)
+	k = append(k, encoding.ArrayValueDelim, 0xFF)
+	return k
+}
+
+func (t *Tree) buildEndKeyExclusive(key []byte) []byte {
+	return t.buildKey(key)
+}
 
 // Value is an implementation of the types.Value interface returned by Tree.
 // It is used to lazily decode values from the underlying store.
 type Value struct {
-	item *kv.Item
+	encoded []byte
-	v    types.Value
+	v       types.Value
-	buf  []byte
 }
 
 func (v *Value) decode() {
@@ -230,12 +235,7 @@ func (v *Value) decode() {
 	}
 
 	var err error
-	v.buf, err = v.item.ValueCopy(v.buf)
+	v.v, err = encoding.DecodeValue(v.encoded)
-	if err != nil {
-		panic(err)
-	}
-
-	v.v, err = encoding.DecodeValue(v.buf)
 	if err != nil {
 		panic(err)
 	}

internal/tree/tree_test.go

@@ -162,7 +162,13 @@ func TestTreeIterate(t *testing.T) {
 
 			var keys []tree.Key
 
-			err := tt.Iterate(test.pivot, test.reverse, func(k tree.Key, v types.Value) error {
+			var rng tree.Range
+			if !test.reverse {
+				rng.Min = test.pivot
+			} else {
+				rng.Max = test.pivot
+			}
+			err := tt.IterateOnRange(&rng, test.reverse, func(k tree.Key, v types.Value) error {
 				keys = append(keys, append([]byte{}, k...))
 				return nil
 			})
@@ -220,7 +226,7 @@ func TestTreeIterateOnRange(t *testing.T) {
 		name    string
 		rng     *tree.Range
 		reverse bool
-		keys    []tree.Key
+		keys    tree.Keys
 	}{
 		{"asc/nil-range", nil, false, keys},
 		{"asc/empty-range", &tree.Range{}, false, keys},
@@ -275,7 +281,7 @@ func TestTreeIterateOnRange(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
 			tt := buildTree()
 
-			var keys []tree.Key
+			var keys tree.Keys
 
 			err := tt.IterateOnRange(test.rng, test.reverse, func(k tree.Key, v types.Value) error {
 				keys = append(keys, append([]byte{}, k...))