You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@iotdb.apache.org by ji...@apache.org on 2019/07/19 03:40:34 UTC

[incubator-iotdb] branch dev_merge updated (e35525c -> 7e05549)

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

jiangtian pushed a change to branch dev_merge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from e35525c  fix merge statistic unit
     add 7e05549  add whole chunk write interface

No new revisions were added by this update.

Summary of changes:
 .../iotdb/db/engine/merge/task/MergeChunkTask.java | 110 ++++++++++++---------
 .../iotdb/db/engine/merge/task/MergeFileTask.java  |  16 +--
 .../java/org/apache/iotdb/db/utils/MergeUtils.java |  20 ++--
 .../iotdb/db/engine/merge/MergePerfTest.java       |  22 ++---
 .../iotdb/db/engine/merge/MergeTaskTest.java       |  25 +++++
 .../apache/iotdb/db/engine/merge/MergeTest.java    |   2 +-
 .../iotdb/tsfile/write/chunk/ChunkBuffer.java      |   5 +-
 .../iotdb/tsfile/write/chunk/ChunkWriterImpl.java  |   5 +
 .../iotdb/tsfile/write/chunk/IChunkWriter.java     |   3 +
 .../tsfile/write/writer/DefaultTsFileOutput.java   |   2 +-
 .../iotdb/tsfile/write/writer/TsFileIOWriter.java  |  19 +++-
 11 files changed, 143 insertions(+), 86 deletions(-)