You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2020/12/15 15:17:10 UTC

[iotdb] branch UpgradeToolV3 updated (51dfc6e -> 7220ae1)

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

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


    from 51dfc6e  merge NewTsFile
     add 9d45b23  fix spark ut
     add a712b52  Add compaction test (#2220)
     add 45dd9bc  merge master
     add e81aac9  make sonar happy
     add 7220ae1  Merge branch 'NewTsFile' of https://github.com/apache/iotdb into UpgradeToolV3

No new revisions were added by this update.

Summary of changes:
 docs/zh/SystemDesign/StorageEngine/Compaction.md   |   10 +-
 .../main/java/org/apache/iotdb/JDBCExample.java    |   10 +-
 .../level/LevelCompactionTsFileManagement.java     |  152 +--
 .../no/NoCompactionTsFileManagement.java           |   10 +-
 .../compaction/utils/CompactionLogAnalyzer.java    |   19 +-
 .../engine/compaction/utils/CompactionLogger.java  |   16 +-
 .../engine/compaction/utils/CompactionUtils.java   |   84 +-
 .../db/engine/storagegroup/TsFileResource.java     |   14 +-
 .../java/org/apache/iotdb/db/utils/QueryUtils.java |    1 -
 .../LevelCompactionLogTest.java}                   |   61 +-
 .../compaction/LevelCompactionMergeTest.java       |  142 +++
 .../compaction/LevelCompactionRecoverTest.java     |  507 +++++++++
 .../LevelCompactionSelectorTest.java}              |   50 +-
 .../LevelCompactionTest.java}                      |   68 +-
 .../LevelCompactionTsFileManagementTest.java       |  120 ++
 .../NoCompactionTsFileManagementTest.java          |  127 +++
 .../iotdb/db/integration/IoTDBCompactionIT.java    |  154 ---
 .../db/integration/IoTDBLevelCompactionIT.java     | 1180 ++++++++++++++++++++
 .../apache/iotdb/spark/tsfile/HDFSInputTest.java   |    4 +-
 .../tsfile/read/reader/chunk/ChunkReader.java      |    9 +-
 20 files changed, 2352 insertions(+), 386 deletions(-)
 copy server/src/test/java/org/apache/iotdb/db/engine/{merge/MergeLogTest.java => compaction/LevelCompactionLogTest.java} (52%)
 create mode 100644 server/src/test/java/org/apache/iotdb/db/engine/compaction/LevelCompactionMergeTest.java
 create mode 100644 server/src/test/java/org/apache/iotdb/db/engine/compaction/LevelCompactionRecoverTest.java
 copy server/src/test/java/org/apache/iotdb/db/engine/{merge/MergeLogTest.java => compaction/LevelCompactionSelectorTest.java} (60%)
 copy server/src/test/java/org/apache/iotdb/db/engine/{merge/MergeTest.java => compaction/LevelCompactionTest.java} (79%)
 create mode 100644 server/src/test/java/org/apache/iotdb/db/engine/compaction/LevelCompactionTsFileManagementTest.java
 create mode 100644 server/src/test/java/org/apache/iotdb/db/engine/compaction/NoCompactionTsFileManagementTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/integration/IoTDBCompactionIT.java
 create mode 100644 server/src/test/java/org/apache/iotdb/db/integration/IoTDBLevelCompactionIT.java