refactor retry/retry and upload with off gocognit linter

Author: grishagavrin

CHANGELOG.md

@@ -1,18 +1,20 @@
-* Refactored `internal/topic/topicwriterinternal/queue_test.go` and extract funcs
-* Refactored `log/driver.go` and extract funcs
-* Refactored `internal/table/scanner/scanner.go` and extract funcs
-* Refactored `log/topic.go` and extract funcs
-* Refactored `internal/table/scanner/scanner_test.go` and extract funcs
-* Refactored `log/sql.go` and extract funcs
-* Refactored `metrics/driver.go` and extract funcs
-* Refactored `metrics/sql.go` and extract funcs
-* Refactored `internal/table/retry_test.go` and extract func `retry_test.checkResultsRetryWithCustomErrors`
-* Refactored `internal/table/client.go` and extract func `client.onCloseSession`
-* Refactored `internal/decimal/decimal.go` and extract func `decimal.dotStringAnalysis`
-* Refactored `internal/backoff/backoff_test.go` and extract func `backoff_test.checkExpWithAct` for compare
-* Refactored `internal/xsql/dsn.go` and extract func `dsn.bindTablePathPrefixInConnectorOptions`
-* Refactored `sugar/path.go` and extract funcs `path.removeWithPrefix`,  `path.removeEntry`
-* Refactored `internal/stack/record.go` and extract func `record.findFileNameAndPkgPath`
+* Refactored `retry/retry.go` and extract func `retry.RecoveryCallbackWrapper` for gocognit linter
+* Refactored `retry/sql_test.go` and extract func `sql_test.canRetry` for gocognit linter
+* Refactored `internal/topic/topicwriterinternal/queue_test.go` and extract funcs for gocognit linter
+* Refactored `log/driver.go` and extract funcs for gocognit linter
+* Refactored `internal/table/scanner/scanner.go` and extract funcs for gocognit linter
+* Refactored `log/topic.go` and extract funcs for gocognit linter
+* Refactored `internal/table/scanner/scanner_test.go` and extract funcs for gocognit linter
+* Refactored `log/sql.go` and extract funcs for gocognit linter
+* Refactored `metrics/driver.go` and extract funcs for gocognit linter
+* Refactored `metrics/sql.go` and extract funcs for gocognit linter
+* Refactored `internal/table/retry_test.go` and extract func `retry_test.checkResultsRetryWithCustomErrors` for gocognit linter
+* Refactored `internal/table/client.go` and extract func `client.onCloseSession` for gocognit linter
+* Refactored `internal/decimal/decimal.go` and extract func `decimal.dotStringAnalysis` for gocognit linter
+* Refactored `internal/backoff/backoff_test.go` and extract func `backoff_test.checkExpWithAct` for gocognit linter
+* Refactored `internal/xsql/dsn.go` and extract func `dsn.bindTablePathPrefixInConnectorOptions` for gocognit linter
+* Refactored `sugar/path.go` and extract funcs `path.removeWithPrefix`,  `path.removeEntry` for gocognit linter
+* Refactored `internal/stack/record.go` and extract func `record.findFileNameAndPkgPath` for gocognit linter
 * Fixed topic writer infinite reconnections in some cases
 * Refactored nil on err `internal/grpcwrapper/rawydb/issues.go`, when golangci-lint nilerr enabled
 * Refactored nil on err `internal/grpcwrapper/rawtopic/describe_topic.go`, when golangci-lint nilerr enabled

retry/retry.go

@@ -276,21 +276,7 @@ func Retry(ctx context.Context, op retryOperation, opts ...Option) (finalErr err
 			)
 
 		default:
-			err := func() (err error) {
-				if options.panicCallback != nil {
-					defer func() {
-						if e := recover(); e != nil {
-							options.panicCallback(e)
-							err = xerrors.WithStackTrace(
-								fmt.Errorf("panic recovered: %v", e),
-							)
-						}
-					}()
-				}
-
-				return op(ctx)
-			}()
-
+			err := RecoveryCallbackWrapper(ctx, op, options)
 			if err == nil {
 				return nil
 			}
