You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hu...@apache.org on 2022/05/31 11:37:45 UTC
[iotdb] 03/03: Merge remote-tracking branch 'origin/master' into lmh/AlignByDeviceDebug
This is an automated email from the ASF dual-hosted git repository.
hui pushed a commit to branch lmh/AlignByDeviceDebug
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 24e1478bc5d42061a57c41b82e12a482e529d4e4
Merge: 9f6f4cf654 d9d2465f0d
Author: Minghui Liu <li...@foxmail.com>
AuthorDate: Tue May 31 14:20:29 2022 +0800
Merge remote-tracking branch 'origin/master' into lmh/AlignByDeviceDebug
.../execution/schedule/AbstractDriverThread.java | 8 +++-
.../db/mpp/execution/schedule/DriverScheduler.java | 34 ++++++++++-------
.../schedule/FragmentInstanceAbortedException.java | 1 +
.../db/mpp/plan/analyze/ExpressionAnalyzer.java | 10 ++++-
.../db/mpp/plan/planner/LocalExecutionPlanner.java | 6 +--
.../java/org/apache/iotdb/db/service/DataNode.java | 9 +++--
...erTest.java => DefaultDriverSchedulerTest.java} | 2 +-
.../execution/schedule/DriverSchedulerTest.java | 2 +-
.../DriverTaskTimeoutSentinelThreadTest.java | 43 ++++++++++++++++++++++
9 files changed, 90 insertions(+), 25 deletions(-)