You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2022/01/07 09:32:31 UTC
[iotdb] branch master updated (f7affbb -> 4df4bcc)

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 f7affbb  fix tag recovery bug after tag upsert (#4718)
     add 4df4bcc  [IOTDB-2176] Limit target chunk size when performing inner space compaction (#4698)

No new revisions were added by this update.

Summary of changes:
 .../apache/iotdb/tsfile/TsFileSequenceRead.java    |    2 +
 .../apache/iotdb/db/integration/IoTDBMergeIT.java  |    6 +-
 .../resources/conf/iotdb-engine.properties         |   18 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |   68 +-
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |   18 +
 .../compaction/CompactionTaskComparator.java       |   14 +-
 .../engine/compaction/CompactionTaskManager.java   |   10 +
 .../sizetiered/SizeTieredCompactionSelector.java   |    6 +-
 .../inner/sizetiered/SizeTieredCompactionTask.java |   17 +-
 .../inner/utils/InnerSpaceCompactionUtils.java     |  496 +---
 .../inner/utils/MultiTsFileDeviceIterator.java     |  251 ++
 .../utils/SingleSeriesCompactionExecutor.java      |  328 +++
 .../engine/compaction/CompactionSchedulerTest.java | 3035 +++++++++++---------
 .../compaction/CompactionTaskComparatorTest.java   |    4 +-
 .../compaction/inner/InnerCompactionChunkTest.java |  246 --
 .../compaction/inner/InnerSeqCompactionTest.java   |  989 ++++---
 .../InnerSpaceCompactionUtilsNoAlignedTest.java    |  827 ++++++
 ....java => InnerSpaceCompactionUtilsOldTest.java} |   11 +-
 .../compaction/inner/InnerUnseqCompactionTest.java |    6 +-
 .../SizeTieredCompactionHandleExceptionTest.java   |  192 +-
 .../recover/SizeTieredCompactionRecoverTest.java   |   46 +
 .../compaction/utils/CompactionCheckerUtils.java   |   76 +-
 .../compaction/utils/CompactionClearUtils.java     |   16 +-
 .../iotdb/tsfile/read/TsFileDeviceIterator.java    |   73 +
 .../iotdb/tsfile/read/TsFileSequenceReader.java    |    2 +-
 .../org/apache/iotdb/tsfile/read/common/Chunk.java |    2 +-
 26 files changed, 4017 insertions(+), 2742 deletions(-)
 create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/utils/MultiTsFileDeviceIterator.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/utils/SingleSeriesCompactionExecutor.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionChunkTest.java
 create mode 100644 server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerSpaceCompactionUtilsNoAlignedTest.java
 rename server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/{InnerSpaceCompactionUtilsTest.java => InnerSpaceCompactionUtilsOldTest.java} (91%)
 create mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileDeviceIterator.java