Skip to content

Commit 741f016

Browse files
committed
chore(spanner): review comments
1 parent 9981932 commit 741f016

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -642,13 +642,14 @@ public void onTransactionMetadata(Transaction transaction, boolean shouldInclude
642642
*/
643643
@Override
644644
public void onPrecommitToken(MultiplexedSessionPrecommitToken token) {
645-
if (token == null) return;
645+
if (token == null) {
646+
return;
647+
}
646648
synchronized (precommitTokenLock) {
647649
if (this.latestPrecommitToken == null
648650
|| token.getSeqNum() > this.latestPrecommitToken.getSeqNum()) {
649651
this.latestPrecommitToken = token;
650-
System.out.println("Updating precommit token to " + this.latestPrecommitToken);
651-
txnLogger.log(Level.ALL, "Updating precommit token to " + this.latestPrecommitToken);
652+
txnLogger.log(Level.FINE, "Updating precommit token to " + this.latestPrecommitToken);
652653
}
653654
}
654655
}
@@ -981,7 +982,6 @@ public long[] batchUpdate(Iterable<Statement> statements, UpdateOption... update
981982
}
982983
}
983984

984-
// TODO(sriharshach): check if we need to get precommit_token from response.getResultSets
985985
if (response.hasPrecommitToken()) {
986986
onPrecommitToken(response.getPrecommitToken());
987987
}

google-cloud-spanner/src/test/java/com/google/cloud/spanner/MockSpannerServiceImpl.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,10 +1093,12 @@ private void returnResultSet(
10931093
Transaction transaction = getTemporaryTransactionOrNull(transactionSelector);
10941094
metadata = metadata.toBuilder().setTransaction(transaction).build();
10951095
}
1096-
resultSet = resultSet.toBuilder().setMetadata(metadata).build();
1096+
ResultSet.Builder resultSetBuilder = resultSet.toBuilder();
1097+
resultSetBuilder.setMetadata(metadata);
10971098
if (session.getMultiplexed()) {
1098-
resultSet = resultSet.toBuilder().setPrecommitToken(getResultSetPrecommitToken()).build();
1099+
resultSetBuilder.setPrecommitToken(getResultSetPrecommitToken());
10991100
}
1101+
resultSet = resultSetBuilder.build();
11001102
responseObserver.onNext(resultSet);
11011103
}
11021104

0 commit comments

Comments
 (0)