This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from a5e9dd0 Accelerate cache usage: combine get and contains (#1356)
add efa77dd enhance merge task management
add 75c7486 clear task map when stopped
add ecfe945 Merge branch 'master' into enhance_merge_management
add 02a0795 fix test and task comparison
add 7e18e35 fix show merge grammar
add 98720f2 fix test
new b8fd77b Merge pull request #1338 from apache/enhance_merge_management
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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 | 8 +-
.../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 +-
...eOperator.java => ShowMergeStatusOperator.java} | 7 +-
.../db/qp/physical/sys/ShowMergeStatusPlan.java | 9 +-
.../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, 1032 insertions(+), 134 deletions(-)
create mode 100644
server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeFuture.java
copy
tsfile/src/main/java/org/apache/iotdb/tsfile/common/cache/Accountable.java =>
server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeManagerMBean.java
(84%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeThreadPool.java
copy
server/src/main/java/org/apache/iotdb/db/qp/logical/sys/{ClearCacheOperator.java
=> ShowMergeStatusOperator.java} (84%)
copy
tsfile/src/main/java/org/apache/iotdb/tsfile/common/cache/Accountable.java =>
server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowMergeStatusPlan.java
(82%)
create mode 100644
server/src/test/java/org/apache/iotdb/db/engine/merge/MergeManagerTest.java
