You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2023/02/27 09:23:27 UTC
[iotdb] branch geely_car_0206 updated (746d5f5423 -> 97fd99e221)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch geely_car_0206
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 746d5f5423 Merge remote-tracking branch 'origin/master' into geely_car_0206
add 74c950d165 [IOTDB-5584] Fix wrong intialization in GROUP BY CONDITION
new e805cef45f Merge remote-tracking branch 'origin/master' into geely_car_0206
new d859c7691a avoid too much warn log
add 12d9e73d6f [IOTDB-5462] Optimize the memory estimation of ExchangeOperator in the pipelin
new 97fd99e221 Merge remote-tracking branch 'origin/master' into geely_car_0206
The 3 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:
docs/UserGuide/Query-Data/Group-By.md | 2 +-
docs/zh/UserGuide/Query-Data/Group-By.md | 2 +-
.../db/it/groupby/IoTDBGroupByConditionIT.java | 11 +++++++++++
.../execution/exchange/sink/ShuffleSinkHandle.java | 6 +++++-
.../operator/source/ExchangeOperator.java | 23 ++++++++++++++++++++--
.../operator/window/SeriesWindowManager.java | 4 +++-
.../db/mpp/plan/planner/OperatorTreeGenerator.java | 6 ++++--
.../mpp/execution/operator/OperatorMemoryTest.java | 15 ++++++++++++++
8 files changed, 61 insertions(+), 8 deletions(-)
[iotdb] 01/03: Merge remote-tracking branch 'origin/master' into geely_car_0206
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch geely_car_0206
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit e805cef45f14ee2b3aca5ae08b02d52a7bc82998
Merge: 746d5f5423 74c950d165
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Mon Feb 27 16:11:48 2023 +0800
Merge remote-tracking branch 'origin/master' into geely_car_0206
docs/UserGuide/Query-Data/Group-By.md | 2 +-
docs/zh/UserGuide/Query-Data/Group-By.md | 2 +-
.../apache/iotdb/db/it/groupby/IoTDBGroupByConditionIT.java | 11 +++++++++++
.../db/mpp/execution/operator/window/SeriesWindowManager.java | 4 +++-
4 files changed, 16 insertions(+), 3 deletions(-)
[iotdb] 03/03: Merge remote-tracking branch 'origin/master' into geely_car_0206
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch geely_car_0206
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 97fd99e22124f6886fea9b230d905aa48f775e9f
Merge: d859c7691a 12d9e73d6f
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Mon Feb 27 17:09:35 2023 +0800
Merge remote-tracking branch 'origin/master' into geely_car_0206
.../operator/source/ExchangeOperator.java | 23 ++++++++++++++++++++--
.../db/mpp/plan/planner/OperatorTreeGenerator.java | 6 ++++--
.../mpp/execution/operator/OperatorMemoryTest.java | 15 ++++++++++++++
3 files changed, 40 insertions(+), 4 deletions(-)
[iotdb] 02/03: avoid too much warn log
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch geely_car_0206
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit d859c7691a982dc53601ef4e3707657124cc4309
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Mon Feb 27 16:14:34 2023 +0800
avoid too much warn log
---
.../iotdb/db/mpp/execution/exchange/sink/ShuffleSinkHandle.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/sink/ShuffleSinkHandle.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/sink/ShuffleSinkHandle.java
index 9b18f4f771..90f601ecae 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/sink/ShuffleSinkHandle.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/sink/ShuffleSinkHandle.java
@@ -162,13 +162,17 @@ public class ShuffleSinkHandle implements ISinkHandle {
return;
}
LOGGER.debug("[StartAbortShuffleSinkHandle]");
+ boolean abortFailed = false;
for (ISink channel : downStreamChannelList) {
try {
channel.abort();
} catch (Exception e) {
- LOGGER.warn("Error occurred when try to abort channel.");
+ abortFailed = true;
}
}
+ if (abortFailed) {
+ LOGGER.warn("Error occurred when try to abort channel.");
+ }
aborted = true;
sinkListener.onAborted(this);
LOGGER.debug("[EndAbortShuffleSinkHandle]");