This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch FIDig in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 19190cc600fee5730be1527556bc9fbe63cfe2fa Merge: 3ecb5b3379 6d30aa2022 Author: JackieTien97 <[email protected]> AuthorDate: Thu Apr 6 14:13:24 2023 +0800 resolve conflicts .../org/apache/iotdb/db/qp/sql/IdentifierParser.g4 | 7 + .../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 558 ++++++++++++--------- .../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 | 24 + .../confignode/client/DataNodeRequestType.java | 5 +- .../client/async/AsyncDataNodeClientPool.java | 7 + .../heartbeat/DataNodeHeartbeatHandler.java | 20 +- .../consensus/request/ConfigPhysicalPlan.java | 4 + .../consensus/request/ConfigPhysicalPlanType.java | 5 +- .../request/write/quota/SetSpaceQuotaPlan.java | 101 ++++ .../confignode/manager/ClusterQuotaManager.java | 222 ++++++++ .../iotdb/confignode/manager/ConfigManager.java | 38 +- .../apache/iotdb/confignode/manager/IManager.java | 11 + .../iotdb/confignode/manager/node/NodeManager.java | 16 +- .../manager/partition/PartitionManager.java | 9 + .../iotdb/confignode/persistence/ModelInfo.java | 14 +- .../persistence/executor/ConfigPlanExecutor.java | 12 +- .../partition/DatabasePartitionTable.java | 20 + .../persistence/partition/PartitionInfo.java | 17 + .../confignode/persistence/quota/QuotaInfo.java | 162 ++++++ .../procedure/impl/model/CreateModelProcedure.java | 2 +- .../procedure/impl/model/DropModelProcedure.java | 27 +- .../procedure/state/model/DropModelState.java | 1 - .../procedure/store/ProcedureFactory.java | 16 +- .../thrift/ConfigNodeRPCServiceProcessor.java | 17 + .../request/ConfigPhysicalPlanSerDeTest.java | 16 + .../confignode/persistence/QuotaInfoTest.java | 82 +++ docs/UserGuide/API/Programming-Java-Native-API.md | 93 ++-- .../Ecosystem-Integration/Spark-TsFile.md | 2 +- docs/UserGuide/IoTDB-Introduction/Publication.md | 2 +- docs/UserGuide/Operate-Metadata/Template.md | 6 +- docs/UserGuide/Reference/Keywords.md | 1 + .../UserGuide/API/Programming-Java-Native-API.md | 83 ++- .../Ecosystem-Integration/Spark-TsFile.md | 24 +- .../zh/UserGuide/IoTDB-Introduction/Publication.md | 2 +- docs/zh/UserGuide/Operate-Metadata/Template.md | 6 +- docs/zh/UserGuide/Reference/Keywords.md | 1 + .../db/it/IoTDBSyntaxConventionIdentifierIT.java | 20 +- .../scalar/IoTDBSubStringFunctionIT.java | 82 +-- .../db/it/specialwords/IoTDBSpecialWordsIT.java | 77 +++ .../session/it/IoTDBSessionSchemaTemplateIT.java | 6 +- .../java/org/apache/iotdb/isession/ISession.java | 2 +- .../apache/iotdb/isession/pool/ISessionPool.java | 2 +- .../iotdb/library/dprofile/util/GKArray.java | 17 +- mlnode/iotdb/mlnode/service.py | 2 +- .../iotdb/commons/concurrent/ThreadName.java | 1 + .../apache/iotdb/commons/conf/CommonConfig.java | 11 + .../iotdb/commons/conf/CommonDescriptor.java | 3 + .../apache/iotdb/commons/conf/IoTDBConstant.java | 4 + .../apache/iotdb/commons/enums/SpaceQuotaType.java | 13 +- .../iotdb/commons/model/ModelHyperparameter.java | 10 + .../iotdb/commons/model/ModelInformation.java | 89 +++- .../iotdb/commons/model/TrailInformation.java | 7 +- .../apache/iotdb/commons/service/ServiceType.java | 3 +- .../commons/utils/BasicStructureSerDeUtil.java | 16 + .../schemaregion/rocksdb/RSchemaRegion.java | 10 + .../metadata/tagSchemaRegion/TagSchemaRegion.java | 10 + .../apache/iotdb/db/client/ConfigNodeClient.java | 108 +++- .../org/apache/iotdb/db/client/MLNodeClient.java | 18 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 32 ++ .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 17 + .../org/apache/iotdb/db/engine/StorageEngine.java | 10 + .../iotdb/db/engine/storagegroup/DataRegion.java | 45 ++ .../db/exception/quota/ExceedQuotaException.java | 16 +- .../db/metadata/mtree/MTreeBelowSGMemoryImpl.java | 18 +- .../db/metadata/schemaregion/ISchemaRegion.java | 5 + .../db/metadata/schemaregion/SchemaEngine.java | 30 ++ .../schemaregion/SchemaRegionMemoryImpl.java | 45 ++ .../schemaregion/SchemaRegionSchemaFileImpl.java | 45 ++ .../db/mpp/common/header/ColumnHeaderConstant.java | 37 ++ .../db/mpp/common/header/DatasetHeaderFactory.java | 12 + .../execution/exchange/MPPDataExchangeManager.java | 45 +- .../apache/iotdb/db/mpp/plan/analyze/Analyzer.java | 16 +- .../plan/execution/config/ConfigTaskVisitor.java | 46 ++ .../config/executor/ClusterConfigTaskExecutor.java | 178 +++++++ .../config/executor/IConfigTaskExecutor.java | 18 + .../config/metadata/model/CreateModelTask.java | 42 ++ .../config/metadata/model/DropModelTask.java | 28 +- .../config/metadata/model/ShowModelsTask.java | 96 ++++ .../config/metadata/model/ShowTrailsTask.java | 90 ++++ .../config/sys/quota/SetSpaceQuotaTask.java | 42 ++ .../config/sys/quota/ShowSpaceQuotaTask.java | 130 +++++ .../builtin/helper/SubStringFunctionHelper.java | 35 +- .../ConcatExpressionWithSuffixPathsVisitor.java | 3 +- .../iotdb/db/mpp/plan/parser/ASTVisitor.java | 202 ++++++-- .../db/mpp/plan/parser/StatementGenerator.java | 71 +++ .../iotdb/db/mpp/plan/statement/StatementType.java | 3 + .../db/mpp/plan/statement/StatementVisitor.java | 31 ++ .../metadata/model/CreateModelStatement.java | 107 ++++ .../metadata/model/DropModelStatement.java | 57 +++ .../metadata/model/ShowModelsStatement.java | 49 ++ .../metadata/model/ShowTrailsStatement.java | 57 +++ .../sys/quota/SetSpaceQuotaStatement.java | 100 ++++ .../sys/quota/ShowSpaceQuotaStatement.java | 62 +++ .../apache/iotdb/db/quotas/DataNodeSizeStore.java | 60 +++ .../iotdb/db/quotas/DataNodeSpaceQuotaManager.java | 153 ++++++ .../java/org/apache/iotdb/db/service/DataNode.java | 4 + .../apache/iotdb/db/service/MLNodeRPCService.java | 98 ++++ .../iotdb/db/service/MLNodeRPCServiceMBean.java | 11 +- .../handler/MLNodeRPCServiceThriftHandler.java | 56 +++ .../service/thrift/impl/ClientRPCServiceImpl.java | 4 +- .../impl/DataNodeInternalRPCServiceImpl.java | 40 +- .../thrift/impl/IMLNodeRPCServiceWithHandler.java | 13 +- .../service/thrift/impl/MLNodeRPCServiceImpl.java | 206 ++++++++ .../java/org/apache/iotdb/rpc/TSStatusCode.java | 5 +- .../java/org/apache/iotdb/session/Session.java | 8 +- .../apache/iotdb/session/SessionConnection.java | 9 +- .../org/apache/iotdb/session/pool/SessionPool.java | 4 +- thrift-commons/src/main/thrift/common.thrift | 18 +- .../src/main/thrift/confignode.thrift | 19 + thrift/src/main/thrift/client.thrift | 4 +- thrift/src/main/thrift/datanode.thrift | 84 ++-- 111 files changed, 4058 insertions(+), 702 deletions(-) diff --cc server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/MPPDataExchangeManager.java index 7211534255,73729fe0ec..5174731dcd --- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/MPPDataExchangeManager.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/MPPDataExchangeManager.java @@@ -552,6 -517,9 +560,10 @@@ public class MPPDataExchangeManager imp */ public ISinkChannel createLocalSinkChannelForPipeline( DriverContext driverContext, String planNodeId) { ++ + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Create local sink handle for {}", driverContext.getDriverTaskID()); + } SharedTsBlockQueue queue = new SharedTsBlockQueue( driverContext.getDriverTaskID().getFragmentInstanceId().toThrift(), @@@ -653,7 -629,10 +673,11 @@@ */ public ISourceHandle createLocalSourceHandleForPipeline( SharedTsBlockQueue queue, DriverContext context) { ++ + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Create local source handle for {}", context.getDriverTaskID()); + } - return new LocalSourceHandle( + return new PipelineSourceHandle( queue, new PipelineSourceHandleListenerImpl(context::failed), context.getDriverTaskID().toString()); diff --cc thrift/src/main/thrift/datanode.thrift index cf8a889dd7,c20f32a703..8e07b80a75 --- a/thrift/src/main/thrift/datanode.thrift +++ b/thrift/src/main/thrift/datanode.thrift @@@ -755,8 -765,25 +771,27 @@@ service IDataNodeRPCService */ common.TSStatus deleteModelMetrics(TDeleteModelMetricsReq req) - // ----------------------------------- For ML Node ----------------------------------------------- + /** + * Set space quota + **/ + common.TSStatus setSpaceQuota(common.TSetSpaceQuotaReq req) + } + + service MPPDataExchangeService { + TGetDataBlockResponse getDataBlock(TGetDataBlockRequest req); + + void onAcknowledgeDataBlockEvent(TAcknowledgeDataBlockEvent e); + + void onCloseSinkChannelEvent(TCloseSinkChannelEvent e); + ++ void onCloseLocalSinkChannelEvent(TCloseLocalSinkChannelEvent e); ++ + void onNewDataBlockEvent(TNewDataBlockEvent e); + + void onEndOfDataBlockEvent(TEndOfDataBlockEvent e); + } + service IMLNodeInternalRPCService{ /** * Fecth the data of the specified time series */ @@@ -772,17 -804,4 +812,3 @@@ */ common.TSStatus recordModelMetrics(TRecordModelMetricsReq req) } - - service MPPDataExchangeService { - TGetDataBlockResponse getDataBlock(TGetDataBlockRequest req); - - void onAcknowledgeDataBlockEvent(TAcknowledgeDataBlockEvent e); - - void onCloseSinkChannelEvent(TCloseSinkChannelEvent e); - - void onCloseLocalSinkChannelEvent(TCloseLocalSinkChannelEvent e); - - void onNewDataBlockEvent(TNewDataBlockEvent e); -- - void onEndOfDataBlockEvent(TEndOfDataBlockEvent e); - }
