refactor: fix lint errors

Author: nalgeon

.github/workflows/build.yml

@@ -41,9 +41,13 @@ jobs:
                   sudo apt-get install -y libsqlite3-dev
                   go get .
 
+            - name: Install linter
+              uses: golangci/golangci-lint-action@v8
+
             - name: Build and test
               run: |
                   make build
+                  make vet lint
                   make test-sqlite
                   make test-postgres
 

Makefile

@@ -1,4 +1,4 @@
-.PHONY: setup lint vet test build run
+.PHONY: build
 
 has_git := $(shell command -v git 2>/dev/null)
 
@@ -21,7 +21,7 @@ setup:
 	@go mod download
 
 lint:
-	@golangci-lint run --print-issued-lines=false --out-format=colored-line-number ./...
+	@golangci-lint run ./...
 
 vet:
 	@go vet ./...

cmd/cli/main.go

@@ -17,7 +17,7 @@ const dbURI = "file:/data.db?vfs=memdb"
 
 func init() {
 	flag.Usage = func() {
-		fmt.Fprintf(flag.CommandLine.Output(), "Usage: redka-cli <filename>\n")
+		_, _ = fmt.Fprintf(flag.CommandLine.Output(), "Usage: redka-cli <filename>\n")
 		flag.PrintDefaults()
 	}
 }

internal/rhash/tx.go

