Merge pull request #844 from tronprotocol/remove_db_create

Remove db create

Author: zhaohong

src/main/java/org/tron/core/config/DefaultConfig.java

@@ -26,72 +26,6 @@ public DefaultConfig() {
     Thread.setDefaultUncaughtExceptionHandler((t, e) -> logger.error("Uncaught exception", e));
   }
 
-  @Bean(name = "witness")
-  public String witness() {
-    return "witness";
-  }
-
-  @Bean(name = "account")
-  public String account() {
-    return "account";
-  }
-
-  @Bean(name = "asset-issue")
-  public String assetIssue() {
-    return "asset-issue";
-  }
-
-  @Bean(name = "block")
-  public String block() {
-    return "block";
-  }
-
-  @Bean(name = "votes")
-  public String votes() {
-    return "votes";
-  }
-
-  @Bean(name = "trans")
-  public String trans() {
-    return "trans";
-  }
-
-  @Bean(name = "utxo")
-  public String utxo() {
-    return "utxo";
-  }
-
-  @Bean(name = "properties")
-  public String properties() {
-    return "properties";
-  }
-
-  @Bean(name = "block_KDB")
-  public String blockKdb() {
-    return "block_KDB";
-  }
-
-  @Bean(name = "block-index")
-  public String blockIndex() {
-    return "block-index";
-  }
-
-  @Bean(name = "account-index")
-  public String accountIndex() {
-    return "account-index";
-  }
-
-  @Bean(name = "witness_schedule")
-  public String witnessSchedule() {
-    return "witness_schedule";
-  }
-
-  @Bean(name = "recent-block")
-  public String recentBlock() {
-    return "recent-block";
-  }
-
-
   @Bean
   public IndexHelper indexHelper() {
     if (!Args.getInstance().isSolidityNode()) {

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

@@ -5,6 +5,7 @@
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.tron.core.capsule.AccountCapsule;
 import org.tron.core.capsule.BytesCapsule;
@@ -13,32 +14,10 @@
 public class AccountIndexStore extends TronStoreWithRevoking<BytesCapsule> {
 
   @Autowired
-  public AccountIndexStore(@Qualifier("account-index") String dbName) {
+  public AccountIndexStore(@Value("account-index") String dbName) {
     super(dbName);
   }
 
-  private static AccountIndexStore instance;
-
-  public static void destroy() {
-    instance = null;
-  }
-
-  /**
-   * create fun.
-   *
-   * @param dbName the name of database
-   */
-  public static AccountIndexStore create(String dbName) {
-    if (instance == null) {
-      synchronized (AccountIndexStore.class) {
-        if (instance == null) {
-          instance = new AccountIndexStore(dbName);
-        }
-      }
-    }
-    return instance;
-  }
-
   public void put(AccountCapsule accountCapsule) {
     put(accountCapsule.getAccountName().toByteArray(),
         new BytesCapsule(accountCapsule.getAddress().toByteArray()));

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

@@ -12,6 +12,7 @@
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.tron.core.Wallet;
 import org.tron.core.capsule.AccountCapsule;
@@ -21,35 +22,13 @@
 @Component
 public class AccountStore extends TronStoreWithRevoking<AccountCapsule> {
 
-  private static Map<String, byte[]> assertsAddress =
-      new HashMap<String, byte[]>(); // key = name , value = address
-  private static AccountStore instance;
+  private static Map<String, byte[]> assertsAddress = new HashMap<>(); // key = name , value = address
 
   @Autowired
-  private AccountStore(@Qualifier("account") String dbName) {
+  private AccountStore(@Value("account") String dbName) {
     super(dbName);
   }
 
-  public static void destroy() {
-    instance = null;
-  }
-
-  /**
-   * create fun.
-   *
-   * @param dbName the name of database
-   */
-  public static AccountStore create(String dbName) {
-    if (instance == null) {
-      synchronized (AccountStore.class) {
-        if (instance == null) {
-          instance = new AccountStore(dbName);
-        }
-      }
-    }
-    return instance;
-  }
-
   @Override
   public AccountCapsule get(byte[] key) {
     byte[] value = dbSource.getData(key);

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

@@ -9,6 +9,7 @@
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.tron.core.capsule.AssetIssueCapsule;
 import org.tron.core.db.common.iterator.AssetIssueIterator;
@@ -17,33 +18,11 @@
 @Component
 public class AssetIssueStore extends TronStoreWithRevoking<AssetIssueCapsule> {
 
-  private static AssetIssueStore instance;
-
   @Autowired
-  private AssetIssueStore(@Qualifier("asset-issue") String dbName) {
+  private AssetIssueStore(@Value("asset-issue") String dbName) {
     super(dbName);
   }
 
-  public static void destroy() {
-    instance = null;
-  }
-
-  /**
-   * create fun.
-   *
-   * @param dbName the name of database
-   */
-  public static AssetIssueStore create(String dbName) {
-    if (instance == null) {
-      synchronized (AssetIssueStore.class) {
-        if (instance == null) {
-          instance = new AssetIssueStore(dbName);
-        }
-      }
-    }
-    return instance;
-  }
-
   @Override
   public AssetIssueCapsule get(byte[] key) {
     byte[] value = dbSource.getData(key);

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

@@ -3,6 +3,7 @@
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.tron.common.utils.ByteArray;
 import org.tron.common.utils.Sha256Hash;
@@ -15,33 +16,11 @@ public class BlockIndexStore extends TronStoreWithRevoking<BytesCapsule> {
 
 
   @Autowired
-  public BlockIndexStore(@Qualifier("block-index") String dbName) {
+  public BlockIndexStore(@Value("block-index") String dbName) {
     super(dbName);
 
   }
 
-  private static BlockIndexStore instance;
-
-  public static void destroy() {
-    instance = null;
-  }
-
-  /**
-   * create fun.
-   *
-   * @param dbName the name of database
-   */
-  public static BlockIndexStore create(String dbName) {
-    if (instance == null) {
-      synchronized (BlockIndexStore.class) {
-        if (instance == null) {
-          instance = new BlockIndexStore(dbName);
-        }
-      }
-    }
-    return instance;
-  }
-
   public void put(BlockId id) {
     put(ByteArray.fromLong(id.getNum()), new BytesCapsule(id.getBytes()));
   }

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

@@ -25,6 +25,7 @@
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.tron.common.utils.Sha256Hash;
 import org.tron.core.capsule.BlockCapsule;
@@ -40,19 +41,12 @@
 public class BlockStore extends TronStoreWithRevoking<BlockCapsule> {
 
   private BlockCapsule head;
-  private IndexedCollection<Block> blockIndex;
 
   @Autowired
-  private BlockStore(@Qualifier("block") String dbName) {
+  private BlockStore(@Value("block") String dbName) {
     super(dbName);
   }
 
-  private static BlockStore instance;
-
-  public static void destroy() {
-    instance = null;
-  }
-
   @Override
   public void put(byte[] key, BlockCapsule item) {
     super.put(key, item);
@@ -61,20 +55,6 @@ public void put(byte[] key, BlockCapsule item) {
     }
   }
 
-  /**
-   * create fun.
-   */
-  public static BlockStore create(String dbName) {
-    if (instance == null) {
-      synchronized (BlockStore.class) {
-        if (instance == null) {
-          instance = new BlockStore(dbName);
-        }
-      }
-    }
-    return instance;
-  }
-
   @Override
   public BlockCapsule get(byte[] key) throws ItemNotFoundException, BadItemException {
     byte[] value = dbSource.getData(key);

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

@@ -8,6 +8,7 @@
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.tron.common.utils.ByteArray;
 import org.tron.common.utils.Sha256Hash;
@@ -78,7 +79,7 @@ public class DynamicPropertiesStore extends TronStoreWithRevoking<BytesCapsule>
   private static final byte[] BLOCK_NET_USAGE = "BLOCK_NET_USAGE".getBytes();
 
   @Autowired
-  private DynamicPropertiesStore(@Qualifier("properties") String dbName) {
+  private DynamicPropertiesStore(@Value("properties") String dbName) {
     super(dbName);
     try {
       this.getMaintenanceTimeInterval();

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

@@ -14,6 +14,7 @@
 import lombok.Getter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.tron.common.utils.Sha256Hash;
 import org.tron.core.capsule.BlockCapsule;
@@ -135,7 +136,7 @@ public int size() {
   private KhaosStore miniUnlinkedStore = new KhaosStore();
 
   @Autowired
-  protected KhaosDatabase(@Qualifier("block_KDB") String dbName) {
+  protected KhaosDatabase(@Value("block_KDB") String dbName) {
     super(dbName);
   }
 

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

@@ -248,19 +248,6 @@ public Set<Node> readNeighbours() {
     return this.peersStore.get("neighbours".getBytes());
   }
 
-  // fot test only
-  public void destory() {
-    AccountStore.destroy();
-    TransactionStore.destroy();
-    BlockStore.destroy();
-    WitnessStore.destory();
-    AssetIssueStore.destroy();
-    DynamicPropertiesStore.destroy();
-    WitnessScheduleStore.destroy();
-    BlockIndexStore.destroy();
-    AccountIndexStore.destroy();
-  }
-
   @PostConstruct
   public void init() {
     revokingStore = RevokingStore.getInstance();

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

@@ -3,6 +3,7 @@
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.tron.core.capsule.BytesCapsule;
 import org.tron.core.exception.ItemNotFoundException;
@@ -11,16 +12,10 @@
 public class RecentBlockStore extends TronStoreWithRevoking<BytesCapsule> {
 
   @Autowired
-  private RecentBlockStore(@Qualifier("recent-block") String dbName) {
+  private RecentBlockStore(@Value("recent-block") String dbName) {
     super(dbName);
   }
 
-  private static BlockStore instance;
-
-  public static void destroy() {
-    instance = null;
-  }
-
   @Override
   public void put(byte[] key, BytesCapsule item) {
     super.put(key, item);