dialect/ydb: a little refactoring

Author: LostImagin4tion

dialect/ydb/retry.go

@@ -23,10 +23,10 @@ func NewRetryExecutor(db *sql.DB) *RetryExecutor {
 	return &RetryExecutor{db: db}
 }
 
-// DoTx executes the operation within a transaction with retry support.
-// It uses ydb-go-sdk's retry.DoTx which handles YDB-specific retryable errors.
+// Do executes a read-only operation with retry support.
+// It uses ydb-go-sdk's retry.Do which handles YDB-specific retryable errors.
 // Options should be created using retry.WithIdempotent(), retry.WithLabel(), etc.
-func (r *RetryExecutor) DoTx(
+func (r *RetryExecutor) Do(
 	ctx context.Context,
 	fn func(ctx context.Context, drv dialect.Driver) error,
 	opts ...any,
@@ -38,20 +38,20 @@ func (r *RetryExecutor) DoTx(
 		}
 	}
 
-	return retry.DoTx(
+	return retry.Do(
 		ctx,
 		r.db,
-		func(ctx context.Context, tx *sql.Tx) error {
-			return fn(ctx, NewTxRetryDriver(tx))
+		func(ctx context.Context, conn *sql.Conn) error {
+			return fn(ctx, NewRetryDriver(conn))
 		},
-		retry.WithDoTxRetryOptions(retryOpts...),
+		retry.WithDoRetryOptions(retryOpts...),
 	)
 }
 
-// Do executes a read-only operation with retry support.
-// It uses ydb-go-sdk's retry.Do which handles YDB-specific retryable errors.
+// DoTx executes the operation within a transaction with retry support.
+// It uses ydb-go-sdk's retry.DoTx which handles YDB-specific retryable errors.
 // Options should be created using retry.WithIdempotent(), retry.WithLabel(), etc.
-func (r *RetryExecutor) Do(
+func (r *RetryExecutor) DoTx(
 	ctx context.Context,
 	fn func(ctx context.Context, drv dialect.Driver) error,
 	opts ...any,
@@ -63,13 +63,13 @@ func (r *RetryExecutor) Do(
 		}
 	}
 
-	return retry.Do(
+	return retry.DoTx(
 		ctx,
 		r.db,
-		func(ctx context.Context, conn *sql.Conn) error {
-			return fn(ctx, NewRetryDriver(conn))
+		func(ctx context.Context, tx *sql.Tx) error {
+			return fn(ctx, NewTxRetryDriver(tx))
 		},
-		retry.WithDoRetryOptions(retryOpts...),
+		retry.WithDoTxRetryOptions(retryOpts...),
 	)
 }
 
@@ -102,7 +102,7 @@ func (d *RetryDriver) Tx(ctx context.Context) (dialect.Tx, error) {
 	return dialect.NopTx(d), nil
 }
 
-// Close is a no-op for TxDriver since retry.DoTx manages the transaction lifecycle.
+// Close is a no-op for RetryDriver since retry.DoTx manages the transaction lifecycle.
 func (d *RetryDriver) Close() error {
 	return nil
 }