You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2024/03/05 02:29:32 UTC
(iotdb) 01/22: Revert "Pipe: support alter pipe functionality (#11963)"
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch rc/1.3.1
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit b14605f11a7793bf108c96088641f6e54c37776c
Author: HTHou <hh...@outlook.com>
AuthorDate: Tue Mar 5 09:57:33 2024 +0800
Revert "Pipe: support alter pipe functionality (#11963)"
This reverts commit 63933967f6a2f3ce8220d22b3cffba158e8f7115.
---
.../org/apache/iotdb/pipe/it/IoTDBPipeAlterIT.java | 154 ---------
.../api/customizer/parameter/PipeParameters.java | 28 --
.../org/apache/iotdb/db/qp/sql/IdentifierParser.g4 | 1 -
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 22 +-
.../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 | 4 -
.../consensus/request/ConfigPhysicalPlan.java | 4 -
.../consensus/request/ConfigPhysicalPlanType.java | 1 -
.../request/write/pipe/task/AlterPipePlanV2.java | 66 ----
.../iotdb/confignode/manager/ConfigManager.java | 9 -
.../apache/iotdb/confignode/manager/IManager.java | 9 -
.../iotdb/confignode/manager/ProcedureManager.java | 19 --
.../pipe/coordinator/task/PipeTaskCoordinator.java | 10 -
.../persistence/executor/ConfigPlanExecutor.java | 3 -
.../persistence/pipe/PipePluginInfo.java | 22 +-
.../confignode/persistence/pipe/PipeTaskInfo.java | 77 +----
.../impl/pipe/AbstractOperatePipeProcedureV2.java | 21 +-
.../procedure/impl/pipe/PipeTaskOperation.java | 1 -
.../impl/pipe/task/AlterPipeProcedureV2.java | 344 ---------------------
.../impl/pipe/task/CreatePipeProcedureV2.java | 25 +-
.../impl/pipe/task/StopPipeProcedureV2.java | 3 +-
.../procedure/store/ProcedureFactory.java | 6 -
.../confignode/procedure/store/ProcedureType.java | 1 -
.../thrift/ConfigNodeRPCServiceProcessor.java | 6 -
.../request/ConfigPhysicalPlanSerDeTest.java | 29 +-
.../iotdb/confignode/persistence/PipeInfoTest.java | 2 +-
.../impl/pipe/task/AlterPipeProcedureV2Test.java | 68 ----
.../pipe/agent/plugin/PipePluginDataNodeAgent.java | 13 -
.../pipe/extractor/IoTDBDataRegionExtractor.java | 13 +-
.../iotdb/db/protocol/client/ConfigNodeClient.java | 7 -
.../plan/execution/config/ConfigTaskVisitor.java | 8 -
.../config/executor/ClusterConfigTaskExecutor.java | 54 +---
.../config/executor/IConfigTaskExecutor.java | 3 -
.../execution/config/sys/pipe/AlterPipeTask.java | 42 ---
.../db/queryengine/plan/parser/ASTVisitor.java | 68 ++--
.../queryengine/plan/statement/StatementType.java | 1 -
.../plan/statement/StatementVisitor.java | 5 -
.../metadata/pipe/AlterPipeStatement.java | 95 ------
.../commons/pipe/agent/plugin/PipePluginAgent.java | 11 -
.../commons/pipe/agent/task/PipeTaskAgent.java | 7 +-
.../src/main/thrift/confignode.thrift | 11 +-
40 files changed, 68 insertions(+), 1205 deletions(-)
diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/IoTDBPipeAlterIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/IoTDBPipeAlterIT.java
deleted file mode 100644
index a5534b32411..00000000000
--- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/IoTDBPipeAlterIT.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.iotdb.pipe.it;
-
-import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient;
-import org.apache.iotdb.confignode.rpc.thrift.TShowPipeInfo;
-import org.apache.iotdb.confignode.rpc.thrift.TShowPipeReq;
-import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper;
-import org.apache.iotdb.it.framework.IoTDBTestRunner;
-import org.apache.iotdb.itbase.category.MultiClusterIT2;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.List;
-
-import static org.junit.Assert.fail;
-
-@RunWith(IoTDBTestRunner.class)
-@Category({MultiClusterIT2.class})
-public class IoTDBPipeAlterIT extends AbstractPipeDualIT {
-
- @Test
- public void testBasicPipeAlter() throws Exception {
- DataNodeWrapper receiverDataNode = receiverEnv.getDataNodeWrapper(0);
-
- // create pipe
- String sql =
- String.format(
- "create pipe a2b with sink ('node-urls'='%s', 'batch.enable'='false')",
- receiverDataNode.getIpAndPortString());
- try (Connection connection = senderEnv.getConnection();
- Statement statement = connection.createStatement()) {
- statement.execute(sql);
- } catch (SQLException e) {
- fail(e.getMessage());
- }
-
- // show pipe and record first creation time
- long firstCreationTime;
- try (SyncConfigNodeIServiceClient client =
- (SyncConfigNodeIServiceClient) senderEnv.getLeaderConfigNodeConnection()) {
- List<TShowPipeInfo> showPipeResult = client.showPipe(new TShowPipeReq()).pipeInfoList;
- Assert.assertEquals(1, showPipeResult.size());
- Assert.assertTrue(showPipeResult.get(0).pipeConnector.contains("batch.enable=false"));
- Assert.assertEquals("RUNNING", showPipeResult.get(0).state);
- firstCreationTime = showPipeResult.get(0).creationTime;
- }
-
- // stop pipe
- try (Connection connection = senderEnv.getConnection();
- Statement statement = connection.createStatement()) {
- statement.execute("stop pipe a2b");
- } catch (SQLException e) {
- fail(e.getMessage());
- }
-
- // show pipe
- try (SyncConfigNodeIServiceClient client =
- (SyncConfigNodeIServiceClient) senderEnv.getLeaderConfigNodeConnection()) {
- List<TShowPipeInfo> showPipeResult = client.showPipe(new TShowPipeReq()).pipeInfoList;
- Assert.assertEquals(1, showPipeResult.size());
- Assert.assertEquals("STOPPED", showPipeResult.get(0).state);
- }
-
- // alter pipe
- sql =
- String.format(
- "alter pipe a2b modify sink ('node-urls'='%s', 'batch.enable'='true')",
- receiverDataNode.getIpAndPortString());
- try (Connection connection = senderEnv.getConnection();
- Statement statement = connection.createStatement()) {
- statement.execute(sql);
- } catch (SQLException e) {
- fail(e.getMessage());
- }
-
- // show pipe
- try (SyncConfigNodeIServiceClient client =
- (SyncConfigNodeIServiceClient) senderEnv.getLeaderConfigNodeConnection()) {
- List<TShowPipeInfo> showPipeResult = client.showPipe(new TShowPipeReq()).pipeInfoList;
- Assert.assertEquals(1, showPipeResult.size());
- Assert.assertTrue(showPipeResult.get(0).pipeConnector.contains("batch.enable=true"));
- Assert.assertEquals("STOPPED", showPipeResult.get(0).state);
- // alter pipe will reset pipe creation time
- Assert.assertTrue(showPipeResult.get(0).creationTime > firstCreationTime);
- // alter pipe will clear exception messages
- Assert.assertEquals("", showPipeResult.get(0).exceptionMessage);
- }
- }
-
- @Test
- public void testPipeAlterFailure() {
- DataNodeWrapper receiverDataNode = receiverEnv.getDataNodeWrapper(0);
-
- // alter non-existed pipe
- String sql =
- String.format(
- "alter pipe a2b modify sink ('node-urls'='%s', 'batch.enable'='true')",
- receiverDataNode.getIpAndPortString());
- try (Connection connection = senderEnv.getConnection();
- Statement statement = connection.createStatement()) {
- statement.execute(sql);
- fail();
- } catch (SQLException ignore) {
- }
-
- // create pipe
- sql =
- String.format(
- "create pipe a2b with sink ('node-urls'='%s', 'batch.enable'='false')",
- receiverDataNode.getIpAndPortString());
- try (Connection connection = senderEnv.getConnection();
- Statement statement = connection.createStatement()) {
- statement.execute(sql);
- } catch (SQLException e) {
- fail(e.getMessage());
- }
-
- // useless alter
- sql =
- String.format(
- "alter pipe a2b modify sink ('node-urls'='%s', 'batch.enable'='false')",
- receiverDataNode.getIpAndPortString());
- try (Connection connection = senderEnv.getConnection();
- Statement statement = connection.createStatement()) {
- statement.execute(sql);
- fail();
- } catch (SQLException ignore) {
- }
- }
-}
diff --git a/iotdb-api/pipe-api/src/main/java/org/apache/iotdb/pipe/api/customizer/parameter/PipeParameters.java b/iotdb-api/pipe-api/src/main/java/org/apache/iotdb/pipe/api/customizer/parameter/PipeParameters.java
index aee06624f7f..9a12f8e315c 100644
--- a/iotdb-api/pipe-api/src/main/java/org/apache/iotdb/pipe/api/customizer/parameter/PipeParameters.java
+++ b/iotdb-api/pipe-api/src/main/java/org/apache/iotdb/pipe/api/customizer/parameter/PipeParameters.java
@@ -32,7 +32,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Set;
-import java.util.TreeMap;
import java.util.stream.Collectors;
/**
@@ -280,33 +279,6 @@ public class PipeParameters {
.toString();
}
- /**
- * This method uses {@link KeyReducer} to reduce keys and then sorts them to determine if two
- * PipeParameters are equivalent.
- */
- public boolean isEquivalent(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null || getClass() != obj.getClass()) {
- return false;
- }
- PipeParameters that = (PipeParameters) obj;
- return Objects.equals(
- this.attributes.entrySet().stream()
- .collect(
- Collectors.toMap(
- entry -> KeyReducer.reduce(entry.getKey()), Entry::getValue,
- (oldValue, newValue) -> oldValue, TreeMap::new))
- .toString(),
- that.attributes.entrySet().stream()
- .collect(
- Collectors.toMap(
- entry -> KeyReducer.reduce(entry.getKey()), Entry::getValue,
- (oldValue, newValue) -> oldValue, TreeMap::new))
- .toString());
- }
-
private static class KeyReducer {
private static final Set<String> PREFIXES = new HashSet<>();
diff --git a/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IdentifierParser.g4 b/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IdentifierParser.g4
index 7b1ca692ed1..13fb5bc9dfc 100644
--- a/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IdentifierParser.g4
+++ b/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IdentifierParser.g4
@@ -133,7 +133,6 @@ keyWords
| MERGE
| METADATA
| MIGRATE
- | MODIFY
| NAN
| NODEID
| NODES
diff --git a/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 b/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4
index 851bf87307e..26bff961f3e 100644
--- a/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4
+++ b/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4
@@ -53,7 +53,7 @@ ddlStatement
// Trigger
| createTrigger | dropTrigger | showTriggers | startTrigger | stopTrigger
// Pipe Task
- | createPipe | alterPipe | dropPipe | startPipe | stopPipe | showPipes
+ | createPipe | dropPipe | startPipe | stopPipe | showPipes
// Pipe Plugin
| createPipePlugin | dropPipePlugin | showPipePlugins
// CQ
@@ -561,26 +561,6 @@ connectorAttributeClause
: connectorKey=STRING_LITERAL OPERATOR_SEQ connectorValue=STRING_LITERAL
;
-alterPipe
- : ALTER PIPE pipeName=identifier
- modifyProcessorAttributesClause?
- modifyConnectorAttributesClause?
- ;
-
-modifyProcessorAttributesClause
- : MODIFY PROCESSOR
- LR_BRACKET
- (processorAttributeClause COMMA)* processorAttributeClause?
- RR_BRACKET
- ;
-
-modifyConnectorAttributesClause
- : MODIFY (CONNECTOR | SINK)
- LR_BRACKET
- (connectorAttributeClause COMMA)* connectorAttributeClause?
- RR_BRACKET
- ;
-
dropPipe
: DROP PIPE pipeName=identifier
;
diff --git a/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 b/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4
index 81b995393d2..5c79f778818 100644
--- a/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4
+++ b/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4
@@ -438,10 +438,6 @@ MIGRATE
: M I G R A T E
;
-MODIFY
- : M O D I F Y
- ;
-
NAN
: N A N
;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlan.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlan.java
index 9200b8fc9ca..ef853cfd9d7 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlan.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlan.java
@@ -79,7 +79,6 @@ import org.apache.iotdb.confignode.consensus.request.write.pipe.plugin.CreatePip
import org.apache.iotdb.confignode.consensus.request.write.pipe.plugin.DropPipePluginPlan;
import org.apache.iotdb.confignode.consensus.request.write.pipe.runtime.PipeHandleLeaderChangePlan;
import org.apache.iotdb.confignode.consensus.request.write.pipe.runtime.PipeHandleMetaChangePlan;
-import org.apache.iotdb.confignode.consensus.request.write.pipe.task.AlterPipePlanV2;
import org.apache.iotdb.confignode.consensus.request.write.pipe.task.CreatePipePlanV2;
import org.apache.iotdb.confignode.consensus.request.write.pipe.task.DropPipePlanV2;
import org.apache.iotdb.confignode.consensus.request.write.pipe.task.SetPipeStatusPlanV2;
@@ -412,9 +411,6 @@ public abstract class ConfigPhysicalPlan implements IConsensusRequest {
case DropPipeV2:
plan = new DropPipePlanV2();
break;
- case AlterPipeV2:
- plan = new AlterPipePlanV2();
- break;
case ShowPipeV2:
plan = new ShowPipePlanV2();
break;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlanType.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlanType.java
index 24ecb66dfe7..aaadd5aa55c 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlanType.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlanType.java
@@ -197,7 +197,6 @@ public enum ConfigPhysicalPlanType {
SetPipeStatusV2((short) 1501),
DropPipeV2((short) 1502),
ShowPipeV2((short) 1503),
- AlterPipeV2((short) 1504),
/** Pipe Runtime. */
PipeHandleLeaderChange((short) 1600),
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/task/AlterPipePlanV2.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/task/AlterPipePlanV2.java
deleted file mode 100644
index af4caffe009..00000000000
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/task/AlterPipePlanV2.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.iotdb.confignode.consensus.request.write.pipe.task;
-
-import org.apache.iotdb.commons.pipe.task.meta.PipeRuntimeMeta;
-import org.apache.iotdb.commons.pipe.task.meta.PipeStaticMeta;
-import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlan;
-import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlanType;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-public class AlterPipePlanV2 extends ConfigPhysicalPlan {
-
- private PipeStaticMeta pipeStaticMeta;
- private PipeRuntimeMeta pipeRuntimeMeta;
-
- public AlterPipePlanV2() {
- super(ConfigPhysicalPlanType.AlterPipeV2);
- }
-
- public AlterPipePlanV2(PipeStaticMeta pipeStaticMeta, PipeRuntimeMeta pipeRuntimeMeta) {
- super(ConfigPhysicalPlanType.AlterPipeV2);
- this.pipeStaticMeta = pipeStaticMeta;
- this.pipeRuntimeMeta = pipeRuntimeMeta;
- }
-
- public PipeStaticMeta getPipeStaticMeta() {
- return pipeStaticMeta;
- }
-
- public PipeRuntimeMeta getPipeRuntimeMeta() {
- return pipeRuntimeMeta;
- }
-
- @Override
- protected void serializeImpl(DataOutputStream stream) throws IOException {
- stream.writeShort(getType().getPlanType());
- pipeStaticMeta.serialize(stream);
- pipeRuntimeMeta.serialize(stream);
- }
-
- @Override
- protected void deserializeImpl(ByteBuffer buffer) throws IOException {
- pipeStaticMeta = PipeStaticMeta.deserialize(buffer);
- pipeRuntimeMeta = PipeRuntimeMeta.deserialize(buffer);
- }
-}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
index ae88161b142..7daef53fccb 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
@@ -104,7 +104,6 @@ import org.apache.iotdb.confignode.persistence.pipe.PipeInfo;
import org.apache.iotdb.confignode.persistence.quota.QuotaInfo;
import org.apache.iotdb.confignode.persistence.schema.ClusterSchemaInfo;
import org.apache.iotdb.confignode.rpc.thrift.TAlterLogicalViewReq;
-import org.apache.iotdb.confignode.rpc.thrift.TAlterPipeReq;
import org.apache.iotdb.confignode.rpc.thrift.TAlterSchemaTemplateReq;
import org.apache.iotdb.confignode.rpc.thrift.TAuthizedPatternTreeResp;
import org.apache.iotdb.confignode.rpc.thrift.TClusterParameters;
@@ -1758,14 +1757,6 @@ public class ConfigManager implements IManager {
: status;
}
- @Override
- public TSStatus alterPipe(TAlterPipeReq req) {
- TSStatus status = confirmLeader();
- return status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()
- ? pipeManager.getPipeTaskCoordinator().alterPipe(req)
- : status;
- }
-
@Override
public TSStatus startPipe(String pipeName) {
TSStatus status = confirmLeader();
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/IManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/IManager.java
index 56ed18cf566..bcdc44c677b 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/IManager.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/IManager.java
@@ -48,7 +48,6 @@ import org.apache.iotdb.confignode.manager.partition.PartitionManager;
import org.apache.iotdb.confignode.manager.pipe.coordinator.PipeManager;
import org.apache.iotdb.confignode.manager.schema.ClusterSchemaManager;
import org.apache.iotdb.confignode.rpc.thrift.TAlterLogicalViewReq;
-import org.apache.iotdb.confignode.rpc.thrift.TAlterPipeReq;
import org.apache.iotdb.confignode.rpc.thrift.TAlterSchemaTemplateReq;
import org.apache.iotdb.confignode.rpc.thrift.TConfigNodeRegisterReq;
import org.apache.iotdb.confignode.rpc.thrift.TConfigNodeRegisterResp;
@@ -556,14 +555,6 @@ public interface IManager {
*/
TSStatus createPipe(TCreatePipeReq req);
- /**
- * Alter Pipe.
- *
- * @param req Info about Pipe
- * @return TSStatus
- */
- TSStatus alterPipe(TAlterPipeReq req);
-
/**
* Start Pipe.
*
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java
index 0fe46a5fc68..965f89b69c7 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java
@@ -59,7 +59,6 @@ import org.apache.iotdb.confignode.procedure.impl.pipe.plugin.DropPipePluginProc
import org.apache.iotdb.confignode.procedure.impl.pipe.runtime.PipeHandleLeaderChangeProcedure;
import org.apache.iotdb.confignode.procedure.impl.pipe.runtime.PipeHandleMetaChangeProcedure;
import org.apache.iotdb.confignode.procedure.impl.pipe.runtime.PipeMetaSyncProcedure;
-import org.apache.iotdb.confignode.procedure.impl.pipe.task.AlterPipeProcedureV2;
import org.apache.iotdb.confignode.procedure.impl.pipe.task.CreatePipeProcedureV2;
import org.apache.iotdb.confignode.procedure.impl.pipe.task.DropPipeProcedureV2;
import org.apache.iotdb.confignode.procedure.impl.pipe.task.StartPipeProcedureV2;
@@ -84,7 +83,6 @@ import org.apache.iotdb.confignode.procedure.store.ProcedureFactory;
import org.apache.iotdb.confignode.procedure.store.ProcedureStore;
import org.apache.iotdb.confignode.procedure.store.ProcedureType;
import org.apache.iotdb.confignode.rpc.thrift.TAlterLogicalViewReq;
-import org.apache.iotdb.confignode.rpc.thrift.TAlterPipeReq;
import org.apache.iotdb.confignode.rpc.thrift.TConfigNodeRegisterReq;
import org.apache.iotdb.confignode.rpc.thrift.TCreateCQReq;
import org.apache.iotdb.confignode.rpc.thrift.TCreatePipeReq;
@@ -772,23 +770,6 @@ public class ProcedureManager {
}
}
- public TSStatus alterPipe(TAlterPipeReq req) {
- try {
- long procedureId = executor.submitProcedure(new AlterPipeProcedureV2(req));
- List<TSStatus> statusList = new ArrayList<>();
- boolean isSucceed =
- waitingProcedureFinished(Collections.singletonList(procedureId), statusList);
- if (isSucceed) {
- return statusList.get(0);
- } else {
- return new TSStatus(TSStatusCode.PIPE_ERROR.getStatusCode())
- .setMessage(statusList.get(0).getMessage());
- }
- } catch (Exception e) {
- return new TSStatus(TSStatusCode.PIPE_ERROR.getStatusCode()).setMessage(e.getMessage());
- }
- }
-
public TSStatus startPipe(String pipeName) {
try {
long procedureId = executor.submitProcedure(new StartPipeProcedureV2(pipeName));
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/coordinator/task/PipeTaskCoordinator.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/coordinator/task/PipeTaskCoordinator.java
index 2027ee3cd7b..ba31e01035a 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/coordinator/task/PipeTaskCoordinator.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/coordinator/task/PipeTaskCoordinator.java
@@ -24,7 +24,6 @@ import org.apache.iotdb.confignode.consensus.request.read.pipe.task.ShowPipePlan
import org.apache.iotdb.confignode.consensus.response.pipe.task.PipeTableResp;
import org.apache.iotdb.confignode.manager.ConfigManager;
import org.apache.iotdb.confignode.persistence.pipe.PipeTaskInfo;
-import org.apache.iotdb.confignode.rpc.thrift.TAlterPipeReq;
import org.apache.iotdb.confignode.rpc.thrift.TCreatePipeReq;
import org.apache.iotdb.confignode.rpc.thrift.TGetAllPipeInfoResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowPipeReq;
@@ -108,15 +107,6 @@ public class PipeTaskCoordinator {
return status;
}
- /** Caller should ensure that the method is called in the lock {@link #tryLock()}. */
- public TSStatus alterPipe(TAlterPipeReq req) {
- final TSStatus status = configManager.getProcedureManager().alterPipe(req);
- if (status.getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
- LOGGER.warn("Failed to alter pipe {}. Result status: {}.", req.getPipeName(), status);
- }
- return status;
- }
-
/** Caller should ensure that the method is called in the lock {@link #tryLock()}. */
public TSStatus startPipe(String pipeName) {
final TSStatus status = configManager.getProcedureManager().startPipe(pipeName);
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/executor/ConfigPlanExecutor.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/executor/ConfigPlanExecutor.java
index 2c977b85165..a46a9e213c1 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/executor/ConfigPlanExecutor.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/executor/ConfigPlanExecutor.java
@@ -76,7 +76,6 @@ import org.apache.iotdb.confignode.consensus.request.write.pipe.plugin.CreatePip
import org.apache.iotdb.confignode.consensus.request.write.pipe.plugin.DropPipePluginPlan;
import org.apache.iotdb.confignode.consensus.request.write.pipe.runtime.PipeHandleLeaderChangePlan;
import org.apache.iotdb.confignode.consensus.request.write.pipe.runtime.PipeHandleMetaChangePlan;
-import org.apache.iotdb.confignode.consensus.request.write.pipe.task.AlterPipePlanV2;
import org.apache.iotdb.confignode.consensus.request.write.pipe.task.CreatePipePlanV2;
import org.apache.iotdb.confignode.consensus.request.write.pipe.task.DropPipePlanV2;
import org.apache.iotdb.confignode.consensus.request.write.pipe.task.SetPipeStatusPlanV2;
@@ -420,8 +419,6 @@ public class ConfigPlanExecutor {
return pipeInfo.getPipeTaskInfo().setPipeStatus((SetPipeStatusPlanV2) physicalPlan);
case DropPipeV2:
return pipeInfo.getPipeTaskInfo().dropPipe((DropPipePlanV2) physicalPlan);
- case AlterPipeV2:
- return pipeInfo.getPipeTaskInfo().alterPipe((AlterPipePlanV2) physicalPlan);
case PipeHandleLeaderChange:
return pipeInfo
.getPipeTaskInfo()
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipePluginInfo.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipePluginInfo.java
index 6c63739107e..346957c2d22 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipePluginInfo.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipePluginInfo.java
@@ -35,6 +35,7 @@ import org.apache.iotdb.confignode.consensus.request.write.pipe.plugin.CreatePip
import org.apache.iotdb.confignode.consensus.request.write.pipe.plugin.DropPipePluginPlan;
import org.apache.iotdb.confignode.consensus.response.JarResp;
import org.apache.iotdb.confignode.consensus.response.pipe.plugin.PipePluginTableResp;
+import org.apache.iotdb.confignode.rpc.thrift.TCreatePipeReq;
import org.apache.iotdb.consensus.common.DataSet;
import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters;
import org.apache.iotdb.pipe.api.exception.PipeException;
@@ -52,7 +53,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import java.util.Map;
import java.util.Objects;
import java.util.concurrent.locks.ReentrantLock;
@@ -122,11 +122,9 @@ public class PipePluginInfo implements SnapshotProcessor {
return !pipePluginMetaKeeper.containsJar(jarName);
}
- public void checkPipePluginExistence(
- Map<String, String> extractorAttributes,
- Map<String, String> processorAttributes,
- Map<String, String> connectorAttributes) {
- final PipeParameters extractorParameters = new PipeParameters(extractorAttributes);
+ public void checkBeforeCreatePipe(TCreatePipeReq createPipeRequest) {
+ final PipeParameters extractorParameters =
+ new PipeParameters(createPipeRequest.getExtractorAttributes());
final String extractorPluginName =
extractorParameters.getStringOrDefault(
Arrays.asList(PipeExtractorConstant.EXTRACTOR_KEY, PipeExtractorConstant.SOURCE_KEY),
@@ -134,26 +132,28 @@ public class PipePluginInfo implements SnapshotProcessor {
if (!pipePluginMetaKeeper.containsPipePlugin(extractorPluginName)) {
final String exceptionMessage =
String.format(
- "Failed to create or alter pipe, the pipe extractor plugin %s does not exist",
+ "Failed to create pipe, the pipe extractor plugin %s does not exist",
extractorPluginName);
LOGGER.warn(exceptionMessage);
throw new PipeException(exceptionMessage);
}
- final PipeParameters processorParameters = new PipeParameters(processorAttributes);
+ final PipeParameters processorParameters =
+ new PipeParameters(createPipeRequest.getProcessorAttributes());
final String processorPluginName =
processorParameters.getStringOrDefault(
PipeProcessorConstant.PROCESSOR_KEY, DO_NOTHING_PROCESSOR.getPipePluginName());
if (!pipePluginMetaKeeper.containsPipePlugin(processorPluginName)) {
final String exceptionMessage =
String.format(
- "Failed to create or alter pipe, the pipe processor plugin %s does not exist",
+ "Failed to create pipe, the pipe processor plugin %s does not exist",
processorPluginName);
LOGGER.warn(exceptionMessage);
throw new PipeException(exceptionMessage);
}
- final PipeParameters connectorParameters = new PipeParameters(connectorAttributes);
+ final PipeParameters connectorParameters =
+ new PipeParameters(createPipeRequest.getConnectorAttributes());
final String connectorPluginName =
connectorParameters.getStringOrDefault(
Arrays.asList(PipeConnectorConstant.CONNECTOR_KEY, PipeConnectorConstant.SINK_KEY),
@@ -161,7 +161,7 @@ public class PipePluginInfo implements SnapshotProcessor {
if (!pipePluginMetaKeeper.containsPipePlugin(connectorPluginName)) {
final String exceptionMessage =
String.format(
- "Failed to create or alter pipe, the pipe connector plugin %s does not exist",
+ "Failed to create pipe, the pipe connector plugin %s does not exist",
connectorPluginName);
LOGGER.warn(exceptionMessage);
throw new PipeException(exceptionMessage);
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipeTaskInfo.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipeTaskInfo.java
index 196852406c5..aa9a985973e 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipeTaskInfo.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipeTaskInfo.java
@@ -27,23 +27,19 @@ import org.apache.iotdb.commons.exception.pipe.PipeRuntimeException;
import org.apache.iotdb.commons.pipe.task.meta.PipeMeta;
import org.apache.iotdb.commons.pipe.task.meta.PipeMetaKeeper;
import org.apache.iotdb.commons.pipe.task.meta.PipeRuntimeMeta;
-import org.apache.iotdb.commons.pipe.task.meta.PipeStaticMeta;
import org.apache.iotdb.commons.pipe.task.meta.PipeStatus;
import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta;
import org.apache.iotdb.commons.snapshot.SnapshotProcessor;
import org.apache.iotdb.confignode.consensus.request.write.pipe.runtime.PipeHandleLeaderChangePlan;
import org.apache.iotdb.confignode.consensus.request.write.pipe.runtime.PipeHandleMetaChangePlan;
-import org.apache.iotdb.confignode.consensus.request.write.pipe.task.AlterPipePlanV2;
import org.apache.iotdb.confignode.consensus.request.write.pipe.task.CreatePipePlanV2;
import org.apache.iotdb.confignode.consensus.request.write.pipe.task.DropPipePlanV2;
import org.apache.iotdb.confignode.consensus.request.write.pipe.task.SetPipeStatusPlanV2;
import org.apache.iotdb.confignode.consensus.response.pipe.task.PipeTableResp;
import org.apache.iotdb.confignode.procedure.impl.pipe.runtime.PipeHandleMetaChangeProcedure;
-import org.apache.iotdb.confignode.rpc.thrift.TAlterPipeReq;
import org.apache.iotdb.confignode.rpc.thrift.TCreatePipeReq;
import org.apache.iotdb.consensus.common.DataSet;
import org.apache.iotdb.mpp.rpc.thrift.TPushPipeMetaResp;
-import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters;
import org.apache.iotdb.pipe.api.exception.PipeException;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -158,55 +154,10 @@ public class PipeTaskInfo implements SnapshotProcessor {
String.format(
"Failed to create pipe %s, the pipe with the same name has been created",
createPipeRequest.getPipeName());
- LOGGER.warn(exceptionMessage);
+ LOGGER.info(exceptionMessage);
throw new PipeException(exceptionMessage);
}
- public void checkBeforeAlterPipe(TAlterPipeReq alterPipeRequest) throws PipeException {
- acquireReadLock();
- try {
- checkBeforeAlterPipeInternal(alterPipeRequest);
- } finally {
- releaseReadLock();
- }
- }
-
- private void checkBeforeAlterPipeInternal(TAlterPipeReq alterPipeRequest) throws PipeException {
- if (!isPipeExisted(alterPipeRequest.getPipeName())) {
- final String exceptionMessage =
- String.format(
- "Failed to alter pipe %s, the pipe does not exist", alterPipeRequest.getPipeName());
- LOGGER.warn(exceptionMessage);
- throw new PipeException(exceptionMessage);
- }
-
- PipeMeta pipeMetaFromCoordinator = getPipeMetaByPipeName(alterPipeRequest.getPipeName());
- PipeStaticMeta pipeStaticMetaFromCoordinator = pipeMetaFromCoordinator.getStaticMeta();
- // fill empty attributes and check useless alter from the perspective of CN
- boolean needToAlter = false;
- if (alterPipeRequest.getProcessorAttributes().isEmpty()) {
- alterPipeRequest.setProcessorAttributes(
- pipeStaticMetaFromCoordinator.getProcessorParameters().getAttribute());
- } else if (!(new PipeParameters(alterPipeRequest.getProcessorAttributes()))
- .isEquivalent(pipeStaticMetaFromCoordinator.getProcessorParameters())) {
- needToAlter = true;
- }
- if (alterPipeRequest.getConnectorAttributes().isEmpty()) {
- alterPipeRequest.setConnectorAttributes(
- pipeStaticMetaFromCoordinator.getConnectorParameters().getAttribute());
- } else if (!(new PipeParameters(alterPipeRequest.getConnectorAttributes())
- .isEquivalent(pipeStaticMetaFromCoordinator.getConnectorParameters()))) {
- needToAlter = true;
- }
- if (!needToAlter) {
- final String exceptionMessage =
- String.format(
- "Failed to alter pipe %s, nothing to alter", alterPipeRequest.getPipeName());
- LOGGER.warn(exceptionMessage);
- throw new PipeException(exceptionMessage);
- }
- }
-
public void checkBeforeStartPipe(String pipeName) throws PipeException {
acquireReadLock();
try {
@@ -220,7 +171,7 @@ public class PipeTaskInfo implements SnapshotProcessor {
if (!isPipeExisted(pipeName)) {
final String exceptionMessage =
String.format("Failed to start pipe %s, the pipe does not exist", pipeName);
- LOGGER.warn(exceptionMessage);
+ LOGGER.info(exceptionMessage);
throw new PipeException(exceptionMessage);
}
@@ -228,7 +179,7 @@ public class PipeTaskInfo implements SnapshotProcessor {
if (pipeStatus == PipeStatus.DROPPED) {
final String exceptionMessage =
String.format("Failed to start pipe %s, the pipe is already dropped", pipeName);
- LOGGER.warn(exceptionMessage);
+ LOGGER.info(exceptionMessage);
throw new PipeException(exceptionMessage);
}
}
@@ -246,7 +197,7 @@ public class PipeTaskInfo implements SnapshotProcessor {
if (!isPipeExisted(pipeName)) {
final String exceptionMessage =
String.format("Failed to stop pipe %s, the pipe does not exist", pipeName);
- LOGGER.warn(exceptionMessage);
+ LOGGER.info(exceptionMessage);
throw new PipeException(exceptionMessage);
}
@@ -254,7 +205,7 @@ public class PipeTaskInfo implements SnapshotProcessor {
if (pipeStatus == PipeStatus.DROPPED) {
final String exceptionMessage =
String.format("Failed to stop pipe %s, the pipe is already dropped", pipeName);
- LOGGER.warn(exceptionMessage);
+ LOGGER.info(exceptionMessage);
throw new PipeException(exceptionMessage);
}
}
@@ -308,12 +259,11 @@ public class PipeTaskInfo implements SnapshotProcessor {
}
}
- public boolean isPipeStoppedByUser(String pipeName) {
+ public boolean isPipeStopped(String pipeName) {
acquireReadLock();
try {
return pipeMetaKeeper.containsPipeMeta(pipeName)
- && PipeStatus.STOPPED.equals(getPipeStatus(pipeName))
- && !isStoppedByRuntimeException(pipeName);
+ && PipeStatus.STOPPED.equals(getPipeStatus(pipeName));
} finally {
releaseReadLock();
}
@@ -333,19 +283,6 @@ public class PipeTaskInfo implements SnapshotProcessor {
}
}
- public TSStatus alterPipe(AlterPipePlanV2 plan) {
- acquireWriteLock();
- try {
- pipeMetaKeeper.removePipeMeta(plan.getPipeStaticMeta().getPipeName());
- pipeMetaKeeper.addPipeMeta(
- plan.getPipeStaticMeta().getPipeName(),
- new PipeMeta(plan.getPipeStaticMeta(), plan.getPipeRuntimeMeta()));
- return new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode());
- } finally {
- releaseWriteLock();
- }
- }
-
public TSStatus setPipeStatus(SetPipeStatusPlanV2 plan) {
acquireWriteLock();
try {
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/AbstractOperatePipeProcedureV2.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/AbstractOperatePipeProcedureV2.java
index 881c144dedc..17ad3a4f4fc 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/AbstractOperatePipeProcedureV2.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/AbstractOperatePipeProcedureV2.java
@@ -50,24 +50,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
/**
- * This procedure manages 2 kinds of PIPE operations:
- *
- * <ul>
- * <li>PIPE user task operations:
- * <ul>
- * <li>{@link PipeTaskOperation#CREATE_PIPE}
- * <li>{@link PipeTaskOperation#START_PIPE}
- * <li>{@link PipeTaskOperation#STOP_PIPE}
- * <li>{@link PipeTaskOperation#DROP_PIPE}
- * <li>{@link PipeTaskOperation#ALTER_PIPE}
- * </ul>
- * <li>PIPE runtime task operations:
- * <ul>
- * <li>{@link PipeTaskOperation#HANDLE_LEADER_CHANGE}
- * <li>{@link PipeTaskOperation#SYNC_PIPE_META}
- * <li>{@link PipeTaskOperation#HANDLE_PIPE_META_CHANGE}
- * </ul>
- * </ul>
+ * This procedure manages 4 kinds of PIPE operations: {@link PipeTaskOperation#CREATE_PIPE}, {@link
+ * PipeTaskOperation#START_PIPE}, {@link PipeTaskOperation#STOP_PIPE} and {@link
+ * PipeTaskOperation#DROP_PIPE}.
*
* <p>This class extends {@link AbstractNodeProcedure} to make sure that pipe task procedures can be
* executed in sequence and node procedures can be locked when a pipe task procedure is running.
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/PipeTaskOperation.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/PipeTaskOperation.java
index 71fd6861598..4ce012f3bb1 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/PipeTaskOperation.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/PipeTaskOperation.java
@@ -24,7 +24,6 @@ public enum PipeTaskOperation {
START_PIPE("startPipe"),
STOP_PIPE("stopPipe"),
DROP_PIPE("dropPipe"),
- ALTER_PIPE("alterPipe"),
HANDLE_LEADER_CHANGE("handleLeaderChange"),
SYNC_PIPE_META("syncPipeMeta"),
HANDLE_PIPE_META_CHANGE("handlePipeMetaChange");
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/AlterPipeProcedureV2.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/AlterPipeProcedureV2.java
deleted file mode 100644
index 4b378a255fd..00000000000
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/AlterPipeProcedureV2.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.iotdb.confignode.procedure.impl.pipe.task;
-
-import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
-import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType;
-import org.apache.iotdb.common.rpc.thrift.TSStatus;
-import org.apache.iotdb.commons.pipe.task.meta.PipeMeta;
-import org.apache.iotdb.commons.pipe.task.meta.PipeRuntimeMeta;
-import org.apache.iotdb.commons.pipe.task.meta.PipeStaticMeta;
-import org.apache.iotdb.commons.pipe.task.meta.PipeStatus;
-import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta;
-import org.apache.iotdb.commons.schema.SchemaConstant;
-import org.apache.iotdb.confignode.consensus.request.write.pipe.task.AlterPipePlanV2;
-import org.apache.iotdb.confignode.manager.pipe.coordinator.PipeManager;
-import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv;
-import org.apache.iotdb.confignode.procedure.impl.pipe.AbstractOperatePipeProcedureV2;
-import org.apache.iotdb.confignode.procedure.impl.pipe.PipeTaskOperation;
-import org.apache.iotdb.confignode.procedure.store.ProcedureType;
-import org.apache.iotdb.confignode.rpc.thrift.TAlterPipeReq;
-import org.apache.iotdb.consensus.exception.ConsensusException;
-import org.apache.iotdb.pipe.api.exception.PipeException;
-import org.apache.iotdb.rpc.TSStatusCode;
-import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-public class AlterPipeProcedureV2 extends AbstractOperatePipeProcedureV2 {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(AlterPipeProcedureV2.class);
-
- private TAlterPipeReq alterPipeRequest;
-
- private PipeStaticMeta currentPipeStaticMeta;
- private PipeStaticMeta updatedPipeStaticMeta;
- private PipeRuntimeMeta currentPipeRuntimeMeta;
- private PipeRuntimeMeta updatedPipeRuntimeMeta;
-
- public AlterPipeProcedureV2() {
- super();
- }
-
- public AlterPipeProcedureV2(TAlterPipeReq alterPipeRequest) throws PipeException {
- super();
- this.alterPipeRequest = alterPipeRequest;
- }
-
- @Override
- protected PipeTaskOperation getOperation() {
- return PipeTaskOperation.ALTER_PIPE;
- }
-
- @Override
- protected boolean executeFromValidateTask(ConfigNodeProcedureEnv env) throws PipeException {
- LOGGER.info(
- "AlterPipeProcedureV2: executeFromValidateTask({})", alterPipeRequest.getPipeName());
-
- final PipeManager pipeManager = env.getConfigManager().getPipeManager();
- pipeManager
- .getPipePluginCoordinator()
- .getPipePluginInfo()
- .checkPipePluginExistence(
- new HashMap<>(),
- alterPipeRequest.getProcessorAttributes(),
- alterPipeRequest.getConnectorAttributes());
- pipeTaskInfo.get().checkBeforeAlterPipe(alterPipeRequest);
-
- return false;
- }
-
- @Override
- protected void executeFromCalculateInfoForTask(ConfigNodeProcedureEnv env) {
- LOGGER.info(
- "AlterPipeProcedureV2: executeFromCalculateInfoForTask({})",
- alterPipeRequest.getPipeName());
-
- PipeMeta currentPipeMeta =
- pipeTaskInfo.get().getPipeMetaByPipeName(alterPipeRequest.getPipeName());
- currentPipeStaticMeta = currentPipeMeta.getStaticMeta();
- currentPipeRuntimeMeta = currentPipeMeta.getRuntimeMeta();
-
- final Map<TConsensusGroupId, PipeTaskMeta> currentConsensusGroupId2PipeTaskMeta =
- currentPipeRuntimeMeta.getConsensusGroupId2TaskMetaMap();
-
- // deep copy reused attributes
- updatedPipeStaticMeta =
- new PipeStaticMeta(
- alterPipeRequest.getPipeName(),
- System.currentTimeMillis(),
- new HashMap<>(currentPipeStaticMeta.getExtractorParameters().getAttribute()),
- new HashMap<>(alterPipeRequest.getProcessorAttributes()),
- new HashMap<>(alterPipeRequest.getConnectorAttributes()));
-
- final Map<TConsensusGroupId, PipeTaskMeta> updatedConsensusGroupIdToTaskMetaMap =
- new HashMap<>();
- env.getConfigManager()
- .getLoadManager()
- .getRegionLeaderMap()
- .forEach(
- (regionGroupId, regionLeaderNodeId) -> {
- if (regionGroupId.getType().equals(TConsensusGroupType.DataRegion)) {
- final String databaseName =
- env.getConfigManager()
- .getPartitionManager()
- .getRegionStorageGroup(regionGroupId);
- final PipeTaskMeta currentPipeTaskMeta =
- currentConsensusGroupId2PipeTaskMeta.get(regionGroupId);
- if (databaseName != null
- && !databaseName.equals(SchemaConstant.SYSTEM_DATABASE)
- && currentPipeTaskMeta.getLeaderDataNodeId() == regionLeaderNodeId) {
- // Pipe only collect user's data, filter metric database here.
- updatedConsensusGroupIdToTaskMetaMap.put(
- regionGroupId,
- new PipeTaskMeta(currentPipeTaskMeta.getProgressIndex(), regionLeaderNodeId));
- }
- }
- });
- updatedPipeRuntimeMeta = new PipeRuntimeMeta(updatedConsensusGroupIdToTaskMetaMap);
- // If the pipe's previous status was user stopped, then after the alter operation, the pipe's
- // status remains user stopped; otherwise, it becomes running.
- if (!pipeTaskInfo.get().isPipeStoppedByUser(alterPipeRequest.getPipeName())) {
- updatedPipeRuntimeMeta.getStatus().set(PipeStatus.RUNNING);
- }
- }
-
- @Override
- protected void executeFromWriteConfigNodeConsensus(ConfigNodeProcedureEnv env)
- throws PipeException {
- LOGGER.info(
- "AlterPipeProcedureV2: executeFromWriteConfigNodeConsensus({})",
- alterPipeRequest.getPipeName());
-
- TSStatus response;
- try {
- response =
- env.getConfigManager()
- .getConsensusManager()
- .write(new AlterPipePlanV2(updatedPipeStaticMeta, updatedPipeRuntimeMeta));
- } catch (ConsensusException e) {
- LOGGER.warn("Failed in the write API executing the consensus layer due to: ", e);
- response = new TSStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR.getStatusCode());
- response.setMessage(e.getMessage());
- }
- if (response.getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
- throw new PipeException(response.getMessage());
- }
- }
-
- @Override
- protected void executeFromOperateOnDataNodes(ConfigNodeProcedureEnv env) throws IOException {
- final String pipeName = alterPipeRequest.getPipeName();
- LOGGER.info("AlterPipeProcedureV2: executeFromOperateOnDataNodes({})", pipeName);
-
- String exceptionMessage =
- parsePushPipeMetaExceptionForPipe(pipeName, pushSinglePipeMetaToDataNodes(pipeName, env));
- if (!exceptionMessage.isEmpty()) {
- LOGGER.warn(
- "Failed to alter pipe {}, details: {}, metadata will be synchronized later.",
- alterPipeRequest.getPipeName(),
- exceptionMessage);
- }
- }
-
- @Override
- protected void rollbackFromValidateTask(ConfigNodeProcedureEnv env) {
- LOGGER.info(
- "AlterPipeProcedureV2: rollbackFromValidateTask({})", alterPipeRequest.getPipeName());
- // Do nothing
- }
-
- @Override
- protected void rollbackFromCalculateInfoForTask(ConfigNodeProcedureEnv env) {
- LOGGER.info(
- "AlterPipeProcedureV2: rollbackFromCalculateInfoForTask({})",
- alterPipeRequest.getPipeName());
- // Do nothing
- }
-
- @Override
- protected void rollbackFromWriteConfigNodeConsensus(ConfigNodeProcedureEnv env) {
- LOGGER.info(
- "AlterPipeProcedureV2: rollbackFromWriteConfigNodeConsensus({})",
- alterPipeRequest.getPipeName());
- TSStatus response;
- try {
- response =
- env.getConfigManager()
- .getConsensusManager()
- .write(new AlterPipePlanV2(currentPipeStaticMeta, currentPipeRuntimeMeta));
- } catch (ConsensusException e) {
- LOGGER.warn("Failed in the write API executing the consensus layer due to: ", e);
- response = new TSStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR.getStatusCode());
- response.setMessage(e.getMessage());
- }
- if (response.getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
- throw new PipeException(response.getMessage());
- }
- }
-
- @Override
- protected void rollbackFromOperateOnDataNodes(ConfigNodeProcedureEnv env) throws IOException {
- LOGGER.info(
- "AlterPipeProcedureV2: rollbackFromOperateOnDataNodes({})", alterPipeRequest.getPipeName());
-
- // Push all pipe metas to datanode, may be time-consuming
- String exceptionMessage =
- parsePushPipeMetaExceptionForPipe(
- alterPipeRequest.getPipeName(), pushPipeMetaToDataNodes(env));
- if (!exceptionMessage.isEmpty()) {
- LOGGER.warn(
- "Failed to rollback alter pipe {}, details: {}, metadata will be synchronized later.",
- alterPipeRequest.getPipeName(),
- exceptionMessage);
- }
- }
-
- @Override
- public void serialize(DataOutputStream stream) throws IOException {
- stream.writeShort(ProcedureType.ALTER_PIPE_PROCEDURE_V2.getTypeCode());
- super.serialize(stream);
- ReadWriteIOUtils.write(alterPipeRequest.getPipeName(), stream);
- ReadWriteIOUtils.write(alterPipeRequest.getProcessorAttributesSize(), stream);
- for (Map.Entry<String, String> entry : alterPipeRequest.getProcessorAttributes().entrySet()) {
- ReadWriteIOUtils.write(entry.getKey(), stream);
- ReadWriteIOUtils.write(entry.getValue(), stream);
- }
- ReadWriteIOUtils.write(alterPipeRequest.getConnectorAttributesSize(), stream);
- for (Map.Entry<String, String> entry : alterPipeRequest.getConnectorAttributes().entrySet()) {
- ReadWriteIOUtils.write(entry.getKey(), stream);
- ReadWriteIOUtils.write(entry.getValue(), stream);
- }
- if (currentPipeStaticMeta != null) {
- ReadWriteIOUtils.write(true, stream);
- currentPipeStaticMeta.serialize(stream);
- } else {
- ReadWriteIOUtils.write(false, stream);
- }
- if (updatedPipeStaticMeta != null) {
- ReadWriteIOUtils.write(true, stream);
- updatedPipeStaticMeta.serialize(stream);
- } else {
- ReadWriteIOUtils.write(false, stream);
- }
- if (currentPipeRuntimeMeta != null) {
- ReadWriteIOUtils.write(true, stream);
- currentPipeRuntimeMeta.serialize(stream);
- } else {
- ReadWriteIOUtils.write(false, stream);
- }
- if (updatedPipeRuntimeMeta != null) {
- ReadWriteIOUtils.write(true, stream);
- updatedPipeRuntimeMeta.serialize(stream);
- } else {
- ReadWriteIOUtils.write(false, stream);
- }
- }
-
- @Override
- public void deserialize(ByteBuffer byteBuffer) {
- super.deserialize(byteBuffer);
- alterPipeRequest =
- new TAlterPipeReq()
- .setPipeName(ReadWriteIOUtils.readString(byteBuffer))
- .setProcessorAttributes(new HashMap<>())
- .setConnectorAttributes(new HashMap<>());
- int size = ReadWriteIOUtils.readInt(byteBuffer);
- for (int i = 0; i < size; ++i) {
- alterPipeRequest
- .getProcessorAttributes()
- .put(ReadWriteIOUtils.readString(byteBuffer), ReadWriteIOUtils.readString(byteBuffer));
- }
- size = ReadWriteIOUtils.readInt(byteBuffer);
- for (int i = 0; i < size; ++i) {
- alterPipeRequest
- .getConnectorAttributes()
- .put(ReadWriteIOUtils.readString(byteBuffer), ReadWriteIOUtils.readString(byteBuffer));
- }
- if (ReadWriteIOUtils.readBool(byteBuffer)) {
- currentPipeStaticMeta = PipeStaticMeta.deserialize(byteBuffer);
- }
- if (ReadWriteIOUtils.readBool(byteBuffer)) {
- updatedPipeStaticMeta = PipeStaticMeta.deserialize(byteBuffer);
- }
- if (ReadWriteIOUtils.readBool(byteBuffer)) {
- currentPipeRuntimeMeta = PipeRuntimeMeta.deserialize(byteBuffer);
- }
- if (ReadWriteIOUtils.readBool(byteBuffer)) {
- updatedPipeRuntimeMeta = PipeRuntimeMeta.deserialize(byteBuffer);
- }
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- AlterPipeProcedureV2 that = (AlterPipeProcedureV2) o;
- return this.alterPipeRequest.getPipeName().equals(that.alterPipeRequest.getPipeName())
- && this.alterPipeRequest
- .getProcessorAttributes()
- .toString()
- .equals(that.alterPipeRequest.getProcessorAttributes().toString())
- && this.alterPipeRequest
- .getConnectorAttributes()
- .toString()
- .equals(that.alterPipeRequest.getConnectorAttributes().toString());
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(
- alterPipeRequest.getPipeName(),
- alterPipeRequest.getProcessorAttributes(),
- alterPipeRequest.getConnectorAttributes());
- }
-}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/CreatePipeProcedureV2.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/CreatePipeProcedureV2.java
index d89e2b463ec..4c6b19189c6 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/CreatePipeProcedureV2.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/CreatePipeProcedureV2.java
@@ -83,10 +83,7 @@ public class CreatePipeProcedureV2 extends AbstractOperatePipeProcedureV2 {
pipeManager
.getPipePluginCoordinator()
.getPipePluginInfo()
- .checkPipePluginExistence(
- createPipeRequest.getExtractorAttributes(),
- createPipeRequest.getProcessorAttributes(),
- createPipeRequest.getConnectorAttributes());
+ .checkBeforeCreatePipe(createPipeRequest);
pipeTaskInfo.get().checkBeforeCreatePipe(createPipeRequest);
return false;
@@ -290,27 +287,11 @@ public class CreatePipeProcedureV2 extends AbstractOperatePipeProcedureV2 {
return false;
}
CreatePipeProcedureV2 that = (CreatePipeProcedureV2) o;
- return this.createPipeRequest.getPipeName().equals(that.createPipeRequest.getPipeName())
- && this.createPipeRequest
- .getExtractorAttributes()
- .toString()
- .equals(that.createPipeRequest.getExtractorAttributes().toString())
- && this.createPipeRequest
- .getProcessorAttributes()
- .toString()
- .equals(that.createPipeRequest.getProcessorAttributes().toString())
- && this.createPipeRequest
- .getConnectorAttributes()
- .toString()
- .equals(that.createPipeRequest.getConnectorAttributes().toString());
+ return createPipeRequest.getPipeName().equals(that.createPipeRequest.getPipeName());
}
@Override
public int hashCode() {
- return Objects.hash(
- createPipeRequest.getPipeName(),
- createPipeRequest.getExtractorAttributes(),
- createPipeRequest.getProcessorAttributes(),
- createPipeRequest.getConnectorAttributes());
+ return Objects.hash(createPipeRequest.getPipeName());
}
}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/StopPipeProcedureV2.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/StopPipeProcedureV2.java
index b6e01ccecaf..5a2e40d97c2 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/StopPipeProcedureV2.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/StopPipeProcedureV2.java
@@ -64,7 +64,8 @@ public class StopPipeProcedureV2 extends AbstractOperatePipeProcedureV2 {
pipeTaskInfo.get().checkBeforeStopPipe(pipeName);
- return pipeTaskInfo.get().isPipeStoppedByUser(pipeName);
+ return pipeTaskInfo.get().isPipeStopped(pipeName)
+ && !pipeTaskInfo.get().isStoppedByRuntimeException(pipeName);
}
@Override
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/store/ProcedureFactory.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/store/ProcedureFactory.java
index a4257a133c4..35b9b739150 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/store/ProcedureFactory.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/store/ProcedureFactory.java
@@ -29,7 +29,6 @@ import org.apache.iotdb.confignode.procedure.impl.pipe.plugin.DropPipePluginProc
import org.apache.iotdb.confignode.procedure.impl.pipe.runtime.PipeHandleLeaderChangeProcedure;
import org.apache.iotdb.confignode.procedure.impl.pipe.runtime.PipeHandleMetaChangeProcedure;
import org.apache.iotdb.confignode.procedure.impl.pipe.runtime.PipeMetaSyncProcedure;
-import org.apache.iotdb.confignode.procedure.impl.pipe.task.AlterPipeProcedureV2;
import org.apache.iotdb.confignode.procedure.impl.pipe.task.CreatePipeProcedureV2;
import org.apache.iotdb.confignode.procedure.impl.pipe.task.DropPipeProcedureV2;
import org.apache.iotdb.confignode.procedure.impl.pipe.task.StartPipeProcedureV2;
@@ -130,9 +129,6 @@ public class ProcedureFactory implements IProcedureFactory {
case DROP_PIPE_PROCEDURE_V2:
procedure = new DropPipeProcedureV2();
break;
- case ALTER_PIPE_PROCEDURE_V2:
- procedure = new AlterPipeProcedureV2();
- break;
case PIPE_HANDLE_LEADER_CHANGE_PROCEDURE:
procedure = new PipeHandleLeaderChangeProcedure();
break;
@@ -220,8 +216,6 @@ public class ProcedureFactory implements IProcedureFactory {
return ProcedureType.STOP_PIPE_PROCEDURE_V2;
} else if (procedure instanceof DropPipeProcedureV2) {
return ProcedureType.DROP_PIPE_PROCEDURE_V2;
- } else if (procedure instanceof AlterPipeProcedureV2) {
- return ProcedureType.ALTER_PIPE_PROCEDURE_V2;
} else if (procedure instanceof PipeHandleLeaderChangeProcedure) {
return ProcedureType.PIPE_HANDLE_LEADER_CHANGE_PROCEDURE;
} else if (procedure instanceof PipeMetaSyncProcedure) {
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/store/ProcedureType.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/store/ProcedureType.java
index b539ffc46df..8c0c2087d60 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/store/ProcedureType.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/store/ProcedureType.java
@@ -69,7 +69,6 @@ public enum ProcedureType {
START_PIPE_PROCEDURE_V2((short) 1001),
STOP_PIPE_PROCEDURE_V2((short) 1002),
DROP_PIPE_PROCEDURE_V2((short) 1003),
- ALTER_PIPE_PROCEDURE_V2((short) 1004),
/** Pipe Runtime */
PIPE_HANDLE_LEADER_CHANGE_PROCEDURE((short) 1100),
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
index 9d35842edf2..b95b949eeea 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
@@ -67,7 +67,6 @@ import org.apache.iotdb.confignode.manager.consensus.ConsensusManager;
import org.apache.iotdb.confignode.rpc.thrift.IConfigNodeRPCService;
import org.apache.iotdb.confignode.rpc.thrift.TAddConsensusGroupReq;
import org.apache.iotdb.confignode.rpc.thrift.TAlterLogicalViewReq;
-import org.apache.iotdb.confignode.rpc.thrift.TAlterPipeReq;
import org.apache.iotdb.confignode.rpc.thrift.TAlterSchemaTemplateReq;
import org.apache.iotdb.confignode.rpc.thrift.TAuthizedPatternTreeResp;
import org.apache.iotdb.confignode.rpc.thrift.TAuthorizerReq;
@@ -923,11 +922,6 @@ public class ConfigNodeRPCServiceProcessor implements IConfigNodeRPCService.Ifac
return configManager.createPipe(req);
}
- @Override
- public TSStatus alterPipe(TAlterPipeReq req) {
- return configManager.alterPipe(req);
- }
-
@Override
public TSStatus startPipe(String pipeName) {
return configManager.startPipe(pipeName);
diff --git a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlanSerDeTest.java b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlanSerDeTest.java
index 0f84008964f..db09cda11b2 100644
--- a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlanSerDeTest.java
+++ b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlanSerDeTest.java
@@ -104,7 +104,6 @@ import org.apache.iotdb.confignode.consensus.request.write.pipe.plugin.CreatePip
import org.apache.iotdb.confignode.consensus.request.write.pipe.plugin.DropPipePluginPlan;
import org.apache.iotdb.confignode.consensus.request.write.pipe.runtime.PipeHandleLeaderChangePlan;
import org.apache.iotdb.confignode.consensus.request.write.pipe.runtime.PipeHandleMetaChangePlan;
-import org.apache.iotdb.confignode.consensus.request.write.pipe.task.AlterPipePlanV2;
import org.apache.iotdb.confignode.consensus.request.write.pipe.task.CreatePipePlanV2;
import org.apache.iotdb.confignode.consensus.request.write.pipe.task.DropPipePlanV2;
import org.apache.iotdb.confignode.consensus.request.write.pipe.task.SetPipeStatusPlanV2;
@@ -1111,7 +1110,7 @@ public class ConfigPhysicalPlanSerDeTest {
Map<String, String> connectorAttributes = new HashMap<>();
extractorAttributes.put("extractor", "org.apache.iotdb.pipe.extractor.DefaultExtractor");
processorAttributes.put("processor", "org.apache.iotdb.pipe.processor.SDTFilterProcessor");
- connectorAttributes.put("connector", "org.apache.iotdb.pipe.protocol.ThriftTransporter");
+ connectorAttributes.put("connector", "org.apache.iotdb.pipe.protocal.ThriftTransporter");
PipeTaskMeta pipeTaskMeta = new PipeTaskMeta(MinimumProgressIndex.INSTANCE, 1);
Map<TConsensusGroupId, PipeTaskMeta> pipeTasks = new HashMap<>();
pipeTasks.put(new TConsensusGroupId(DataRegion, 1), pipeTaskMeta);
@@ -1125,32 +1124,6 @@ public class ConfigPhysicalPlanSerDeTest {
ConfigPhysicalPlan.Factory.create(createPipePlanV2.serializeToByteBuffer());
Assert.assertEquals(
createPipePlanV2.getPipeStaticMeta(), createPipePlanV21.getPipeStaticMeta());
- Assert.assertEquals(
- createPipePlanV2.getPipeRuntimeMeta(), createPipePlanV21.getPipeRuntimeMeta());
- }
-
- @Test
- public void AlterPipePlanV2Test() throws IOException {
- Map<String, String> extractorAttributes = new HashMap<>();
- Map<String, String> processorAttributes = new HashMap<>();
- Map<String, String> connectorAttributes = new HashMap<>();
- extractorAttributes.put("pattern", "root.db");
- processorAttributes.put("processor", "do-nothing-processor");
- connectorAttributes.put("batch.enable", "false");
- PipeTaskMeta pipeTaskMeta = new PipeTaskMeta(MinimumProgressIndex.INSTANCE, 1);
- Map<TConsensusGroupId, PipeTaskMeta> pipeTasks = new HashMap<>();
- pipeTasks.put(new TConsensusGroupId(DataRegion, 1), pipeTaskMeta);
- PipeStaticMeta pipeStaticMeta =
- new PipeStaticMeta(
- "testPipe", 121, extractorAttributes, processorAttributes, connectorAttributes);
- PipeRuntimeMeta pipeRuntimeMeta = new PipeRuntimeMeta(pipeTasks);
- AlterPipePlanV2 alterPipePlanV2 = new AlterPipePlanV2(pipeStaticMeta, pipeRuntimeMeta);
- AlterPipePlanV2 alterPipePlanV21 =
- (AlterPipePlanV2)
- ConfigPhysicalPlan.Factory.create(alterPipePlanV2.serializeToByteBuffer());
- Assert.assertEquals(alterPipePlanV2.getPipeStaticMeta(), alterPipePlanV21.getPipeStaticMeta());
- Assert.assertEquals(
- alterPipePlanV2.getPipeRuntimeMeta(), alterPipePlanV21.getPipeRuntimeMeta());
}
@Test
diff --git a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/persistence/PipeInfoTest.java b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/persistence/PipeInfoTest.java
index 83b0bc51648..5e99bfae1e8 100644
--- a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/persistence/PipeInfoTest.java
+++ b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/persistence/PipeInfoTest.java
@@ -120,7 +120,7 @@ public class PipeInfoTest {
Map<String, String> connectorAttributes = new HashMap<>();
extractorAttributes.put("extractor", "org.apache.iotdb.pipe.extractor.DefaultExtractor");
processorAttributes.put("processor", "org.apache.iotdb.pipe.processor.SDTFilterProcessor");
- connectorAttributes.put("connector", "org.apache.iotdb.pipe.protocol.ThriftTransporter");
+ connectorAttributes.put("connector", "org.apache.iotdb.pipe.protocal.ThriftTransporter");
PipeTaskMeta pipeTaskMeta = new PipeTaskMeta(MinimumProgressIndex.INSTANCE, 1);
Map<TConsensusGroupId, PipeTaskMeta> pipeTasks = new HashMap<>();
pipeTasks.put(new TConsensusGroupId(DataRegion, 1), pipeTaskMeta);
diff --git a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/AlterPipeProcedureV2Test.java b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/AlterPipeProcedureV2Test.java
deleted file mode 100644
index 326fcc791bc..00000000000
--- a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/AlterPipeProcedureV2Test.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.iotdb.confignode.procedure.impl.pipe.task;
-
-import org.apache.iotdb.confignode.procedure.store.ProcedureFactory;
-import org.apache.iotdb.confignode.rpc.thrift.TAlterPipeReq;
-import org.apache.iotdb.tsfile.utils.PublicBAOS;
-
-import org.junit.Test;
-
-import java.io.DataOutputStream;
-import java.nio.ByteBuffer;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-public class AlterPipeProcedureV2Test {
- @Test
- public void serializeDeserializeTest() {
- PublicBAOS byteArrayOutputStream = new PublicBAOS();
- DataOutputStream outputStream = new DataOutputStream(byteArrayOutputStream);
-
- Map<String, String> processorAttributes = new HashMap<>();
- Map<String, String> connectorAttributes = new HashMap<>();
- processorAttributes.put("processor", "do-nothing-processor");
- connectorAttributes.put("connector", "iotdb-thrift-connector");
- connectorAttributes.put("host", "127.0.0.1");
- connectorAttributes.put("port", "6667");
-
- AlterPipeProcedureV2 proc =
- new AlterPipeProcedureV2(
- new TAlterPipeReq()
- .setPipeName("testPipe")
- .setProcessorAttributes(processorAttributes)
- .setConnectorAttributes(connectorAttributes));
-
- try {
- proc.serialize(outputStream);
- ByteBuffer buffer =
- ByteBuffer.wrap(byteArrayOutputStream.getBuf(), 0, byteArrayOutputStream.size());
- AlterPipeProcedureV2 proc2 =
- (AlterPipeProcedureV2) ProcedureFactory.getInstance().create(buffer);
-
- assertEquals(proc, proc2);
- } catch (Exception e) {
- fail();
- }
- }
-}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/PipePluginDataNodeAgent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/PipePluginDataNodeAgent.java
index ecd263fda96..25e7b2fe2d5 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/PipePluginDataNodeAgent.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/PipePluginDataNodeAgent.java
@@ -214,17 +214,4 @@ public class PipePluginDataNodeAgent {
// schemaRegionPluginAgent.validate(pipeName, extractorAttributes, processorAttributes,
// connectorAttributes);
}
-
- public void validateExtractor(Map<String, String> extractorAttributes) throws Exception {
- dataRegionPluginAgent.validateExtractor(extractorAttributes);
- }
-
- public void validateProcessor(Map<String, String> processorAttributes) throws Exception {
- dataRegionPluginAgent.validateProcessor(processorAttributes);
- }
-
- public void validateConnector(String pipeName, Map<String, String> connectorAttributes)
- throws Exception {
- dataRegionPluginAgent.validateConnector(pipeName, connectorAttributes);
- }
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/IoTDBDataRegionExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/IoTDBDataRegionExtractor.java
index ba5cb279e09..c13f4071a67 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/IoTDBDataRegionExtractor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/IoTDBDataRegionExtractor.java
@@ -220,7 +220,9 @@ public class IoTDBDataRegionExtractor implements PipeExtractor {
EXTRACTOR_REALTIME_ENABLE_DEFAULT_VALUE)) {
realtimeExtractor = new PipeRealtimeDataRegionFakeExtractor();
LOGGER.info(
- "Pipe: '{}' is set to false, use fake realtime extractor.",
+ "Pipe {}@{}: '{}' is set to false, use fake realtime extractor.",
+ pipeName,
+ dataRegionId,
EXTRACTOR_REALTIME_ENABLE_KEY);
return;
}
@@ -229,7 +231,10 @@ public class IoTDBDataRegionExtractor implements PipeExtractor {
if (!parameters.hasAnyAttributes(EXTRACTOR_REALTIME_MODE_KEY, SOURCE_REALTIME_MODE_KEY)) {
realtimeExtractor = new PipeRealtimeDataRegionHybridExtractor();
LOGGER.info(
- "Pipe: '{}' is not set, use hybrid mode by default.", EXTRACTOR_REALTIME_MODE_KEY);
+ "Pipe {}@{}: '{}' is not set, use hybrid mode by default.",
+ pipeName,
+ dataRegionId,
+ EXTRACTOR_REALTIME_MODE_KEY);
return;
}
@@ -250,7 +255,9 @@ public class IoTDBDataRegionExtractor implements PipeExtractor {
realtimeExtractor = new PipeRealtimeDataRegionHybridExtractor();
if (LOGGER.isWarnEnabled()) {
LOGGER.warn(
- "Pipe: Unsupported extractor realtime mode: {}, create a hybrid extractor.",
+ "Pipe {}@{}: Unsupported extractor realtime mode: {}, create a hybrid extractor.",
+ pipeName,
+ dataRegionId,
parameters.getStringByKeys(EXTRACTOR_REALTIME_MODE_KEY, SOURCE_REALTIME_MODE_KEY));
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/ConfigNodeClient.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/ConfigNodeClient.java
index 6cb1373fd17..12c6f1d3f90 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/ConfigNodeClient.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/ConfigNodeClient.java
@@ -36,7 +36,6 @@ import org.apache.iotdb.commons.consensus.ConfigRegionId;
import org.apache.iotdb.confignode.rpc.thrift.IConfigNodeRPCService;
import org.apache.iotdb.confignode.rpc.thrift.TAddConsensusGroupReq;
import org.apache.iotdb.confignode.rpc.thrift.TAlterLogicalViewReq;
-import org.apache.iotdb.confignode.rpc.thrift.TAlterPipeReq;
import org.apache.iotdb.confignode.rpc.thrift.TAlterSchemaTemplateReq;
import org.apache.iotdb.confignode.rpc.thrift.TAuthizedPatternTreeResp;
import org.apache.iotdb.confignode.rpc.thrift.TAuthorizerReq;
@@ -864,12 +863,6 @@ public class ConfigNodeClient implements IConfigNodeRPCService.Iface, ThriftClie
() -> client.createPipe(req), status -> !updateConfigNodeLeader(status));
}
- @Override
- public TSStatus alterPipe(TAlterPipeReq req) throws TException {
- return executeRemoteCallWithRetry(
- () -> client.alterPipe(req), status -> !updateConfigNodeLeader(status));
- }
-
@Override
public TSStatus startPipe(String pipeName) throws TException {
return executeRemoteCallWithRetry(
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/ConfigTaskVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/ConfigTaskVisitor.java
index d9a578d3415..a739c14aa43 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/ConfigTaskVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/ConfigTaskVisitor.java
@@ -72,7 +72,6 @@ import org.apache.iotdb.db.queryengine.plan.execution.config.sys.LoadConfigurati
import org.apache.iotdb.db.queryengine.plan.execution.config.sys.MergeTask;
import org.apache.iotdb.db.queryengine.plan.execution.config.sys.RepairDataTask;
import org.apache.iotdb.db.queryengine.plan.execution.config.sys.SetSystemStatusTask;
-import org.apache.iotdb.db.queryengine.plan.execution.config.sys.pipe.AlterPipeTask;
import org.apache.iotdb.db.queryengine.plan.execution.config.sys.pipe.CreatePipeTask;
import org.apache.iotdb.db.queryengine.plan.execution.config.sys.pipe.DropPipeTask;
import org.apache.iotdb.db.queryengine.plan.execution.config.sys.pipe.ShowPipeTask;
@@ -113,7 +112,6 @@ import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowTTLStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowTriggersStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowVariablesStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.UnSetTTLStatement;
-import org.apache.iotdb.db.queryengine.plan.statement.metadata.pipe.AlterPipeStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.pipe.CreatePipePluginStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.pipe.CreatePipeStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.pipe.DropPipePluginStatement;
@@ -417,12 +415,6 @@ public class ConfigTaskVisitor extends StatementVisitor<IConfigTask, MPPQueryCon
return new CreatePipeTask(createPipeStatement);
}
- @Override
- public IConfigTask visitAlterPipe(
- AlterPipeStatement alterPipeStatement, MPPQueryContext context) {
- return new AlterPipeTask(alterPipeStatement);
- }
-
@Override
public IConfigTask visitStartPipe(
StartPipeStatement startPipeStatement, MPPQueryContext context) {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java
index c17b4c5e1bd..9dbc37e1a8c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java
@@ -47,7 +47,6 @@ import org.apache.iotdb.commons.udf.service.UDFClassLoader;
import org.apache.iotdb.commons.udf.service.UDFExecutableManager;
import org.apache.iotdb.commons.utils.TimePartitionUtils;
import org.apache.iotdb.confignode.rpc.thrift.TAlterLogicalViewReq;
-import org.apache.iotdb.confignode.rpc.thrift.TAlterPipeReq;
import org.apache.iotdb.confignode.rpc.thrift.TAlterSchemaTemplateReq;
import org.apache.iotdb.confignode.rpc.thrift.TCountDatabaseResp;
import org.apache.iotdb.confignode.rpc.thrift.TCountTimeSlotListReq;
@@ -160,7 +159,6 @@ import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowDataNodesStat
import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowDatabaseStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowRegionStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowTTLStatement;
-import org.apache.iotdb.db.queryengine.plan.statement.metadata.pipe.AlterPipeStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.pipe.CreatePipePluginStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.pipe.CreatePipeStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.pipe.DropPipeStatement;
@@ -1644,7 +1642,7 @@ public class ClusterConfigTaskExecutor implements IConfigTaskExecutor {
TSStatus tsStatus = configNodeClient.createPipe(req);
if (TSStatusCode.SUCCESS_STATUS.getStatusCode() != tsStatus.getCode()) {
LOGGER.warn(
- "Failed to create pipe {} in config node, status is {}.",
+ "Failed to create PIPE {} in config node, status is {}.",
createPipeStatement.getPipeName(),
tsStatus);
future.setException(new IoTDBException(tsStatus.message, tsStatus.code));
@@ -1657,50 +1655,6 @@ public class ClusterConfigTaskExecutor implements IConfigTaskExecutor {
return future;
}
- @Override
- public SettableFuture<ConfigTaskResult> alterPipe(AlterPipeStatement alterPipeStatement) {
- SettableFuture<ConfigTaskResult> future = SettableFuture.create();
-
- // Validate before alteration
- try {
- if (!alterPipeStatement.getProcessorAttributes().isEmpty()) {
- PipeAgent.plugin().validateProcessor(alterPipeStatement.getProcessorAttributes());
- }
- if (!alterPipeStatement.getConnectorAttributes().isEmpty()) {
- PipeAgent.plugin()
- .validateConnector(
- alterPipeStatement.getPipeName(), alterPipeStatement.getConnectorAttributes());
- }
- } catch (Exception e) {
- LOGGER.info("Failed to validate pipe statement, because {}", e.getMessage(), e);
- future.setException(
- new IoTDBException(e.getMessage(), TSStatusCode.PIPE_ERROR.getStatusCode()));
- return future;
- }
-
- try (ConfigNodeClient configNodeClient =
- CONFIG_NODE_CLIENT_MANAGER.borrowClient(ConfigNodeInfo.CONFIG_REGION_ID)) {
- TAlterPipeReq req =
- new TAlterPipeReq()
- .setPipeName(alterPipeStatement.getPipeName())
- .setProcessorAttributes(alterPipeStatement.getProcessorAttributes())
- .setConnectorAttributes(alterPipeStatement.getConnectorAttributes());
- TSStatus tsStatus = configNodeClient.alterPipe(req);
- if (TSStatusCode.SUCCESS_STATUS.getStatusCode() != tsStatus.getCode()) {
- LOGGER.warn(
- "Failed to alter pipe {} in config node, status is {}.",
- alterPipeStatement.getPipeName(),
- tsStatus);
- future.setException(new IoTDBException(tsStatus.message, tsStatus.code));
- } else {
- future.set(new ConfigTaskResult(TSStatusCode.SUCCESS_STATUS));
- }
- } catch (Exception e) {
- future.setException(e);
- }
- return future;
- }
-
@Override
public SettableFuture<ConfigTaskResult> startPipe(StartPipeStatement startPipeStatement) {
SettableFuture<ConfigTaskResult> future = SettableFuture.create();
@@ -1709,7 +1663,7 @@ public class ClusterConfigTaskExecutor implements IConfigTaskExecutor {
TSStatus tsStatus = configNodeClient.startPipe(startPipeStatement.getPipeName());
if (TSStatusCode.SUCCESS_STATUS.getStatusCode() != tsStatus.getCode()) {
LOGGER.warn(
- "Failed to start pipe {}, status is {}.", startPipeStatement.getPipeName(), tsStatus);
+ "Failed to start PIPE {}, status is {}.", startPipeStatement.getPipeName(), tsStatus);
future.setException(new IoTDBException(tsStatus.message, tsStatus.code));
} else {
future.set(new ConfigTaskResult(TSStatusCode.SUCCESS_STATUS));
@@ -1728,7 +1682,7 @@ public class ClusterConfigTaskExecutor implements IConfigTaskExecutor {
TSStatus tsStatus = configNodeClient.dropPipe(dropPipeStatement.getPipeName());
if (TSStatusCode.SUCCESS_STATUS.getStatusCode() != tsStatus.getCode()) {
LOGGER.warn(
- "Failed to drop pipe {}, status is {}.", dropPipeStatement.getPipeName(), tsStatus);
+ "Failed to drop PIPE {}, status is {}.", dropPipeStatement.getPipeName(), tsStatus);
future.setException(new IoTDBException(tsStatus.message, tsStatus.code));
} else {
future.set(new ConfigTaskResult(TSStatusCode.SUCCESS_STATUS));
@@ -1747,7 +1701,7 @@ public class ClusterConfigTaskExecutor implements IConfigTaskExecutor {
TSStatus tsStatus = configNodeClient.stopPipe(stopPipeStatement.getPipeName());
if (TSStatusCode.SUCCESS_STATUS.getStatusCode() != tsStatus.getCode()) {
LOGGER.warn(
- "Failed to stop pipe {}, status is {}.", stopPipeStatement.getPipeName(), tsStatus);
+ "Failed to stop PIPE {}, status is {}.", stopPipeStatement.getPipeName(), tsStatus);
future.setException(new IoTDBException(tsStatus.message, tsStatus.code));
} else {
future.set(new ConfigTaskResult(TSStatusCode.SUCCESS_STATUS));
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/IConfigTaskExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/IConfigTaskExecutor.java
index 7d8523af31d..1209b01bb1c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/IConfigTaskExecutor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/IConfigTaskExecutor.java
@@ -44,7 +44,6 @@ import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowDataNodesStat
import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowDatabaseStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowRegionStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowTTLStatement;
-import org.apache.iotdb.db.queryengine.plan.statement.metadata.pipe.AlterPipeStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.pipe.CreatePipePluginStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.pipe.CreatePipeStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.pipe.DropPipeStatement;
@@ -164,8 +163,6 @@ public interface IConfigTaskExecutor {
SettableFuture<ConfigTaskResult> createPipe(CreatePipeStatement createPipeStatement);
- SettableFuture<ConfigTaskResult> alterPipe(AlterPipeStatement alterPipeStatement);
-
SettableFuture<ConfigTaskResult> startPipe(StartPipeStatement startPipeStatement);
SettableFuture<ConfigTaskResult> stopPipe(StopPipeStatement stopPipeStatement);
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/pipe/AlterPipeTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/pipe/AlterPipeTask.java
deleted file mode 100644
index 104501ae23f..00000000000
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/pipe/AlterPipeTask.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.iotdb.db.queryengine.plan.execution.config.sys.pipe;
-
-import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
-import org.apache.iotdb.db.queryengine.plan.execution.config.IConfigTask;
-import org.apache.iotdb.db.queryengine.plan.execution.config.executor.IConfigTaskExecutor;
-import org.apache.iotdb.db.queryengine.plan.statement.metadata.pipe.AlterPipeStatement;
-
-import com.google.common.util.concurrent.ListenableFuture;
-
-public class AlterPipeTask implements IConfigTask {
-
- private final AlterPipeStatement alterPipeStatement;
-
- public AlterPipeTask(AlterPipeStatement alterPipeStatement) {
- this.alterPipeStatement = alterPipeStatement;
- }
-
- @Override
- public ListenableFuture<ConfigTaskResult> execute(IConfigTaskExecutor configTaskExecutor)
- throws InterruptedException {
- return configTaskExecutor.alterPipe(alterPipeStatement);
- }
-}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/ASTVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/ASTVisitor.java
index 93ac57753d2..39df521dd75 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/ASTVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/ASTVisitor.java
@@ -35,7 +35,6 @@ import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.qp.sql.IoTDBSqlParser;
-import org.apache.iotdb.db.qp.sql.IoTDBSqlParser.ConnectorAttributeClauseContext;
import org.apache.iotdb.db.qp.sql.IoTDBSqlParser.ConstantContext;
import org.apache.iotdb.db.qp.sql.IoTDBSqlParser.CountDatabasesContext;
import org.apache.iotdb.db.qp.sql.IoTDBSqlParser.CountDevicesContext;
@@ -44,10 +43,8 @@ import org.apache.iotdb.db.qp.sql.IoTDBSqlParser.CountTimeseriesContext;
import org.apache.iotdb.db.qp.sql.IoTDBSqlParser.CreateFunctionContext;
import org.apache.iotdb.db.qp.sql.IoTDBSqlParser.DropFunctionContext;
import org.apache.iotdb.db.qp.sql.IoTDBSqlParser.ExpressionContext;
-import org.apache.iotdb.db.qp.sql.IoTDBSqlParser.ExtractorAttributeClauseContext;
import org.apache.iotdb.db.qp.sql.IoTDBSqlParser.GroupByAttributeClauseContext;
import org.apache.iotdb.db.qp.sql.IoTDBSqlParser.IdentifierContext;
-import org.apache.iotdb.db.qp.sql.IoTDBSqlParser.ProcessorAttributeClauseContext;
import org.apache.iotdb.db.qp.sql.IoTDBSqlParser.ShowFunctionsContext;
import org.apache.iotdb.db.qp.sql.IoTDBSqlParserBaseVisitor;
import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
@@ -158,7 +155,6 @@ import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowTimeSeriesSta
import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowTriggersStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowVariablesStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.UnSetTTLStatement;
-import org.apache.iotdb.db.queryengine.plan.statement.metadata.pipe.AlterPipeStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.pipe.CreatePipePluginStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.pipe.CreatePipeStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.pipe.DropPipePluginStatement;
@@ -3597,83 +3593,57 @@ public class ASTVisitor extends IoTDBSqlParserBaseVisitor<Statement> {
createPipeStatement.setPipeName(parseIdentifier(ctx.pipeName.getText()));
} else {
throw new SemanticException(
- "Not support for this sql in CREATE PIPE, please enter pipe name.");
+ "Not support for this sql in CREATEPIPE, please enter pipe name.");
}
if (ctx.extractorAttributesClause() != null) {
createPipeStatement.setExtractorAttributes(
- parseExtractorAttributesClause(
- ctx.extractorAttributesClause().extractorAttributeClause()));
+ parseExtractorAttributesClause(ctx.extractorAttributesClause()));
} else {
createPipeStatement.setExtractorAttributes(new HashMap<>());
}
if (ctx.processorAttributesClause() != null) {
createPipeStatement.setProcessorAttributes(
- parseProcessorAttributesClause(
- ctx.processorAttributesClause().processorAttributeClause()));
+ parseProcessorAttributesClause(ctx.processorAttributesClause()));
} else {
createPipeStatement.setProcessorAttributes(new HashMap<>());
}
createPipeStatement.setConnectorAttributes(
- parseConnectorAttributesClause(ctx.connectorAttributesClause().connectorAttributeClause()));
+ parseConnectorAttributesClause(ctx.connectorAttributesClause()));
return createPipeStatement;
}
- @Override
- public Statement visitAlterPipe(IoTDBSqlParser.AlterPipeContext ctx) {
- final AlterPipeStatement alterPipeStatement = new AlterPipeStatement(StatementType.ALTER_PIPE);
-
- if (ctx.pipeName != null) {
- alterPipeStatement.setPipeName(ctx.pipeName.getText());
- } else {
- throw new SemanticException(
- "Not support for this sql in ALTER PIPE, please enter pipe name.");
- }
- if (ctx.modifyProcessorAttributesClause() != null) {
- alterPipeStatement.setProcessorAttributes(
- parseProcessorAttributesClause(
- ctx.modifyProcessorAttributesClause().processorAttributeClause()));
- } else {
- alterPipeStatement.setProcessorAttributes(new HashMap<>());
- }
- if (ctx.modifyConnectorAttributesClause() != null) {
- alterPipeStatement.setConnectorAttributes(
- parseConnectorAttributesClause(
- ctx.modifyConnectorAttributesClause().connectorAttributeClause()));
- } else {
- alterPipeStatement.setConnectorAttributes(new HashMap<>());
- }
- return alterPipeStatement;
- }
-
private Map<String, String> parseExtractorAttributesClause(
- List<ExtractorAttributeClauseContext> contexts) {
+ IoTDBSqlParser.ExtractorAttributesClauseContext ctx) {
final Map<String, String> collectorMap = new HashMap<>();
- for (IoTDBSqlParser.ExtractorAttributeClauseContext context : contexts) {
+ for (IoTDBSqlParser.ExtractorAttributeClauseContext singleCtx :
+ ctx.extractorAttributeClause()) {
collectorMap.put(
- parseStringLiteral(context.extractorKey.getText()),
- parseStringLiteral(context.extractorValue.getText()));
+ parseStringLiteral(singleCtx.extractorKey.getText()),
+ parseStringLiteral(singleCtx.extractorValue.getText()));
}
return collectorMap;
}
private Map<String, String> parseProcessorAttributesClause(
- List<ProcessorAttributeClauseContext> contexts) {
+ IoTDBSqlParser.ProcessorAttributesClauseContext ctx) {
final Map<String, String> processorMap = new HashMap<>();
- for (IoTDBSqlParser.ProcessorAttributeClauseContext context : contexts) {
+ for (IoTDBSqlParser.ProcessorAttributeClauseContext singleCtx :
+ ctx.processorAttributeClause()) {
processorMap.put(
- parseStringLiteral(context.processorKey.getText()),
- parseStringLiteral(context.processorValue.getText()));
+ parseStringLiteral(singleCtx.processorKey.getText()),
+ parseStringLiteral(singleCtx.processorValue.getText()));
}
return processorMap;
}
private Map<String, String> parseConnectorAttributesClause(
- List<ConnectorAttributeClauseContext> contexts) {
+ IoTDBSqlParser.ConnectorAttributesClauseContext ctx) {
final Map<String, String> connectorMap = new HashMap<>();
- for (IoTDBSqlParser.ConnectorAttributeClauseContext context : contexts) {
+ for (IoTDBSqlParser.ConnectorAttributeClauseContext singleCtx :
+ ctx.connectorAttributeClause()) {
connectorMap.put(
- parseStringLiteral(context.connectorKey.getText()),
- parseStringLiteral(context.connectorValue.getText()));
+ parseStringLiteral(singleCtx.connectorKey.getText()),
+ parseStringLiteral(singleCtx.connectorValue.getText()));
}
return connectorMap;
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/StatementType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/StatementType.java
index d450a3cff41..abccc5c5983 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/StatementType.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/StatementType.java
@@ -145,7 +145,6 @@ public enum StatementType {
DROP_PIPESINK,
CREATE_PIPE,
- ALTER_PIPE,
START_PIPE,
STOP_PIPE,
DROP_PIPE,
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/StatementVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/StatementVisitor.java
index 6498c599875..c1b6c1f83e9 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/StatementVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/StatementVisitor.java
@@ -72,7 +72,6 @@ import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowTimeSeriesSta
import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowTriggersStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowVariablesStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.UnSetTTLStatement;
-import org.apache.iotdb.db.queryengine.plan.statement.metadata.pipe.AlterPipeStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.pipe.CreatePipePluginStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.pipe.CreatePipeStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.pipe.DropPipePluginStatement;
@@ -469,10 +468,6 @@ public abstract class StatementVisitor<R, C> {
return visitStatement(createPipeStatement, context);
}
- public R visitAlterPipe(AlterPipeStatement alterPipeStatement, C context) {
- return visitStatement(alterPipeStatement, context);
- }
-
public R visitDropPipe(DropPipeStatement dropPipeStatement, C context) {
return visitStatement(dropPipeStatement, context);
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/AlterPipeStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/AlterPipeStatement.java
deleted file mode 100644
index 9fcdf2436dc..00000000000
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/AlterPipeStatement.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.iotdb.db.queryengine.plan.statement.metadata.pipe;
-
-import org.apache.iotdb.common.rpc.thrift.TSStatus;
-import org.apache.iotdb.commons.auth.entity.PrivilegeType;
-import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.db.auth.AuthorityChecker;
-import org.apache.iotdb.db.queryengine.plan.analyze.QueryType;
-import org.apache.iotdb.db.queryengine.plan.statement.IConfigStatement;
-import org.apache.iotdb.db.queryengine.plan.statement.Statement;
-import org.apache.iotdb.db.queryengine.plan.statement.StatementType;
-import org.apache.iotdb.db.queryengine.plan.statement.StatementVisitor;
-import org.apache.iotdb.rpc.TSStatusCode;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-public class AlterPipeStatement extends Statement implements IConfigStatement {
-
- private String pipeName;
- private Map<String, String> processorAttributes;
- private Map<String, String> connectorAttributes;
-
- public AlterPipeStatement(StatementType alterPipeStatement) {
- this.statementType = alterPipeStatement;
- }
-
- public String getPipeName() {
- return pipeName;
- }
-
- public Map<String, String> getProcessorAttributes() {
- return processorAttributes;
- }
-
- public Map<String, String> getConnectorAttributes() {
- return connectorAttributes;
- }
-
- public void setPipeName(String pipeName) {
- this.pipeName = pipeName;
- }
-
- public void setProcessorAttributes(Map<String, String> processorAttributes) {
- this.processorAttributes = processorAttributes;
- }
-
- public void setConnectorAttributes(Map<String, String> connectorAttributes) {
- this.connectorAttributes = connectorAttributes;
- }
-
- @Override
- public QueryType getQueryType() {
- return QueryType.WRITE;
- }
-
- @Override
- public List<PartialPath> getPaths() {
- return Collections.emptyList();
- }
-
- @Override
- public TSStatus checkPermissionBeforeProcess(String userName) {
- if (AuthorityChecker.SUPER_USER.equals(userName)) {
- return new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode());
- }
- return AuthorityChecker.getTSStatus(
- AuthorityChecker.checkSystemPermission(userName, PrivilegeType.USE_PIPE.ordinal()),
- PrivilegeType.USE_PIPE);
- }
-
- @Override
- public <R, C> R accept(StatementVisitor<R, C> visitor, C context) {
- return visitor.visitAlterPipe(this, context);
- }
-}
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/PipePluginAgent.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/PipePluginAgent.java
index 6e51eca43ae..865a8febbc0 100644
--- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/PipePluginAgent.java
+++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/PipePluginAgent.java
@@ -74,12 +74,6 @@ public abstract class PipePluginAgent {
Map<String, String> processorAttributes,
Map<String, String> connectorAttributes)
throws Exception {
- validateExtractor(extractorAttributes);
- validateProcessor(processorAttributes);
- validateConnector(pipeName, connectorAttributes);
- }
-
- public void validateExtractor(Map<String, String> extractorAttributes) throws Exception {
final PipeParameters extractorParameters = new PipeParameters(extractorAttributes);
final PipeExtractor temporaryExtractor = reflectExtractor(extractorParameters);
try {
@@ -91,9 +85,7 @@ public abstract class PipePluginAgent {
LOGGER.warn("Failed to close temporary extractor: {}", e.getMessage(), e);
}
}
- }
- public void validateProcessor(Map<String, String> processorAttributes) throws Exception {
final PipeParameters processorParameters = new PipeParameters(processorAttributes);
final PipeProcessor temporaryProcessor = reflectProcessor(processorParameters);
try {
@@ -105,10 +97,7 @@ public abstract class PipePluginAgent {
LOGGER.warn("Failed to close temporary processor: {}", e.getMessage(), e);
}
}
- }
- public void validateConnector(String pipeName, Map<String, String> connectorAttributes)
- throws Exception {
final PipeParameters connectorParameters = new PipeParameters(connectorAttributes);
final PipeConnector temporaryConnector = reflectConnector(connectorParameters);
try {
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/PipeTaskAgent.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/PipeTaskAgent.java
index e4b784ceeae..9d8996053e0 100644
--- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/PipeTaskAgent.java
+++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/PipeTaskAgent.java
@@ -760,9 +760,10 @@ public abstract class PipeTaskAgent {
* Check if we need to drop pipe tasks.
*
* @return {@code true} if need to drop pipe tasks, {@code false} if no need to drop.
+ * @throws IllegalStateException if current pipe status is illegal.
*/
protected boolean checkBeforeDropPipe(
- PipeMeta existedPipeMeta, String pipeName, long creationTime) {
+ PipeMeta existedPipeMeta, String pipeName, long creationTime) throws IllegalStateException {
if (existedPipeMeta == null) {
LOGGER.info(
"Pipe {} (creation time = {}) has already been dropped or has not been created. "
@@ -789,8 +790,10 @@ public abstract class PipeTaskAgent {
* Check if we need to drop pipe tasks.
*
* @return {@code true} if need to drop pipe tasks, {@code false} if no need to drop.
+ * @throws IllegalStateException if current pipe status is illegal.
*/
- protected boolean checkBeforeDropPipe(PipeMeta existedPipeMeta, String pipeName) {
+ protected boolean checkBeforeDropPipe(PipeMeta existedPipeMeta, String pipeName)
+ throws IllegalStateException {
if (existedPipeMeta == null) {
LOGGER.info(
"Pipe {} has already been dropped or has not been created. Skip dropping.", pipeName);
diff --git a/iotdb-protocol/thrift-confignode/src/main/thrift/confignode.thrift b/iotdb-protocol/thrift-confignode/src/main/thrift/confignode.thrift
index 52b4cccdc99..d0320a54081 100644
--- a/iotdb-protocol/thrift-confignode/src/main/thrift/confignode.thrift
+++ b/iotdb-protocol/thrift-confignode/src/main/thrift/confignode.thrift
@@ -687,7 +687,7 @@ struct TShowPipeInfo {
7: required string exceptionMessage
}
-struct TGetAllPipeInfoResp {
+struct TGetAllPipeInfoResp{
1: required common.TSStatus status
2: required list<binary> allPipeInfo
}
@@ -699,12 +699,6 @@ struct TCreatePipeReq {
4: required map<string, string> connectorAttributes
}
-struct TAlterPipeReq {
- 1: required string pipeName
- 2: optional map<string, string> processorAttributes
- 3: optional map<string, string> connectorAttributes
-}
-
// Deprecated, restored for compatibility
struct TPipeSinkInfo {
1: required string pipeSinkName
@@ -1328,9 +1322,6 @@ service IConfigNodeRPCService {
/** Create Pipe */
common.TSStatus createPipe(TCreatePipeReq req)
- /** Alter Pipe */
- common.TSStatus alterPipe(TAlterPipeReq req)
-
/** Start Pipe */
common.TSStatus startPipe(string pipeName)