You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by li...@apache.org on 2019/11/15 02:34:49 UTC
[incubator-iotdb] 01/01: Merge branch 'master' into dynamic_config
This is an automated email from the ASF dual-hosted git repository.
liurui pushed a commit to branch dynamic_config
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit c47967e7ff38175d1976e3482322ee4899ef5463
Merge: 2056cf0 3e18e11
Author: liuruiyiyang <24...@qq.com>
AuthorDate: Fri Nov 15 10:32:23 2019 +0800
Merge branch 'master' into dynamic_config
.../UserGuide/3-Server/4-Config Manual.md | 53 +++--
.../UserGuide/3-Server/4-Config Manual.md | 43 ++--
server/server-changelist.md | 39 ++++
server/src/assembly/resources/conf/iotdb-env.bat | 19 +-
.../org/apache/iotdb/db/sql/parse/TqlLexer.g | 4 +
.../org/apache/iotdb/db/sql/parse/TqlParser.g | 34 +--
.../iotdb/db/auth/user/LocalFileUserAccessor.java | 19 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 79 +++----
.../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 4 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 247 +++++++++++++--------
.../db/conf/directories/DirectoryManager.java | 57 ++++-
.../directories/strategy/DirectoryStrategy.java | 11 +-
.../directories/strategy/SequenceStrategy.java | 6 +-
.../db/exception/LoadConfigurationException.java | 37 +++
.../org/apache/iotdb/db/qp/QueryProcessor.java | 1 +
.../apache/iotdb/db/qp/constant/SQLConstant.java | 3 +
.../iotdb/db/qp/executor/QueryProcessExecutor.java | 3 +
.../org/apache/iotdb/db/qp/logical/Operator.java | 2 +-
.../qp/logical/sys/LoadConfigurationOperator.java | 31 +++
.../db/qp/physical/sys/LoadConfigurationPlan.java | 43 ++++
.../iotdb/db/qp/strategy/LogicalGenerator.java | 8 +-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 8 +-
.../db/sync/receiver/transfer/SyncServiceImpl.java | 2 +-
.../sync/sender/transfer/DataTransferManager.java | 1 -
.../strategy/DirectoryStrategyTest.java | 12 +-
.../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 9 +
26 files changed, 545 insertions(+), 230 deletions(-)