Upgrade linter and fix lint issues

Author: prudhvi

.golangci.yaml

@@ -1,3 +1,5 @@
+version: "2"
+
 run:
   tests: true
 
@@ -10,11 +12,8 @@ linters:
     - gomoddirectives
     - exhaustruct
     - funlen
-    - gci
     - gochecknoglobals
     - gocritic
-    - gofumpt
-    - gomnd
     - gosec
     - lll
     - mnd
@@ -29,7 +28,9 @@ linters:
     - ireturn
     - godox
     - err113
-    - execinquery
+
+formatters:
+  disable-all: true
 
 issues:
   max-per-linter: 0

bin/[email protected] bin/.golangci-lint-2.0.2.pkgbin/[email protected] renamed to bin/.golangci-lint-2.0.2.pkg

@@ -1 +1 @@
-.golangci-lint@1.61.pkg
+.golangci-lint-2.0.2.pkg

bin/golangci-lint

@@ -80,7 +80,11 @@ func (a *ArchiveCmd) Run() error {
 	if err != nil {
 		return fmt.Errorf("error creating archive runner: %w", err)
 	}
-	defer archiveRunner.Close()
+	defer func() {
+		if closeErr := archiveRunner.Close(); closeErr != nil {
+			logger.Errorf("error closing archive runner: %v", closeErr)
+		}
+	}()
 
 	return archiveRunner.Run(context.Background())
 }
@@ -96,8 +100,8 @@ func (s *StageCmd) Run() error {
 		StartedBy:       s.StartedBy,
 		AuditDB:         s.AuditDB,
 		DryRun:          s.DryRun,
-		Threads:         s.DBConfig.Threads,
-		LockWaitTimeout: s.DBConfig.LockWaitTimeout,
+		Threads:         s.Threads,
+		LockWaitTimeout: s.LockWaitTimeout,
 		TargetChunkTime: s.TargetChunkTime,
 		Host:            s.Host,
 		Username:        s.Username,
@@ -109,7 +113,11 @@ func (s *StageCmd) Run() error {
 	if err != nil {
 		return fmt.Errorf("error creating stage runner: %w", err)
 	}
-	defer stageRunner.Close()
+	defer func() {
+		if closeErr := stageRunner.Close(); closeErr != nil {
+			logger.Errorf("error closing stage runner: %v", closeErr)
+		}
+	}()
 
 	_, err = stageRunner.Run(context.Background())
 

cmd/polt/main.go

@@ -156,7 +156,11 @@ func (b *BufferStager) stageChunk(ctx context.Context, chunk *table.Chunk) (int6
 
 		return -1, err
 	}
-	defer rows.Close()
+	defer func() {
+		if closeErr := rows.Close(); closeErr != nil {
+			b.logger.Errorf("error closing rows: %v", closeErr)
+		}
+	}()
 
 	return b.loadRowsToBuffer(rows, chunk)
 }

pkg/archive/buffer_stager.go

@@ -70,7 +70,11 @@ func TestNewFileArchiver(t *testing.T) {
 	fileReader, err := file.OpenParquetFile(path.Clean(test.FindParquetFile(t, parquetFileSuffix, true)[0]),
 		false, file.WithReadProps(props))
 	require.NoError(t, err)
-	defer fileReader.Close()
+	defer func() {
+		if closeErr := fileReader.Close(); closeErr != nil {
+			t.Errorf("error closing file reader: %v", closeErr)
+		}
+	}()
 
 	require.Equal(t, 1, fileReader.NumRowGroups())
 	rgr := fileReader.RowGroup(0)
@@ -138,7 +142,11 @@ func TestNewFileArchiver_BinaryKey(t *testing.T) {
 	fileReader, err := file.OpenParquetFile(path.Clean(test.FindParquetFile(t, parquetFileSuffix, true)[0]),
 		false, file.WithReadProps(props))
 	require.NoError(t, err)
-	defer fileReader.Close()
+	defer func() {
+		if closeErr := fileReader.Close(); closeErr != nil {
+			t.Errorf("error closing file reader: %v", closeErr)
+		}
+	}()
 
 	require.Equal(t, 1, fileReader.NumRowGroups())
 	rgr := fileReader.RowGroup(0)

pkg/archive/file_test.go

@@ -14,7 +14,11 @@ func TestCreateAuditDB(t *testing.T) {
 	// Check that the audit database is created correctly
 	db, err := sql.Open("mysql", test.DSN())
 	require.NoError(t, err)
-	defer db.Close()
+	defer func() {
+		if closeErr := db.Close(); closeErr != nil {
+			t.Errorf("error closing db: %v", closeErr)
+		}
+	}()
 	err = CreateDB(context.Background(), db, "auditDB")
 	require.NoError(t, err)
 	var schemaName string
@@ -28,7 +32,11 @@ func TestCreateCheckpointTbl(t *testing.T) {
 	// Check that the checkpoint table is created correctly
 	db, err := sql.Open("mysql", test.DSN())
 	require.NoError(t, err)
-	defer db.Close()
+	defer func() {
+		if closeErr := db.Close(); closeErr != nil {
+			t.Errorf("error closing db: %v", closeErr)
+		}
+	}()
 	err = CreateDB(context.Background(), db, "auditDB")
 	require.NoError(t, err)
 	err = CreateCheckpointTbl(context.Background(), db, "auditDB", "runid")
@@ -44,7 +52,11 @@ func TestCreateRunsTbl(t *testing.T) {
 	// Check that the runs table is created correctly
 	db, err := sql.Open("mysql", test.DSN())
 	require.NoError(t, err)
-	defer db.Close()
+	defer func() {
+		if closeErr := db.Close(); closeErr != nil {
+			t.Errorf("error closing db: %v", closeErr)
+		}
+	}()
 	err = CreateDB(context.Background(), db, "auditDB")
 	require.NoError(t, err)
 	err = CreateRunsTbl(context.Background(), db, "auditDB")

pkg/audit/db_test.go

@@ -137,7 +137,12 @@ func (sb *StageBooter) replicaisHealthy(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
-	defer rows.Close()
+	defer func() {
+		if closeErr := rows.Close(); closeErr != nil {
+			// Log error but don't override the main error
+			_ = closeErr
+		}
+	}()
 	status, err := scanToMap(rows)
 	if err != nil {
 		return err

pkg/boot/stage_booter.go

@@ -39,7 +39,12 @@ func MysqlToArrowSchema(db *sql.DB, tableName string) (*arrow.Schema, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer rows.Close()
+	defer func() {
+		if closeErr := rows.Close(); closeErr != nil {
+			// Log error but don't override the main error
+			_ = closeErr
+		}
+	}()
 
 	var fields []arrow.Field
 	for rows.Next() {

pkg/parquet/arrow_schema.go

@@ -109,15 +109,20 @@ func TestNewParquetManagerFlush(t *testing.T) {
 
 	err = chunker.Open()
 	require.NoError(t, err)
-	defer chunker.Close()
+	defer func() {
+		if closeErr := chunker.Close(); closeErr != nil {
+			t.Errorf("error closing chunker: %v", closeErr)
+		}
+	}()
 
 	chunk, err := chunker.Next()
 	require.NoError(t, err)
 
 	// Add the chunk
 	pm.AddChunk(chunk, 1*time.Second, 0)
 	// Flush the chunks
-	pm.Flush(context.Background())
+	_, err = pm.Flush(context.Background())
+	require.NoError(t, err)
 
 	// Verify the chunks were flushed correctly
 	require.Empty(t, pm.bufferedChunks, "BufferedChunks should be empty after flushing")