This is an automated email from the ASF dual-hosted git repository. jiangtian pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit b8fd77b5d2b3c0220f1c046f341f472bc2a4a263 Merge: a5e9dd0 98720f2 Author: Jiang Tian <[email protected]> AuthorDate: Sun Jun 14 21:56:25 2020 -0500 Merge pull request #1338 from apache/enhance_merge_management Enhance merge management docs/UserGuide/Operation Manual/SQL Reference.md | 8 + .../zh/UserGuide/Operation Manual/SQL Reference.md | 8 + .../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 1 + .../org/apache/iotdb/db/conf/IoTDBConstant.java | 6 + .../iotdb/db/engine/merge/manage/MergeFuture.java | 153 +++++++++++++++ .../iotdb/db/engine/merge/manage/MergeManager.java | 196 ++++++++++++++++++- .../db/engine/merge/manage/MergeManagerMBean.java | 26 +++ .../db/engine/merge/manage/MergeThreadPool.java | 48 +++++ .../iotdb/db/engine/merge/task/MergeFileTask.java | 107 +++++++--- .../db/engine/merge/task/MergeMultiChunkTask.java | 216 ++++++++++++++------- .../iotdb/db/engine/merge/task/MergeTask.java | 77 +++++++- .../db/engine/merge/task/RecoverMergeTask.java | 13 +- .../main/java/org/apache/iotdb/db/qp/Planner.java | 2 + .../apache/iotdb/db/qp/constant/SQLConstant.java | 4 + .../apache/iotdb/db/qp/executor/PlanExecutor.java | 49 +++++ .../org/apache/iotdb/db/qp/logical/Operator.java | 3 +- .../db/qp/logical/sys/ShowMergeStatusOperator.java | 30 +++ .../db/qp/physical/sys/ShowMergeStatusPlan.java | 27 +++ .../apache/iotdb/db/qp/physical/sys/ShowPlan.java | 2 +- .../iotdb/db/qp/strategy/LogicalGenerator.java | 8 + .../iotdb/db/qp/strategy/PhysicalGenerator.java | 3 + .../org/apache/iotdb/db/service/RPCService.java | 4 +- .../org/apache/iotdb/db/service/ServiceType.java | 2 +- .../org/apache/iotdb/db/service/StaticResps.java | 12 ++ .../org/apache/iotdb/db/service/TSServiceImpl.java | 2 + .../iotdb/db/engine/merge/MergeManagerTest.java | 168 ++++++++++++++++ .../iotdb/db/integration/IoTDBMergeTest.java | 50 ++++- 27 files changed, 1102 insertions(+), 123 deletions(-)
