This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch IOTDB-4741
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 2a1264fc09 fix ci
add aaf595de63 [IOTDB-3397] Support Template Session and Add Session IT
(#7789)
add 9fb49a57b9 [IOTDB-4793] Prevent compatibility problems in ConfigNode
(#7784)
add 9e48049e54 [IOTDB-4710] Update Keyword list (#7790)
add 1f151ba1cf SELECT INTO: implement explain & ignore ORDER BY (#7794)
add 9cc5e9ee98 [IOTDB-4763]Implement snapshot of UDFInfo (#7760)
add ca844c043a [IOTDB-4728] Unify APIs in session and sessionPool (#7707)
add 50e0139e7d [IOTDB-4728] Unify APIs in session and sessionPool (#7707)
add 04aebce3ef [IOTDB-4750] Refactor the configuration name (#7796)
add 093ae53c23 remove Ignore of UDFManagementIT
add a77f7bb3db [IOTDB-4137][IOTDB-4799] Update sync-tool docs and print
more detailed pipe information in show pipe (#7797)
add 1fb1bdb1d7 Add UT for CreateCQProcedure (#7793)
add 506d2dc52d resolve conflicts
No new revisions were added by this update.
Summary of changes:
.github/workflows/client-python.yml | 2 +-
.gitignore | 1 +
.../org/apache/iotdb/db/qp/sql/IdentifierParser.g4 | 21 +-
.../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 | 1 -
client-py/tests/test_template.py | 127 +------
confignode/pom.xml | 5 +
.../resources/conf/iotdb-confignode.properties | 68 +---
.../iotdb/confignode/conf/ConfigNodeConfig.java | 28 +-
.../confignode/conf/ConfigNodeDescriptor.java | 37 +-
.../confignode/conf/ConfigNodeRemoveCheck.java | 2 +-
.../confignode/conf/ConfigNodeStartupCheck.java | 2 +-
.../confignode/conf/SystemPropertiesUtils.java | 24 +-
.../consensus/request/ConfigPhysicalPlan.java | 199 +++++-----
.../consensus/request/ConfigPhysicalPlanType.java | 232 +++++++-----
.../consensus/request/auth/AuthorPlan.java | 41 +--
.../GetDataNodeConfigurationPlan.java | 4 +-
.../read/{ => function}/GetFunctionTablePlan.java | 4 +-
.../read/{ => partition}/GetDataPartitionPlan.java | 4 +-
.../{ => partition}/GetNodePathsPartitionPlan.java | 4 +-
.../GetOrCreateDataPartitionPlan.java | 2 +-
.../GetOrCreateSchemaPartitionPlan.java | 2 +-
.../{ => partition}/GetSchemaPartitionPlan.java | 4 +-
.../{ => partition}/GetSeriesSlotListPlan.java | 4 +-
.../read/{ => partition}/GetTimeSlotListPlan.java | 4 +-
.../request/read/{ => region}/GetRegionIdPlan.java | 4 +-
.../read/{ => region}/GetRegionInfoListPlan.java | 4 +-
.../{ => storagegroup}/CountStorageGroupPlan.java | 4 +-
.../{ => storagegroup}/GetStorageGroupPlan.java | 2 +-
.../read/template/CheckTemplateSettablePlan.java | 2 +-
.../read/template/GetAllSchemaTemplatePlan.java | 2 +-
.../read/template/GetAllTemplateSetInfoPlan.java | 2 +-
.../read/template/GetPathsSetTemplatePlan.java | 2 +-
.../read/template/GetSchemaTemplatePlan.java | 2 +-
.../read/template/GetTemplateSetInfoPlan.java | 2 +-
.../{ => trigger}/GetTransferringTriggersPlan.java | 4 +-
.../read/{ => trigger}/GetTriggerJarPlan.java | 4 +-
.../read/{ => trigger}/GetTriggerLocationPlan.java | 4 +-
.../read/{ => trigger}/GetTriggerTablePlan.java | 4 +-
.../request/read/{ => udf}/GetUDFJarPlan.java | 4 +-
.../write/confignode/ApplyConfigNodePlan.java | 2 +-
.../write/confignode/RemoveConfigNodePlan.java | 2 +-
.../consensus/request/write/cq/ActiveCQPlan.java | 2 +-
.../consensus/request/write/cq/AddCQPlan.java | 2 +-
.../consensus/request/write/cq/DropCQPlan.java | 2 +-
.../consensus/request/write/cq/ShowCQPlan.java | 2 +-
.../request/write/cq/UpdateCQLastExecTimePlan.java | 2 +-
.../write/datanode/RegisterDataNodePlan.java | 2 +-
.../request/write/datanode/RemoveDataNodePlan.java | 2 +-
.../request/write/datanode/UpdateDataNodePlan.java | 2 +-
.../request/write/function/CreateFunctionPlan.java | 2 +-
.../request/write/function/DropFunctionPlan.java | 2 +-
.../write/partition/CreateDataPartitionPlan.java | 2 +-
.../write/partition/CreateSchemaPartitionPlan.java | 2 +-
.../write/partition/UpdateRegionLocationPlan.java | 2 +-
.../write/procedure/DeleteProcedurePlan.java | 2 +-
.../write/procedure/UpdateProcedurePlan.java | 2 +-
.../write/region/CreateRegionGroupsPlan.java | 6 +-
.../write/region/OfferRegionMaintainTasksPlan.java | 2 +-
.../write/region/PollRegionMaintainTaskPlan.java | 2 +-
.../write/statistics/UpdateLoadStatisticsPlan.java | 3 +-
.../AdjustMaxRegionGroupCountPlan.java | 2 +-
.../write/storagegroup/DeleteStorageGroupPlan.java | 2 +-
.../storagegroup/PreDeleteStorageGroupPlan.java | 2 +-
.../storagegroup/SetDataReplicationFactorPlan.java | 2 +-
.../SetSchemaReplicationFactorPlan.java | 2 +-
.../write/storagegroup/SetStorageGroupPlan.java | 2 +-
.../request/write/storagegroup/SetTTLPlan.java | 2 +-
.../storagegroup/SetTimePartitionIntervalPlan.java | 2 +-
.../request/write/sync/CreatePipeSinkPlan.java | 2 +-
.../consensus/request/write/sync/DropPipePlan.java | 2 +-
.../request/write/sync/DropPipeSinkPlan.java | 2 +-
.../request/write/sync/GetPipeSinkPlan.java | 2 +-
.../request/write/sync/PreCreatePipePlan.java | 2 +-
.../request/write/sync/SetPipeStatusPlan.java | 2 +-
.../consensus/request/write/sync/ShowPipePlan.java | 2 +-
.../write/template/CreateSchemaTemplatePlan.java | 2 +-
.../write/template/DropSchemaTemplatePlan.java | 2 +-
.../write/template/PreUnsetSchemaTemplatePlan.java | 2 +-
.../RollbackPreUnsetSchemaTemplatePlan.java | 2 +-
.../write/template/SetSchemaTemplatePlan.java | 2 +-
.../write/template/UnsetSchemaTemplatePlan.java | 2 +-
.../write/trigger/AddTriggerInTablePlan.java | 2 +-
.../write/trigger/DeleteTriggerInTablePlan.java | 2 +-
.../write/trigger/UpdateTriggerLocationPlan.java | 2 +-
.../trigger/UpdateTriggerStateInTablePlan.java | 2 +-
.../trigger/UpdateTriggersOnTransferNodesPlan.java | 2 +-
.../confignode/manager/ClusterSchemaManager.java | 4 +-
.../iotdb/confignode/manager/ConfigManager.java | 26 +-
.../apache/iotdb/confignode/manager/IManager.java | 18 +-
.../iotdb/confignode/manager/ProcedureManager.java | 19 +-
.../iotdb/confignode/manager/TriggerManager.java | 8 +-
.../iotdb/confignode/manager/UDFManager.java | 4 +-
.../iotdb/confignode/manager/load/LoadManager.java | 2 +-
.../iotdb/confignode/manager/node/NodeManager.java | 4 +-
.../manager/partition/PartitionManager.java | 18 +-
.../iotdb/confignode/persistence/TriggerInfo.java | 11 +-
.../iotdb/confignode/persistence/UDFInfo.java | 81 ++++-
.../persistence/executor/ConfigPlanExecutor.java | 68 ++--
.../confignode/persistence/node/NodeInfo.java | 2 +-
.../persistence/partition/PartitionInfo.java | 12 +-
.../partition/StorageGroupPartitionTable.java | 2 +-
.../persistence/schema/ClusterSchemaInfo.java | 22 +-
.../procedure/impl/cq/CreateCQProcedure.java | 4 +-
.../impl/node/AddConfigNodeProcedure.java | 4 +-
.../impl/node/RemoveConfigNodeProcedure.java | 4 +-
.../impl/node/RemoveDataNodeProcedure.java | 4 +-
.../impl/schema/DeactivateTemplateProcedure.java | 5 +-
.../impl/schema/DeleteStorageGroupProcedure.java | 4 +-
.../impl/schema/DeleteTimeSeriesProcedure.java | 4 +-
.../impl/schema/UnsetTemplateProcedure.java | 4 +-
.../statemachine/CreateRegionGroupsProcedure.java | 6 +-
.../impl/statemachine/RegionMigrateProcedure.java | 4 +-
.../procedure/impl/sync/CreatePipeProcedure.java | 4 +-
.../procedure/impl/sync/DropPipeProcedure.java | 4 +-
.../procedure/impl/sync/StartPipeProcedure.java | 4 +-
.../procedure/impl/sync/StopPipeProcedure.java | 4 +-
.../impl/{ => trigger}/CreateTriggerProcedure.java | 6 +-
.../impl/{ => trigger}/DropTriggerProcedure.java | 6 +-
.../procedure/store/ConfigProcedureStore.java | 2 +-
.../procedure/store/ProcedureFactory.java | 41 +--
.../confignode/procedure/store/ProcedureType.java | 82 +++++
.../iotdb/confignode/service/ConfigNode.java | 8 +-
.../service/thrift/ConfigNodeRPCService.java | 4 +-
.../thrift/ConfigNodeRPCServiceProcessor.java | 20 +-
.../request/ConfigPhysicalPlanSerDeTest.java | 36 +-
.../persistence/ClusterSchemaInfoTest.java | 2 +-
.../confignode/persistence/PartitionInfoTest.java | 2 +-
.../iotdb/confignode/persistence/UDFInfoTest.java | 82 +++++
.../procedure/impl/CreateCQProcedureTest.java | 87 +++++
.../impl/CreateRegionGroupsProcedureTest.java | 4 +-
.../procedure/impl/CreateTriggerProcedureTest.java | 1 +
.../impl/DeactivateTemplateProcedureTest.java | 5 +-
.../impl/DeleteTimeSeriesProcedureTest.java | 4 +-
.../procedure/impl/DropTriggerProcedureTest.java | 1 +
.../procedure/impl/UnsetTemplateProcedureTest.java | 4 +-
.../impl/node/AddConfigNodeProcedureTest.java} | 22 +-
.../impl/node/RemoveConfigNodeProcedureTest.java} | 22 +-
.../impl/node/RemoveDataNodeProcedureTest.java} | 27 +-
.../statemachine/RegionMigrateProcedureTest.java | 65 ++++
.../confignode1conf/iotdb-confignode.properties | 14 +-
.../confignode2conf/iotdb-confignode.properties | 14 +-
.../confignode3conf/iotdb-confignode.properties | 14 +-
docs/UserGuide/Maintenance-Tools/Sync-Tool.md | 296 ++++++---------
docs/UserGuide/Reference/Keywords.md | 52 ++-
docs/zh/UserGuide/Maintenance-Tools/Sync-Tool.md | 332 ++++++-----------
docs/zh/UserGuide/Reference/Keywords.md | 50 ++-
integration-test/import-control.xml | 6 +-
.../org/apache/iotdb/it/env/ConfigNodeWrapper.java | 10 +-
.../org/apache/iotdb/it/env/DataNodeWrapper.java | 16 +-
.../confignode/it/IoTDBConfigNodeSnapshotIT.java | 65 +++-
.../org/apache/iotdb/db/it/IoTDBNestedQueryIT.java | 3 +-
.../db/it/IoTDBSyntaxConventionIdentifierIT.java | 3 -
.../it/IoTDBSyntaxConventionStringLiteralIT.java | 5 -
.../iotdb/db/it/selectinto/IoTDBSelectInto2IT.java | 2 -
...BSelectInto2IT.java => IoTDBSelectInto3IT.java} | 9 +-
.../iotdb/db/it/selectinto/IoTDBSelectIntoIT.java | 7 +-
.../org/apache/iotdb/db/it/sync/IoTDBPipeIT.java | 50 +--
.../apache/iotdb/db/it/sync/IoTDBPipeSinkIT.java | 2 +-
.../db/it/trigger/IoTDBTriggerExecutionIT.java | 10 +-
.../db/it/trigger/IoTDBTriggerManagementIT.java | 7 +-
.../iotdb/db/it/udf/IoTDBUDFManagementIT.java | 20 +-
.../db/it/udf/IoTDBUDFOtherWindowQueryIT.java | 3 -
.../iotdb/db/it/udf/IoTDBUDFWindowQueryIT.java | 2 -
.../db/it/udf/IoTDBUDTFAlignByTimeQueryIT.java | 3 -
.../db/it/udf/IoTDBUDTFBuiltinFunctionIT.java | 3 -
.../iotdb/db/it/udf/IoTDBUDTFHybridQueryIT.java | 2 -
.../iotdb/db/it/udf/IoTDBUDTFNonAlignQueryIT.java | 2 -
...ertNulIT.java => IoTDBSessionInsertNullIT.java} | 4 +-
.../IoTDBSessionInsertWithTriggerExecutionIT.java | 10 +-
.../session/it/IoTDBSessionSchemaTemplateIT.java | 223 ++++++++++++
.../iotdb/session/it/IoTDBSessionSimpleIT.java | 186 +---------
.../iotdb/session/it/pool/SessionPoolIT.java | 90 ++++-
.../src/test/resources/udf-example.jar | Bin 0 -> 10018 bytes
.../apache/iotdb/integration/env/ClusterNode.java | 2 +-
.../apache/iotdb/db/integration/IoTDBTtlIT.java | 4 +-
.../apache/iotdb/session/template/TemplateUT.java | 400 ---------------------
.../resources/conf/iotdb-common.properties | 41 ++-
.../iotdb/commons/client/ClientPoolFactory.java | 24 +-
.../apache/iotdb/commons/conf/CommonConfig.java | 28 +-
.../iotdb/commons/conf/CommonDescriptor.java | 23 +-
.../apache/iotdb/commons/conf/IoTDBConstant.java | 18 +-
.../iotdb/commons/sync/pipe/TsFilePipeInfo.java | 8 +-
.../apache/iotdb/commons/trigger/TriggerTable.java | 2 +
.../apache/iotdb/commons/udf/UDFInformation.java | 24 ++
.../org/apache/iotdb/commons/udf/UDFTable.java | 37 ++
.../rocksdb/mnode/RStorageGroupMNode.java | 2 +-
.../resources/conf/iotdb-datanode.properties | 38 +-
.../apache/iotdb/db/client/ConfigNodeClient.java | 2 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 33 +-
.../org/apache/iotdb/db/conf/IoTDBStartCheck.java | 14 +-
.../iotdb/db/metadata/mtree/ConfigMTree.java | 2 +-
.../db/metadata/mtree/store/MemMTreeStore.java | 2 +-
.../store/disk/schemafile/MockSchemaFile.java | 2 +-
.../mtree/store/disk/schemafile/SchemaFile.java | 2 +-
.../db/mpp/common/header/ColumnHeaderConstant.java | 2 +
.../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 2 +
.../config/executor/ClusterConfigTaskExecutor.java | 11 +-
.../execution/config/sys/sync/ShowPipeTask.java | 3 +-
.../memory/StatementMemorySourceVisitor.java | 9 +-
.../db/mpp/plan/parser/StatementGenerator.java | 14 +
.../plan/planner/plan/node/PlanGraphPrinter.java | 51 +++
.../service/thrift/impl/ClientRPCServiceImpl.java | 85 ++++-
.../java/org/apache/iotdb/db/sync/SyncService.java | 25 +-
.../datanode1conf/iotdb-datanode.properties | 28 +-
.../datanode2conf/iotdb-datanode.properties | 28 +-
.../datanode3conf/iotdb-datanode.properties | 28 +-
.../src/test/resources/iotdb-datanode.properties | 10 +-
.../java/org/apache/iotdb/session/ISession.java | 2 +
.../java/org/apache/iotdb/session/Session.java | 8 +
.../apache/iotdb/session/SessionConnection.java | 4 +
.../org/apache/iotdb/session/pool/SessionPool.java | 294 ++++++++++++++-
.../src/test/resources/iotdb-datanode.properties | 2 +-
.../src/main/thrift/confignode.thrift | 3 +-
213 files changed, 2621 insertions(+), 2071 deletions(-)
rename
confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/{
=> datanode}/GetDataNodeConfigurationPlan.java (93%)
rename
confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/{
=> function}/GetFunctionTablePlan.java (91%)
rename
confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/{
=> partition}/GetDataPartitionPlan.java (97%)
rename
confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/{
=> partition}/GetNodePathsPartitionPlan.java (95%)
rename
confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/{
=> partition}/GetOrCreateDataPartitionPlan.java (96%)
rename
confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/{
=> partition}/GetOrCreateSchemaPartitionPlan.java (95%)
rename
confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/{
=> partition}/GetSchemaPartitionPlan.java (97%)
rename
confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/{
=> partition}/GetSeriesSlotListPlan.java (95%)
rename
confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/{
=> partition}/GetTimeSlotListPlan.java (96%)
rename
confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/{
=> region}/GetRegionIdPlan.java (96%)
rename
confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/{
=> region}/GetRegionInfoListPlan.java (96%)
rename
confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/{
=> storagegroup}/CountStorageGroupPlan.java (95%)
rename
confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/{
=> storagegroup}/GetStorageGroupPlan.java (94%)
rename
confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/{
=> trigger}/GetTransferringTriggersPlan.java (91%)
rename
confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/{
=> trigger}/GetTriggerJarPlan.java (94%)
rename
confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/{
=> trigger}/GetTriggerLocationPlan.java (93%)
rename
confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/{
=> trigger}/GetTriggerTablePlan.java (93%)
rename
confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/{
=> udf}/GetUDFJarPlan.java (94%)
rename confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/{
=> trigger}/CreateTriggerProcedure.java (98%)
rename confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/{
=> trigger}/DropTriggerProcedure.java (96%)
create mode 100644
confignode/src/main/java/org/apache/iotdb/confignode/procedure/store/ProcedureType.java
create mode 100644
confignode/src/test/java/org/apache/iotdb/confignode/persistence/UDFInfoTest.java
create mode 100644
confignode/src/test/java/org/apache/iotdb/confignode/procedure/impl/CreateCQProcedureTest.java
copy
confignode/src/test/java/org/apache/iotdb/confignode/{persistence/node/NodeStatisticsTest.java
=> procedure/impl/node/AddConfigNodeProcedureTest.java} (66%)
copy
confignode/src/test/java/org/apache/iotdb/confignode/{persistence/node/NodeStatisticsTest.java
=> procedure/impl/node/RemoveConfigNodeProcedureTest.java} (65%)
copy
confignode/src/test/java/org/apache/iotdb/confignode/{persistence/node/NodeStatisticsTest.java
=> procedure/impl/node/RemoveDataNodeProcedureTest.java} (60%)
create mode 100644
confignode/src/test/java/org/apache/iotdb/confignode/procedure/impl/statemachine/RegionMigrateProcedureTest.java
copy
integration-test/src/test/java/org/apache/iotdb/db/it/selectinto/{IoTDBSelectInto2IT.java
=> IoTDBSelectInto3IT.java} (85%)
rename
integration-test/src/test/java/org/apache/iotdb/session/it/{IoTDBSessionInsertNulIT.java
=> IoTDBSessionInsertNullIT.java} (99%)
create mode 100644
integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSchemaTemplateIT.java
rename
integration/src/test/java/org/apache/iotdb/session/pool/SessionPoolTest.java =>
integration-test/src/test/java/org/apache/iotdb/session/it/pool/SessionPoolIT.java
(82%)
create mode 100644 integration-test/src/test/resources/udf-example.jar
delete mode 100644
integration/src/test/java/org/apache/iotdb/session/template/TemplateUT.java