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/08/12 08:23:48 UTC

[incubator-iotdb] branch dev_merge updated (0bfb4d0 -> 666bba9)

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 0bfb4d0  log timeseries to be merged before merge refactor LogAnalyzer
     add 666bba9  use concuurent MergeMultiChunkTask

No new revisions were added by this update.

Summary of changes:
 .../resources/conf/iotdb-engine.properties         |   6 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |  15 ++-
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |   3 +
 .../iotdb/db/engine/merge/manage/MergeContext.java |  16 ++--
 .../iotdb/db/engine/merge/manage/MergeManager.java |  21 ++++-
 .../db/engine/merge/manage/MergeResource.java      |   3 +-
 .../db/engine/merge/task/MergeMultiChunkTask.java  | 101 ++++++++++++++-------
 .../engine/storagegroup/StorageGroupProcessor.java |   2 +-
 .../apache/iotdb/db/engine/merge/MergeLogTest.java |   2 +-
 .../apache/iotdb/db/engine/merge/MergeTest.java    |   3 +
 10 files changed, 127 insertions(+), 45 deletions(-)