Merge pull request #1064 from tronprotocol/switch_back_when_switch_fork_failed

Switch back when switch fork failed

Author: zhaohong

src/main/java/org/tron/core/db/AbstractRevokingStore.java

@@ -109,7 +109,7 @@ public synchronized void onRemove(RevokingTuple tuple, byte[] value) {
   }
 
   @Override
-  public synchronized void merge() throws RevokingStoreIllegalStateException {
+  public synchronized void merge() {
     if (activeDialog <= 0) {
       throw new RevokingStoreIllegalStateException("activeDialog has to be greater than 0");
     }
@@ -148,7 +148,7 @@ public synchronized void merge() throws RevokingStoreIllegalStateException {
         .filter(e -> {
           boolean has = prevState.oldValues.containsKey(e.getKey());
           if (has) {
-            prevState.removed.put(e.getKey(), e.getValue());
+            prevState.removed.put(e.getKey(), prevState.oldValues.get(e.getKey()));
             prevState.oldValues.remove(e.getKey());
           }
 
@@ -161,7 +161,7 @@ public synchronized void merge() throws RevokingStoreIllegalStateException {
   }
 
   @Override
-  public synchronized void revoke() throws RevokingStoreIllegalStateException {
+  public synchronized void revoke() {
     if (disabled) {
       return;
     }
@@ -189,7 +189,7 @@ public synchronized void revoke() throws RevokingStoreIllegalStateException {
   }
 
   @Override
-  public synchronized void commit() throws RevokingStoreIllegalStateException {
+  public synchronized void commit() {
     if (activeDialog <= 0) {
       throw new RevokingStoreIllegalStateException("activeDialog has to be greater than 0");
     }
@@ -198,7 +198,7 @@ public synchronized void commit() throws RevokingStoreIllegalStateException {
   }
 
   @Override
-  public synchronized void pop() throws RevokingStoreIllegalStateException {
+  public synchronized void pop() {
     if (activeDialog != 0) {
       throw new RevokingStoreIllegalStateException("activeDialog has to be equal 0");
     }
@@ -311,28 +311,28 @@ public Dialog(RevokingDatabase revokingDatabase, boolean disableOnExit) {
       this.disableOnExit = disableOnExit;
     }
 
-    void commit() throws RevokingStoreIllegalStateException {
+    void commit() {
       applyRevoking = false;
       revokingDatabase.commit();
     }
 
-    void revoke() throws RevokingStoreIllegalStateException {
+    void revoke() {
       if (applyRevoking) {
         revokingDatabase.revoke();
       }
 
       applyRevoking = false;
     }
 
-    void merge() throws RevokingStoreIllegalStateException {
+    void merge() {
       if (applyRevoking) {
         revokingDatabase.merge();
       }
 
       applyRevoking = false;
     }
 
-    void copy(Dialog dialog) throws RevokingStoreIllegalStateException {
+    void copy(Dialog dialog) {
       if (this.equals(dialog)) {
         return;
       }
@@ -358,7 +358,7 @@ public void destroy() {
     }
 
     @Override
-    public void close() throws RevokingStoreIllegalStateException {
+    public void close() {
       try {
         if (applyRevoking) {
           revokingDatabase.revoke();

src/main/java/org/tron/core/db/KhaosDatabase.java

@@ -10,6 +10,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javafx.util.Pair;
 import lombok.Getter;
@@ -21,12 +22,13 @@
 import org.tron.core.capsule.BlockCapsule;
 import org.tron.core.capsule.BlockCapsule.BlockId;
 import org.tron.core.exception.BadNumberBlockException;
+import org.tron.core.exception.NonCommonBlockException;
 import org.tron.core.exception.UnLinkedBlockException;
 
 @Component
 public class KhaosDatabase extends TronDatabase {
 
-  private class KhaosBlock {
+  public static class KhaosBlock {
 
     public Sha256Hash getParentHash() {
       return this.blk.getParentHash();
@@ -38,6 +40,7 @@ public KhaosBlock(BlockCapsule blk) {
       this.num = blk.getNum();
     }
 
+    @Getter
     BlockCapsule blk;
     Reference<KhaosBlock> parent = new WeakReference<>(null);
     BlockId id;
@@ -82,10 +85,16 @@ public class KhaosStore {
 
           @Override
           protected boolean removeEldestEntry(Map.Entry<Long, ArrayList<KhaosBlock>> entry) {
-            if (entry.getKey() < Long.max(0L, head.num - maxCapcity)) {
-              entry.getValue().forEach(b -> hashKblkMap.remove(b.id));
-              return true;
-            }
+            long minNum = Long.max(0L, head.num - maxCapcity);
+            Map<Long, ArrayList<KhaosBlock>> minNumMap = numKblkMap.entrySet().stream()
+                .filter(e -> e.getKey() < minNum)
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+
+            minNumMap.forEach((k, v) -> {
+              numKblkMap.remove(k);
+              v.forEach(b -> hashKblkMap.remove(b.id));
+            });
+
             return false;
           }
         };
@@ -260,33 +269,48 @@ public void setMaxSize(int maxSize) {
   /**
    * Find two block's most recent common parent block.
    */
-  public Pair<LinkedList<BlockCapsule>, LinkedList<BlockCapsule>> getBranch(
-      Sha256Hash block1, Sha256Hash block2) {
-    LinkedList<BlockCapsule> list1 = new LinkedList<>();
-    LinkedList<BlockCapsule> list2 = new LinkedList<>();
+  public Pair<LinkedList<KhaosBlock>, LinkedList<KhaosBlock>> getBranch(Sha256Hash block1, Sha256Hash block2)
+      throws NonCommonBlockException {
+    LinkedList<KhaosBlock> list1 = new LinkedList<>();
+    LinkedList<KhaosBlock> list2 = new LinkedList<>();
     KhaosBlock kblk1 = miniStore.getByHash(block1);
+    checkNull(kblk1);
     KhaosBlock kblk2 = miniStore.getByHash(block2);
+    checkNull(kblk2);
 
-    if (kblk1 != null && kblk2 != null) {
-      while (!Objects.equals(kblk1, kblk2)) {
-        if (kblk1.num > kblk2.num) {
-          list1.add(kblk1.blk);
-          kblk1 = kblk1.getParent();
-        } else if (kblk1.num < kblk2.num) {
-          list2.add(kblk2.blk);
-          kblk2 = kblk2.getParent();
-        } else {
-          list1.add(kblk1.blk);
-          list2.add(kblk2.blk);
-          kblk1 = kblk1.getParent();
-          kblk2 = kblk2.getParent();
-        }
-      }
+    while (kblk1.num > kblk2.num) {
+      list1.add(kblk1);
+      kblk1 = kblk1.getParent();
+      checkNull(kblk1);
+      checkNull(miniStore.getByHash(kblk1.id));
+    }
+
+    while (kblk2.num > kblk1.num) {
+      list2.add(kblk2);
+      kblk2 = kblk2.getParent();
+      checkNull(kblk2);
+      checkNull(miniStore.getByHash(kblk2.id));
+    }
+
+    while (!Objects.equals(kblk1, kblk2)) {
+      list1.add(kblk1);
+      list2.add(kblk2);
+      kblk1 = kblk1.getParent();
+      checkNull(kblk1);
+      checkNull(miniStore.getByHash(kblk1.id));
+      kblk2 = kblk2.getParent();
+      checkNull(kblk2);
+      checkNull(miniStore.getByHash(kblk2.id));
     }
 
     return new Pair<>(list1, list2);
   }
 
+  private void checkNull(Object o) throws NonCommonBlockException {
+    if (o == null) {
+      throw new NonCommonBlockException();
+    }
+  }
   /**
    * Find two block's most recent common parent block.
    */