This is an automated email from the ASF dual-hosted git repository. hui pushed a commit to branch lmh/addQueryIT in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 9ccd98d021fd3a19dc82a15f9412450919675681 Merge: 6046807cb5 1fb7229c2d Author: Minghui Liu <[email protected]> AuthorDate: Mon Jun 20 09:27:48 2022 +0800 Merge remote-tracking branch 'origin/master' into lmh/addQueryIT integration/checkstyle.xml | 2 +- .../db/integration/IoTDBLoadExternalTsfileIT.java | 8 +- .../IoTDBLoadExternalTsfileWithVirtualSGIT.java | 138 +++++++++++++++++++++ .../org/apache/iotdb/db/engine/StorageEngine.java | 73 ++++++++++- .../dataregion/StorageGroupManager.java | 19 ++- .../execution/datatransfer/LocalSinkHandle.java | 72 +++++++---- .../execution/datatransfer/LocalSourceHandle.java | 43 ++++--- .../execution/datatransfer/SharedTsBlockQueue.java | 23 ++-- .../execution/fragment/FragmentInstanceState.java | 4 +- .../mpp/plan/analyze/FakePartitionFetcherImpl.java | 53 +++++++- .../iotdb/db/mpp/plan/planner/LogicalPlanner.java | 72 ++++++++--- .../plan/planner/distribution/SourceRewriter.java | 7 +- .../scheduler/AbstractFragInsStateTracker.java | 1 - .../scheduler/FixedRateFragInsStateTracker.java | 5 +- .../mpp/plan/scheduler/SimpleQueryTerminator.java | 1 - .../service/thrift/impl/InternalServiceImpl.java | 57 +++++---- .../iotdb/db/mpp/plan/plan/LogicalPlannerTest.java | 16 +-- 17 files changed, 471 insertions(+), 123 deletions(-)
