From ddeccdfc6ec0df69a0f19c1b6ca7e7cb1016809d Mon Sep 17 00:00:00 2001 From: OneSizeFitQuorum Date: Wed, 12 Jun 2024 14:12:46 +0800 Subject: [PATCH 1/2] rename Signed-off-by: OneSizeFitQuorum --- .../main/java/org/apache/iotdb/it/env/cluster/EnvUtils.java | 6 +++--- .../iotdb/confignode/conf/ConfigNodeStartupCheck.java | 2 +- .../confignode/manager/load/balancer/RouteBalancer.java | 4 ++-- .../java/org/apache/iotdb/consensus/ConsensusFactory.java | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/EnvUtils.java b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/EnvUtils.java index 6ecb87c3f0420..1126b46888bb3 100644 --- a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/EnvUtils.java +++ b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/EnvUtils.java @@ -31,7 +31,7 @@ import java.util.stream.IntStream; import static org.apache.iotdb.consensus.ConsensusFactory.FAST_IOT_CONSENSUS; -import static org.apache.iotdb.consensus.ConsensusFactory.IOTV2_CONSENSUS; +import static org.apache.iotdb.consensus.ConsensusFactory.IOT_CONSENSUS_V2; import static org.apache.iotdb.consensus.ConsensusFactory.IOT_CONSENSUS; import static org.apache.iotdb.consensus.ConsensusFactory.RATIS_CONSENSUS; import static org.apache.iotdb.consensus.ConsensusFactory.REAL_PIPE_CONSENSUS; @@ -224,7 +224,7 @@ public static String fromConsensusFullNameToAbbr(String consensus) { return IOT_CONSENSUS_STR; case REAL_PIPE_CONSENSUS: return PIPE_CONSENSUS_STR; - case IOTV2_CONSENSUS: + case IOT_CONSENSUS_V2: return STREAM_CONSENSUS_STR; case FAST_IOT_CONSENSUS: return BATCH_CONSENSUS_STR; @@ -244,7 +244,7 @@ public static String fromConsensusAbbrToFullName(String consensus) { case PIPE_CONSENSUS_STR: return REAL_PIPE_CONSENSUS; case STREAM_CONSENSUS_STR: - return IOTV2_CONSENSUS; + return IOT_CONSENSUS_V2; case BATCH_CONSENSUS_STR: return FAST_IOT_CONSENSUS; default: diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java index 88be42eb417f0..9a42264ed937e 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java @@ -146,7 +146,7 @@ private void checkGlobalConfig() throws ConfigurationException { // When the schemaengine region consensus protocol is set to PipeConsensus, // we should report an error if (CONF.getSchemaRegionConsensusProtocolClass().equals(ConsensusFactory.FAST_IOT_CONSENSUS) - || CONF.getSchemaRegionConsensusProtocolClass().equals(ConsensusFactory.IOTV2_CONSENSUS)) { + || CONF.getSchemaRegionConsensusProtocolClass().equals(ConsensusFactory.IOT_CONSENSUS_V2)) { throw new ConfigurationException( "schema_region_consensus_protocol_class", String.valueOf(CONF.getSchemaRegionConsensusProtocolClass()), diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RouteBalancer.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RouteBalancer.java index 5640721fba1ae..74a376a9170bf 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RouteBalancer.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RouteBalancer.java @@ -83,7 +83,7 @@ public class RouteBalancer implements IClusterStatusSubscriber { || (CONF.isEnableAutoLeaderBalanceForIoTConsensus() && ConsensusFactory.FAST_IOT_CONSENSUS.equals(DATA_REGION_CONSENSUS_PROTOCOL_CLASS)) || (CONF.isEnableAutoLeaderBalanceForIoTConsensus() - && ConsensusFactory.IOTV2_CONSENSUS.equals(DATA_REGION_CONSENSUS_PROTOCOL_CLASS)) + && ConsensusFactory.IOT_CONSENSUS_V2.equals(DATA_REGION_CONSENSUS_PROTOCOL_CLASS)) // The simple consensus protocol will always automatically designate itself as the leader || ConsensusFactory.SIMPLE_CONSENSUS.equals(DATA_REGION_CONSENSUS_PROTOCOL_CLASS); private static final boolean IS_ENABLE_AUTO_LEADER_BALANCE_FOR_SCHEMA_REGION = @@ -185,7 +185,7 @@ private void balanceRegionLeader( newLeaderId); switch (consensusProtocolClass) { case ConsensusFactory.FAST_IOT_CONSENSUS: - case ConsensusFactory.IOTV2_CONSENSUS: + case ConsensusFactory.IOT_CONSENSUS_V2: case ConsensusFactory.IOT_CONSENSUS: case ConsensusFactory.SIMPLE_CONSENSUS: // For IoTConsensus or SimpleConsensus or PipeConsensus protocol, change diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ConsensusFactory.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ConsensusFactory.java index 7742baf3bdccf..ef9032516d779 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ConsensusFactory.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ConsensusFactory.java @@ -41,13 +41,13 @@ public class ConsensusFactory { public static final String IOT_CONSENSUS = "org.apache.iotdb.consensus.iot.IoTConsensus"; public static final String REAL_PIPE_CONSENSUS = "org.apache.iotdb.consensus.pipe.PipeConsensus"; // Corresponding to streamConsensus - public static final String IOTV2_CONSENSUS = "org.apache.iotdb.consensus.iot.IoTV2Consensus"; + public static final String IOT_CONSENSUS_V2 = "org.apache.iotdb.consensus.iot.IoTConsensusV2"; // Corresponding to batchConsensus public static final String FAST_IOT_CONSENSUS = "org.apache.iotdb.consensus.iot.FastIoTConsensus"; private static final Map PIPE_CONSENSUS_MODE_MAP = new HashMap<>(); static { - PIPE_CONSENSUS_MODE_MAP.put(IOTV2_CONSENSUS, ReplicateMode.STREAM); + PIPE_CONSENSUS_MODE_MAP.put(IOT_CONSENSUS_V2, ReplicateMode.STREAM); PIPE_CONSENSUS_MODE_MAP.put(FAST_IOT_CONSENSUS, ReplicateMode.BATCH); } @@ -61,7 +61,7 @@ public static Optional getConsensusImpl( String className, ConsensusConfig config, IStateMachine.Registry registry) { try { // special judge for PipeConsensus - if (className.equals(IOTV2_CONSENSUS) || className.equals(FAST_IOT_CONSENSUS)) { + if (className.equals(IOT_CONSENSUS_V2) || className.equals(FAST_IOT_CONSENSUS)) { config.getPipeConsensusConfig().setReplicateMode(PIPE_CONSENSUS_MODE_MAP.get(className)); className = REAL_PIPE_CONSENSUS; // initialize pipeConsensus' thrift component From a67853137b7a7b571f24fa6dde3950d4bce636c1 Mon Sep 17 00:00:00 2001 From: OneSizeFitQuorum Date: Wed, 12 Jun 2024 15:26:59 +0800 Subject: [PATCH 2/2] spotless IT Signed-off-by: OneSizeFitQuorum --- .../src/main/java/org/apache/iotdb/it/env/cluster/EnvUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/EnvUtils.java b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/EnvUtils.java index 1126b46888bb3..f3c9527e5952f 100644 --- a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/EnvUtils.java +++ b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/EnvUtils.java @@ -31,8 +31,8 @@ import java.util.stream.IntStream; import static org.apache.iotdb.consensus.ConsensusFactory.FAST_IOT_CONSENSUS; -import static org.apache.iotdb.consensus.ConsensusFactory.IOT_CONSENSUS_V2; import static org.apache.iotdb.consensus.ConsensusFactory.IOT_CONSENSUS; +import static org.apache.iotdb.consensus.ConsensusFactory.IOT_CONSENSUS_V2; import static org.apache.iotdb.consensus.ConsensusFactory.RATIS_CONSENSUS; import static org.apache.iotdb.consensus.ConsensusFactory.REAL_PIPE_CONSENSUS; import static org.apache.iotdb.consensus.ConsensusFactory.SIMPLE_CONSENSUS;