@@ -92,7 +92,7 @@ func (tx *Tx) Fields(key string) ([]string, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer rows.Close()
+	defer func() { _ = rows.Close() }()
 
 	// Build a slice of hash fields.
 	fields := []string{}
@@ -140,7 +140,7 @@ func (tx *Tx) GetMany(key string, fields ...string) (map[string]core.Value, erro
 	if err != nil {
 		return nil, err
 	}
-	defer rows.Close()
+	defer func() { _ = rows.Close() }()
 
 	// Fill the map with the values for existing fields.
 	items := map[string]core.Value{}
@@ -226,7 +226,7 @@ func (tx *Tx) Items(key string) (map[string]core.Value, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer rows.Close()
+	defer func() { _ = rows.Close() }()
 
 	// Build a map of hash fields and their values.
 	items := map[string]core.Value{}
@@ -389,7 +389,7 @@ func (tx *Tx) Values(key string) ([]core.Value, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer rows.Close()
+	defer func() { _ = rows.Close() }()
 
 	// Build a slice of hash values.
 	vals := []core.Value{}

internal/rkey/tx.go

@@ -271,10 +271,7 @@ func (tx *Tx) Scan(cursor int, pattern string, ktype core.TypeID, count int) (Sc
 		count = scanPageSize
 	}
 	query := tx.sql.scan
-	ktypeGuard := false
-	if ktype == core.TypeAny {
-		ktypeGuard = true
-	}
+	ktypeGuard := ktype == core.TypeAny
 	pattern = tx.dialect.GlobToLike(pattern)
 	args := []any{
 		cursor,

internal/rlist/tx.go

@@ -201,7 +201,7 @@ func (tx *Tx) Range(key string, start, stop int) ([]core.Value, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer rows.Close()
+	defer func() { _ = rows.Close() }()
 
 	var values []core.Value
 	for rows.Next() {

internal/rstring/tx.go

@@ -53,7 +53,7 @@ func (tx *Tx) GetMany(keys ...string) (map[string]core.Value, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer rows.Close()
+	defer func() { _ = rows.Close() }()
 
 	// Fill the map with the values for existing keys.
 	items := map[string]core.Value{}

internal/rzset/range.go

@@ -98,7 +98,7 @@ func (c RangeCmd) rangeRank() ([]SetItem, error) {
 	// Change sort direction if necessary.
 	query := c.tx.sql.rangeRank
 	if c.sortDir != sqlx.Asc {
-		query = strings.Replace(query, sqlx.Asc, c.sortDir, -1)
+		query = strings.ReplaceAll(query, sqlx.Asc, c.sortDir)
 	}
 
 	// Prepare query arguments.
@@ -137,7 +137,7 @@ func (c RangeCmd) rangeScore() ([]SetItem, error) {
 	// Change sort direction if necessary.
 	query := c.tx.sql.rangeScore
 	if c.sortDir != sqlx.Asc {
-		query = strings.Replace(query, sqlx.Asc, c.sortDir, -1)
+		query = strings.ReplaceAll(query, sqlx.Asc, c.sortDir)
 	}
 
 	// Prepare query arguments.

internal/sqlx/sql.go

@@ -63,7 +63,7 @@ func Select[T any](db Tx, query string, args []any,
 	if err != nil {
 		return nil, err
 	}
-	defer rows.Close()
+	defer func() { _ = rows.Close() }()
 
 	var vals []T
 	for rows.Next() {

redka_test.go

@@ -20,7 +20,7 @@ func ExampleOpen() {
 	if err != nil {
 		panic(err)
 	}
-	defer db.Close()
+	defer func() { _ = db.Close() }()
 	// ...
 }
 
@@ -31,7 +31,7 @@ func ExampleOpenRead() {
 		panic(err)
 	}
 	_ = db.Str().Set("name", "alice")
-	db.Close()
+	_ = db.Close()
 
 	// open a read-only database
 	db, err = redka.OpenRead("redka.db", nil)
@@ -45,7 +45,7 @@ func ExampleOpenRead() {
 	err = db.Str().Set("name", "bob")
 	fmt.Println(err)
 	// attempt to write a readonly database
-	db.Close()
+	_ = db.Close()
 
 	// Output:
 	// alice
@@ -57,7 +57,7 @@ func ExampleDB_Close() {
 	if err != nil {
 		panic(err)
 	}
-	defer db.Close()
+	defer func() { _ = db.Close() }()
 	// ...
 }
 
@@ -66,7 +66,7 @@ func ExampleDB_Hash() {
 	// In real code, always check for errors.
 
 	db, _ := redka.Open("file:/redka.db?vfs=memdb", nil)
-	defer db.Close()
+	defer func() { _ = db.Close() }()
 
 	ok, err := db.Hash().Set("user:1", "name", "alice")
 	fmt.Printf("ok=%v, err=%v\n", ok, err)
@@ -90,7 +90,7 @@ func ExampleDB_Key() {
 	// In real code, always check for errors.
 
 	db, _ := redka.Open("file:/redka.db?vfs=memdb", nil)
-	defer db.Close()
+	defer func() { _ = db.Close() }()
 
 	_ = db.Str().SetExpires("name", "alice", 60*time.Second)
 	_ = db.Str().Set("city", "paris")
@@ -121,7 +121,7 @@ func ExampleDB_Str() {
 	// In real code, always check for errors.
 
 	db, _ := redka.Open("file:/redka.db?vfs=memdb", nil)
-	defer db.Close()
+	defer func() { _ = db.Close() }()
 
 	_ = db.Str().Set("name", "alice")
 
@@ -141,7 +141,7 @@ func ExampleDB_ZSet() {
 	// In real code, always check for errors.
 
 	db, _ := redka.Open("file:/redka.db?vfs=memdb", nil)
-	defer db.Close()
+	defer func() { _ = db.Close() }()
 
 	ok, err := db.ZSet().Add("race", "alice", 11)
 	fmt.Printf("ok=%v, err=%v\n", ok, err)
@@ -166,7 +166,7 @@ func ExampleDB_Update() {
 	if err != nil {
 		panic(err)
 	}
-	defer db.Close()
+	defer func() { _ = db.Close() }()
 
 	updCount := 0
 	err = db.Update(func(tx *redka.Tx) error {
@@ -195,7 +195,7 @@ func ExampleDB_View() {
 	// In real code, always check for errors.
 
 	db, _ := redka.Open("file:/redka.db?vfs=memdb", nil)
-	defer db.Close()
+	defer func() { _ = db.Close() }()
 
 	_ = db.Str().SetMany(map[string]any{
 		"name": "alice",
@@ -236,7 +236,7 @@ func TestOpenDB(t *testing.T) {
 
 	db, err := redka.OpenDB(sdb, sdb, nil)
 	be.Err(t, err, nil)
-	defer db.Close()
+	defer func() { _ = db.Close() }()
 
 	n, err := db.Key().Len()
 	be.Err(t, err, nil)
@@ -322,7 +322,7 @@ func TestTimeout(t *testing.T) {
 	opts := &redka.Options{Timeout: time.Nanosecond}
 	db, err := redka.Open("file:/redka.db?vfs=memdb", opts)
 	be.Err(t, err, nil)
-	defer db.Close()
+	defer func() { _ = db.Close() }()
 	err = db.Str().Set("name", "alice")
 	be.Err(t, err, context.DeadlineExceeded)
 }