You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by su...@apache.org on 2020/06/15 10:24:49 UTC
[incubator-iotdb] branch jira_759 updated (5bab6c6 -> 8f163c3)
This is an automated email from the ASF dual-hosted git repository.
sunzesong pushed a change to branch jira_759
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 5bab6c6 Merge master
add 2c4ab85 add more debug log in tag = (#1349)
add 75c842d disable auto deploy the website because of vuepress OOM (#1353)
add 051ef4d [IOTDB-765] Failed to get upgrade.txt file when using HDFS storage (#1357)
add 81f7e59 Merge remote-tracking branch 'origin/master' into mtree_checkpoint
add 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
add b8fd77b Merge pull request #1338 from apache/enhance_merge_management
add 3cf4eea updated python client to ver-0.10
add 049bbfd Merge remote-tracking branch 'origin/master' into mtree_checkpoint
add 8f163c3 [IOTDB-726] CheckPoint of MTree
No new revisions were added by this update.
Summary of changes:
Jenkinsfile | 40 ++--
client-py/src/client_example.py | 64 +++---
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 +
.../apache/iotdb/db/engine/cache/ChunkCache.java | 22 +--
.../iotdb/db/engine/cache/ChunkMetadataCache.java | 10 +-
.../db/engine/cache/TimeSeriesMetadataCache.java | 20 +-
.../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 | 85 ++++++--
.../db/engine/merge/task/RecoverMergeTask.java | 13 +-
.../apache/iotdb/db/engine/upgrade/UpgradeLog.java | 5 +-
.../org/apache/iotdb/db/metadata/MManager.java | 113 +++++++++--
.../org/apache/iotdb/db/metadata/mnode/MNode.java | 46 +----
.../iotdb/db/metadata/mnode/MeasurementMNode.java | 24 +--
.../iotdb/db/metadata/mnode/StorageGroupMNode.java | 27 +--
.../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 +
.../db/tools/upgrade/TsFileOnlineUpgradeTool.java | 121 ++++++------
.../iotdb/db/engine/merge/MergeManagerTest.java | 168 ++++++++++++++++
.../iotdb/db/integration/IoTDBMergeTest.java | 50 ++++-
38 files changed, 1293 insertions(+), 373 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