This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch NewTsFileV2
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from ae1f0c4 Merge branch 'master' into NewTsFileV2
add efa90b7 [To NewTsFileV2]fix merge cpu (#2575)
No new revisions were added by this update.
Summary of changes:
.../engine/compaction/utils/CompactionUtils.java | 190 ++++++++++++---------
.../db/engine/merge/task/MergeMultiChunkTask.java | 90 +++++++++-
.../java/org/apache/iotdb/db/utils/MergeUtils.java | 2 +-
...nTest.java => LevelCompactionMoreDataTest.java} | 168 ++++++++----------
.../db/engine/compaction/LevelCompactionTest.java | 6 +-
.../iotdb/db/engine/merge/MergeOverLapTest.java | 26 ++-
.../apache/iotdb/db/engine/merge/MergeTest.java | 19 +--
7 files changed, 285 insertions(+), 216 deletions(-)
copy
server/src/test/java/org/apache/iotdb/db/engine/compaction/{LevelCompactionTest.java
=> LevelCompactionMoreDataTest.java} (59%)
