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

qiaojialin pushed a commit to tag v0.12.5.1
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 874317f41bc09087dbc75f71bb1ff03de216a408
Merge: 1fcd2e09f1 6ec73d57ad
Author: qiaojialin <[email protected]>
AuthorDate: Sat Jun 11 21:51:30 2022 +0800

    Merge branch 'rel/0.12' of github.com:apache/iotdb into rel/0.12

 .../java/org/apache/iotdb/RewriteFileTool.java     |  74 ++++--
 .../db/engine/merge/task/MergeMultiChunkTask.java  | 265 ++++++++++-----------
 .../iotdb/db/engine/merge/MergeNewSeriesTest.java  | 115 +++++++++
 .../iotdb/db/engine/merge/MergeOverLapTest.java    |  62 +----
 .../iotdb/db/engine/merge/MergeTaskTest.java       |   6 +-
 .../apache/iotdb/db/engine/merge/MergeTest.java    | 216 ++++++++++++-----
 .../iotdb/db/integration/IoTDBCheckConfigIT.java   |   6 +
 .../iotdb/tsfile/read/TsFileSequenceReader.java    |  83 +++++++
 .../apache/iotdb/tsfile/utils/PreviewIterator.java |  27 +++
 9 files changed, 570 insertions(+), 284 deletions(-)

Reply via email to