Merge branch 'main' into spanner-lib

olavloite · olavloite · commit 3db43beb2e08 · 2025-06-26T08:44:07.000+02:00
diff --git a/transaction.go b/transaction.go
@@ -381,7 +381,6 @@ func (tx *readWriteTransaction) retry(ctx context.Context) (err error) {
 	if err := tx.rwTx.BufferWrite(tx.mutations); err != nil {
 		return err
 	}
-
 	for _, stmt := range tx.statements {
 		tx.logger.Log(ctx, slog.LevelDebug, "retrying statement", "stmt", stmt)
 		err = stmt.retry(ctx, tx.rwTx)

Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,6 @@ func (tx *readWriteTransaction) retry(ctx context.Context) (err error) {`
`381`	`381`	`if err := tx.rwTx.BufferWrite(tx.mutations); err != nil {`
`382`	`382`	`return err`
`383`	`383`	`}`
`384`		`-`
`385`	`384`	`for _, stmt := range tx.statements {`
`386`	`385`	`tx.logger.Log(ctx, slog.LevelDebug, "retrying statement", "stmt", stmt)`
`387`	`386`	`err = stmt.retry(ctx, tx.rwTx)`