You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/06/16 08:02:47 UTC
[incubator-iotdb] 01/02: Merge remote-tracking branch
'origin/master'
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch add_audit_log
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit a2416e88022adc8ca9b80ae1268790ebc7daa2e4
Merge: b6beda8 3cf4eea
Author: qiaojialin <64...@qq.com>
AuthorDate: Tue Jun 16 11:40:09 2020 +0800
Merge remote-tracking branch 'origin/master'
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 | 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 +-
.../apache/iotdb/db/engine/upgrade/UpgradeLog.java | 5 +-
.../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 +
.../db/tools/upgrade/TsFileOnlineUpgradeTool.java | 121 ++++++------
.../iotdb/db/engine/merge/MergeManagerTest.java | 168 ++++++++++++++++
.../iotdb/db/integration/IoTDBMergeTest.java | 50 ++++-
34 files changed, 1249 insertions(+), 258 deletions(-)