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

Posted to commits@iotdb.apache.org by ej...@apache.org on 2020/11/12 03:29:44 UTC

[iotdb] branch rel-0.11-fix updated (671dd50 -> 2227bf3)

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

ejttianyu pushed a change to branch rel-0.11-fix
in repository https://gitbox.apache.org/repos/asf/iotdb.git.


    from 671dd50  tmp fix dead lock
     add 2227bf3  fix v2

No new revisions were added by this update.

Summary of changes:
 .../iotdb/db/engine/compaction/TsFileManagement.java  | 10 +---------
 .../iotdb/db/engine/merge/task/MergeFileTask.java     |  5 +++++
 .../apache/iotdb/db/engine/merge/task/MergeTask.java  |  2 ++
 .../apache/iotdb/db/engine/merge/MergeLogTest.java    |  1 -
 .../iotdb/db/engine/merge/MergeOverLapTest.java       |  3 ++-
 .../apache/iotdb/db/engine/merge/MergePerfTest.java   |  3 ++-
 .../apache/iotdb/db/engine/merge/MergeTaskTest.java   | 19 ++++++++++++-------
 .../org/apache/iotdb/db/engine/merge/MergeTest.java   | 15 ---------------
 server/src/test/resources/logback.xml                 |  1 -
 9 files changed, 24 insertions(+), 35 deletions(-)