fix: Avoid blocking thread in AsyncResultSet

Author: sakthivelmanii

google-cloud-spanner/clirr-ignored-differences.xml

@@ -790,5 +790,9 @@
     <className>com/google/cloud/spanner/connection/Connection</className>
     <method>boolean isAutoBatchDmlUpdateCountVerification()</method>
   </difference>
-  
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/spanner/ResultSet</className>
+    <method>boolean initiateStreaming(com.google.cloud.spanner.AsyncResultSet$StreamMessageListener)</method>
+  </difference>
 </differences>

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

@@ -768,9 +768,12 @@ ResultSet executeQueryInternalWithOptions(
             rpc.getExecuteQueryRetrySettings(),
             rpc.getExecuteQueryRetryableCodes()) {
           @Override
-          CloseableIterator<PartialResultSet> startStream(@Nullable ByteString resumeToken) {
+          CloseableIterator<PartialResultSet> startStream(
+              @Nullable ByteString resumeToken,
+              AsyncResultSet.StreamMessageListener streamListener) {
             GrpcStreamIterator stream =
                 new GrpcStreamIterator(statement, prefetchChunks, cancelQueryWhenClientIsClosed);
+            stream.registerListener(streamListener);
             if (partitionToken != null) {
               request.setPartitionToken(partitionToken);
             }
@@ -791,8 +794,8 @@ CloseableIterator<PartialResultSet> startStream(@Nullable ByteString resumeToken
                     getTransactionChannelHint(),
                     isRouteToLeader());
             session.markUsed(clock.instant());
-            call.request(prefetchChunks);
             stream.setCall(call, request.getTransaction().hasBegin());
+            call.request(prefetchChunks);
             return stream;
           }
 
@@ -959,9 +962,12 @@ ResultSet readInternalWithOptions(
             rpc.getReadRetrySettings(),
             rpc.getReadRetryableCodes()) {
           @Override
-          CloseableIterator<PartialResultSet> startStream(@Nullable ByteString resumeToken) {
+          CloseableIterator<PartialResultSet> startStream(
+              @Nullable ByteString resumeToken,
+              AsyncResultSet.StreamMessageListener streamListener) {
             GrpcStreamIterator stream =
                 new GrpcStreamIterator(prefetchChunks, cancelQueryWhenClientIsClosed);
+            stream.registerListener(streamListener);
             TransactionSelector selector = null;
             if (resumeToken != null) {
               builder.setResumeToken(resumeToken);
@@ -980,8 +986,8 @@ CloseableIterator<PartialResultSet> startStream(@Nullable ByteString resumeToken
                     getTransactionChannelHint(),
                     isRouteToLeader());
             session.markUsed(clock.instant());
-            call.request(prefetchChunks);
             stream.setCall(call, /* withBeginTransaction = */ builder.getTransaction().hasBegin());
+            call.request(prefetchChunks);
             return stream;
           }
 

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

@@ -150,6 +150,10 @@ interface CloseableIterator<T> extends Iterator<T> {
     void close(@Nullable String message);
 
     boolean isWithBeginTransaction();
+
+    default boolean initiateStreaming(AsyncResultSet.StreamMessageListener streamMessageListener) {
+      return false;
+    }
   }
 
   static double valueProtoToFloat64(com.google.protobuf.Value proto) {

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

@@ -18,6 +18,7 @@
 
 import com.google.api.core.ApiFuture;
 import com.google.common.base.Function;
+import com.google.spanner.v1.PartialResultSet;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
@@ -223,4 +224,24 @@ interface ReadyCallback {
    * @param transformer function which will be used to transform the row. It should not return null.
    */
   <T> List<T> toList(Function<StructReader, T> transformer) throws SpannerException;
+
+  /**
+   * An interface to register the listener for streaming gRPC request. It will be called when a
+   * chunk is received from gRPC streaming call.
+   */
+  interface StreamMessageListener {
+    void onStreamMessage(
+        PartialResultSet partialResultSet,
+        int prefetchChunks,
+        int currentBufferSize,
+        StreamMessageRequestor streamMessageRequestor);
+  }
+
+  /**
+   * An interface to request more messages from the gRPC streaming call. It will be implemented by
+   * the class which has access to SpannerRpc.StreamingCall object
+   */
+  interface StreamMessageRequestor {
+    void requestMessages(int numOfMessages);
+  }
 }

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

@@ -18,7 +18,6 @@
 
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
-import com.google.api.core.ListenableFutureToApiFuture;
 import com.google.api.core.SettableApiFuture;
 import com.google.api.gax.core.ExecutorProvider;
 import com.google.cloud.spanner.AbstractReadContext.ListenableAsyncResultSet;
@@ -29,28 +28,25 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.ListeningScheduledExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
+import com.google.spanner.v1.PartialResultSet;
 import com.google.spanner.v1.ResultSetMetadata;
 import com.google.spanner.v1.ResultSetStats;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.BlockingDeque;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Future;
-import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /** Default implementation for {@link AsyncResultSet}. */
-class AsyncResultSetImpl extends ForwardingStructReader implements ListenableAsyncResultSet {
+class AsyncResultSetImpl extends ForwardingStructReader
+    implements ListenableAsyncResultSet, AsyncResultSet.StreamMessageListener {
   private static final Logger log = Logger.getLogger(AsyncResultSetImpl.class.getName());
 
   /** State of an {@link AsyncResultSetImpl}. */
   private enum State {
     INITIALIZED,
+    IN_PROGRESS,
     /** SYNC indicates that the {@link ResultSet} is used in sync pattern. */
     SYNC,
     CONSUMING,
@@ -115,12 +111,15 @@ private enum State {
 
   private State state = State.INITIALIZED;
 
+  /** This variable indicates that produce rows thread is initiated */
+  private volatile boolean produceRowsInitiated;
+
   /**
    * This variable indicates whether all the results from the underlying result set have been read.
    */
   private volatile boolean finished;
 
-  private volatile ApiFuture<Void> result;
+  private volatile SettableApiFuture<Void> result;
 
   /**
    * This variable indicates whether {@link #tryNext()} has returned {@link CursorState#DONE} or a
@@ -329,12 +328,12 @@ public void run() {
   private final CallbackRunnable callbackRunnable = new CallbackRunnable();
 
   /**
-   * {@link ProduceRowsCallable} reads data from the underlying {@link ResultSet}, places these in
+   * {@link ProduceRowsRunnable} reads data from the underlying {@link ResultSet}, places these in
    * the buffer and dispatches the {@link CallbackRunnable} when data is ready to be consumed.
    */
-  private class ProduceRowsCallable implements Callable<Void> {
+  private class ProduceRowsRunnable implements Runnable {
     @Override
-    public Void call() throws Exception {
+    public void run() {
       boolean stop = false;
       boolean hasNext = false;
       try {
@@ -393,12 +392,17 @@ public Void call() throws Exception {
         }
         // Call the callback if there are still rows in the buffer that need to be processed.
         while (!stop) {
-          waitIfPaused();
-          startCallbackIfNecessary();
-          // Make sure we wait until the callback runner has actually finished.
-          consumingLatch.await();
-          synchronized (monitor) {
-            stop = cursorReturnedDoneOrException;
+          try {
+            waitIfPaused();
+            startCallbackIfNecessary();
+            // Make sure we wait until the callback runner has actually finished.
+            consumingLatch.await();
+            synchronized (monitor) {
+              stop = cursorReturnedDoneOrException;
+            }
+          } catch (InterruptedException e) {
+            result.setException(e);
+            return;
           }
         }
       } finally {
@@ -410,14 +414,16 @@ public Void call() throws Exception {
         }
         synchronized (monitor) {
           if (executionException != null) {
+            result.setException(executionException);
             throw executionException;
           }
           if (state == State.CANCELLED) {
+            result.setException(CANCELLED_EXCEPTION);
             throw CANCELLED_EXCEPTION;
           }
         }
       }
-      return null;
+      result.set(null);
     }
 
     private void waitIfPaused() throws InterruptedException {
@@ -449,6 +455,21 @@ private void startCallbackWithBufferLatchIfNecessary(int bufferLatch) {
     }
   }
 
+  private class InitiateStreamingRunnable implements Runnable {
+
+    @Override
+    public void run() {
+      try {
+        if (!initiateStreaming(AsyncResultSetImpl.this)) {
+          initiateProduceRows();
+        }
+      } catch (SpannerException e) {
+        executionException = e;
+        initiateProduceRows();
+      }
+    }
+  }
+
   /** Sets the callback for this {@link AsyncResultSet}. */
   @Override
   public ApiFuture<Void> setCallback(Executor exec, ReadyCallback cb) {
@@ -458,16 +479,24 @@ public ApiFuture<Void> setCallback(Executor exec, ReadyCallback cb) {
           this.state == State.INITIALIZED, "callback may not be set multiple times");
 
       // Start to fetch data and buffer these.
-      this.result =
-          new ListenableFutureToApiFuture<>(this.service.submit(new ProduceRowsCallable()));
+      this.result = SettableApiFuture.create();
+      this.state = State.IN_PROGRESS;
+      this.service.execute(new InitiateStreamingRunnable());
       this.executor = MoreExecutors.newSequentialExecutor(Preconditions.checkNotNull(exec));
       this.callback = Preconditions.checkNotNull(cb);
-      this.state = State.RUNNING;
       pausedLatch.countDown();
       return result;
     }
   }
 
+  private void initiateProduceRows() {
+    this.service.execute(new ProduceRowsRunnable());
+    if (this.state == State.IN_PROGRESS) {
+      this.state = State.RUNNING;
+    }
+    produceRowsInitiated = true;
+  }
+
   Future<Void> getResult() {
     return result;
   }
@@ -578,6 +607,11 @@ public ResultSetMetadata getMetadata() {
     return delegateResultSet.get().getMetadata();
   }
 
+  @Override
+  public boolean initiateStreaming(StreamMessageListener streamMessageListener) {
+    return delegateResultSet.get().initiateStreaming(streamMessageListener);
+  }
+
   @Override
   protected void checkValidState() {
     synchronized (monitor) {
@@ -593,4 +627,28 @@ public Struct getCurrentRowAsStruct() {
     checkValidState();
     return currentRow;
   }
+
+  @Override
+  public void onStreamMessage(
+      PartialResultSet partialResultSet,
+      int prefetchChunks,
+      int currentBufferSize,
+      StreamMessageRequestor streamMessageRequestor) {
+    synchronized (monitor) {
+      if (produceRowsInitiated) {
+        return;
+      }
+      // if PartialResultSet contains resume token or buffer size is more than configured size or
+      // we have reached end of stream, we can start the thread
+      boolean startJobThread =
+          !partialResultSet.getResumeToken().isEmpty()
+              || currentBufferSize >= prefetchChunks
+              || partialResultSet == GrpcStreamIterator.END_OF_STREAM;
+      if (startJobThread || state != State.IN_PROGRESS) {
+        initiateProduceRows();
+      } else {
+        streamMessageRequestor.requestMessages(1);
+      }
+    }
+  }
 }

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

@@ -102,4 +102,9 @@ public ResultSetStats getStats() {
   public ResultSetMetadata getMetadata() {
     return delegate.get().getMetadata();
   }
+
+  @Override
+  public boolean initiateStreaming(AsyncResultSet.StreamMessageListener streamMessageListener) {
+    return delegate.get().initiateStreaming(streamMessageListener);
+  }
 }

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

@@ -123,6 +123,11 @@ public ResultSetMetadata getMetadata() {
     return metadata;
   }
 
+  @Override
+  public boolean initiateStreaming(AsyncResultSet.StreamMessageListener streamMessageListener) {
+    return iterator.initiateStreaming(streamMessageListener);
+  }
+
   @Override
   public void close() {
     synchronized (this) {