Merge pull request #737 from tronprotocol/fix_fill_on_fullnode_for_master

fix fill on fullnode for master

Author: CodeNinjaEvan

src/main/java/org/tron/core/db/api/IndexHelper.java

@@ -1,5 +1,6 @@
 package org.tron.core.db.api;
 
+import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -34,6 +35,14 @@ public class IndexHelper {
   @Resource
   private Index.Iface<AssetIssueContract> assetIssueIndex;
 
+  @PostConstruct
+  public void init() {
+    transactionIndex.fill();
+    blockIndex.fill();
+    witnessIndex.fill();
+    accountIndex.fill();
+    assetIssueIndex.fill();
+  }
   private <T> void add(Index.Iface<T> index, byte[] bytes) {
     index.add(bytes);
   }

src/main/java/org/tron/core/db/api/index/AbstractIndex.java

@@ -56,9 +56,10 @@ protected T getObject(final WrappedByteArray byteArray) {
     return getObject(byteArray.getBytes());
   }
 
-  protected void fill() {
+  @Override
+  public void fill() {
     int size = Iterables.size(database);
-    if (size != 0 && (!indexPath.exists() || index.size() < size)) {
+    if (size != 0 && !indexPath.exists()) {
       database.forEach(e -> add(e.getKey()));
     }
   }

src/main/java/org/tron/core/db/api/index/AccountIndex.java

@@ -40,7 +40,6 @@ public AccountIndex(@Qualifier("accountStore") final TronDatabase<AccountCapsule
   public void init() {
     initIndex(DiskPersistence.onPrimaryKeyInFile(Account_ADDRESS, indexPath));
 //    index.addIndex(DiskIndex.onAttribute(Account_ADDRESS));
-    fill();
   }
 
   @Override

src/main/java/org/tron/core/db/api/index/AssetIssueIndex.java

@@ -39,7 +39,6 @@ public void init() {
 //    index.addIndex(DiskIndex.onAttribute(AssetIssue_NAME));
     index.addIndex(DiskIndex.onAttribute(AssetIssue_START));
     index.addIndex(DiskIndex.onAttribute(AssetIssue_END));
-    fill();
   }
 
   @Override

src/main/java/org/tron/core/db/api/index/BlockIndex.java

@@ -56,7 +56,6 @@ public void init() {
     index.addIndex(DiskIndex.onAttribute(WITNESS_ADDRESS));
     index.addIndex(DiskIndex.onAttribute(OWNERS));
     index.addIndex(DiskIndex.onAttribute(TOS));
-    fill();
   }
 
   @Override

src/main/java/org/tron/core/db/api/index/Index.java

@@ -27,5 +27,7 @@ public interface Iface<T> extends Iterable<T> {
     long size();
 
     String getName();
+
+    void fill();
   }
 }

src/main/java/org/tron/core/db/api/index/TransactionIndex.java

@@ -49,7 +49,6 @@ public void init() {
     index.addIndex(DiskIndex.onAttribute(OWNERS));
     index.addIndex(DiskIndex.onAttribute(TOS));
     index.addIndex(DiskIndex.onAttribute(TIMESTAMP));
-    fill();
   }
 
   @Override

src/main/java/org/tron/core/db/api/index/WitnessIndex.java

@@ -43,7 +43,6 @@ public void init() {
 //    index.addIndex(DiskIndex.onAttribute(Witness_ADDRESS));
     index.addIndex(DiskIndex.onAttribute(PUBLIC_KEY));
     index.addIndex(DiskIndex.onAttribute(Witness_URL));
-    fill();
   }
 
   @Override