This is an automated email from the ASF dual-hosted git repository.
rong pushed a change to branch pipe-meta-sync
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 251d8737eef merge with conflicts
add 21ec650499c Pipe Meta: Support deletion and air gap sink sync in meta
sync (#12027)
No new revisions were added by this update.
Summary of changes:
.../pipe/it/{ => autocreate}/IoTDBPipeAlterIT.java | 4 +-
.../pipe/it/autocreate/IoTDBPipeIdempotentIT.java | 29 +++
.../pipe/it/autocreate/IoTDBPipeNullValueIT.java | 2 +
.../pipe/it/autocreate/IoTDBPipeProtocolIT.java | 22 +-
.../iotdb/pipe/it/manual/IoTDBPipeInclusionIT.java | 65 ++++++
.../IoTDBPipeMultiSchemaRegionIT.java} | 43 ++--
.../org/apache/iotdb/tools/it/ImportCsvTestIT.java | 15 +-
.../org/apache/iotdb/pipe/api/PipeConnector.java | 12 +-
.../org/apache/iotdb/pipe/api/PipeExtractor.java | 39 ++--
.../org/apache/iotdb/pipe/api/PipeProcessor.java | 45 ++--
.../java/org/apache/iotdb/cli/AbstractCli.java | 14 --
.../iotdb/tool/integration/ExportCsvTestIT.java | 109 ----------
.../consensus/request/ConfigPhysicalPlan.java | 12 +
.../consensus/request/ConfigPhysicalPlanType.java | 3 +
.../consensus/request/PhysicalPlanVisitor.java | 23 ++
.../pipe/payload/PipeDeactivateTemplatePlan.java | 106 +++++++++
.../PipeDeleteLogicalViewPlan.java} | 46 ++--
.../PipeDeleteTimeSeriesPlan.java} | 46 ++--
.../pipe/payload/PipeUnsetSchemaTemplatePlan.java | 9 +-
.../iotdb/confignode/manager/ConfigManager.java | 2 +-
.../pipe/receiver/IoTDBConfigReceiverAgent.java | 2 +-
.../pipe/receiver/IoTDBConfigReceiverV1.java | 45 +++-
.../pipe/receiver/PipePlanTSStatusVisitor.java | 22 ++
.../PipeConfigRegionConnectorConstructor.java | 6 +
.../IoTDBThriftSyncClientConfigNodeManager.java | 22 +-
.../config/IoTDBAirGapConfigConnector.java | 139 ++++++++++++
.../config/IoTDBConfigRegionConnector.java | 20 +-
.../PipeTransferConfigNodeHandshakeV1Req.java} | 27 ++-
...a => PipeTransferConfigNodeHandshakeV2Req.java} | 29 +--
.../payload/request/PipeTransferConfigPlanReq.java | 4 +-
.../PipeTransferConfigSnapshotPieceReq.java | 4 +-
.../request/PipeTransferConfigSnapshotSealReq.java | 4 +-
.../transfer/extractor/PipeConfigPlanFilter.java | 10 +
.../persistence/executor/ConfigPlanExecutor.java | 5 +
.../confignode/persistence/pipe/PipeTaskInfo.java | 5 +-
.../impl/pipe/task/AlterPipeProcedureV2.java | 12 +-
.../impl/pipe/task/CreatePipeProcedureV2.java | 11 -
.../impl/pipe/task/StartPipeProcedureV2.java | 3 +-
.../impl/pipe/task/StopPipeProcedureV2.java | 6 -
.../impl/schema/DeactivateTemplateProcedure.java | 28 +++
.../impl/schema/DeleteLogicalViewProcedure.java | 28 +++
.../impl/schema/DeleteTimeSeriesProcedure.java | 28 +++
.../request/ConfigPhysicalPlanSerDeTest.java | 62 +++++-
.../pipe/PipeConfigNodeThriftRequestTest.java | 10 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 1 +
.../dataregion/DataExecutionVisitor.java | 2 +
.../PipeSchemaRegionConnectorConstructor.java | 8 +-
.../db/pipe/agent/task/PipeTaskDataNodeAgent.java | 43 ++--
.../client/IoTDBThriftAsyncClientManager.java | 23 +-
.../PipeTransferDataNodeHandshakeV1Req.java} | 27 +--
...ava => PipeTransferDataNodeHandshakeV2Req.java} | 28 +--
...maPlanReq.java => PipeTransferPlanNodeReq.java} | 18 +-
.../PipeTransferSchemaSnapshotPieceReq.java | 4 +-
.../request/PipeTransferSchemaSnapshotSealReq.java | 4 +-
.../request/PipeTransferTabletBatchReq.java | 4 +-
.../request/PipeTransferTabletBinaryReq.java | 4 +-
.../request/PipeTransferTabletInsertNodeReq.java | 4 +-
.../request/PipeTransferTabletRawReq.java | 4 +-
.../request/PipeTransferTsFilePieceReq.java | 4 +-
.../request/PipeTransferTsFileSealReq.java | 4 +-
.../protocol/airgap/IoTDBAirGapConnector.java | 242 +--------------------
.../airgap/IoTDBAirGapDataNodeConnector.java | 50 +++++
.../airgap/IoTDBAirGapSchemaConnector.java | 115 ++++++++++
.../thrift/async/IoTDBThriftAsyncConnector.java | 4 +-
.../PipeTransferTsFileInsertionEventHandler.java | 2 +-
.../thrift/sync/IoTDBDataNodeSyncConnector.java | 74 +++++++
.../IoTDBSchemaRegionConnector.java | 66 ++----
.../sync/IoTDBThriftSyncClientDataNodeManager.java | 22 +-
.../thrift/sync/IoTDBThriftSyncConnector.java | 34 +--
.../db/pipe/event/UserDefinedEnrichedEvent.java | 1 +
.../schema/PipeSchemaSerializableEventType.java | 2 +-
...aPlanEvent.java => PipeWritePlanNodeEvent.java} | 11 +-
.../event/realtime/PipeRealtimeEventFactory.java | 7 +
.../dataregion/IoTDBDataRegionExtractor.java | 15 +-
.../PipeHistoricalDataRegionTsFileExtractor.java | 88 +++-----
.../realtime/PipeRealtimeDataRegionExtractor.java | 110 ++++++++++
.../PipeRealtimeDataRegionHybridExtractor.java | 62 +-----
.../PipeRealtimeDataRegionLogExtractor.java | 48 +---
.../PipeRealtimeDataRegionTsFileExtractor.java | 48 +---
.../listener/PipeInsertionDataNodeListener.java | 13 +-
.../matcher/CachedSchemaPatternMatcher.java | 13 ++
.../schemaregion/IoTDBSchemaRegionExtractor.java | 40 ++--
.../schemaregion/PipeSchemaNodeFilter.java | 9 -
.../schemaregion/SchemaNodeListeningQueue.java | 10 +-
.../pipe/receiver/airgap/IoTDBAirGapReceiver.java | 6 +-
.../receiver/thrift/IoTDBThriftReceiverAgent.java | 2 +-
.../receiver/thrift/IoTDBThriftReceiverV1.java | 186 ++--------------
.../pipe/task/builder/PipeDataNodeTaskBuilder.java | 28 +--
.../subtask/connector/PipeConnectorSubtask.java | 132 -----------
.../connector/PipeConnectorSubtaskLifeCycle.java | 21 +-
.../subtask/processor/PipeProcessorSubtask.java | 3 -
.../config/executor/ClusterConfigTaskExecutor.java | 2 +-
.../crud/InsertMultiTabletsStatement.java | 2 +-
.../dataregion/memtable/TsFileProcessor.java | 3 +-
.../dataregion/wal/buffer/WALEntry.java | 2 +-
.../connector/PipeDataNodeThriftRequestTest.java | 96 +-------
.../iotdb/db/pipe/connector/PipeReceiverTest.java | 15 +-
.../extractor/SchemaNodeListeningQueueTest.java | 8 +-
.../commons/pipe/agent/task/PipeTaskAgent.java | 21 --
.../client/IoTDBThriftSyncClientManager.java | 47 ++--
.../payload/airgap/AirGapELanguageConstant.java | 2 +-
.../payload/airgap/AirGapOneByteResponse.java | 2 +-
.../airgap/AirGapPseudoTPipeTransferRequest.java | 2 +-
.../payload/request/PipeTransferHandshakeReq.java | 135 ------------
.../common/PipeTransferHandshakeConstant.java | 2 +-
.../request/IoTDBConnectorRequestVersion.java | 2 +-
.../{ => thrift}/request/PipeRequestType.java | 23 +-
.../request/PipeTransferFilePieceReq.java | 2 +-
.../request/PipeTransferFileSealReq.java | 2 +-
.../request/PipeTransferHandshakeV1Req.java | 40 +---
.../request/PipeTransferHandshakeV2Req.java | 53 ++---
.../response/PipeTransferFilePieceResp.java | 2 +-
.../protocol/IoTDBAirGapCommonConnector.java | 233 ++++++++++++++++++++
.../connector/protocol/IoTDBMetaConnector.java | 37 ----
.../iotdb/commons/pipe/event/EnrichedEvent.java | 4 -
.../commons/pipe/receiver/IoTDBFileReceiverV1.java | 75 ++++++-
.../commons/pipe/receiver/IoTDBThriftReceiver.java | 2 +-
.../pipe/task/subtask/PipeReportableSubtask.java | 96 ++------
.../pipe/task/subtask/PipeTransferSubtask.java | 151 ++++++-------
119 files changed, 1959 insertions(+), 1926 deletions(-)
rename integration-test/src/test/java/org/apache/iotdb/pipe/it/{ =>
autocreate}/IoTDBPipeAlterIT.java (98%)
copy
integration-test/src/test/java/org/apache/iotdb/pipe/it/{autocreate/IoTDBPipeConnectorParallelIT.java
=> manual/IoTDBPipeMultiSchemaRegionIT.java} (71%)
delete mode 100644
iotdb-client/cli/src/test/java/org/apache/iotdb/tool/integration/ExportCsvTestIT.java
create mode 100644
iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/payload/PipeDeactivateTemplatePlan.java
copy
iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/{task/SetPipeStatusPlanV2.java
=> payload/PipeDeleteLogicalViewPlan.java} (62%)
copy
iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/{task/SetPipeStatusPlanV2.java
=> payload/PipeDeleteTimeSeriesPlan.java} (62%)
create mode 100644
iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/transfer/connector/config/IoTDBAirGapConfigConnector.java
copy
iotdb-core/{datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferDataNodeHandshakeReq.java
=>
confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/transfer/connector/payload/request/PipeTransferConfigNodeHandshakeV1Req.java}
(60%)
copy
iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/transfer/connector/payload/request/{PipeTransferConfigNodeHandshakeReq.java
=> PipeTransferConfigNodeHandshakeV2Req.java} (57%)
rename
iotdb-core/{confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/transfer/connector/payload/request/PipeTransferConfigNodeHandshakeReq.java
=>
datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferDataNodeHandshakeV1Req.java}
(66%)
rename
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/{PipeTransferDataNodeHandshakeReq.java
=> PipeTransferDataNodeHandshakeV2Req.java} (58%)
rename
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/{PipeTransferSchemaPlanReq.java
=> PipeTransferPlanNodeReq.java} (82%)
create mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/airgap/IoTDBAirGapDataNodeConnector.java
create mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/airgap/IoTDBAirGapSchemaConnector.java
create mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/sync/IoTDBDataNodeSyncConnector.java
rename
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/{schema
=> sync}/IoTDBSchemaRegionConnector.java (71%)
rename
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/{PipeWriteSchemaPlanEvent.java
=> PipeWritePlanNodeEvent.java} (88%)
rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/pipe/connector/payload/airgap/AirGapELanguageConstant.java
(95%)
rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/pipe/connector/payload/airgap/AirGapOneByteResponse.java
(94%)
rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/pipe/connector/payload/airgap/AirGapPseudoTPipeTransferRequest.java
(93%)
delete mode 100644
iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/payload/request/PipeTransferHandshakeReq.java
rename
iotdb-core/{datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable
=>
node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/payload/thrift}/common/PipeTransferHandshakeConstant.java
(93%)
rename
iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/payload/{
=> thrift}/request/IoTDBConnectorRequestVersion.java (93%)
rename
iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/payload/{
=> thrift}/request/PipeRequestType.java (79%)
rename
iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/payload/{
=> thrift}/request/PipeTransferFilePieceReq.java (98%)
rename
iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/payload/{
=> thrift}/request/PipeTransferFileSealReq.java (98%)
rename
iotdb-core/{datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable
=>
node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/payload/thrift}/request/PipeTransferHandshakeV1Req.java
(57%)
rename
iotdb-core/{datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable
=>
node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/payload/thrift}/request/PipeTransferHandshakeV2Req.java
(68%)
rename
iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/payload/{
=> thrift}/response/PipeTransferFilePieceResp.java (97%)
create mode 100644
iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/protocol/IoTDBAirGapCommonConnector.java
delete mode 100644
iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/protocol/IoTDBMetaConnector.java