@@ -335,6 +321,25 @@ func Retry(ctx context.Context, op retryOperation, opts ...Option) (finalErr err
 	}
 }
 
+// RecoveryCallbackWrapper is a function that wraps the provided `op` retry operation
+// with a panic recovery mechanism. If the `options.panicCallback` is specified, it
+// is invoked with the recovered value, and an error is returned with the recovered value wrapped
+// as the cause. This function returns the result of the `op` retry operation.
+func RecoveryCallbackWrapper(context context.Context, op retryOperation, options *retryOptions) (err error) {
+	if options.panicCallback != nil {
+		defer func() {
+			if e := recover(); e != nil {
+				options.panicCallback(e)
+				err = xerrors.WithStackTrace(
+					fmt.Errorf("panic recovered: %v", e),
+				)
+			}
+		}()
+	}
+
+	return op(context)
+}
+
 // Check returns retry mode for queryErr.
 func Check(err error) (m retryMode) {
 	code, errType, backoffType, deleteSession := xerrors.Check(err)

retry/sql_test.go

@@ -180,7 +180,6 @@ func (m *mockStmt) QueryContext(ctx context.Context, args []driver.NamedValue) (
 	return m.conn.QueryContext(ctx, m.query, args)
 }
 
-//nolint:nestif
 func TestDoTx(t *testing.T) {
 	for _, idempotentType := range []idempotency{
 		idempotent,
@@ -228,27 +227,44 @@ func TestDoTx(t *testing.T) {
 							},
 						}),
 					)
-					if tt.canRetry[idempotentType] {
-						if err != nil {
-							t.Errorf("unexpected err after attempts=%d and driver conns=%d: %v)", attempts, m.conns, err)
-						}
-						if attempts <= 1 {
-							t.Errorf("must be attempts > 1 (actual=%d), driver conns=%d)", attempts, m.conns)
-						}
-						if tt.deleteSession {
-							if m.conns <= 1 {
-								t.Errorf("must be retry on different conns (attempts=%d, driver conns=%d)", attempts, m.conns)
-							}
-						} else {
-							if m.conns > 1 {
-								t.Errorf("must be retry on single conn (attempts=%d, driver conns=%d)", attempts, m.conns)
-							}
-						}
-					} else if err == nil {
-						t.Errorf("unexpected nil err (attempts=%d, driver conns=%d)", attempts, m.conns)
-					}
+					canRetry(t, tt, idempotentType, err, attempts, m)
 				})
 			}
 		})
 	}
 }
+
+// canRetry checks if a retry can be performed based on the given parameters.
+//
+//nolint:nestif
+func canRetry(t *testing.T, tt struct {
+	err           error
+	backoff       backoff.Type
+	deleteSession bool
+	canRetry      map[idempotency]bool
+},
+	idempotentType idempotency,
+	err error,
+	attempts int,
+	m *mockConnector,
+) {
+	if tt.canRetry[idempotentType] {
+		if err != nil {
+			t.Errorf("unexpected err after attempts=%d and driver conns=%d: %v)", attempts, m.conns, err)
+		}
+		if attempts <= 1 {
+			t.Errorf("must be attempts > 1 (actual=%d), driver conns=%d)", attempts, m.conns)
+		}
+		if tt.deleteSession {
+			if m.conns <= 1 {
+				t.Errorf("must be retry on different conns (attempts=%d, driver conns=%d)", attempts, m.conns)
+			}
+		} else {
+			if m.conns > 1 {
+				t.Errorf("must be retry on single conn (attempts=%d, driver conns=%d)", attempts, m.conns)
+			}
+		}
+	} else if err == nil {
+		t.Errorf("unexpected nil err (attempts=%d, driver conns=%d)", attempts, m.conns)
+	}
+}