Merge branch 'main' into release/v1.0.1

.golangci.yml

@@ -81,12 +81,14 @@ linters-settings:
  - $gostd
  - github.com/cockroachdb/pebble
  - github.com/google/btree
+ - github.com/syndtr/goleveldb/leveldb
  test:
  files:
  - "$test"
  allow:
  - $gostd
  - github.com/stretchr/testify
+ - github.com/syndtr/goleveldb/leveldb/opt
 
  revive:
  enable-all-rules: true

Makefile

@@ -15,15 +15,9 @@ all: lint test
 #? test: Run pure Go tests only
 test:
  @echo "--> Running go test"
- @go test $(PACKAGES) -tags goleveldb,boltdb,badgerdb
+ @go test $(PACKAGES) -tags boltdb,badgerdb
 .PHONY: test
 
-#? test-goleveldb: Run goleveldb tests
-test-goleveldb:
- @echo "--> Running go test"
- @go test $(PACKAGES) -tags goleveldb -v
-.PHONY: test-goleveldb
-
 #? test-cleveldb: Run cleveldb tests
 test-cleveldb:
  @echo "--> Running go test"
@@ -62,7 +56,7 @@ test-all-with-coverage:
  -race \
  -coverprofile=coverage.txt \
  -covermode=atomic \
- -tags=goleveldb,cleveldb,boltdb,rocksdb,badgerdb\
+ -tags=cleveldb,boltdb,rocksdb,badgerdb\
  -v
 .PHONY: test-all-with-coverage
 

db.go

@@ -14,7 +14,6 @@ const (
  // - UNMAINTANED
  // - pure go
  // - stable
- // - use goleveldb build tag (go build -tags goleveldb)
  GoLevelDBBackend BackendType = "goleveldb"
  // CLevelDBBackend represents cleveldb (uses levigo wrapper)
  // - DEPRECATED

goleveldb.go

@@ -1,6 +1,3 @@
-//go:build goleveldb
-// +build goleveldb
-
 package db
 
 import (
@@ -31,7 +28,7 @@ func NewGoLevelDB(name string, dir string) (*GoLevelDB, error) {
 }
 
 func NewGoLevelDBWithOpts(name string, dir string, o *opt.Options) (*GoLevelDB, error) {
- dbPath := filepath.Join(dir, name+".db") //nolint:goconst
+ dbPath := filepath.Join(dir, name+".db")
  db, err := leveldb.OpenFile(dbPath, o)
  if err != nil {
  return nil, err
@@ -129,10 +126,7 @@ func (db *GoLevelDB) DB() *leveldb.DB {
 
 // Close implements DB.
 func (db *GoLevelDB) Close() error {
- if err := db.db.Close(); err != nil {
- return err
- }
- return nil
+ return db.db.Close()
 }
 
 // Print implements DB.
@@ -198,7 +192,7 @@ func (db *GoLevelDB) ReverseIterator(start, end []byte) (Iterator, error) {
  return newGoLevelDBIterator(itr, start, end, true), nil
 }
 
-// Compact range
+// Compact range.
 func (db *GoLevelDB) Compact(start, end []byte) error {
  return db.db.CompactRange(util.Range{Start: start, Limit: end})
 }

goleveldb_batch.go

@@ -1,6 +1,3 @@
-//go:build goleveldb
-// +build goleveldb
-
 package db
 
 import (

goleveldb_iterator.go

@@ -1,6 +1,3 @@
-//go:build goleveldb
-// +build goleveldb
-
 package db
 
 import (

goleveldb_test.go

@@ -1,6 +1,3 @@
-//go:build goleveldb
-// +build goleveldb
-
 package db
 
 import (