This is an automated email from the ASF dual-hosted git repository. liyuheng pushed a commit to branch lyh/fix-procedure in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 16a241915c1fdf679156f0a7737fd9383f95b667 Author: liyuheng <[email protected]> AuthorDate: Thu May 22 13:37:52 2025 +0800 remove ProcedureYieldException.java --- .../confignode/procedure/InternalProcedure.java | 4 +-- .../iotdb/confignode/procedure/Procedure.java | 9 ++---- .../confignode/procedure/ProcedureExecutor.java | 4 --- .../exception/ProcedureYieldException.java | 36 ---------------------- .../procedure/impl/StateMachineProcedure.java | 7 ++--- .../procedure/impl/cq/CreateCQProcedure.java | 3 +- .../procedure/impl/node/RemoveAINodeProcedure.java | 3 +- .../impl/pipe/AbstractOperatePipeProcedureV2.java | 3 +- .../pipe/plugin/CreatePipePluginProcedure.java | 3 +- .../impl/pipe/plugin/DropPipePluginProcedure.java | 3 +- .../impl/region/AddRegionPeerProcedure.java | 3 +- .../region/NotifyRegionMigrationProcedure.java | 3 +- .../impl/region/ReconstructRegionProcedure.java | 3 +- .../impl/region/RemoveRegionPeerProcedure.java | 3 +- .../impl/schema/AlterLogicalViewProcedure.java | 3 +- .../impl/schema/DeactivateTemplateProcedure.java | 3 +- .../impl/schema/DeleteDatabaseProcedure.java | 3 +- .../impl/schema/DeleteLogicalViewProcedure.java | 3 +- .../impl/schema/DeleteTimeSeriesProcedure.java | 3 +- .../procedure/impl/schema/SetTTLProcedure.java | 3 +- .../impl/schema/SetTemplateProcedure.java | 3 +- .../impl/schema/UnsetTemplateProcedure.java | 3 +- .../impl/schema/table/AddTableColumnProcedure.java | 3 +- .../impl/schema/table/CreateTableProcedure.java | 3 +- .../impl/schema/table/DeleteDevicesProcedure.java | 3 +- .../schema/table/DropTableColumnProcedure.java | 3 +- .../impl/schema/table/DropTableProcedure.java | 3 +- .../schema/table/RenameTableColumnProcedure.java | 3 +- .../impl/schema/table/RenameTableProcedure.java | 3 +- .../schema/table/SetTablePropertiesProcedure.java | 3 +- .../AbstractOperateSubscriptionProcedure.java | 3 +- .../impl/sync/AbstractOperatePipeProcedure.java | 3 +- .../AddNeverFinishSubProcedureProcedure.java | 3 +- .../impl/testonly/NeverFinishProcedure.java | 3 +- .../confignode/procedure/entity/IncProcedure.java | 4 +-- .../confignode/procedure/entity/NoopProcedure.java | 4 +-- .../procedure/entity/SimpleLockProcedure.java | 4 +-- .../procedure/entity/SimpleSTMProcedure.java | 3 +- .../procedure/entity/SleepProcedure.java | 4 +-- .../procedure/entity/StuckSTMProcedure.java | 3 +- 40 files changed, 40 insertions(+), 129 deletions(-) diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/InternalProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/InternalProcedure.java index 5041c9feac2..f9ff68bde7e 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/InternalProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/InternalProcedure.java @@ -19,8 +19,6 @@ package org.apache.iotdb.confignode.procedure; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; - import java.io.IOException; import java.nio.ByteBuffer; @@ -37,7 +35,7 @@ public abstract class InternalProcedure<Env> extends Procedure<Env> { protected abstract void periodicExecute(final Env env); @Override - protected Procedure<Env>[] execute(Env env) throws ProcedureYieldException, InterruptedException { + protected Procedure<Env>[] execute(Env env) throws InterruptedException { throw new UnsupportedOperationException(); } diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/Procedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/Procedure.java index cb632612822..110b34099f8 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/Procedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/Procedure.java @@ -21,7 +21,6 @@ package org.apache.iotdb.confignode.procedure; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.state.ProcedureLockState; import org.apache.iotdb.confignode.procedure.state.ProcedureState; import org.apache.iotdb.confignode.procedure.store.IProcedureStore; @@ -80,12 +79,9 @@ public abstract class Procedure<Env> implements Comparable<Procedure<Env>> { * @param env the environment passed to the ProcedureExecutor * @return a set of sub-procedures to run or ourselves if there is more work to do or null if the * procedure is done. - * @throws ProcedureYieldException the procedure will be added back to the queue and retried - * later. * @throws InterruptedException the procedure will be added back to the queue and retried later. */ - protected abstract Procedure<Env>[] execute(Env env) - throws ProcedureYieldException, InterruptedException; + protected abstract Procedure<Env>[] execute(Env env) throws InterruptedException; /** * The code to undo what was done by the execute() code. It is called when the procedure or one of @@ -283,8 +279,7 @@ public abstract class Procedure<Env> implements Comparable<Procedure<Env>> { * @param env execute environment * @return sub procedures */ - protected Procedure<Env>[] doExecute(Env env) - throws ProcedureYieldException, InterruptedException { + protected Procedure<Env>[] doExecute(Env env) throws InterruptedException { try { updateTimestamp(); return execute(env); diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/ProcedureExecutor.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/ProcedureExecutor.java index 4f2ffdec2cc..781dcdd030e 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/ProcedureExecutor.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/ProcedureExecutor.java @@ -23,7 +23,6 @@ import org.apache.iotdb.commons.concurrent.ThreadName; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.scheduler.ProcedureScheduler; import org.apache.iotdb.confignode.procedure.scheduler.SimpleProcedureScheduler; import org.apache.iotdb.confignode.procedure.state.ProcedureLockState; @@ -417,9 +416,6 @@ public class ProcedureExecutor<Env> { if (subprocs != null && subprocs.length == 0) { subprocs = null; } - } catch (ProcedureYieldException e) { - LOG.debug("Yield {}", proc); - yieldProcedure(proc); } catch (InterruptedException e) { LOG.warn("Interrupt during execution, suspend or retry it later.", e); yieldProcedure(proc); diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/exception/ProcedureYieldException.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/exception/ProcedureYieldException.java deleted file mode 100644 index 59addee34f0..00000000000 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/exception/ProcedureYieldException.java +++ /dev/null @@ -1,36 +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.exception; - -public class ProcedureYieldException extends ProcedureException { - /** Default constructor. */ - public ProcedureYieldException() { - super(); - } - - /** - * Constructor. - * - * @param s message - */ - public ProcedureYieldException(String s) { - super(s); - } -} diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/StateMachineProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/StateMachineProcedure.java index f6b15ce7a7b..c3c9167e6ef 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/StateMachineProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/StateMachineProcedure.java @@ -21,7 +21,6 @@ package org.apache.iotdb.confignode.procedure.impl; import org.apache.iotdb.confignode.procedure.Procedure; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.thrift.annotation.Nullable; import org.slf4j.Logger; @@ -89,8 +88,7 @@ public abstract class StateMachineProcedure<Env, TState> extends Procedure<Env> * @return Flow.NO_MORE_STATE if the procedure is completed, Flow.HAS_MORE_STATE if there is * another step. */ - protected abstract Flow executeFromState(Env env, TState state) - throws ProcedureYieldException, InterruptedException; + protected abstract Flow executeFromState(Env env, TState state) throws InterruptedException; /** * Called to perform the rollback of the specified state. @@ -143,8 +141,7 @@ public abstract class StateMachineProcedure<Env, TState> extends Procedure<Env> } @Override - protected Procedure<Env>[] execute(final Env env) - throws ProcedureYieldException, InterruptedException { + protected Procedure<Env>[] execute(final Env env) throws InterruptedException { updateTimestamp(); try { if (noMoreState() || isFailed()) { diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/cq/CreateCQProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/cq/CreateCQProcedure.java index 14b039d1dcf..2b274be607c 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/cq/CreateCQProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/cq/CreateCQProcedure.java @@ -28,7 +28,6 @@ import org.apache.iotdb.confignode.consensus.request.write.cq.DropCQPlan; import org.apache.iotdb.confignode.manager.cq.CQScheduleTask; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.impl.node.AbstractNodeProcedure; import org.apache.iotdb.confignode.procedure.state.cq.CreateCQState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; @@ -83,7 +82,7 @@ public class CreateCQProcedure extends AbstractNodeProcedure<CreateCQState> { @Override protected Flow executeFromState(ConfigNodeProcedureEnv env, CreateCQState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { try { switch (state) { diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/RemoveAINodeProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/RemoveAINodeProcedure.java index 76903142686..41676414afe 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/RemoveAINodeProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/RemoveAINodeProcedure.java @@ -26,7 +26,6 @@ import org.apache.iotdb.confignode.consensus.request.write.ainode.RemoveAINodePl import org.apache.iotdb.confignode.consensus.request.write.model.DropModelInNodePlan; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.state.RemoveAINodeState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; import org.apache.iotdb.rpc.TSStatusCode; @@ -57,7 +56,7 @@ public class RemoveAINodeProcedure extends AbstractNodeProcedure<RemoveAINodeSta @Override protected Flow executeFromState(ConfigNodeProcedureEnv env, RemoveAINodeState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { if (removedAINode == null) { return Flow.NO_MORE_STATE; } 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 26c44605ba4..a9654fd3080 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 @@ -26,7 +26,6 @@ import org.apache.iotdb.confignode.manager.pipe.metric.overview.PipeProcedureMet import org.apache.iotdb.confignode.persistence.pipe.PipeTaskInfo; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.impl.node.AbstractNodeProcedure; import org.apache.iotdb.confignode.procedure.impl.pipe.runtime.PipeMetaSyncProcedure; import org.apache.iotdb.confignode.procedure.state.ProcedureLockState; @@ -222,7 +221,7 @@ public abstract class AbstractOperatePipeProcedureV2 @Override protected Flow executeFromState(ConfigNodeProcedureEnv env, OperatePipeTaskState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { if (pipeTaskInfo == null) { LOGGER.warn( "ProcedureId {}: Pipe lock is not acquired, executeFromState's execution will be skipped.", diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/plugin/CreatePipePluginProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/plugin/CreatePipePluginProcedure.java index d4dbf6aabee..e3a4719a719 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/plugin/CreatePipePluginProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/plugin/CreatePipePluginProcedure.java @@ -28,7 +28,6 @@ import org.apache.iotdb.confignode.manager.ConfigManager; import org.apache.iotdb.confignode.manager.pipe.coordinator.plugin.PipePluginCoordinator; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.impl.node.AbstractNodeProcedure; import org.apache.iotdb.confignode.procedure.impl.node.AddConfigNodeProcedure; import org.apache.iotdb.confignode.procedure.impl.node.RemoveConfigNodeProcedure; @@ -84,7 +83,7 @@ public class CreatePipePluginProcedure extends AbstractNodeProcedure<CreatePipeP @Override protected Flow executeFromState(ConfigNodeProcedureEnv env, CreatePipePluginState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { if (pipePluginMeta == null) { return Flow.NO_MORE_STATE; } diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/plugin/DropPipePluginProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/plugin/DropPipePluginProcedure.java index aadf4d1aee8..665a3782a91 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/plugin/DropPipePluginProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/plugin/DropPipePluginProcedure.java @@ -27,7 +27,6 @@ import org.apache.iotdb.confignode.persistence.pipe.PipeTaskInfo; import org.apache.iotdb.confignode.persistence.subscription.SubscriptionInfo; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.impl.node.AbstractNodeProcedure; import org.apache.iotdb.confignode.procedure.impl.node.AddConfigNodeProcedure; import org.apache.iotdb.confignode.procedure.impl.node.RemoveConfigNodeProcedure; @@ -81,7 +80,7 @@ public class DropPipePluginProcedure extends AbstractNodeProcedure<DropPipePlugi @Override protected Flow executeFromState(ConfigNodeProcedureEnv env, DropPipePluginState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { if (pluginName == null) { return Flow.NO_MORE_STATE; } diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/AddRegionPeerProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/AddRegionPeerProcedure.java index d9d368ea773..307fcc8f99a 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/AddRegionPeerProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/AddRegionPeerProcedure.java @@ -29,7 +29,6 @@ import org.apache.iotdb.commons.utils.ThriftCommonsSerDeUtils; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.env.RegionMaintainHandler; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.state.AddRegionPeerState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; import org.apache.iotdb.db.utils.DateTimeUtils; @@ -74,7 +73,7 @@ public class AddRegionPeerProcedure extends RegionOperationProcedure<AddRegionPe @Override protected Flow executeFromState(ConfigNodeProcedureEnv env, AddRegionPeerState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { if (regionId == null) { return Flow.NO_MORE_STATE; } diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/NotifyRegionMigrationProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/NotifyRegionMigrationProcedure.java index 79fa63f2de1..96432852437 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/NotifyRegionMigrationProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/NotifyRegionMigrationProcedure.java @@ -24,7 +24,6 @@ import org.apache.iotdb.commons.exception.runtime.ThriftSerDeException; import org.apache.iotdb.commons.utils.ThriftCommonsSerDeUtils; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.state.NotifyRegionMigrationState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; @@ -55,7 +54,7 @@ public class NotifyRegionMigrationProcedure @Override protected Flow executeFromState(ConfigNodeProcedureEnv env, NotifyRegionMigrationState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { if (regionId == null) { return Flow.NO_MORE_STATE; } diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/ReconstructRegionProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/ReconstructRegionProcedure.java index 851dfafcc28..230a40098e3 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/ReconstructRegionProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/ReconstructRegionProcedure.java @@ -26,7 +26,6 @@ import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.commons.utils.ThriftCommonsSerDeUtils; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.state.ReconstructRegionState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; import org.apache.iotdb.db.utils.DateTimeUtils; @@ -56,7 +55,7 @@ public class ReconstructRegionProcedure extends RegionOperationProcedure<Reconst @Override protected Flow executeFromState(ConfigNodeProcedureEnv env, ReconstructRegionState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { try { switch (state) { case RECONSTRUCT_REGION_PREPARE: diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RemoveRegionPeerProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RemoveRegionPeerProcedure.java index 7e5ed5e3cd2..f362a7a1008 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RemoveRegionPeerProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RemoveRegionPeerProcedure.java @@ -30,7 +30,6 @@ import org.apache.iotdb.commons.utils.ThriftCommonsSerDeUtils; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.env.RegionMaintainHandler; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.state.RemoveRegionPeerState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; import org.apache.iotdb.db.utils.DateTimeUtils; @@ -81,7 +80,7 @@ public class RemoveRegionPeerProcedure extends RegionOperationProcedure<RemoveRe @Override protected Flow executeFromState(ConfigNodeProcedureEnv env, RemoveRegionPeerState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { if (regionId == null) { return Flow.NO_MORE_STATE; } diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/AlterLogicalViewProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/AlterLogicalViewProcedure.java index c25079c2f91..a0537f14175 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/AlterLogicalViewProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/AlterLogicalViewProcedure.java @@ -35,7 +35,6 @@ import org.apache.iotdb.confignode.client.async.CnToDnInternalServiceAsyncReques import org.apache.iotdb.confignode.client.async.handlers.DataNodeAsyncRequestContext; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.impl.StateMachineProcedure; import org.apache.iotdb.confignode.procedure.state.schema.AlterLogicalViewState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; @@ -90,7 +89,7 @@ public class AlterLogicalViewProcedure @Override protected Flow executeFromState( final ConfigNodeProcedureEnv env, final AlterLogicalViewState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { final long startTime = System.currentTimeMillis(); try { switch (state) { diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeactivateTemplateProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeactivateTemplateProcedure.java index 90c3df2021f..1df9da1509d 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeactivateTemplateProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeactivateTemplateProcedure.java @@ -35,7 +35,6 @@ import org.apache.iotdb.confignode.consensus.request.write.pipe.payload.PipeDeac import org.apache.iotdb.confignode.consensus.request.write.pipe.payload.PipeEnrichedPlan; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.impl.StateMachineProcedure; import org.apache.iotdb.confignode.procedure.state.schema.DeactivateTemplateState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; @@ -96,7 +95,7 @@ public class DeactivateTemplateProcedure @Override protected Flow executeFromState(ConfigNodeProcedureEnv env, DeactivateTemplateState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { long startTime = System.currentTimeMillis(); try { switch (state) { diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeleteDatabaseProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeleteDatabaseProcedure.java index e589bc0eb04..6d14b8be050 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeleteDatabaseProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeleteDatabaseProcedure.java @@ -36,7 +36,6 @@ import org.apache.iotdb.confignode.manager.partition.PartitionMetrics; import org.apache.iotdb.confignode.persistence.partition.maintainer.RegionDeleteTask; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.impl.StateMachineProcedure; import org.apache.iotdb.confignode.procedure.state.schema.DeleteStorageGroupState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; @@ -85,7 +84,7 @@ public class DeleteDatabaseProcedure @Override protected Flow executeFromState( final ConfigNodeProcedureEnv env, final DeleteStorageGroupState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { if (deleteDatabaseSchema == null) { return Flow.NO_MORE_STATE; } diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeleteLogicalViewProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeleteLogicalViewProcedure.java index 6edb7c72f07..6b448e32579 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeleteLogicalViewProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeleteLogicalViewProcedure.java @@ -33,7 +33,6 @@ import org.apache.iotdb.confignode.consensus.request.write.pipe.payload.PipeDele import org.apache.iotdb.confignode.consensus.request.write.pipe.payload.PipeEnrichedPlan; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.impl.StateMachineProcedure; import org.apache.iotdb.confignode.procedure.state.schema.DeleteLogicalViewState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; @@ -91,7 +90,7 @@ public class DeleteLogicalViewProcedure @Override protected Flow executeFromState( final ConfigNodeProcedureEnv env, final DeleteLogicalViewState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { long startTime = System.currentTimeMillis(); try { switch (state) { diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeleteTimeSeriesProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeleteTimeSeriesProcedure.java index bebab547cc2..b49834abaa2 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeleteTimeSeriesProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeleteTimeSeriesProcedure.java @@ -33,7 +33,6 @@ import org.apache.iotdb.confignode.consensus.request.write.pipe.payload.PipeDele import org.apache.iotdb.confignode.consensus.request.write.pipe.payload.PipeEnrichedPlan; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.impl.StateMachineProcedure; import org.apache.iotdb.confignode.procedure.state.schema.DeleteTimeSeriesState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; @@ -96,7 +95,7 @@ public class DeleteTimeSeriesProcedure @Override protected Flow executeFromState( final ConfigNodeProcedureEnv env, final DeleteTimeSeriesState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { final long startTime = System.currentTimeMillis(); try { switch (state) { diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/SetTTLProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/SetTTLProcedure.java index b4cff74cf2d..9b43af2003b 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/SetTTLProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/SetTTLProcedure.java @@ -32,7 +32,6 @@ import org.apache.iotdb.confignode.consensus.request.write.database.SetTTLPlan; import org.apache.iotdb.confignode.consensus.request.write.pipe.payload.PipeEnrichedPlan; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.impl.StateMachineProcedure; import org.apache.iotdb.confignode.procedure.state.schema.SetTTLState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; @@ -66,7 +65,7 @@ public class SetTTLProcedure extends StateMachineProcedure<ConfigNodeProcedureEn @Override protected Flow executeFromState(ConfigNodeProcedureEnv env, SetTTLState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { long startTime = System.currentTimeMillis(); try { switch (state) { diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/SetTemplateProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/SetTemplateProcedure.java index e6bb4328172..46c09e9f36f 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/SetTemplateProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/SetTemplateProcedure.java @@ -39,7 +39,6 @@ import org.apache.iotdb.confignode.consensus.request.write.template.PreSetSchema import org.apache.iotdb.confignode.consensus.response.template.TemplateInfoResp; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.impl.StateMachineProcedure; import org.apache.iotdb.confignode.procedure.state.schema.SetTemplateState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; @@ -99,7 +98,7 @@ public class SetTemplateProcedure @Override protected Flow executeFromState(final ConfigNodeProcedureEnv env, final SetTemplateState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { long startTime = System.currentTimeMillis(); try { switch (state) { diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/UnsetTemplateProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/UnsetTemplateProcedure.java index 6da9dd48322..fd8eb399406 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/UnsetTemplateProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/UnsetTemplateProcedure.java @@ -31,7 +31,6 @@ import org.apache.iotdb.confignode.client.async.CnToDnInternalServiceAsyncReques import org.apache.iotdb.confignode.client.async.handlers.DataNodeAsyncRequestContext; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.impl.StateMachineProcedure; import org.apache.iotdb.confignode.procedure.state.schema.UnsetTemplateState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; @@ -85,7 +84,7 @@ public class UnsetTemplateProcedure @Override protected Flow executeFromState(final ConfigNodeProcedureEnv env, final UnsetTemplateState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { final long startTime = System.currentTimeMillis(); try { switch (state) { diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/AddTableColumnProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/AddTableColumnProcedure.java index 5b57d70f91f..bdb5331e01e 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/AddTableColumnProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/AddTableColumnProcedure.java @@ -29,7 +29,6 @@ import org.apache.iotdb.confignode.consensus.request.write.table.AddTableColumnP import org.apache.iotdb.confignode.consensus.request.write.table.view.AddTableViewColumnPlan; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.impl.schema.table.view.AddViewColumnProcedure; import org.apache.iotdb.confignode.procedure.state.schema.AddTableColumnState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; @@ -67,7 +66,7 @@ public class AddTableColumnProcedure @Override protected Flow executeFromState(final ConfigNodeProcedureEnv env, final AddTableColumnState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { final long startTime = System.currentTimeMillis(); try { switch (state) { diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/CreateTableProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/CreateTableProcedure.java index a4561c1614e..ad47622bda2 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/CreateTableProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/CreateTableProcedure.java @@ -30,7 +30,6 @@ import org.apache.iotdb.confignode.consensus.request.write.table.RollbackCreateT import org.apache.iotdb.confignode.exception.DatabaseNotExistsException; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.impl.StateMachineProcedure; import org.apache.iotdb.confignode.procedure.impl.schema.SchemaUtils; import org.apache.iotdb.confignode.procedure.state.schema.CreateTableState; @@ -72,7 +71,7 @@ public class CreateTableProcedure @Override protected Flow executeFromState(final ConfigNodeProcedureEnv env, final CreateTableState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { final long startTime = System.currentTimeMillis(); try { switch (state) { diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/DeleteDevicesProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/DeleteDevicesProcedure.java index afd7a309e2a..c093084e1e0 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/DeleteDevicesProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/DeleteDevicesProcedure.java @@ -33,7 +33,6 @@ import org.apache.iotdb.confignode.consensus.request.write.pipe.payload.PipeEnri import org.apache.iotdb.confignode.manager.ClusterManager; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.impl.schema.DataNodeRegionTaskExecutor; import org.apache.iotdb.confignode.procedure.state.schema.DeleteDevicesState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; @@ -96,7 +95,7 @@ public class DeleteDevicesProcedure extends AbstractAlterOrDropTableProcedure<De @Override protected Flow executeFromState(final ConfigNodeProcedureEnv env, final DeleteDevicesState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { final long startTime = System.currentTimeMillis(); try { switch (state) { diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/DropTableColumnProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/DropTableColumnProcedure.java index 49566767143..02bd1679b52 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/DropTableColumnProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/DropTableColumnProcedure.java @@ -34,7 +34,6 @@ import org.apache.iotdb.confignode.consensus.request.write.table.view.CommitDele import org.apache.iotdb.confignode.consensus.request.write.table.view.PreDeleteViewColumnPlan; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.impl.schema.SchemaUtils; import org.apache.iotdb.confignode.procedure.impl.schema.table.view.DropViewColumnProcedure; import org.apache.iotdb.confignode.procedure.state.schema.DropTableColumnState; @@ -84,7 +83,7 @@ public class DropTableColumnProcedure @Override protected Flow executeFromState( final ConfigNodeProcedureEnv env, final DropTableColumnState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { final long startTime = System.currentTimeMillis(); try { switch (state) { diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/DropTableProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/DropTableProcedure.java index c0e68568f88..1d9dbef13e2 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/DropTableProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/DropTableProcedure.java @@ -34,7 +34,6 @@ import org.apache.iotdb.confignode.consensus.request.write.table.view.CommitDele import org.apache.iotdb.confignode.consensus.request.write.table.view.PreDeleteViewPlan; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.impl.schema.SchemaUtils; import org.apache.iotdb.confignode.procedure.impl.schema.table.view.DropViewProcedure; import org.apache.iotdb.confignode.procedure.state.schema.DropTableState; @@ -75,7 +74,7 @@ public class DropTableProcedure extends AbstractAlterOrDropTableProcedure<DropTa @Override protected Flow executeFromState(final ConfigNodeProcedureEnv env, final DropTableState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { final long startTime = System.currentTimeMillis(); try { switch (state) { diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/RenameTableColumnProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/RenameTableColumnProcedure.java index d738eda26a8..8303a4481f7 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/RenameTableColumnProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/RenameTableColumnProcedure.java @@ -27,7 +27,6 @@ import org.apache.iotdb.confignode.consensus.request.write.table.RenameTableColu import org.apache.iotdb.confignode.consensus.request.write.table.view.RenameViewColumnPlan; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.impl.schema.table.view.RenameViewColumnProcedure; import org.apache.iotdb.confignode.procedure.state.schema.RenameTableColumnState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; @@ -69,7 +68,7 @@ public class RenameTableColumnProcedure @Override protected Flow executeFromState( final ConfigNodeProcedureEnv env, final RenameTableColumnState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { final long startTime = System.currentTimeMillis(); try { switch (state) { diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/RenameTableProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/RenameTableProcedure.java index a9c26895413..dc2dafc1af6 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/RenameTableProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/RenameTableProcedure.java @@ -27,7 +27,6 @@ import org.apache.iotdb.confignode.consensus.request.write.table.RenameTablePlan import org.apache.iotdb.confignode.consensus.request.write.table.view.RenameViewPlan; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.impl.schema.table.view.RenameViewProcedure; import org.apache.iotdb.confignode.procedure.state.schema.RenameTableState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; @@ -62,7 +61,7 @@ public class RenameTableProcedure extends AbstractAlterOrDropTableProcedure<Rena @Override protected Flow executeFromState(final ConfigNodeProcedureEnv env, final RenameTableState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { final long startTime = System.currentTimeMillis(); try { switch (state) { diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/SetTablePropertiesProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/SetTablePropertiesProcedure.java index 8e220af81cc..6c0673068eb 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/SetTablePropertiesProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/SetTablePropertiesProcedure.java @@ -27,7 +27,6 @@ import org.apache.iotdb.confignode.consensus.request.write.table.SetTablePropert import org.apache.iotdb.confignode.consensus.request.write.table.view.SetViewPropertiesPlan; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.impl.schema.table.view.SetViewPropertiesProcedure; import org.apache.iotdb.confignode.procedure.state.schema.SetTablePropertiesState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; @@ -75,7 +74,7 @@ public class SetTablePropertiesProcedure @Override protected Flow executeFromState( final ConfigNodeProcedureEnv env, final SetTablePropertiesState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { final long startTime = System.currentTimeMillis(); try { switch (state) { diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/subscription/AbstractOperateSubscriptionProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/subscription/AbstractOperateSubscriptionProcedure.java index ad7a0aa876c..07bbe2c014c 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/subscription/AbstractOperateSubscriptionProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/subscription/AbstractOperateSubscriptionProcedure.java @@ -24,7 +24,6 @@ import org.apache.iotdb.commons.subscription.meta.topic.TopicMeta; import org.apache.iotdb.confignode.persistence.subscription.SubscriptionInfo; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.impl.node.AbstractNodeProcedure; import org.apache.iotdb.confignode.procedure.impl.subscription.consumer.runtime.ConsumerGroupMetaSyncProcedure; import org.apache.iotdb.confignode.procedure.impl.subscription.topic.runtime.TopicMetaSyncProcedure; @@ -180,7 +179,7 @@ public abstract class AbstractOperateSubscriptionProcedure @Override protected Flow executeFromState(ConfigNodeProcedureEnv env, OperateSubscriptionState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { if (subscriptionInfo == null) { LOGGER.warn( "ProcedureId {}: Subscription lock is not acquired, executeFromState({})'s execution will be skipped.", diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/AbstractOperatePipeProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/AbstractOperatePipeProcedure.java index ed45b018e48..03c3e985e2b 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/AbstractOperatePipeProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/AbstractOperatePipeProcedure.java @@ -21,7 +21,6 @@ package org.apache.iotdb.confignode.procedure.impl.sync; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.impl.StateMachineProcedure; import org.apache.iotdb.confignode.procedure.impl.pipe.AbstractOperatePipeProcedureV2; import org.apache.iotdb.confignode.procedure.state.sync.OperatePipeState; @@ -39,7 +38,7 @@ abstract class AbstractOperatePipeProcedure @Override protected Flow executeFromState(ConfigNodeProcedureEnv env, OperatePipeState state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { return Flow.NO_MORE_STATE; } diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/testonly/AddNeverFinishSubProcedureProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/testonly/AddNeverFinishSubProcedureProcedure.java index 66171c91ec8..1e82892af78 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/testonly/AddNeverFinishSubProcedureProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/testonly/AddNeverFinishSubProcedureProcedure.java @@ -22,7 +22,6 @@ package org.apache.iotdb.confignode.procedure.impl.testonly; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.impl.StateMachineProcedure; import org.apache.iotdb.confignode.procedure.store.ProcedureType; @@ -41,7 +40,7 @@ public class AddNeverFinishSubProcedureProcedure @Override protected Flow executeFromState(ConfigNodeProcedureEnv env, Integer state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { if (state == 0) { // the sub procedure will never finish, so the father procedure should never be called again addChildProcedure(new NeverFinishProcedure()); diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/testonly/NeverFinishProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/testonly/NeverFinishProcedure.java index 3f259519d0a..18c8a69e7ac 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/testonly/NeverFinishProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/testonly/NeverFinishProcedure.java @@ -22,7 +22,6 @@ package org.apache.iotdb.confignode.procedure.impl.testonly; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.impl.StateMachineProcedure; import org.apache.iotdb.confignode.procedure.store.ProcedureType; @@ -41,7 +40,7 @@ public class NeverFinishProcedure extends StateMachineProcedure<ConfigNodeProced @Override protected Flow executeFromState(ConfigNodeProcedureEnv env, Integer state) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { setNextState(state + 1); Thread.sleep(1000); return Flow.HAS_MORE_STATE; diff --git a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/entity/IncProcedure.java b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/entity/IncProcedure.java index 42c14b2ae5b..43d2f5d4659 100644 --- a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/entity/IncProcedure.java +++ b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/entity/IncProcedure.java @@ -21,7 +21,6 @@ package org.apache.iotdb.confignode.procedure.entity; import org.apache.iotdb.confignode.procedure.Procedure; import org.apache.iotdb.confignode.procedure.env.TestProcEnv; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import java.io.DataOutputStream; import java.io.IOException; @@ -32,8 +31,7 @@ public class IncProcedure extends Procedure<TestProcEnv> { public boolean throwEx = false; @Override - protected Procedure<TestProcEnv>[] execute(TestProcEnv testProcEnv) - throws ProcedureYieldException, InterruptedException { + protected Procedure<TestProcEnv>[] execute(TestProcEnv testProcEnv) throws InterruptedException { AtomicInteger acc = testProcEnv.getAcc(); if (throwEx) { throw new RuntimeException("throw a EXCEPTION"); diff --git a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/entity/NoopProcedure.java b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/entity/NoopProcedure.java index 4d2c070b804..550a1919506 100644 --- a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/entity/NoopProcedure.java +++ b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/entity/NoopProcedure.java @@ -21,15 +21,13 @@ package org.apache.iotdb.confignode.procedure.entity; import org.apache.iotdb.confignode.procedure.Procedure; import org.apache.iotdb.confignode.procedure.env.TestProcEnv; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import java.io.IOException; public class NoopProcedure extends Procedure<TestProcEnv> { @Override - protected Procedure<TestProcEnv>[] execute(TestProcEnv testProcEnv) - throws ProcedureYieldException, InterruptedException { + protected Procedure<TestProcEnv>[] execute(TestProcEnv testProcEnv) throws InterruptedException { return new Procedure[0]; } diff --git a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/entity/SimpleLockProcedure.java b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/entity/SimpleLockProcedure.java index 44d1bcab8e6..ce9fea39d55 100644 --- a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/entity/SimpleLockProcedure.java +++ b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/entity/SimpleLockProcedure.java @@ -21,7 +21,6 @@ package org.apache.iotdb.confignode.procedure.entity; import org.apache.iotdb.confignode.procedure.Procedure; import org.apache.iotdb.confignode.procedure.env.TestProcEnv; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.scheduler.SimpleProcedureScheduler; import org.apache.iotdb.confignode.procedure.state.ProcedureLockState; @@ -38,8 +37,7 @@ public class SimpleLockProcedure extends Procedure<TestProcEnv> { } @Override - protected Procedure<TestProcEnv>[] execute(TestProcEnv testProcEnv) - throws ProcedureYieldException, InterruptedException { + protected Procedure<TestProcEnv>[] execute(TestProcEnv testProcEnv) throws InterruptedException { testProcEnv.executeSeq.append(procName); return null; } diff --git a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/entity/SimpleSTMProcedure.java b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/entity/SimpleSTMProcedure.java index 9296c05106e..764d3c09729 100644 --- a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/entity/SimpleSTMProcedure.java +++ b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/entity/SimpleSTMProcedure.java @@ -21,7 +21,6 @@ package org.apache.iotdb.confignode.procedure.entity; import org.apache.iotdb.confignode.procedure.env.TestProcEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.impl.StateMachineProcedure; import java.io.IOException; @@ -40,7 +39,7 @@ public class SimpleSTMProcedure @Override protected Flow executeFromState(TestProcEnv testProcEnv, TestState testState) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { AtomicInteger acc = testProcEnv.getAcc(); try { switch (testState) { diff --git a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/entity/SleepProcedure.java b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/entity/SleepProcedure.java index 249ef8f7dd8..1dd978515b4 100644 --- a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/entity/SleepProcedure.java +++ b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/entity/SleepProcedure.java @@ -21,7 +21,6 @@ package org.apache.iotdb.confignode.procedure.entity; import org.apache.iotdb.confignode.procedure.Procedure; import org.apache.iotdb.confignode.procedure.env.TestProcEnv; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.util.ProcedureTestUtil; import java.io.DataOutputStream; @@ -29,8 +28,7 @@ import java.io.IOException; public class SleepProcedure extends Procedure<TestProcEnv> { @Override - protected Procedure<TestProcEnv>[] execute(TestProcEnv testProcEnv) - throws ProcedureYieldException, InterruptedException { + protected Procedure<TestProcEnv>[] execute(TestProcEnv testProcEnv) throws InterruptedException { System.out.println("Procedure is sleeping."); ProcedureTestUtil.sleepWithoutInterrupt(2000); return null; diff --git a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/entity/StuckSTMProcedure.java b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/entity/StuckSTMProcedure.java index 9bcea7da725..0b1b6aa424b 100644 --- a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/entity/StuckSTMProcedure.java +++ b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/entity/StuckSTMProcedure.java @@ -21,7 +21,6 @@ package org.apache.iotdb.confignode.procedure.entity; import org.apache.iotdb.confignode.procedure.env.TestProcEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; -import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException; import org.apache.iotdb.confignode.procedure.impl.StateMachineProcedure; import java.io.DataOutputStream; @@ -47,7 +46,7 @@ public class StuckSTMProcedure @Override protected Flow executeFromState(TestProcEnv testProcEnv, TestState testState) - throws ProcedureYieldException, InterruptedException { + throws InterruptedException { AtomicInteger acc = testProcEnv.getAcc(); try { switch (testState) {
