This is an automated email from the ASF dual-hosted git repository. hui pushed a commit to branch lmh/GroupByLevelDebug in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 7498ccd8f0a28a3183de6c35d5aefe60f4c9bca2 Merge: a7450f648f fbb18a3224 Author: liuminghui233 <[email protected]> AuthorDate: Wed Jun 1 21:59:42 2022 +0800 Merge remote-tracking branch 'upstream/fix_some_issues_0531' into GroupByLevelDebug confignode/src/assembly/confignode.xml | 4 + distribution/src/assembly/all.xml | 4 + .../metrics/config/MetricConfigDescriptor.java | 10 +- .../engine/compaction/CompactionTaskManager.java | 7 ++ .../rewrite/task/ReadPointPerformerSubTask.java | 26 ++---- .../compaction/inner/InnerSpaceCompactionTask.java | 4 +- .../utils/AlignedSeriesCompactionExecutor.java | 24 ++++- .../inner/utils/MultiTsFileDeviceIterator.java | 3 + .../utils/SingleSeriesCompactionExecutor.java | 34 +++++++ .../impl/ReadChunkCompactionPerformer.java | 18 +--- .../impl/ReadPointCompactionPerformer.java | 104 +++++++++++++++++---- .../plan/expression/multi/FunctionExpression.java | 8 +- .../compaction/CompactionTaskManagerTest.java | 21 ++++- .../compaction/inner/InnerUnseqCompactionTest.java | 2 + .../ReadChunkCompactionPerformerNoAlignedTest.java | 1 - 15 files changed, 203 insertions(+), 67 deletions(-)
