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:31 UTC
[iotdb] branch mlnode/test created (now bb7bdb5356)
This is an automated email from the ASF dual-hosted git repository.
hui pushed a change to branch mlnode/test
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at bb7bdb5356 Merge branch 'datanodeiter' into mlnode/test
This branch includes the following new commits:
new a6f6af2fd1 Merge branch 'lmh/MLSQL' into mlnode/test
new a996776c59 Merge branch 'parser' into mlnode/test
new bb7bdb5356 Merge branch 'datanodeiter' into mlnode/test
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 03/03: Merge branch 'datanodeiter' into mlnode/test
Posted by hu...@apache.org.
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 bb7bdb5356ab782c2cb55f9aecf9de5b9b74aa41
Merge: a996776c59 e7066f5f3a
Author: Minghui Liu <li...@foxmail.com>
AuthorDate: Fri Mar 31 11:26:09 2023 +0800
Merge branch 'datanodeiter' into mlnode/test
.../iotdb/commons/concurrent/ThreadName.java | 3 +-
.../apache/iotdb/commons/service/ServiceType.java | 3 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 22 +++
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 13 ++
.../db/mpp/plan/parser/StatementGenerator.java | 69 +++++++
.../java/org/apache/iotdb/db/service/DataNode.java | 4 +
.../apache/iotdb/db/service/MLNodeRPCService.java | 98 ++++++++++
.../iotdb/db/service/MLNodeRPCServiceMBean.java | 22 +++
.../handler/MLNodeRPCServiceThriftHandler.java | 56 ++++++
.../impl/DataNodeInternalRPCServiceImpl.java | 23 ---
.../thrift/impl/IMLNodeRPCServiceWithHandler.java | 26 +++
.../service/thrift/impl/MLNodeRPCServiceImpl.java | 206 +++++++++++++++++++++
thrift-commons/src/main/thrift/common.thrift | 6 -
thrift/src/main/thrift/datanode.thrift | 69 ++++---
14 files changed, 563 insertions(+), 57 deletions(-)
diff --cc server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
index 9e02350f5f,da32425582..d00903759a
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
@@@ -875,27 -870,10 +870,9 @@@ public class DataNodeInternalRPCService
@Override
public TSStatus deleteModelMetrics(TDeleteModelMetricsReq req) throws TException {
- // TODO
- throw new TException(new UnsupportedOperationException().getCause());
+ return RpcUtils.SUCCESS_STATUS;
}
- @Override
- public TFetchTimeseriesResp fetchTimeseries(TFetchTimeseriesReq req) throws TException {
- // TODO
- throw new TException(new UnsupportedOperationException().getCause());
- }
-
- @Override
- public TFetchWindowBatchResp fetchWindowBatch(TFetchWindowBatchReq req) throws TException {
- // TODO
- throw new TException(new UnsupportedOperationException().getCause());
- }
-
- @Override
- public TSStatus recordModelMetrics(TRecordModelMetricsReq req) throws TException {
- // TODO
- throw new TException(new UnsupportedOperationException().getCause());
- }
-
private PathPatternTree filterPathPatternTree(PathPatternTree patternTree, String storageGroup) {
PathPatternTree filteredPatternTree = new PathPatternTree();
try {
[iotdb] 02/03: Merge branch 'parser' into mlnode/test
Posted by hu...@apache.org.
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 a996776c59fe7a5713eff17d737f02e14ffc4f68
Merge: a6f6af2fd1 0c397abcf1
Author: Minghui Liu <li...@foxmail.com>
AuthorDate: Fri Mar 31 11:24:11 2023 +0800
Merge branch 'parser' into mlnode/test
.../{models/forecast/__init__.py => enums.py} | 12 ++
mlnode/iotdb/mlnode/algorithm/factory.py | 128 ++++++++++++++
.../mlnode/algorithm/models/forecast/__init__.py | 3 +
.../mlnode/algorithm/models/forecast/dlinear.py | 41 ++++-
.../mlnode/algorithm/models/forecast/nbeats.py | 47 ++++-
mlnode/iotdb/mlnode/client.py | 9 +-
mlnode/iotdb/mlnode/constant.py | 1 +
.../{datats/utils => data_access}/__init__.py | 0
.../forecast/__init__.py => data_access/enums.py} | 12 ++
mlnode/iotdb/mlnode/data_access/factory.py | 105 +++++++++++
.../forecast => data_access/offline}/__init__.py | 0
.../{datats => data_access}/offline/dataset.py | 30 +---
.../offline/source.py} | 9 +-
.../forecast => data_access/utils}/__init__.py | 0
.../{datats => data_access}/utils/timefeatures.py | 2 -
mlnode/iotdb/mlnode/exception.py | 16 +-
mlnode/iotdb/mlnode/handler.py | 27 ++-
mlnode/iotdb/mlnode/parser.py | 194 +++++++++++++++++++++
mlnode/iotdb/mlnode/serde.py | 30 +++-
mlnode/iotdb/mlnode/util.py | 4 +-
mlnode/test/test_parse_training_request.py | 136 +++++++++++++++
21 files changed, 747 insertions(+), 59 deletions(-)
[iotdb] 01/03: Merge branch 'lmh/MLSQL' into mlnode/test
Posted by hu...@apache.org.
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
+ ;