You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2022/05/11 13:28:36 UTC
[iotdb] branch xingtanzjr/0511_test updated (9e4749ae46 -> f29fb7edcb)
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a change to branch xingtanzjr/0511_test
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 9e4749ae46 Merge branch 'BrokenPipe' into xingtanzjr/0511_test
new 6c4676fc1f tmp save
add 679c5b5793 add more message
new f29fb7edcb Merge branch 'BrokenPipe' into xingtanzjr/0511_test
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../sync/SyncThriftClientWithErrorHandler.java | 21 ++++++++++++++++++---
.../iotdb/db/mpp/plan/execution/QueryExecution.java | 4 +++-
2 files changed, 21 insertions(+), 4 deletions(-)
[iotdb] 02/02: Merge branch 'BrokenPipe' into xingtanzjr/0511_test
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch xingtanzjr/0511_test
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit f29fb7edcb3d755c74fdaaf05d86249d87b482b8
Merge: 6c4676fc1f 679c5b5793
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Wed May 11 21:28:25 2022 +0800
Merge branch 'BrokenPipe' into xingtanzjr/0511_test
.../sync/SyncThriftClientWithErrorHandler.java | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
[iotdb] 01/02: tmp save
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch xingtanzjr/0511_test
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 6c4676fc1ffb084a091070a0a0ec780924a5e026
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Wed May 11 21:28:05 2022 +0800
tmp save
---
.../java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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 0e5da23ad1..257559527c 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
@@ -236,7 +236,9 @@ public class QueryExecution implements IQueryExecution {
// There are only two scenarios where the ResultHandle should be closed:
// 1. The client fetch all the result and the ResultHandle is finished.
// 2. The client's connection is closed that all owned QueryExecution should be cleaned up
- if (resultHandle != null && resultHandle.isFinished()) {
+ // If the QueryExecution's state is abnormal, we should also abort the resultHandle without
+ // waiting it to be finished.
+ if (resultHandle != null) {
resultHandle.abort();
}
}