You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by lt...@apache.org on 2019/11/15 04:36:35 UTC
[incubator-iotdb] 04/06: merge master
This is an automated email from the ASF dual-hosted git repository.
lta pushed a commit to branch fix_show_info
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit e15747692f165891300307440c1937e4fd07f17c
Merge: fbe0227 3e18e11
Author: lta <li...@163.com>
AuthorDate: Thu Nov 14 19:53:02 2019 +0800
merge master
.../UserGuide/3-Server/4-Config Manual.md | 53 +++--
.../UserGuide/3-Server/4-Config Manual.md | 43 ++--
server/src/assembly/resources/conf/iotdb-env.bat | 19 +-
.../org/apache/iotdb/db/sql/parse/TqlLexer.g | 5 +-
.../org/apache/iotdb/db/sql/parse/TqlParser.g | 34 +--
.../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 +-
.../strategy/DirectoryStrategyTest.java | 12 +-
.../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 9 +
22 files changed, 490 insertions(+), 225 deletions(-)
diff --cc server/src/main/antlr3/org/apache/iotdb/db/sql/parse/TqlLexer.g
index 896c11f,6a00dde..00ce42e
--- a/server/src/main/antlr3/org/apache/iotdb/db/sql/parse/TqlLexer.g
+++ b/server/src/main/antlr3/org/apache/iotdb/db/sql/parse/TqlLexer.g
@@@ -273,26 -273,10 +273,29 @@@ K_UNSE
: U N S E T
;
+ K_CONFIGURATION
+ : C O N F I G U R A T I O N
+ ;
+
+K_FLUSH
+ : F L U S H
+ ;
+
+K_TASK
+ : T A S K
+ ;
+
+K_DYNAMIC
+ : D Y N A M I C
+ ;
+
+K_PARAMETERS
+ : P A R A M E T E R S
+ ;
+
+K_INFO
+ : I N F O
- ;
+
//************** logical operator***********
OPERATOR_AND
: A N D