changelog + codestyle

Author: Shabad Kirill

CHANGELOG.md

@@ -1,3 +1,11 @@
+* Fixed error catching in DoTxWithResult
+
+## v3.115.2
+* Fixed bug with wrong literal YQL representation for signed integer YDB types
+
+## v3.115.1
+* Added `ydb.Param.Range()` range iterator
+
 ## v3.115.0
 * Added public package `pkg/xtest` with test helpers
 

retry/sql.go

@@ -222,7 +222,8 @@ func DoTxWithResult[T any](ctx context.Context, db *sql.DB,
 			return zeroValue, xerrors.WithStackTrace(err)
 		}
 		if err = tx.Commit(); err != nil {
-			return zeroValue, xerrors.WithStackTrace(err)
+			// We create and use tx in this method, so if we catch this error, it means context cancellation
+			return zeroValue, xerrors.WithStackTrace(transformCommitError(ctx, err))
 		}
 
 		return v, nil
@@ -236,6 +237,16 @@ func DoTxWithResult[T any](ctx context.Context, db *sql.DB,
 	return v, nil
 }
 
+func transformCommitError(ctx context.Context, err error) error {
+	if xerrors.Is(err, sql.ErrTxDone) {
+		if ctxErr := ctx.Err(); ctxErr != nil {
+			return ctxErr
+		}
+	}
+
+	return err
+}
+
 func mustDeleteConn[T interface {
 	*sql.Conn
 }](err error, conn T) bool {

retry/sql_test.go

@@ -18,10 +18,11 @@ import (
 )
 
 type mockConnector struct {
-	t        testing.TB
-	conns    uint32
-	queryErr error
-	execErr  error
+	t         testing.TB
+	conns     uint32
+	queryErr  error
+	execErr   error
+	commitErr error
 }
 
 var _ driver.Connector = &mockConnector{}
@@ -292,3 +293,55 @@ func TestCleanUpResourcesOnPanicInRetryOperation(t *testing.T) {
 		})
 	})
 }
+
+func TestTxDoneErrorReturnsContextError(t *testing.T) {
+	t.Run("DoTxWithResult", func(t *testing.T) {
+		ctx, cancel := context.WithCancel(context.Background())
+
+		m := &mockConnector{
+			t:         t,
+			commitErr: sql.ErrTxDone,
+		}
+		db := sql.OpenDB(m)
+
+		attempts := 0
+		_, err := DoTxWithResult(ctx, db,
+			func(ctx context.Context, tx *sql.Tx) (int, error) {
+				attempts++
+				cancel()
+				time.Sleep(10 * time.Millisecond)
+
+				return 42, nil
+			},
+		)
+
+		require.Error(t, err)
+		require.ErrorIs(t, err, context.Canceled)
+		require.Equal(t, 1, attempts)
+	})
+
+	t.Run("DoTx", func(t *testing.T) {
+		ctx, cancel := context.WithCancel(context.Background())
+
+		m := &mockConnector{
+			t:         t,
+			commitErr: sql.ErrTxDone,
+		}
+		db := sql.OpenDB(m)
+
+		attempts := 0
+		err := DoTx(ctx, db,
+			func(ctx context.Context, tx *sql.Tx) error {
+				attempts++
+				cancel()
+				time.Sleep(10 * time.Millisecond)
+
+				return nil
+			},
+		)
+
+		require.Error(t, err)
+		require.ErrorIs(t, err, context.Canceled)
+		require.Equal(t, 1, attempts)
+	})
+}