This is an automated email from the ASF dual-hosted git repository. rong pushed a commit to branch pipe-package-refactor in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c4f57ba614cfd8ece72d7124f28d700009ef3b8c Author: Steve Yurong Su <[email protected]> AuthorDate: Wed Jun 7 03:15:23 2023 +0800 Pipe: refactor package structure (confignode) --- .../consensus/response/pipe/PipeResp.java | 48 ---------------------- .../consensus/response/pipe/PipeSinkResp.java | 48 ---------------------- .../{task => }/AbstractOperatePipeProcedureV2.java | 3 +- .../impl}/pipe/PipeTaskOperation.java | 2 +- .../runtime/PipeHandleLeaderChangeProcedure.java | 4 +- .../runtime/PipeHandleMetaChangeProcedure.java | 4 +- .../impl/pipe/runtime/PipeMetaSyncProcedure.java | 4 +- .../impl/pipe/task/CreatePipeProcedureV2.java | 3 +- .../impl/pipe/task/DropPipeProcedureV2.java | 3 +- .../impl/pipe/task/StartPipeProcedureV2.java | 3 +- .../impl/pipe/task/StopPipeProcedureV2.java | 3 +- 11 files changed, 16 insertions(+), 109 deletions(-) diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/pipe/PipeResp.java b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/pipe/PipeResp.java deleted file mode 100644 index 26bd8b3290f..00000000000 --- a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/pipe/PipeResp.java +++ /dev/null @@ -1,48 +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.response.pipe; - -import org.apache.iotdb.common.rpc.thrift.TSStatus; -import org.apache.iotdb.commons.sync.pipe.PipeInfo; -import org.apache.iotdb.consensus.common.DataSet; - -import java.util.List; - -public class PipeResp implements DataSet { - - TSStatus status; - List<PipeInfo> pipeInfoList; - - public TSStatus getStatus() { - return status; - } - - public void setStatus(TSStatus status) { - this.status = status; - } - - public List<PipeInfo> getPipeInfoList() { - return pipeInfoList; - } - - public void setPipeInfoList(List<PipeInfo> pipeInfoList) { - this.pipeInfoList = pipeInfoList; - } -} diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/pipe/PipeSinkResp.java b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/pipe/PipeSinkResp.java deleted file mode 100644 index 850165a923a..00000000000 --- a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/pipe/PipeSinkResp.java +++ /dev/null @@ -1,48 +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.response.pipe; - -import org.apache.iotdb.common.rpc.thrift.TSStatus; -import org.apache.iotdb.commons.sync.pipesink.PipeSink; -import org.apache.iotdb.consensus.common.DataSet; - -import java.util.List; - -public class PipeSinkResp implements DataSet { - - TSStatus status; - List<PipeSink> pipeSinkList; - - public TSStatus getStatus() { - return status; - } - - public void setStatus(TSStatus status) { - this.status = status; - } - - public List<PipeSink> getPipeSinkList() { - return pipeSinkList; - } - - public void setPipeSinkList(List<PipeSink> pipeSinkList) { - this.pipeSinkList = pipeSinkList; - } -} diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/AbstractOperatePipeProcedureV2.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/AbstractOperatePipeProcedureV2.java similarity index 98% rename from confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/AbstractOperatePipeProcedureV2.java rename to confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/AbstractOperatePipeProcedureV2.java index 023585bb85d..200a71e8f6f 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/AbstractOperatePipeProcedureV2.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/AbstractOperatePipeProcedureV2.java @@ -16,10 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.confignode.procedure.impl.pipe.task; +package org.apache.iotdb.confignode.procedure.impl.pipe; import org.apache.iotdb.commons.pipe.task.meta.PipeMeta; -import org.apache.iotdb.confignode.persistence.pipe.PipeTaskOperation; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; import org.apache.iotdb.confignode.procedure.exception.ProcedureSuspendedException; diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipeTaskOperation.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/PipeTaskOperation.java similarity index 94% rename from confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipeTaskOperation.java rename to confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/PipeTaskOperation.java index 6531f84e049..74a31ac223f 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipeTaskOperation.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/PipeTaskOperation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.confignode.persistence.pipe; +package org.apache.iotdb.confignode.procedure.impl.pipe; public enum PipeTaskOperation { CREATE_PIPE, diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeHandleLeaderChangeProcedure.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeHandleLeaderChangeProcedure.java index dc56840f114..c07982381cd 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeHandleLeaderChangeProcedure.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeHandleLeaderChangeProcedure.java @@ -22,9 +22,9 @@ package org.apache.iotdb.confignode.procedure.impl.pipe.runtime; import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId; import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType; import org.apache.iotdb.confignode.consensus.request.write.pipe.runtime.PipeHandleLeaderChangePlan; -import org.apache.iotdb.confignode.persistence.pipe.PipeTaskOperation; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; -import org.apache.iotdb.confignode.procedure.impl.pipe.task.AbstractOperatePipeProcedureV2; +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.consensus.common.response.ConsensusWriteResponse; import org.apache.iotdb.pipe.api.exception.PipeException; diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeHandleMetaChangeProcedure.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeHandleMetaChangeProcedure.java index 2911b95e839..31ebb405907 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeHandleMetaChangeProcedure.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeHandleMetaChangeProcedure.java @@ -29,9 +29,9 @@ import org.apache.iotdb.commons.pipe.task.meta.PipeStatus; import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.confignode.consensus.request.write.pipe.runtime.PipeHandleMetaChangePlan; import org.apache.iotdb.confignode.consensus.response.pipe.task.PipeTableResp; -import org.apache.iotdb.confignode.persistence.pipe.PipeTaskOperation; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; -import org.apache.iotdb.confignode.procedure.impl.pipe.task.AbstractOperatePipeProcedureV2; +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.consensus.common.response.ConsensusWriteResponse; import org.apache.iotdb.pipe.api.exception.PipeException; diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeMetaSyncProcedure.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeMetaSyncProcedure.java index a7faa989ab9..65ecdaae628 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeMetaSyncProcedure.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeMetaSyncProcedure.java @@ -19,9 +19,9 @@ package org.apache.iotdb.confignode.procedure.impl.pipe.runtime; -import org.apache.iotdb.confignode.persistence.pipe.PipeTaskOperation; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; -import org.apache.iotdb.confignode.procedure.impl.pipe.task.AbstractOperatePipeProcedureV2; +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.slf4j.Logger; diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/CreatePipeProcedureV2.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/CreatePipeProcedureV2.java index aefab3c03f5..297b1c97a79 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/CreatePipeProcedureV2.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/CreatePipeProcedureV2.java @@ -27,8 +27,9 @@ import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; 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.manager.pipe.PipeManager; -import org.apache.iotdb.confignode.persistence.pipe.PipeTaskOperation; 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.TCreatePipeReq; import org.apache.iotdb.consensus.common.response.ConsensusWriteResponse; diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/DropPipeProcedureV2.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/DropPipeProcedureV2.java index 3edd2ec5d57..bae85b9bf74 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/DropPipeProcedureV2.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/DropPipeProcedureV2.java @@ -19,8 +19,9 @@ package org.apache.iotdb.confignode.procedure.impl.pipe.task; import org.apache.iotdb.confignode.consensus.request.write.pipe.task.DropPipePlanV2; -import org.apache.iotdb.confignode.persistence.pipe.PipeTaskOperation; 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.consensus.common.response.ConsensusWriteResponse; import org.apache.iotdb.pipe.api.exception.PipeException; diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/StartPipeProcedureV2.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/StartPipeProcedureV2.java index 7bdd3bbd6fa..ef277a4fcc8 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/StartPipeProcedureV2.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/StartPipeProcedureV2.java @@ -20,8 +20,9 @@ package org.apache.iotdb.confignode.procedure.impl.pipe.task; import org.apache.iotdb.commons.pipe.task.meta.PipeStatus; import org.apache.iotdb.confignode.consensus.request.write.pipe.task.SetPipeStatusPlanV2; -import org.apache.iotdb.confignode.persistence.pipe.PipeTaskOperation; 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.consensus.common.response.ConsensusWriteResponse; import org.apache.iotdb.pipe.api.exception.PipeException; diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/StopPipeProcedureV2.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/StopPipeProcedureV2.java index 2408bac3209..7c98678a608 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/StopPipeProcedureV2.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/StopPipeProcedureV2.java @@ -20,8 +20,9 @@ package org.apache.iotdb.confignode.procedure.impl.pipe.task; import org.apache.iotdb.commons.pipe.task.meta.PipeStatus; import org.apache.iotdb.confignode.consensus.request.write.pipe.task.SetPipeStatusPlanV2; -import org.apache.iotdb.confignode.persistence.pipe.PipeTaskOperation; 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.consensus.common.response.ConsensusWriteResponse; import org.apache.iotdb.pipe.api.exception.PipeException;
