You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hu...@apache.org on 2023/03/31 03:26:32 UTC
[iotdb] 01/03: Merge branch 'lmh/MLSQL' into mlnode/test
This is an automated email from the ASF dual-hosted git repository.
hui pushed a commit to branch mlnode/test
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit a6f6af2fd138e810bd9639ae40048c36cfbb0dc5
Merge: 810bf11dfe abf5d82de6
Author: Minghui Liu <li...@foxmail.com>
AuthorDate: Fri Mar 31 11:23:31 2023 +0800
Merge branch 'lmh/MLSQL' into mlnode/test
.../org/apache/iotdb/db/qp/sql/IdentifierParser.g4 | 4 +
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 549 ++++++++++++---------
.../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 | 16 +
.../iotdb/confignode/persistence/ModelInfo.java | 14 +-
.../procedure/impl/model/CreateModelProcedure.java | 2 +-
.../procedure/impl/model/DropModelProcedure.java | 27 +-
.../procedure/state/model/DropModelState.java | 1 -
.../procedure/store/ProcedureFactory.java | 16 +-
mlnode/iotdb/mlnode/service.py | 2 +-
.../iotdb/commons/model/ModelInformation.java | 82 ++-
.../apache/iotdb/db/client/ConfigNodeClient.java | 58 ++-
.../org/apache/iotdb/db/client/MLNodeClient.java | 18 +-
.../db/mpp/common/header/ColumnHeaderConstant.java | 25 +
.../db/mpp/common/header/DatasetHeaderFactory.java | 8 +
.../apache/iotdb/db/mpp/plan/analyze/Analyzer.java | 16 +-
.../plan/execution/config/ConfigTaskVisitor.java | 30 ++
.../config/executor/ClusterConfigTaskExecutor.java | 111 +++++
.../config/executor/IConfigTaskExecutor.java | 9 +
.../config/metadata/model/CreateModelTask.java | 42 ++
.../config/metadata/model/DropModelTask.java | 28 +-
.../config/metadata/model/ShowModelsTask.java | 87 ++++
.../config/metadata/model/ShowTrailsTask.java | 79 +++
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 105 ++--
.../db/mpp/plan/statement/StatementVisitor.java | 21 +
.../metadata/model/CreateModelStatement.java | 107 ++++
.../metadata/model/DropModelStatement.java | 57 +++
.../metadata/model/ShowModelsStatement.java | 49 ++
.../metadata/model/ShowTrailsStatement.java | 57 +++
.../impl/DataNodeInternalRPCServiceImpl.java | 3 +-
29 files changed, 1258 insertions(+), 365 deletions(-)
diff --cc antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4
index 00a9d5d481,938ae91362..212099ba97
--- a/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4
+++ b/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4
@@@ -1037,35 -1116,7 +1117,16 @@@ attributeValu
| constant
;
- collectorAttributesClause
- : WITH COLLECTOR LR_BRACKET (collectorAttributeClause COMMA)* collectorAttributeClause? RR_BRACKET
- ;
-
- collectorAttributeClause
- : collectorKey=STRING_LITERAL OPERATOR_SEQ collectorValue=STRING_LITERAL
- ;
-
- processorAttributesClause
- : WITH PROCESSOR LR_BRACKET (processorAttributeClause COMMA)* processorAttributeClause? RR_BRACKET
- ;
-
- processorAttributeClause
- : processorKey=STRING_LITERAL OPERATOR_SEQ processorValue=STRING_LITERAL
- ;
-
- connectorAttributesClause
- : WITH CONNECTOR LR_BRACKET (connectorAttributeClause COMMA)* connectorAttributeClause? RR_BRACKET
- ;
-
- connectorAttributeClause
- : connectorKey=STRING_LITERAL OPERATOR_SEQ connectorValue=STRING_LITERAL
+ alias
+ : constant
+ | identifier
;
+
+subStringExpression
+ : LR_BRACKET input=expression COMMA startPosition=signedIntegerLiteral (COMMA length=signedIntegerLiteral)? RR_BRACKET
+ | LR_BRACKET input=expression FROM from=signedIntegerLiteral (FOR forLength=signedIntegerLiteral)? RR_BRACKET
+ ;
+
+signedIntegerLiteral
+ : (PLUS|MINUS)?INTEGER_LITERAL
+ ;