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

Posted to commits@iotdb.apache.org by ja...@apache.org on 2021/01/21 15:24:54 UTC

[iotdb] branch master updated (32d91c1 -> 7416dcf)

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

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


    from 32d91c1  Use FileOutputStream instead of FileChannel to avoid a potential resource leak in synchronous service (#2408)
     add 7416dcf  [ISSUE-2545, 2549] Fix unseq merge end time bug (#2544)

No new revisions were added by this update.

Summary of changes:
 .../iotdb/db/engine/merge/task/MergeFileTask.java  | 15 ++++-
 .../java/org/apache/iotdb/db/utils/MergeUtils.java |  2 +-
 .../iotdb/db/engine/merge/MergeTaskTest.java       | 66 +++++++++++++++-------
 .../iotdb/db/integration/IoTDBMergeTest.java       | 51 ++++++++++++++++-
 4 files changed, 108 insertions(+), 26 deletions(-)