Merge branch 'develop' of https://github.com/tronprotocol/java-tron into refactorStatistcs

Author: olenheim

src/main/java/org/tron/common/storage/leveldb/LevelDbDataSourceImpl.java

@@ -56,7 +56,6 @@ public LevelDbDataSourceImpl(String parentName, String name) {
     parentName += Args.getInstance().getStorage().getDirectory();
     this.parentName = parentName;
     this.dataBaseName = name;
-    logger.debug("New LevelDbDataSourceImpl: " + name);
   }
 
   @Override

src/main/java/org/tron/common/utils/FileUtil.java

@@ -112,7 +112,7 @@ public static int readData(String filePath, char[] buf) {
    * delete directory.
    */
   public static boolean deleteDir(File dir) {
-    if (dir.isDirectory()) {
+   /* if (dir.isDirectory()) {
       String[] children = dir.list();
       for (int i = 0; i < children.length; i++) {
         boolean success = deleteDir(new File(dir, children[i]));
@@ -121,6 +121,7 @@ public static boolean deleteDir(File dir) {
         }
       }
     }
-    return dir.delete();
+    return dir.delete();*/
+    return true;
   }
 }

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

@@ -22,7 +22,9 @@
 
 import com.typesafe.config.ConfigFactory;
 import java.io.File;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 public class Configuration {
 
   private static com.typesafe.config.Config config;
@@ -38,14 +40,24 @@ public static com.typesafe.config.Config getByPath(final String configurationPat
       throw new IllegalArgumentException("Configuration path is required!");
     }
 
-    if (config == null) {
-      File confFile = new File(configurationPath);
-      if (confFile.exists()) {
-        config = ConfigFactory.parseFile(new File(configurationPath));
-      } else {
-        config = ConfigFactory.load(configurationPath);
-      }
+    //if (config == null) {
+
+    File confFile = new File(configurationPath);
+    if (confFile.exists()) {
+      logger.info("eee");
+      logger.info(configurationPath);
+
+      config = ConfigFactory.parseFile(new File(configurationPath));
+      return config;
+    } else {
+      logger.info("aaa");
+      logger.info(configurationPath);
+      config = ConfigFactory.load(configurationPath);
+      return config;
     }
-    return config;
   }
+  //logger.info("fff");
+  //logger.info(configurationPath);
+  //return config;
 }
+

src/main/java/org/tron/core/config/args/Args.java

@@ -35,8 +35,8 @@
 import org.tron.common.overlay.discover.Node;
 import org.tron.core.Constant;
 import org.tron.core.Wallet;
-import org.tron.core.db.AccountStore;
 import org.tron.core.config.Configuration;
+import org.tron.core.db.AccountStore;
 
 @Slf4j
 @NoArgsConstructor
@@ -185,9 +185,11 @@ public static void clearParam() {
    */
   public static void setParam(final String[] args, final String configFile) {
     Config config;
+    logger.info(configFile);
     JCommander.newBuilder().addObject(INSTANCE).build().parse(args);
     if ("" == INSTANCE.confFile) {
       config = Configuration.getByPath(configFile);
+      logger.info(configFile);
     } else {
       config = Configuration.getByPath(INSTANCE.confFile);
     }
@@ -211,10 +213,12 @@ public static void setParam(final String[] args, final String configFile) {
     }
 
     INSTANCE.storage = new Storage();
+    logger.info("abc");
+    logger.info(INSTANCE.storageDirectory);
     INSTANCE.storage.setDirectory(Optional.ofNullable(INSTANCE.storageDirectory)
         .filter(StringUtils::isNotEmpty)
         .orElse(config.getString("storage.directory")));
-
+    logger.info(INSTANCE.storage.getDirectory());
     INSTANCE.seedNode = new SeedNode();
     INSTANCE.seedNode.setIpList(Optional.ofNullable(INSTANCE.seedNodes)
         .filter(seedNode -> 0 != seedNode.size())

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

@@ -21,6 +21,10 @@ private AccountStore(String dbName) {
     super(dbName);
   }
 
+  public void destroy() {
+    instance = null;
+  }
+
   /**
    * create fun.
    *

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

@@ -15,6 +15,10 @@ private AssetIssueStore(String dbName) {
     super(dbName);
   }
 
+  public void destroy() {
+    instance = null;
+  }
+
   /**
    * create fun.
    *

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

@@ -34,13 +34,18 @@ private BlockStore(String dbName) {
 
   private static BlockStore instance;
 
+  public static void destroy() {
+    instance = null;
+  }
+
   /**
    * create fun.
    */
   public static BlockStore create(String dbName) {
     if (instance == null) {
-      synchronized (AccountStore.class) {
+      synchronized (BlockStore.class) {
         if (instance == null) {
+          logger.info("adafasdfasdfasdfasdf");
           instance = new BlockStore(dbName);
         }
       }

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

@@ -5,7 +5,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.joda.time.DateTime;
 import org.tron.common.utils.ByteArray;
-import org.tron.common.utils.Time;
 import org.tron.core.capsule.BytesCapsule;
 import org.tron.core.config.args.Args;
 
@@ -82,11 +81,16 @@ public boolean has(byte[] key) {
 
   private static DynamicPropertiesStore instance;
 
+  public void destroy() {
+    instance = null;
+  }
+
   /**
    * create fun.
    *
    * @param dbName the name of database
    */
+
   public static DynamicPropertiesStore create(String dbName) {
     if (instance == null) {
       synchronized (DynamicPropertiesStore.class) {

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

@@ -244,6 +244,14 @@ public Set<Node> readNeighbours() {
     return this.peersStore.get("neighbours".getBytes());
   }
 
+  public void destory() {
+    getAccountStore().destroy();
+    getTransactionStore().destroy();
+    getBlockStore().destroy();
+    getWitnessStore().destory();
+    getAssetIssueStore().destroy();
+    getDynamicPropertiesStore().destroy();
+  }
 
   /**
    * all db should be init here.
@@ -259,12 +267,10 @@ public void init() {
 
     revokingStore = RevokingStore.getInstance();
     revokingStore.enable();
-
     this.numHashCache = new LevelDbDataSourceImpl(
         Args.getInstance().getOutputDirectory(), "block" + "_NUM_HASH");
     this.numHashCache.initDB();
     this.khaosDb = new KhaosDatabase("block" + "_KDB");
-
     this.pendingTransactions = new ArrayList<>();
     this.initGenesis();
     this.updateWits();

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

@@ -34,6 +34,13 @@ public long getTotalTransactions() {
 
   private static TransactionStore instance;
 
+  public static void destory() {
+    instance = null;
+  }
+
+  void destroy() {
+    instance = null;
+  }
 
   /**
    * create Fun.