Skip to content

chore: delay transaction activation until actual use #552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 8, 2025
Merged

chore: delay transaction activation until actual use #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
27d7edc
chore: store temp TransactionOptions in connection state
olavloite Oct 4, 2025
a4f182b
chore: delay transaction activation until actual use
olavloite Oct 7, 2025
af6ff67
Merge branch 'main' into delay-transaction-activation
olavloite Oct 7, 2025
2e15c1b
Merge branch 'main' into delay-transaction-activation
olavloite Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion aborted_transactions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ func TestCommitAborted(t *testing.T) {
if err != nil {
t.Fatalf("begin failed: %v", err)
}
if _, err := tx.ExecContext(ctx, testutil.UpdateBarSetFoo); err != nil {
t.Fatal(err)
}
server.TestSpanner.PutExecutionTime(testutil.MethodCommitTransaction, testutil.SimulatedExecutionTime{
Errors: []error{status.Error(codes.Aborted, "Aborted")},
})
Expand All @@ -51,7 +54,7 @@ func TestCommitAborted(t *testing.T) {
reqs := server.TestSpanner.DrainRequestsFromServer()
commitReqs := testutil.RequestsOfType(reqs, reflect.TypeOf(&sppb.CommitRequest{}))
if g, w := len(commitReqs), 2; g != w {
t.Fatalf("commit request count mismatch\nGot: %v\nWant: %v", g, w)
t.Fatalf("commit request count mismatch\n Got: %v\nWant: %v", g, w)
}

// Verify that the db is still usable.
Expand Down Expand Up @@ -117,6 +120,9 @@ func TestCommitAbortedWithInternalRetriesDisabled(t *testing.T) {
if err != nil {
t.Fatalf("begin failed: %v", err)
}
if _, err := tx.ExecContext(ctx, testutil.UpdateBarSetFoo); err != nil {
t.Fatal(err)
}
server.TestSpanner.PutExecutionTime(testutil.MethodCommitTransaction, testutil.SimulatedExecutionTime{
Errors: []error{status.Error(codes.Aborted, "Aborted")},
})
Expand Down
6 changes: 3 additions & 3 deletions client_side_statement_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func TestStatementExecutor_StartBatchDdl(t *testing.T) {
}

// Starting a DDL batch while the connection is in a transaction is not allowed.
c.tx = &readWriteTransaction{}
c.tx = &delegatingTransaction{conn: c, ctx: ctx}
if _, err := c.ExecContext(ctx, "start batch ddl", []driver.NamedValue{}); spanner.ErrCode(err) != codes.FailedPrecondition {
t.Fatalf("error mismatch for starting a DDL batch while in a transaction\nGot: %v\nWant: %v", spanner.ErrCode(err), codes.FailedPrecondition)
}
Expand Down Expand Up @@ -102,13 +102,13 @@ func TestStatementExecutor_StartBatchDml(t *testing.T) {
}

// Starting a DML batch while the connection is in a read-only transaction is not allowed.
c.tx = &readOnlyTransaction{logger: noopLogger}
c.tx = &delegatingTransaction{conn: c, contextTransaction: &readOnlyTransaction{logger: noopLogger}}
if _, err := c.ExecContext(ctx, "start batch dml", []driver.NamedValue{}); spanner.ErrCode(err) != codes.FailedPrecondition {
t.Fatalf("error mismatch for starting a DML batch while in a read-only transaction\nGot: %v\nWant: %v", spanner.ErrCode(err), codes.FailedPrecondition)
}

// Starting a DML batch while the connection is in a read/write transaction is allowed.
c.tx = &readWriteTransaction{logger: noopLogger}
c.tx = &delegatingTransaction{conn: c, contextTransaction: &readWriteTransaction{logger: noopLogger}}
if _, err := c.ExecContext(ctx, "start batch dml", []driver.NamedValue{}); err != nil {
t.Fatalf("could not start a DML batch while in a read/write transaction: %v", err)
}
Expand Down
Loading
Loading