fixed lint

Author: LostImagin4tion

dialect/sql/sqlgraph/graph.go

@@ -791,10 +791,7 @@ func CreateNode(ctx context.Context, drv dialect.Driver, spec *CreateSpec) error
 		cr := &creator{CreateSpec: spec, graph: gr}
 		return cr.node(ctx, d)
 	}
-	if retry := getRetryExecutor(drv); retry != nil {
-		return retry.DoTx(ctx, op, spec.RetryConfig.Options...)
-	}
-	return op(ctx, drv)
+	return execWithRetryTx(ctx, drv, op, spec.RetryConfig.Options)
 }
 
 // BatchCreate applies the BatchCreateSpec on the graph.
@@ -804,8 +801,13 @@ func BatchCreate(ctx context.Context, drv dialect.Driver, spec *BatchCreateSpec)
 		cr := &batchCreator{BatchCreateSpec: spec, graph: gr}
 		return cr.nodes(ctx, d)
 	}
+	return execWithRetryTx(ctx, drv, op, spec.RetryConfig.Options)
+}
+
+// execWithRetryTx executes the operation with retry if available, otherwise executes directly.
+func execWithRetryTx(ctx context.Context, drv dialect.Driver, op func(context.Context, dialect.Driver) error, opts []any) error {
 	if retry := getRetryExecutor(drv); retry != nil {
-		return retry.DoTx(ctx, op, spec.RetryConfig.Options...)
+		return retry.DoTx(ctx, op, opts...)
 	}
 	return op(ctx, drv)
 }

dialect/ydb/retry.go

@@ -31,20 +31,13 @@ func (r *RetryExecutor) Do(
 	fn func(ctx context.Context, drv dialect.Driver) error,
 	opts ...any,
 ) error {
-	retryOpts := make([]retry.Option, 0, len(opts))
-	for _, opt := range opts {
-		if ro, ok := opt.(retry.Option); ok {
-			retryOpts = append(retryOpts, ro)
-		}
-	}
-
 	return retry.Do(
 		ctx,
 		r.db,
 		func(ctx context.Context, conn *sql.Conn) error {
 			return fn(ctx, NewRetryDriver(conn))
 		},
-		retry.WithDoRetryOptions(retryOpts...),
+		retry.WithDoRetryOptions(toRetryOptions(opts)...),
 	)
 }
 
@@ -56,23 +49,27 @@ func (r *RetryExecutor) DoTx(
 	fn func(ctx context.Context, drv dialect.Driver) error,
 	opts ...any,
 ) error {
-	retryOpts := make([]retry.Option, 0, len(opts))
-	for _, opt := range opts {
-		if ro, ok := opt.(retry.Option); ok {
-			retryOpts = append(retryOpts, ro)
-		}
-	}
-
 	return retry.DoTx(
 		ctx,
 		r.db,
 		func(ctx context.Context, tx *sql.Tx) error {
 			return fn(ctx, NewTxRetryDriver(tx))
 		},
-		retry.WithDoTxRetryOptions(retryOpts...),
+		retry.WithDoTxRetryOptions(toRetryOptions(opts)...),
 	)
 }
 
+// toRetryOptions converts a slice of any options to retry.Option slice
+func toRetryOptions(opts []any) []retry.Option {
+	retryOpts := make([]retry.Option, 0, len(opts))
+	for _, opt := range opts {
+		if ro, ok := opt.(retry.Option); ok {
+			retryOpts = append(retryOpts, ro)
+		}
+	}
+	return retryOpts
+}
+
 // RetryDriver is designed for use only in sqlgraph,
 // specifically - in retry.DoTx callbacks
 type RetryDriver struct {