Another global source code improvement

filter/filters.go

@@ -35,7 +35,7 @@ func (Any) ValuesRange() *Range {
 }
 
 // EQ is a shorthand for Equal.
-func EQ(v values.Value) SortableFilter {
+func EQ(v values.Value) Equal {
 	return Equal{Value: v}
 }
 

kv/bbolt/bolt.go

@@ -17,6 +17,7 @@ package bbolt
 import (
 	"bytes"
 	"context"
+	"errors"
 	"time"
 
 	bolt "go.etcd.io/bbolt"
@@ -165,7 +166,7 @@ func (tx *Tx) Put(k kv.Key, v kv.Value) error {
 		return nil // bucket creation, no need to put value
 	}
 	err = b.Put(k[0], v)
-	if err == bolt.ErrTxNotWritable {
+	if errors.Is(err, bolt.ErrTxNotWritable) {
 		err = kv.ErrReadOnly
 	}
 	return err
@@ -177,8 +178,8 @@ func (tx *Tx) Del(k kv.Key) error {
 		return nil
 	}
 	err := b.Delete(k[0])
-	if err == bolt.ErrTxNotWritable {
-		err = kv.ErrReadOnly
+	if errors.Is(err, bolt.ErrTxNotWritable) {
+		return kv.ErrReadOnly
 	}
 	return err
 }

kv/bbolt/bolt_test.go

@@ -1,16 +1,17 @@
-package bbolt
+package bbolt_test
 
 import (
 	"path/filepath"
 	"testing"
 
 	"github.com/hidal-go/hidalgo/kv"
+	"github.com/hidal-go/hidalgo/kv/bbolt"
 	"github.com/hidal-go/hidalgo/kv/kvtest"
 )
 
 func TestBBolt(t *testing.T) {
 	kvtest.RunTestLocal(t, func(path string) (kv.KV, error) {
 		path = filepath.Join(path, "bbolt.db")
-		return OpenPath(path)
+		return bbolt.OpenPath(path)
 	}, nil)
 }

kv/bolt/bolt.go

@@ -17,6 +17,7 @@ package bolt
 import (
 	"bytes"
 	"context"
+	"errors"
 	"time"
 
 	"github.com/boltdb/bolt"
@@ -165,7 +166,7 @@ func (tx *Tx) Put(k kv.Key, v kv.Value) error {
 		return nil // bucket creation, no need to put value
 	}
 	err = b.Put(k[0], v)
-	if err == bolt.ErrTxNotWritable {
+	if errors.Is(err, bolt.ErrTxNotWritable) {
 		err = kv.ErrReadOnly
 	}
 	return err
@@ -177,7 +178,7 @@ func (tx *Tx) Del(k kv.Key) error {
 		return nil
 	}
 	err := b.Delete(k[0])
-	if err == bolt.ErrTxNotWritable {
+	if errors.Is(err, bolt.ErrTxNotWritable) {
 		err = kv.ErrReadOnly
 	}
 	return err

kv/bolt/bolt_test.go

@@ -1,16 +1,17 @@
-package bolt
+package bolt_test
 
 import (
 	"path/filepath"
 	"testing"
 
 	"github.com/hidal-go/hidalgo/kv"
+	"github.com/hidal-go/hidalgo/kv/bolt"
 	"github.com/hidal-go/hidalgo/kv/kvtest"
 )
 
 func TestBolt(t *testing.T) {
 	kvtest.RunTestLocal(t, func(path string) (kv.KV, error) {
 		path = filepath.Join(path, "bolt.db")
-		return OpenPath(path)
+		return bolt.OpenPath(path)
 	}, nil)
 }

kv/flat/badger/badger.go

@@ -2,6 +2,7 @@ package badger
 
 import (
 	"context"
+	"errors"
 
 	"github.com/dgraph-io/badger/v2"
 
@@ -85,7 +86,7 @@ type Tx struct {
 
 func (tx *Tx) Commit(ctx context.Context) error {
 	err := tx.tx.Commit()
-	if err == badger.ErrConflict {
+	if errors.Is(err, badger.ErrConflict) {
 		err = flat.ErrConflict
 	}
 	return err
@@ -101,7 +102,7 @@ func (tx *Tx) Get(ctx context.Context, key flat.Key) (flat.Value, error) {
 		return nil, flat.ErrNotFound
 	}
 	item, err := tx.tx.Get(key)
-	if err == badger.ErrKeyNotFound {
+	if errors.Is(err, badger.ErrKeyNotFound) {
 		return nil, flat.ErrNotFound
 	} else if err != nil {
 		return nil, err
@@ -115,15 +116,15 @@ func (tx *Tx) GetBatch(ctx context.Context, keys []flat.Key) ([]flat.Value, erro
 
 func (tx *Tx) Put(k flat.Key, v flat.Value) error {
 	err := tx.tx.Set(k, v)
-	if err == badger.ErrConflict {
+	if errors.Is(err, badger.ErrConflict) {
 		err = flat.ErrConflict
 	}
 	return err
 }
 
 func (tx *Tx) Del(k flat.Key) error {
 	err := tx.tx.Delete(k)
-	if err == badger.ErrConflict {
+	if errors.Is(err, badger.ErrConflict) {
 		err = flat.ErrConflict
 	}
 	return err
@@ -142,11 +143,11 @@ var (
 )
 
 type Iterator struct {
+	err   error
 	it    *badger.Iterator
 	pref  flat.Key
 	first bool
 	valid bool
-	err   error
 }
 
 func (it *Iterator) Reset() {

kv/flat/badger/badger_test.go

@@ -1,12 +1,13 @@
-package badger
+package badger_test
 
 import (
 	"testing"
 
 	"github.com/hidal-go/hidalgo/kv/flat"
+	"github.com/hidal-go/hidalgo/kv/flat/badger"
 	"github.com/hidal-go/hidalgo/kv/kvtest"
 )
 
 func TestBadger(t *testing.T) {
-	kvtest.RunTestLocal(t, flat.UpgradeOpenPath(OpenPath), nil)
+	kvtest.RunTestLocal(t, flat.UpgradeOpenPath(badger.OpenPath), nil)
 }

kv/flat/btree/btree.go

@@ -17,6 +17,7 @@ package btree
 import (
 	"bytes"
 	"context"
+	"errors"
 	"io"
 
 	"github.com/hidal-go/hidalgo/base"
@@ -152,7 +153,7 @@ func (it *Iterator) WithPrefix(pref flat.Key) flat.Iterator {
 
 func (it *Iterator) next() bool {
 	k, v, err := it.e.Next()
-	if err == io.EOF {
+	if errors.Is(err, io.EOF) {
 		return false
 	} else if !bytes.HasPrefix(k, it.pref) {
 		return false

kv/flat/btree/btree_test.go

@@ -1,15 +1,16 @@
-package btree
+package btree_test
 
 import (
 	"testing"
 
 	"github.com/hidal-go/hidalgo/kv"
 	"github.com/hidal-go/hidalgo/kv/flat"
+	"github.com/hidal-go/hidalgo/kv/flat/btree"
 	"github.com/hidal-go/hidalgo/kv/kvtest"
 )
 
 func TestBtree(t *testing.T) {
-	kvtest.RunTest(t, func(t testing.TB) kv.KV {
-		return flat.Upgrade(New())
+	kvtest.RunTest(t, func(tb testing.TB) kv.KV {
+		return flat.Upgrade(btree.New())
 	}, nil)
 }