Propagate more session.getChannel() as well as comments for PR googleapis#3900

Author: odeke-em

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

@@ -458,7 +458,7 @@ void initTransaction() {
 
     private void initTransactionInternal(BeginTransactionRequest request) {
       XGoogSpannerRequestId reqId =
-          session.getRequestIdCreator().nextRequestId(1 /*TODO: retrieve channelId*/, 1);
+          session.getRequestIdCreator().nextRequestId(session.getChannel(), 1);
       try {
         Transaction transaction =
             rpc.beginTransaction(

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

@@ -251,7 +251,7 @@ private List<Partition> partitionReadUsingIndex(
       builder.setPartitionOptions(pbuilder.build());
 
       XGoogSpannerRequestId reqId =
-          session.getRequestIdCreator().nextRequestId(1 /*TODO: retrieve channelId*/, 1);
+          session.getRequestIdCreator().nextRequestId(session.getChannel(), 1);
       final PartitionReadRequest request = builder.build();
       try {
         PartitionResponse response = rpc.partitionRead(request, reqId.withOptions(options));
@@ -317,7 +317,7 @@ private List<Partition> partitionQuery(
       builder.setPartitionOptions(pbuilder.build());
 
       XGoogSpannerRequestId reqId =
-          session.getRequestIdCreator().nextRequestId(1 /*TODO: retrieve channelId*/, 1);
+          session.getRequestIdCreator().nextRequestId(session.getChannel(), 1);
       final PartitionQueryRequest request = builder.build();
       try {
         PartitionResponse response = rpc.partitionQuery(request, reqId.withOptions(options));

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

@@ -1101,7 +1101,7 @@ public boolean equals(Object o) {
       if (this.reqId == null || other.reqId == null) {
         return this.reqId == null && other.reqId == null;
       }
-      return this.reqId.equals(other.reqId);
+      return Objects.equals(this.reqId, other.reqId);
     }
   }
 }

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

@@ -82,7 +82,7 @@ long executeStreamingPartitionedUpdate(
     Options options = Options.fromUpdateOptions(updateOptions);
     XGoogSpannerRequestId reqId = options.reqId();
     if (reqId == null) {
-      reqId = session.getRequestIdCreator().nextRequestId(1 /*TODO: infer channelId*/, 0);
+      reqId = session.getRequestIdCreator().nextRequestId(session.getChannel(), 0);
     }
 
     try {
@@ -126,7 +126,7 @@ long executeStreamingPartitionedUpdate(
           updateCount = 0L;
           request = newTransactionRequestFrom(statement, options);
           // Create a new xGoogSpannerRequestId.
-          reqId = session.getRequestIdCreator().nextRequestId(1 /*TODO: infer channelId*/, 0);
+          reqId = session.getRequestIdCreator().nextRequestId(session.getChannel(), 0);
         } catch (SpannerException e) {
           e.setRequestId(reqId);
           throw e;
@@ -223,7 +223,7 @@ private ByteString initTransaction(final Options options) {
             .build();
     XGoogSpannerRequestId reqId = options.reqId();
     if (reqId == null) {
-      reqId = session.getRequestIdCreator().nextRequestId(1 /*TODO: infer channelId*/, 1);
+      reqId = session.getRequestIdCreator().nextRequestId(session.getChannel(), 1);
     }
     Transaction tx = rpc.beginTransaction(request, reqId.withOptions(session.getOptions()), true);
     if (tx.getId().isEmpty()) {

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

@@ -465,15 +465,15 @@ public AsyncTransactionManagerImpl transactionManagerAsync(TransactionOption...
 
   @Override
   public ApiFuture<Empty> asyncClose() {
-    XGoogSpannerRequestId reqId = this.getRequestIdCreator().nextRequestId(this.getChannel(), 0);
+    XGoogSpannerRequestId reqId = this.getRequestIdCreator().nextRequestId(this.getChannel(), 1);
     return spanner.getRpc().asyncDeleteSession(getName(), reqId.withOptions(getOptions()));
   }
 
   @Override
   public void close() {
     ISpan span = tracer.spanBuilder(SpannerImpl.DELETE_SESSION);
     try (IScope s = tracer.withSpan(span)) {
-      XGoogSpannerRequestId reqId = this.getRequestIdCreator().nextRequestId(this.getChannel(), 0);
+      XGoogSpannerRequestId reqId = this.getRequestIdCreator().nextRequestId(this.getChannel(), 1);
       spanner.getRpc().deleteSession(getName(), reqId.withOptions(getOptions()));
     } catch (RuntimeException e) {
       span.setStatus(e);

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

@@ -450,7 +450,7 @@ private final class CommitRunnable implements Runnable {
       @Override
       public void run() {
         XGoogSpannerRequestId reqId =
-            session.getRequestIdCreator().nextRequestId(1 /*TODO: channelId */, 1);
+            session.getRequestIdCreator().nextRequestId(session.getChannel(), 1);
         try {
           prev.get();
           if (transactionId == null && transactionIdFuture == null) {
@@ -930,7 +930,7 @@ private ResultSet internalExecuteUpdate(
           getExecuteSqlRequestBuilder(
               statement, queryMode, options, /* withTransactionSelector= */ true);
       XGoogSpannerRequestId reqId =
-          session.getRequestIdCreator().nextRequestId(1 /*TODO: channelId */, 1);
+          session.getRequestIdCreator().nextRequestId(session.getChannel(), 1);
       try {
         com.google.spanner.v1.ResultSet resultSet =
             rpc.executeQuery(
@@ -1066,7 +1066,7 @@ public long[] batchUpdate(Iterable<Statement> statements, UpdateOption... update
         final ExecuteBatchDmlRequest.Builder builder =
             getExecuteBatchDmlRequestBuilder(statements, options);
         XGoogSpannerRequestId reqId =
-            session.getRequestIdCreator().nextRequestId(1 /*TODO: channelId */, 1);
+            session.getRequestIdCreator().nextRequestId(session.getChannel(), 1);
         try {
           com.google.spanner.v1.ExecuteBatchDmlResponse response =
               rpc.executeBatchDml(builder.build(), reqId.withOptions(getTransactionChannelHint()));
@@ -1128,7 +1128,7 @@ public ApiFuture<long[]> batchUpdateAsync(
             getExecuteBatchDmlRequestBuilder(statements, options);
         ApiFuture<com.google.spanner.v1.ExecuteBatchDmlResponse> response;
         XGoogSpannerRequestId reqId =
-            session.getRequestIdCreator().nextRequestId(1 /*TODO: channelId */, 1);
+            session.getRequestIdCreator().nextRequestId(session.getChannel(), 1);
         try {
           // Register the update as an async operation that must finish before the transaction may
           // commit.