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

Posted to commits@iotdb.apache.org by ha...@apache.org on 2021/03/16 02:36:01 UTC

[iotdb] branch Vector updated (f434983 -> 25b944d)

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

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


    from f434983  support query memtable step 2
     add 743f57d  fix test executor error (#2829)
     add 4f60e92  [IOTDB-1187] Fix unseq compaction loss data bug after delete operation (#2785)
     add e35a3e4  Fix refactor query code, reduce complexity in PhysicalGenerator (#2820)
     add daa50d7  optimize the doc that WAL has three ways to be flashed to disk (#2822)
     add 5540272  [ISSUE-2827] add an overrided addChild() method in MNode. (#2828)
     add 25b944d  merge master and resolve conflicts

No new revisions were added by this update.

Summary of changes:
 .../cluster/client/DataClientProviderTest.java     |  48 ++-
 docs/SystemDesign/StorageEngine/WAL.md             |   6 +-
 docs/zh/SystemDesign/StorageEngine/WAL.md          |   7 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |   2 +-
 .../db/engine/merge/manage/MergeResource.java      |  27 ++
 .../iotdb/db/engine/merge/task/MergeFileTask.java  |  26 +-
 .../db/engine/merge/task/MergeMultiChunkTask.java  |   4 +
 .../db/engine/storagegroup/TsFileResource.java     |  10 +
 .../storagegroup/timeindex/DeviceTimeIndex.java    |  12 +
 .../storagegroup/timeindex/FileTimeIndex.java      |  12 +
 .../engine/storagegroup/timeindex/ITimeIndex.java  |  16 +
 .../org/apache/iotdb/db/metadata/mnode/MNode.java  |  31 ++
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    | 405 +++++++++++----------
 .../iotdb/db/engine/merge/MergeTaskTest.java       |  55 +++
 .../apache/iotdb/db/metadata/mnode/MNodeTest.java  |  27 ++
 15 files changed, 472 insertions(+), 216 deletions(-)