This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a change to branch fix_some_issues_0531
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 7205b03d25 Merge branch 'master' into fix_some_issues_0531
add 7fe40937a2 [IOTDB-3340] Fix NPE caused by deserialization of
FunctionExpression (#6128)
add d4ccd578da [IOTDB-2931] Remove access to metadata manager during
compaction (#5572)
add ab1451514b [IOTDB-3369] Fix some problems of metric module in
confignode. (#6132)
add fbb18a3224 erge branch 'master' into fix_some_issues_0531
No new revisions were added by this update.
Summary of changes:
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(-)
