Merge pull request #839 from tronprotocol/db_change_config

Add detailed configurations (storage path, LevelDB options and so on) for each database

Author: zhaohong

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

@@ -60,9 +60,11 @@ public class LevelDbDataSourceImpl implements DbSourceInter<byte[]>,
    * constructor.
    */
   public LevelDbDataSourceImpl(String parentName, String name) {
-    parentName += Args.getInstance().getStorage().getDirectory();
-    this.parentName = parentName;
     this.dataBaseName = name;
+    this.parentName = Paths.get(
+            parentName,
+            Args.getInstance().getStorage().getDbDirectory()
+    ).toString();
   }
 
   @Override
@@ -79,7 +81,7 @@ public void initDB() {
         throw new NullPointerException("no name set to the dbStore");
       }
 
-      Options dbOptions = createDbOptions();
+      Options dbOptions = Args.getInstance().getStorage().getOptionsByDbName(dataBaseName);
 
       try {
         openDatabase(dbOptions);
@@ -109,6 +111,7 @@ private void openDatabase(Options dbOptions) throws IOException {
     }
   }
 
+  @Deprecated
   private Options createDbOptions() {
     Options dbOptions = new Options();
     dbOptions.createIfMissing(true);

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

@@ -27,6 +27,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.iq80.leveldb.Options;
 import org.spongycastle.util.encoders.Hex;
 import org.springframework.stereotype.Component;
 import org.tron.common.crypto.ECKey;
@@ -65,8 +66,11 @@ public class Args {
   @Parameter(names = {"-p", "--private-key"}, description = "private-key")
   private String privateKey = "";
 
-  @Parameter(names = {"--storage-directory"}, description = "Storage directory")
-  private String storageDirectory = "";
+  @Parameter(names = {"--storage-db-directory"}, description = "Storage db directory")
+  private String storageDbDirectory = "";
+
+  @Parameter(names = {"--storage-index-directory"}, description = "Storage index directory")
+  private String storageIndexDirectory = "";
 
   @Getter
   private Storage storage;
@@ -218,8 +222,16 @@ public static void clearParam() {
     INSTANCE.witness = false;
     INSTANCE.seedNodes = new ArrayList<>();
     INSTANCE.privateKey = "";
-    INSTANCE.storageDirectory = "";
-    INSTANCE.storage = null;
+    INSTANCE.storageDbDirectory = "";
+    INSTANCE.storageIndexDirectory = "";
+
+    // FIXME: INSTANCE.storage maybe null ?
+    if (INSTANCE.storage != null) {
+      // WARNING: WILL DELETE DB STORAGE PATHS
+      INSTANCE.storage.deleteAllStoragePaths();
+      INSTANCE.storage = null;
+    }
+
     INSTANCE.overlay = null;
     INSTANCE.seedNode = null;
     INSTANCE.genesisBlock = null;
@@ -253,6 +265,7 @@ public static void clearParam() {
     INSTANCE.getTransactionsToThisCountFeature = false;
     INSTANCE.getTransactionsByTimestampFeature = false;
     INSTANCE.getTransactionsByTimestampCountFeature = false;
+
   }
 
   /**
@@ -281,9 +294,16 @@ public static void setParam(final String[] args, final String confFileName) {
     }
 
     INSTANCE.storage = new Storage();
-    INSTANCE.storage.setDirectory(Optional.ofNullable(INSTANCE.storageDirectory)
+    INSTANCE.storage.setDbDirectory(Optional.ofNullable(INSTANCE.storageDbDirectory)
         .filter(StringUtils::isNotEmpty)
-        .orElse(config.getString("storage.directory")));
+        .orElse(config.getString("storage.db.directory")));
+
+    INSTANCE.storage.setIndexDirectory(Optional.ofNullable(INSTANCE.storageIndexDirectory)
+            .filter(StringUtils::isNotEmpty)
+            .orElse(config.getString("storage.index.directory")));
+
+    INSTANCE.storage.setPropertyMapFromConfig(config);
+
     INSTANCE.seedNode = new SeedNode();
     INSTANCE.seedNode.setIpList(Optional.ofNullable(INSTANCE.seedNodes)
         .filter(seedNode -> 0 != seedNode.size())
@@ -436,6 +456,20 @@ public static Args getInstance() {
     return INSTANCE;
   }
 
+  /**
+   * Get storage path by name of database
+   *
+   * @param dbName name of database
+   * @return path of that database
+   */
+  public String getOutputDirectoryByDbName(String dbName) {
+    String path = storage.getPathByDbName(dbName);
+    if (!StringUtils.isBlank(path)) {
+      return path;
+    }
+    return getOutputDirectory();
+  }
+
   /**
    * get output directory.
    */
@@ -475,7 +509,7 @@ private static String getGeneratedNodePrivateKey() {
     String nodeId;
     try {
       File file = new File(
-          INSTANCE.outputDirectory + File.separator + INSTANCE.storage.getDirectory(),
+          INSTANCE.outputDirectory + File.separator + INSTANCE.storage.getDbDirectory(),
           "nodeId.properties");
       Properties props = new Properties();
       if (file.canRead()) {