fix: fix potential unnecessary transaction retry (#337)

olavloite · web-flow · commit 1a4f4fd675a1 · 2020-07-14T13:09:26.000+10:00
A transaction could in some circumstances be retried after an abort using the previous transaction id. This would cause the retry to abort directly as well, and then start a new transaction. This extra loop has now been removed. Fixes #327
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java
@@ -654,7 +654,7 @@ private <T> T runInternal(final TransactionCallable<T> txCallable) {
         new Callable<T>() {
           @Override
           public T call() {
-            if (txn.isAborted()) {
+            if (attempt.get() > 0) {
               txn = session.newTransaction();
             }
             checkState(

Original file line number	Diff line number	Diff line change
`@@ -654,7 +654,7 @@ private <T> T runInternal(final TransactionCallable<T> txCallable) {`
`654`	`654`	`new Callable<T>() {`
`655`	`655`	`@Override`
`656`	`656`	`public T call() {`
`657`		`- if (txn.isAborted()) {`
	`657`	`+ if (attempt.get() > 0) {`
`658`	`658`	`txn = session.newTransaction();`
`659`	`659`	`}`
`660`	`660`	`checkState(`