[iotdb] branch master updated (18dea61 -> 4626f6f)

[qi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git.


    from 18dea61  [IOTDB-2258] restructure the csv import tool (#4954)
     add 4626f6f  [IOTDB-2445]select count(*) execution failed : overlapped data should be consumed first (#4983)

No new revisions were added by this update.

Summary of changes:
 docs/UserGuide/Reference/Config-Manual.md          |  11 +--
 docs/zh/UserGuide/Reference/Config-Manual.md       |  11 +--
 .../integration/IoTDBSizeTieredCompactionIT.java   |  20 +---
 .../resources/conf/iotdb-engine.properties         |   6 --
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |  19 +---
 .../org/apache/iotdb/db/conf/IoTDBConstant.java    |   1 +
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |   6 --
 .../db/engine/compaction/CompactionScheduler.java  |  14 +--
 .../engine/compaction/CompactionTaskManager.java   |   4 +-
 .../db/engine/compaction/CompactionUtils.java      |   3 +-
 .../CrossSpaceCompactionExceptionHandler.java      |   9 +-
 .../RewriteCrossSpaceCompactionSelector.java       |   7 +-
 .../rewrite/manage/CrossSpaceMergeResource.java    |  36 ++++---
 .../selector/RewriteCompactionFileSelector.java    |  58 ++++++-----
 .../task/RewriteCrossCompactionRecoverTask.java    |   2 +-
 .../task/RewriteCrossSpaceCompactionTask.java      |  12 ++-
 .../inner/AbstractInnerSpaceCompactionTask.java    |   4 +-
 .../InnerSpaceCompactionExceptionHandler.java      |   3 +-
 .../SizeTieredCompactionRecoverTask.java           |   3 +-
 .../sizetiered/SizeTieredCompactionSelector.java   |   4 +-
 .../inner/sizetiered/SizeTieredCompactionTask.java |  12 ++-
 .../inner/utils/InnerSpaceCompactionUtils.java     |   3 +-
 .../compaction/task/AbstractCompactionTask.java    |   4 +-
 .../db/engine/storagegroup/TsFileResource.java     |   7 +-
 .../storagegroup/VirtualStorageGroupProcessor.java |  14 ++-
 .../java/org/apache/iotdb/db/utils/MergeUtils.java | 109 ---------------------
 .../engine/compaction/CompactionSchedulerTest.java |  12 +--
 .../db/engine/compaction/CompactionUtilsTest.java  |  61 ++++++++++++
 .../cross/RewriteCompactionFileSelectorTest.java   |   2 +-
 .../compaction/utils/CompactionConfigRestorer.java |   2 -
 30 files changed, 206 insertions(+), 253 deletions(-)