Lint fixes (#192)

* added errorlint

* added all linters

---------

Co-authored-by: JkLondon <ilya@mikheev.fun>

Author: JkLondon

.golangci.yml

@@ -22,14 +22,14 @@ linters:
     - unconvert
     - wastedassign
     - zerologlint
+    - errorlint
+    - noctx
+    - nilerr
+    - unused
+    - makezero
+    - perfsprint
+    - gocritic
   disable:
-    - errorlint #TODO: enable me
-    - noctx #TODO: enable me
-    - nilerr #TODO: enable me
-    - unused #TODO: enable me
-    - makezero #TODO: enable me
-    - perfsprint #TODO: enable me
-    - gocritic #TODO: enable me
     - contextcheck
     - err113
     - errchkjson

exp/mdbxpool/txnpool.go

@@ -1,7 +1,7 @@
 package mdbxpool
 
 import (
-	"fmt"
+	"errors"
 	"log"
 	"sync"
 	"sync/atomic"
@@ -90,7 +90,7 @@ func (p *TxnPool) BeginTxn(flags uint) (*mdbx.Txn, error) {
 	// instead of masking flags with mdbx.Readonly an equality comparison
 	// is necessary.
 	if flags != mdbx.Readonly {
-		return nil, fmt.Errorf("flag mdbx.Readonly not provided")
+		return nil, errors.New("flag mdbx.Readonly not provided")
 	}
 
 	return p.beginReadonly()

mdbx/cursor.go

@@ -7,7 +7,7 @@ package mdbx
 */
 import "C"
 import (
-	"fmt"
+	"errors"
 	"sync"
 	"unsafe"
 )
@@ -66,6 +66,7 @@ type Cursor struct {
 	_c  *C.MDBX_cursor
 }
 
+//nolint:gocritic // reason: false positive on dupSubExpr
 func openCursor(txn *Txn, db DBI) (*Cursor, error) {
 	c := &Cursor{txn: txn}
 	ret := C.mdbx_cursor_open(txn._txn, C.MDBX_dbi(db), &c._c)
@@ -176,10 +177,8 @@ func (c *Cursor) Get(setkey, setval []byte, op uint) (key, val []byte, err error
 	// (panic or potentially garbage memory reference).
 	if op == Set {
 		key = setkey
-	} else {
-		if op != LastDup && op != FirstDup {
-			key = castToBytes(&c.txn.key)
-		}
+	} else if op != LastDup && op != FirstDup {
+		key = castToBytes(&c.txn.key)
 	}
 	val = castToBytes(&c.txn.val)
 
@@ -194,6 +193,8 @@ func (c *Cursor) Get(setkey, setval []byte, op uint) (key, val []byte, err error
 // data for reference (Next, First, Last, etc).
 //
 // See mdb_cursor_get.
+//
+//nolint:gocritic // false positive on dupSubExpr
 func (c *Cursor) getValEmpty(op uint) error {
 	ret := C.mdbx_cursor_get(c._c, &c.txn.key, &c.txn.val, C.MDBX_cursor_op(op))
 	return operrno("mdbx_cursor_get", ret)
@@ -203,6 +204,8 @@ func (c *Cursor) getValEmpty(op uint) error {
 // reference (GetBoth, GetBothRange, etc).
 //
 // See mdb_cursor_get.
+//
+//nolint:gocritic // false positive on dupSubExpr
 func (c *Cursor) getVal(setkey, setval []byte, op uint) error {
 	var k, v *C.char
 	if len(setkey) > 0 {
@@ -244,6 +247,8 @@ func (c *Cursor) Put(key, val []byte, flags uint) error {
 // PutReserve returns a []byte of length n that can be written to, potentially
 // avoiding a memcopy.  The returned byte slice is only valid in txn's thread,
 // before it has terminated.
+//
+//nolint:gocritic // false positive on dupSubExpr
 func (c *Cursor) PutReserve(key []byte, n int, flags uint) ([]byte, error) {
 	var k *C.char
 	if len(key) > 0 {
@@ -322,7 +327,7 @@ func CursorToPool(c *Cursor)  { cursorPool.Put(c) }
 func CreateCursor() *Cursor {
 	c := &Cursor{_c: C.mdbx_cursor_create(nil)}
 	if c._c == nil {
-		panic(fmt.Errorf("mdbx.CreateCursor: OOM"))
+		panic(errors.New("mdbx.CreateCursor: OOM"))
 	}
 	return c
 }

mdbx/cursor_test.go

@@ -566,7 +566,7 @@ func TestCursor_Get_reverse(t *testing.T) {
 	}
 }
 
-//func TestCursor_PutMulti(t *testing.T) {
+// func TestCursor_PutMulti(t *testing.T) {
 //	env := setup(t)
 //
 //
@@ -688,7 +688,7 @@ func TestCursor_Del(t *testing.T) {
 
 		k, v, err = cur.Get(nil, nil, Next)
 		if err != nil {
-			return fmt.Errorf("post-delete: %v", err)
+			return fmt.Errorf("post-delete: %w", err)
 		}
 		item = items[2]
 		if !bytes.Equal(k, []byte(item.k)) {
@@ -786,10 +786,10 @@ func TestDupCursor_EmptyKeyValues1(t *testing.T) {
 			panic("nil")
 		}
 		if !bytes.Equal(k, []byte{1}) {
-			panic(fmt.Sprintf("%x", k))
+			panic(hex.EncodeToString(k))
 		}
 		if !bytes.Equal(v, []byte{}) {
-			panic(fmt.Sprintf("%x", v))
+			panic(hex.EncodeToString(k))
 		}
 		k, _, err = cur.Get([]byte{}, nil, Set)
 		if err == nil {
@@ -861,10 +861,10 @@ func TestDupCursor_EmptyKeyValues2(t *testing.T) {
 			panic("nil")
 		}
 		if !bytes.Equal(k, []byte{1}) {
-			panic(fmt.Sprintf("%x", k))
+			panic(hex.EncodeToString(k))
 		}
 		if !bytes.Equal(v, []byte{}) {
-			panic(fmt.Sprintf("%x", v))
+			panic(hex.EncodeToString(k))
 		}
 		k, _, err = cur.Get([]byte{}, nil, Set)
 		if err == nil {
@@ -965,10 +965,10 @@ func TestDupCursor_EmptyKeyValues3(t *testing.T) {
 			panic("nil")
 		}
 		if !bytes.Equal(k, []byte{1}) {
-			panic(fmt.Sprintf("%x", k))
+			panic(hex.EncodeToString(k))
 		}
 		if !bytes.Equal(v, []byte{}) {
-			panic(fmt.Sprintf("%x", v))
+			panic(hex.EncodeToString(k))
 		}
 		k, _, err = cur.Get([]byte{}, nil, Set)
 		if err == nil {
@@ -1078,10 +1078,10 @@ func TestDupCursor_EmptyKeyValues(t *testing.T) {
 			panic("nil")
 		}
 		if !bytes.Equal(k, []byte{1}) {
-			panic(fmt.Sprintf("%x", k))
+			panic(hex.EncodeToString(v))
 		}
 		if !bytes.Equal(v, []byte{}) {
-			panic(fmt.Sprintf("%x", v))
+			panic(hex.EncodeToString(v))
 		}
 		k, _, err = cur.Get([]byte{}, nil, Set)
 		if err == nil {
@@ -1253,21 +1253,13 @@ func TestCursor_Del_DupSort(t *testing.T) {
 			panic(err)
 		}
 
-		//numdup, err = cur.Count()
-		//if err != nil {
-		//	return err
-		//}
-		//
-		//if numdup != 1 {
-		//	t.Errorf("unexpected count: %d != %d", numdup, 2)
-		//}
 		kk, vv, err := cur.Get(nil, nil, NextDup)
 		if err != nil {
 			panic(err)
 		}
 		_, _ = kk, vv //TODO: add assert
-		//fmt.Printf("kk: %s\n", kk)
-		//fmt.Printf("vv: %s\n", vv)
+		// fmt.Printf("kk: %s\n", kk)
+		// fmt.Printf("vv: %s\n", vv)
 
 		return nil
 	})

mdbx/env.go

@@ -31,7 +31,7 @@ const (
 
 	EnvDefaults = C.MDBX_ENV_DEFAULTS
 	LifoReclaim = C.MDBX_LIFORECLAIM
-	//FixedMap    = C.MDBX_FIXEDMAP   // Danger zone. Map memory at a fixed address.
+	// FixedMap    = C.MDBX_FIXEDMAP   // Danger zone. Map memory at a fixed address.
 	NoSubdir = C.MDBX_NOSUBDIR // Argument to Open is a file, not a directory.
 	Accede   = C.MDBX_ACCEDE
 	// Deprecated: always turned on since v0.12, deprecated since v0.13
@@ -45,7 +45,7 @@ const (
 	// Deprecated: use NoStickyThreads instead because now they're sharing the same functionality
 	NoTLS           = C.MDBX_NOTLS           // Danger zone. When unset reader locktable slots are tied to their thread.
 	NoStickyThreads = C.MDBX_NOSTICKYTHREADS // Danger zone. Like MDBX_NOTLS. But also allow move RwTx between threads. Still require to call Begin/Rollback in same thread.
-	//NoLock      = C.MDBX_NOLOCK     // Danger zone. MDBX does not use any locks.
+	// NoLock      = C.MDBX_NOLOCK     // Danger zone. MDBX does not use any locks.
 	NoReadahead = C.MDBX_NORDAHEAD // Disable readahead. Requires OS support.
 	NoMemInit   = C.MDBX_NOMEMINIT // Disable MDBX memory initialization.
 	Exclusive   = C.MDBX_EXCLUSIVE // Disable MDBX memory initialization.
@@ -145,6 +145,8 @@ type Env struct {
 // NewEnv allocates and initializes a new Env.
 //
 // See mdbx_env_create.
+//
+//nolint:gocritic // false positive on dupSubExpr
 func NewEnv(label Label) (*Env, error) {
 	env := &Env{label: label}
 	ret := C.mdbx_env_create(&env._env)
@@ -206,7 +208,7 @@ func (env *Env) FD() (uintptr, error) {
 // line.
 //
 // See mdbx_reader_list.
-//func (env *Env) ReaderList(fn func(string) error) error {
+// func (env *Env) ReaderList(fn func(string) error) error {
 //	ctx, done := newMsgFunc(fn)
 //	defer done()
 //	if fn == nil {
@@ -254,23 +256,23 @@ func (env *Env) Close() {
 // CopyFD copies env to the the file descriptor fd.
 //
 // See mdbx_env_copyfd.
-//func (env *Env) CopyFD(fd uintptr) error {
+// func (env *Env) CopyFD(fd uintptr) error {
 //	ret := C.mdbx_env_copyfd(env._env, C.mdbx_filehandle_t(fd))
 //	return operrno("mdbx_env_copyfd", ret)
 //}
 
 // CopyFDFlag copies env to the file descriptor fd, with options.
 //
 // See mdbx_env_copyfd2.
-//func (env *Env) CopyFDFlag(fd uintptr, flags uint) error {
+// func (env *Env) CopyFDFlag(fd uintptr, flags uint) error {
 //	ret := C.mdbx_env_copyfd2(env._env, C.mdbx_filehandle_t(fd), C.uint(flags))
 //	return operrno("mdbx_env_copyfd2", ret)
 //}
 
 // Copy copies the data in env to an environment at path.
 //
 // See mdbx_env_copy.
-//func (env *Env) Copy(path string) error {
+// func (env *Env) Copy(path string) error {
 //	cpath := C.CString(path)
 //	defer C.free(unsafe.Pointer(cpath))
 //	ret := C.mdbx_env_copy(env._env, cpath)
@@ -280,7 +282,7 @@ func (env *Env) Close() {
 // CopyFlag copies the data in env to an environment at path created with flags.
 //
 // See mdbx_env_copy2.
-//func (env *Env) CopyFlag(path string, flags uint) error {
+// func (env *Env) CopyFlag(path string, flags uint) error {
 //	cpath := C.CString(path)
 //	defer C.free(unsafe.Pointer(cpath))
 //	ret := C.mdbx_env_copy2(env._env, cpath, C.uint(flags))

mdbx/env_not_win.go

@@ -13,7 +13,7 @@ import "C"
 // if env.Open() was not previously called.
 //
 // See mdbx_env_get_path.
-//func (env *Env) Path() (string, error) {
+// func (env *Env) Path() (string, error) {
 //	var cpath *C.char
 //	ret := C.mdbx_env_get_path(env._env, &cpath)
 //	if ret != success {