Skip to content

Commit 1bdf647

Browse files
committed
Fix more channelId TODOs
1 parent 2694d7e commit 1bdf647

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
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
@@ -450,7 +450,7 @@ private final class CommitRunnable implements Runnable {
450450
@Override
451451
public void run() {
452452
XGoogSpannerRequestId reqId =
453-
session.getRequestIdCreator().nextRequestId(1 /*TODO: channelId */, 1);
453+
session.getRequestIdCreator().nextRequestId(session.getChannel(), 1);
454454
try {
455455
prev.get();
456456
if (transactionId == null && transactionIdFuture == null) {
@@ -930,7 +930,7 @@ private ResultSet internalExecuteUpdate(
930930
getExecuteSqlRequestBuilder(
931931
statement, queryMode, options, /* withTransactionSelector= */ true);
932932
XGoogSpannerRequestId reqId =
933-
session.getRequestIdCreator().nextRequestId(1 /*TODO: channelId */, 1);
933+
session.getRequestIdCreator().nextRequestId(session.getChannel(), 1);
934934
try {
935935
com.google.spanner.v1.ResultSet resultSet =
936936
rpc.executeQuery(
@@ -1066,7 +1066,7 @@ public long[] batchUpdate(Iterable<Statement> statements, UpdateOption... update
10661066
final ExecuteBatchDmlRequest.Builder builder =
10671067
getExecuteBatchDmlRequestBuilder(statements, options);
10681068
XGoogSpannerRequestId reqId =
1069-
session.getRequestIdCreator().nextRequestId(1 /*TODO: channelId */, 1);
1069+
session.getRequestIdCreator().nextRequestId(session.getChannel(), 1);
10701070
try {
10711071
com.google.spanner.v1.ExecuteBatchDmlResponse response =
10721072
rpc.executeBatchDml(builder.build(), reqId.withOptions(getTransactionChannelHint()));
@@ -1128,7 +1128,7 @@ public ApiFuture<long[]> batchUpdateAsync(
11281128
getExecuteBatchDmlRequestBuilder(statements, options);
11291129
ApiFuture<com.google.spanner.v1.ExecuteBatchDmlResponse> response;
11301130
XGoogSpannerRequestId reqId =
1131-
session.getRequestIdCreator().nextRequestId(1 /*TODO: channelId */, 1);
1131+
session.getRequestIdCreator().nextRequestId(session.getChannel(), 1);
11321132
try {
11331133
// Register the update as an async operation that must finish before the transaction may
11341134
// commit.

0 commit comments

Comments
 (0)