Merge pull request tronprotocol#2668 from tronprotocol/hotfix/splitDBConfig

Hotfix/split db config

Author: DorianRust

actuator/src/main/java/org/tron/core/actuator/FreezeBalanceActuator.java

@@ -20,6 +20,7 @@
 import org.tron.core.store.DelegatedResourceAccountIndexStore;
 import org.tron.core.store.DelegatedResourceStore;
 import org.tron.core.store.DynamicPropertiesStore;
+import org.tron.core.vm.config.VMConfig;
 import org.tron.protos.Protocol.AccountType;
 import org.tron.protos.Protocol.Transaction.Contract.ContractType;
 import org.tron.protos.Protocol.Transaction.Result.code;
@@ -167,7 +168,7 @@ public boolean validate() throws ContractValidateException {
     long minFrozenTime = dynamicStore.getMinFrozenTime();
     long maxFrozenTime = dynamicStore.getMaxFrozenTime();
 
-    boolean needCheckFrozeTime = DBConfig.getCheckFrozenTime() == 1;//for test
+    boolean needCheckFrozeTime = VMConfig.getCheckFrozenTime() == 1;//for test
     if (needCheckFrozeTime && !(frozenDuration >= minFrozenTime
         && frozenDuration <= maxFrozenTime)) {
       throw new ContractValidateException(

actuator/src/main/java/org/tron/core/actuator/ShieldedTransferActuator.java

@@ -35,7 +35,6 @@
 import org.tron.core.store.DynamicPropertiesStore;
 import org.tron.core.store.NullifierStore;
 import org.tron.core.store.ZKProofStore;
-import org.tron.core.utils.TransactionUtil;
 import org.tron.protos.Protocol.AccountType;
 import org.tron.protos.Protocol.Transaction.Contract.ContractType;
 import org.tron.protos.Protocol.Transaction.Result.code;

actuator/src/main/java/org/tron/core/actuator/UpdateEnergyLimitContractActuator.java

@@ -5,8 +5,8 @@
 import java.util.Arrays;
 import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
-import org.tron.common.utils.DBConfig;
 import org.tron.common.utils.DecodeUtil;
+import org.tron.common.utils.StorageUtils;
 import org.tron.common.utils.StringUtil;
 import org.tron.core.capsule.AccountCapsule;
 import org.tron.core.capsule.ContractCapsule;
@@ -56,7 +56,7 @@ public boolean execute(Object object) throws ContractExeException {
 
   @Override
   public boolean validate() throws ContractValidateException {
-    if (!DBConfig.getEnergyLimitHardFork()) {
+    if (!StorageUtils.getEnergyLimitHardFork()) {
       throw new ContractValidateException(
           "contract type error, unexpected type [UpdateEnergyLimitContract]");
     }

actuator/src/main/java/org/tron/core/actuator/VMActuator.java

@@ -23,6 +23,7 @@
 import org.tron.common.runtime.InternalTransaction.TrxType;
 import org.tron.common.runtime.ProgramResult;
 import org.tron.common.utils.DBConfig;
+import org.tron.common.utils.StorageUtils;
 import org.tron.common.utils.WalletUtil;
 import org.tron.core.capsule.AccountCapsule;
 import org.tron.core.capsule.BlockCapsule;
@@ -339,7 +340,7 @@ private void create()
       long energyLimit;
       // according to version
 
-      if (VMConfig.getEnergyLimitHardFork()) {
+      if (StorageUtils.getEnergyLimitHardFork()) {
         if (callValue < 0) {
           throw new ContractValidateException("callValue must be >= 0");
         }
@@ -441,7 +442,7 @@ private void call()
       tokenId = contract.getTokenId();
     }
 
-    if (VMConfig.getEnergyLimitHardFork()) {
+    if (StorageUtils.getEnergyLimitHardFork()) {
       if (callValue < 0) {
         throw new ContractValidateException("callValue must be >= 0");
       }
@@ -576,7 +577,7 @@ public long getTotalEnergyLimit(AccountCapsule creator, AccountCapsule caller,
       return getAccountEnergyLimitWithFixRatio(caller, feeLimit, callValue);
     }
     //  according to version
-    if (VMConfig.getEnergyLimitHardFork()) {
+    if (StorageUtils.getEnergyLimitHardFork()) {
       return getTotalEnergyLimitWithFixRatio(creator, caller, contract, feeLimit, callValue);
     } else {
       return getTotalEnergyLimitWithFloatRatio(creator, caller, contract, feeLimit, callValue);
@@ -615,9 +616,9 @@ private double getCpuLimitInUsRatio() {
       } else {
         // self witness or other witness or fullnode verifies block
         if (trx.getRet(0).getContractRet() == contractResult.OUT_OF_TIME) {
-          cpuLimitRatio = DBConfig.getMinTimeRatio();
+          cpuLimitRatio = VMConfig.getMinTimeRatio();
         } else {
-          cpuLimitRatio = DBConfig.getMaxTimeRatio();
+          cpuLimitRatio = VMConfig.getMaxTimeRatio();
         }
       }
     } else {

actuator/src/main/java/org/tron/core/vm/config/VMConfig.java

@@ -19,14 +19,25 @@
 
 import static org.tron.common.utils.DBConfig.ENERGY_LIMIT_HARD_FORK;
 
+import lombok.Getter;
 import lombok.Setter;
 
 /**
  * For developer only
  */
 public class VMConfig {
 
-  public static final int MAX_CODE_LENGTH = 1024 * 1024;
+  @Getter
+  @Setter
+  private static double maxTimeRatio;
+
+  @Getter
+  @Setter
+  private static double minTimeRatio;
+
+  @Getter
+  @Setter
+  private static int checkFrozenTime; // for test only
 
   public static final int MAX_FEE_LIMIT = 1_000_000_000; //1000 trx
 
@@ -83,10 +94,6 @@ public static void initAllowTvmSolidity059(long allow) {
     ALLOW_TVM_SOLIDITY_059 = allow == 1;
   }
 
-  public static boolean getEnergyLimitHardFork() {
-    return ENERGY_LIMIT_HARD_FORK;
-  }
-
   public static boolean allowTvmTransferTrc10() {
     return ALLOW_TVM_TRANSFER_TRC10;
   }
@@ -104,8 +111,6 @@ public static boolean allowTvmSolidity059() {
   }
 
   private static class SystemPropertiesInstance {
-
     private static final VMConfig INSTANCE = new VMConfig();
   }
-
 }

actuator/src/main/java/org/tron/core/vm/program/Program.java

@@ -975,7 +975,7 @@ public void checkCPUTimeLimit(String opName) {
       logger.info(
           "minTimeRatio: {}, maxTimeRatio: {}, vm should end time in us: {}, "
               + "vm now time in us: {}, vm start time in us: {}",
-          DBConfig.getMinTimeRatio(), DBConfig.getMaxTimeRatio(),
+          VMConfig.getMinTimeRatio(), VMConfig.getMaxTimeRatio(),
           getVmShouldEndInUs(), vmNowInUs, getVmStartInUs());
       throw Exception.notEnoughTime(opName);
     }

actuator/src/main/java/org/tron/core/vm/repository/RepositoryImpl.java

@@ -14,6 +14,7 @@
 import org.tron.common.utils.DBConfig;
 import org.tron.common.utils.Hash;
 import org.tron.common.utils.Sha256Hash;
+import org.tron.common.utils.StorageUtils;
 import org.tron.common.utils.StringUtil;
 import org.tron.core.ChainBaseManager;
 import org.tron.core.capsule.AccountCapsule;
@@ -344,7 +345,7 @@ public Storage getStorage(byte[] address) {
     Storage storage;
     if (this.parent != null) {
       Storage parentStorage = parent.getStorage(address);
-      if (VMConfig.getEnergyLimitHardFork()) {
+      if (StorageUtils.getEnergyLimitHardFork()) {
         // deep copy
         storage = new Storage(parentStorage);
       } else {

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

@@ -45,6 +45,7 @@
 import org.tron.common.storage.WriteOptionsWrapper;
 import org.tron.common.utils.DBConfig;
 import org.tron.common.utils.FileUtil;
+import org.tron.common.utils.StorageUtils;
 import org.tron.core.db.common.DbSourceInter;
 import org.tron.core.db.common.iterator.StoreIterator;
 import org.tron.core.db2.common.Instance;
@@ -457,7 +458,6 @@ public Stream<Entry<byte[], byte[]>> parallelStream() {
 
   @Override
   public LevelDbDataSourceImpl newInstance() {
-    return new LevelDbDataSourceImpl(DBConfig.getOutputDirectoryByDbName(dataBaseName),
-        dataBaseName, options, writeOptions);
+    return new LevelDbDataSourceImpl(StorageUtils.getOutputDirectoryByDbName(dataBaseName), dataBaseName, options, writeOptions);
   }
 }

chainbase/src/main/java/org/tron/common/utils/DBConfig.java

@@ -1,23 +1,14 @@
 package org.tron.common.utils;
 
-import java.io.File;
 import java.util.Map;
 import java.util.Set;
 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.setting.RocksDbSettings;
 import org.tron.common.args.GenesisBlock;
 
 public class DBConfig {
 
-  private static final CompressionType DEFAULT_COMPRESSION_TYPE = CompressionType.SNAPPY;
-  private static final int DEFAULT_BLOCK_SIZE = 4 * 1024;
-  private static final int DEFAULT_WRITE_BUFFER_SIZE = 10 * 1024 * 1024;
-  private static final long DEFAULT_CACHE_SIZE = 10 * 1024 * 1024L;
-  private static final int DEFAULT_MAX_OPEN_FILES = 100;
   //Odyssey3.2 hard fork -- ForkBlockVersionConsts.ENERGY_LIMIT
   @Setter
   public static boolean ENERGY_LIMIT_HARD_FORK = false;
@@ -83,39 +74,18 @@ public class DBConfig {
   private static long blockNumForEneryLimit;
   @Getter
   @Setter
-  private static long proposalExpireTime; // (ms)
-  @Getter
-  @Setter
   private static long allowProtoFilterNum;
   @Getter
   @Setter
-  private static int checkFrozenTime; // for test only
-  @Getter
-  @Setter
   private static String dbDirectory;
   @Getter
   @Setter
   private static boolean fullNodeAllowShieldedTransaction;
   @Getter
   @Setter
-  private static String zenTokenId;
-  @Getter
-  @Setter
   private static boolean vmTrace;
   @Getter
   @Setter
-  private static boolean debug;
-  @Getter
-  @Setter
-  private static double minTimeRatio;
-  @Getter
-  @Setter
-  private static double maxTimeRatio;
-  @Getter
-  @Setter
-  private static boolean solidityNode;
-  @Getter
-  @Setter
   private static int validContractProtoThreadNum;
   @Getter
   @Setter
@@ -129,65 +99,22 @@ public class DBConfig {
 
   @Getter
   @Setter
-  private static Set<String> actuatorSet;
-
-  public static boolean getEnergyLimitHardFork() {
-    return ENERGY_LIMIT_HARD_FORK;
-  }
-
-  public static String getOutputDirectoryByDbName(String dbName) {
-    String path = getPathByDbName(dbName);
-    if (!StringUtils.isBlank(path)) {
-      return path;
-    }
-    return getOutputDirectory();
-  }
-
-  public static String getPathByDbName(String dbName) {
-    if (hasProperty(dbName)) {
-      return getProperty(dbName).getPath();
-    }
-    return null;
-  }
-
-  private static boolean hasProperty(String dbName) {
-    if (propertyMap != null) {
-      return propertyMap.containsKey(dbName);
-    }
-    return false;
-  }
-
-  private static Property getProperty(String dbName) {
-    return propertyMap.get(dbName);
-  }
-
-  public static String getOutputDirectory() {
-    if (!outputDirectoryConfig.equals("") && !outputDirectoryConfig.endsWith(File.separator)) {
-      return outputDirectoryConfig + File.separator;
-    }
-    return outputDirectoryConfig;
-  }
+  private static String zenTokenId;
 
-  public static Options getOptionsByDbName(String dbName) {
-    if (hasProperty(dbName)) {
-      return getProperty(dbName).getDbOptions();
-    }
-    return createDefaultDbOptions();
-  }
+  @Getter
+  @Setter
+  private static Set<String> actuatorSet;
 
-  private static Options createDefaultDbOptions() {
-    Options dbOptions = new Options();
+  @Getter
+  @Setter
+  private static boolean debug;
 
-    dbOptions.createIfMissing(true);
-    dbOptions.paranoidChecks(true);
-    dbOptions.verifyChecksums(true);
+  @Getter
+  @Setter
+  private static boolean solidityNode;
 
-    dbOptions.compressionType(DEFAULT_COMPRESSION_TYPE);
-    dbOptions.blockSize(DEFAULT_BLOCK_SIZE);
-    dbOptions.writeBufferSize(DEFAULT_WRITE_BUFFER_SIZE);
-    dbOptions.cacheSize(DEFAULT_CACHE_SIZE);
-    dbOptions.maxOpenFiles(DEFAULT_MAX_OPEN_FILES);
 
-    return dbOptions;
-  }
+  @Getter
+  @Setter
+  private static long proposalExpireTime; // (ms)
 }