Skip to content

Commit b6d76cc

Browse files
committed
fix: resolve golangci-lint errcheck and unconvert violations
- Remove redundant uint32 cast in vector_getters.go (unconvert) - Wrap defer Close() calls in require.NoError for errcheck compliance in enum_bench_test.go (conn, dkRows, Stmt) and types_test.go (rows x2)
1 parent e79eb40 commit b6d76cc

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

enum_bench_test.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ import (
44
"context"
55
"database/sql"
66
"database/sql/driver"
7+
"errors"
78
"fmt"
89
"io"
910
"testing"
1011

11-
"github.com/duckdb/duckdb-go/v2/mapping"
1212
"github.com/stretchr/testify/require"
13+
14+
"github.com/duckdb/duckdb-go/v2/mapping"
1315
)
1416

1517
// getEnumCGO is the original (pre-optimization) implementation, preserved
@@ -79,7 +81,9 @@ func benchEnumVector(b *testing.B, rowCount int, useCGO bool) {
7981
mc, err := c.Connect(context.Background())
8082
require.NoError(b, err)
8183
conn := mc.(*Conn)
82-
defer conn.Close()
84+
defer func() {
85+
require.NoError(b, conn.Close())
86+
}()
8387

8488
var sink string
8589
b.ResetTimer()
@@ -98,7 +102,7 @@ func benchEnumVector(b *testing.B, rowCount int, useCGO bool) {
98102

99103
for {
100104
e = r.Next(dest)
101-
if e == io.EOF {
105+
if errors.Is(e, io.EOF) {
102106
break
103107
}
104108
require.NoError(b, e)
@@ -114,8 +118,8 @@ func benchEnumVector(b *testing.B, rowCount int, useCGO bool) {
114118
count++
115119
}
116120

117-
dkRows.Close()
118-
s.Close()
121+
require.NoError(b, dkRows.Close())
122+
require.NoError(b, s.Close())
119123
require.Equal(b, rowCount, count)
120124
}
121125

types_test.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,9 @@ func TestEnumNullValues(t *testing.T) {
790790

791791
rows, err := db.Query("SELECT val FROM nullable_colors ORDER BY rowid")
792792
require.NoError(t, err)
793-
defer rows.Close()
793+
defer func() {
794+
require.NoError(t, rows.Close())
795+
}()
794796

795797
expected := []any{"red", nil, "blue"}
796798
for _, exp := range expected {
@@ -827,7 +829,9 @@ func TestEnumLargeDictionary(t *testing.T) {
827829

828830
rows, err := db.Query("SELECT val FROM large_enum_tbl ORDER BY rowid")
829831
require.NoError(t, err)
830-
defer rows.Close()
832+
defer func() {
833+
require.NoError(t, rows.Close())
834+
}()
831835

832836
expected := []string{"v0", "v255", "v299"}
833837
for _, exp := range expected {

vector_getters.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ func (vec *vector) getEnum(rowIdx mapping.IdxT) string {
209209
case TYPE_USMALLINT:
210210
idx = uint32(getPrimitive[uint16](vec, rowIdx))
211211
case TYPE_UINTEGER:
212-
idx = uint32(getPrimitive[uint32](vec, rowIdx))
212+
idx = getPrimitive[uint32](vec, rowIdx)
213213
case TYPE_UBIGINT:
214214
idx = uint32(getPrimitive[uint64](vec, rowIdx))
215215
}

0 commit comments

Comments
 (0)