[iotdb] branch gitsubmodule2 updated (2a99d54 -> d34d688)

[hx...@apache.org]

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

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


    from 2a99d54  Merge branch 'gitsubmodule2' of github.com:apache/incubator-iotdb into gitsubmodule2
     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 a735202  Optimize the code structure of deduplicate()  (#2856)
     add adc61e2  Optimize the code structure of deduplicate() - PART2 (#2863)
     add d34d688  Merge remote-tracking branch 'origin/master' into gitsubmodule2

No new revisions were added by this update.

Summary of changes:
 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/physical/crud/AggregationPlan.java |  32 ++
 .../iotdb/db/qp/physical/crud/FillQueryPlan.java   |   9 +
 .../iotdb/db/qp/physical/crud/QueryPlan.java       |  18 +-
 .../apache/iotdb/db/qp/physical/crud/UDTFPlan.java |   8 +
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    | 471 ++++++++++-----------
 .../db/query/control/QueryResourceManager.java     |   9 +
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  89 ++--
 .../iotdb/db/engine/merge/MergeTaskTest.java       |  55 +++
 .../apache/iotdb/db/metadata/mnode/MNodeTest.java  |  27 ++
 20 files changed, 559 insertions(+), 312 deletions(-)