(pinot) branch master updated: Always return metadata block when leaf stage operator is early terminated (#15129)

[gortiz]

This is an automated email from the ASF dual-hosted git repository.

gortiz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git


The following commit(s) were added to refs/heads/master by this push:
     new ca43a859cc Always return metadata block when leaf stage operator is 
early terminated (#15129)
ca43a859cc is described below

commit ca43a859cc3fa4064be16cf113f4614c5b0c49dc
Author: Yash Mayya <yash.ma...@gmail.com>
AuthorDate: Wed Feb 26 17:20:31 2025 +0530

    Always return metadata block when leaf stage operator is early terminated 
(#15129)
---
 .../query/runtime/operator/LeafStageTransferableBlockOperator.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/LeafStageTransferableBlockOperator.java
 
b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/LeafStageTransferableBlockOperator.java
index b722afbda9..e6fe338fb7 100644
--- 
a/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/LeafStageTransferableBlockOperator.java
+++ 
b/pinot-query-runtime/src/main/java/org/apache/pinot/query/runtime/operator/LeafStageTransferableBlockOperator.java
@@ -165,6 +165,9 @@ public class LeafStageTransferableBlockOperator extends 
MultiStageOperator {
     if (_executionFuture == null) {
       _executionFuture = startExecution();
     }
+    if (_isEarlyTerminated) {
+      return constructMetadataBlock();
+    }
     BaseResultsBlock resultsBlock =
         _blockingQueue.poll(_context.getDeadlineMs() - 
System.currentTimeMillis(), TimeUnit.MILLISECONDS);
     if (resultsBlock == null) {
@@ -175,7 +178,7 @@ public class LeafStageTransferableBlockOperator extends 
MultiStageOperator {
     if (exceptions != null) {
       return TransferableBlockUtils.getErrorTransferableBlock(exceptions);
     }
-    if (_isEarlyTerminated || resultsBlock == LAST_RESULTS_BLOCK) {
+    if (resultsBlock == LAST_RESULTS_BLOCK) {
       return constructMetadataBlock();
     } else {
       // Regular data block


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org