improve code

apache · Aug 16, 2022 · 54dac30 · 54dac30
1 parent ed3f3ca
commit 54dac30
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/election/MetaData.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/election/MetaData.java
@@ -15,7 +15,7 @@ public MetaData(String node, int epoch) {
     }
 
     public void increaseCount() {
-        this.count ++;
+        this.count++;
     }
 
     public boolean isMaster(String node) {

diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/election/MetaDataAdapter.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/election/MetaDataAdapter.java
@@ -3,6 +3,7 @@
 import java.util.Optional;
 
 public interface MetaDataAdapter {
+
     boolean postDelyIfPresent(MetaData metaData, long delySecond);
 
     Optional<MetaData> queryDelay(long delySecond);

diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/election/RoleElectionStateMachineImpl.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/election/RoleElectionStateMachineImpl.java
@@ -5,7 +5,7 @@
 
 import com.baidu.hugegraph.util.E;
 
-public class RoleElectionStateMachineImpl implements RoleElectionStateMachine{
+public class RoleElectionStateMachineImpl implements RoleElectionStateMachine {
 
     private volatile boolean shutdown = false;
     private Config config;
@@ -189,9 +189,10 @@ public void merge(WorkerState state) {
                 throw new IllegalStateException("Meta count must increase");
             } else if (state.metaData.epoch() == this.metaData.epoch() &&
                        state.metaData.count() > this.metaData.count()) {
+                this.count = 0;
                 this.metaData = state.metaData;
             } else {
-                this.count ++;
+                this.count++;
             }
         }
     }