[iotdb] branch xingtanzjr/query_retry updated: make resultHandle could be created again

[xingtanzjr]

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

xingtanzjr pushed a commit to branch xingtanzjr/query_retry
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/xingtanzjr/query_retry by this 
push:
     new a10a5077fa make resultHandle could be created again
a10a5077fa is described below

commit a10a5077fa0b38fdaacf6aace564112d2d04929b
Author: Jinrui.Zhang <xingtan...@gmail.com>
AuthorDate: Tue Jul 19 16:17:43 2022 +0800

    make resultHandle could be created again
---
 .../db/mpp/plan/execution/QueryExecution.java      | 40 ++++++++++------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java
 
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java
index 0225d403eb..72017c0f55 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java
@@ -401,27 +401,25 @@ public class QueryExecution implements IQueryExecution {
   }
 
   private void initResultHandle() {
-    if (this.resultHandle == null) {
-      TEndPoint upstreamEndPoint = 
context.getResultNodeContext().getUpStreamEndpoint();
-
-      this.resultHandle =
-          isSameNode(upstreamEndPoint)
-              ? MPPDataExchangeService.getInstance()
-                  .getMPPDataExchangeManager()
-                  .createLocalSourceHandle(
-                      
context.getResultNodeContext().getVirtualFragmentInstanceId().toThrift(),
-                      
context.getResultNodeContext().getVirtualResultNodeId().getId(),
-                      
context.getResultNodeContext().getUpStreamFragmentInstanceId().toThrift(),
-                      stateMachine::transitionToFailed)
-              : MPPDataExchangeService.getInstance()
-                  .getMPPDataExchangeManager()
-                  .createSourceHandle(
-                      
context.getResultNodeContext().getVirtualFragmentInstanceId().toThrift(),
-                      
context.getResultNodeContext().getVirtualResultNodeId().getId(),
-                      upstreamEndPoint,
-                      
context.getResultNodeContext().getUpStreamFragmentInstanceId().toThrift(),
-                      stateMachine::transitionToFailed);
-    }
+    TEndPoint upstreamEndPoint = 
context.getResultNodeContext().getUpStreamEndpoint();
+
+    this.resultHandle =
+        isSameNode(upstreamEndPoint)
+            ? MPPDataExchangeService.getInstance()
+                .getMPPDataExchangeManager()
+                .createLocalSourceHandle(
+                    
context.getResultNodeContext().getVirtualFragmentInstanceId().toThrift(),
+                    
context.getResultNodeContext().getVirtualResultNodeId().getId(),
+                    
context.getResultNodeContext().getUpStreamFragmentInstanceId().toThrift(),
+                    stateMachine::transitionToFailed)
+            : MPPDataExchangeService.getInstance()
+                .getMPPDataExchangeManager()
+                .createSourceHandle(
+                    
context.getResultNodeContext().getVirtualFragmentInstanceId().toThrift(),
+                    
context.getResultNodeContext().getVirtualResultNodeId().getId(),
+                    upstreamEndPoint,
+                    
context.getResultNodeContext().getUpStreamFragmentInstanceId().toThrift(),
+                    stateMachine::transitionToFailed);
   }
 
   @SuppressWarnings("squid:S3776") // Suppress high Cognitive Complexity 
warning