Merge pull request #1776 from tronprotocol/dbversion_default_2

db.version default 2
tronprotocol · Nov 28, 2018 · 607f1ca · 607f1ca
2 parents f24e586 + 753482c
commit 607f1ca
Show file tree

Hide file tree

Showing 3 changed files with 303 additions and 283 deletions.
diff --git a/src/main/java/org/tron/core/config/args/Args.java b/src/main/java/org/tron/core/config/args/Args.java
@@ -953,6 +953,8 @@ private static void logConfig() {
     logger.info("Backup priority: {}", args.getBackupPriority());
     logger.info("************************ Code version *************************");
     logger.info("Code version : {}", Version.getVersion());
+    logger.info("************************ DB config *************************");
+    logger.info("DB version : {}", args.getStorage().getDbVersion());
     logger.info("***************************************************************");
     logger.info("\n");
   }

diff --git a/src/main/java/org/tron/core/config/args/Storage.java b/src/main/java/org/tron/core/config/args/Storage.java
@@ -17,19 +17,15 @@
 
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigObject;
-
-import org.apache.commons.lang3.StringUtils;
-import org.iq80.leveldb.CompressionType;
-import org.iq80.leveldb.Options;
-
 import java.io.File;
 import java.util.Map;
 import java.util.stream.Collectors;
-
-import org.tron.common.utils.FileUtil;
-
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
+import org.iq80.leveldb.CompressionType;
+import org.iq80.leveldb.Options;
+import org.tron.common.utils.FileUtil;
 
 /**
  * Custom storage configurations
@@ -64,7 +60,7 @@ public class Storage {
   /**
    * Default values of directory
    */
-  private static final int DEFAULT_DB_VERSION = 1;
+  private static final int DEFAULT_DB_VERSION = 2;
   private static final String DEFAULT_DB_DIRECTORY = "database";
   private static final String DEFAULT_INDEX_DIRECTORY = "index";
   private static final String DEFAULT_INDEX_SWTICH = "on";