fix(config): use boxed types for partial LevelDB option overrides

- Add DbOptionOverride with nullable boxed types to distinguish
  "user set this" from "default value", fixing full-override bug
- Fix cacheSize type from int to long to match LevelDB Options API

Author: vividctrlalt

common/src/main/java/org/tron/core/config/args/Storage.java

@@ -48,9 +48,9 @@ public class Storage {
   private static final String DEFAULT_INDEX_SWITCH = "on";
 
   // Optional per-tier LevelDB option overrides, read from StorageConfig bean
-  private StorageConfig.PropertyConfig defaultDbOption;
-  private StorageConfig.PropertyConfig defaultMDbOption;
-  private StorageConfig.PropertyConfig defaultLDbOption;
+  private StorageConfig.DbOptionOverride defaultDbOption;
+  private StorageConfig.DbOptionOverride defaultMDbOption;
+  private StorageConfig.DbOptionOverride defaultLDbOption;
 
   /**
    * Database storage directory: /path/to/{dbDirectory}
@@ -320,15 +320,45 @@ public Options newDefaultDbOptions(String name) {
     Options options = DbOptionalsUtils.newDefaultDbOptions(name, this.defaultDbOptions);
 
     if (defaultDbOption != null) {
-      applyPropertyOptions(defaultDbOption, options);
+      applyDbOptionOverride(defaultDbOption, options);
     }
     if (defaultMDbOption != null && DbOptionalsUtils.DB_M.contains(name)) {
-      applyPropertyOptions(defaultMDbOption, options);
+      applyDbOptionOverride(defaultMDbOption, options);
     }
     if (defaultLDbOption != null && DbOptionalsUtils.DB_L.contains(name)) {
-      applyPropertyOptions(defaultLDbOption, options);
+      applyDbOptionOverride(defaultLDbOption, options);
     }
 
     return options;
   }
+
+  // Apply only user-specified overrides (non-null fields) to LevelDB Options.
+  private static void applyDbOptionOverride(
+      StorageConfig.DbOptionOverride o, Options dbOptions) {
+    if (o.getCreateIfMissing() != null) {
+      dbOptions.createIfMissing(o.getCreateIfMissing());
+    }
+    if (o.getParanoidChecks() != null) {
+      dbOptions.paranoidChecks(o.getParanoidChecks());
+    }
+    if (o.getVerifyChecksums() != null) {
+      dbOptions.verifyChecksums(o.getVerifyChecksums());
+    }
+    if (o.getCompressionType() != null) {
+      dbOptions.compressionType(
+          CompressionType.getCompressionTypeByPersistentId(o.getCompressionType()));
+    }
+    if (o.getBlockSize() != null) {
+      dbOptions.blockSize(o.getBlockSize());
+    }
+    if (o.getWriteBufferSize() != null) {
+      dbOptions.writeBufferSize(o.getWriteBufferSize());
+    }
+    if (o.getCacheSize() != null) {
+      dbOptions.cacheSize(o.getCacheSize());
+    }
+    if (o.getMaxOpenFiles() != null) {
+      dbOptions.maxOpenFiles(o.getMaxOpenFiles());
+    }
+  }
 }

common/src/main/java/org/tron/core/config/args/StorageConfig.java

@@ -51,17 +51,17 @@ public Config getRawStorageConfig() {
   // Excluded from auto-binding: optional partial overrides that ConfigBeanFactory cannot handle.
   @Getter(lombok.AccessLevel.NONE)
   @Setter(lombok.AccessLevel.NONE)
-  private PropertyConfig defaultDbOption;
+  private DbOptionOverride defaultDbOption;
   @Getter(lombok.AccessLevel.NONE)
   @Setter(lombok.AccessLevel.NONE)
-  private PropertyConfig defaultMDbOption;
+  private DbOptionOverride defaultMDbOption;
   @Getter(lombok.AccessLevel.NONE)
   @Setter(lombok.AccessLevel.NONE)
-  private PropertyConfig defaultLDbOption;
+  private DbOptionOverride defaultLDbOption;
 
-  public PropertyConfig getDefaultDbOption() { return defaultDbOption; }
-  public PropertyConfig getDefaultMDbOption() { return defaultMDbOption; }
-  public PropertyConfig getDefaultLDbOption() { return defaultLDbOption; }
+  public DbOptionOverride getDefaultDbOption() { return defaultDbOption; }
+  public DbOptionOverride getDefaultMDbOption() { return defaultMDbOption; }
+  public DbOptionOverride getDefaultLDbOption() { return defaultLDbOption; }
 
   @Getter
   @Setter
@@ -174,7 +174,7 @@ public static class PropertyConfig {
     private int compressionType = 1;
     private int blockSize = 4096;
     private int writeBufferSize = 10485760;
-    private int cacheSize = 10485760;
+    private long cacheSize = 10485760;
     private int maxOpenFiles = 100;
   }
 
@@ -193,47 +193,62 @@ public static StorageConfig fromConfig(Config config) {
     return sc;
   }
 
+  // Partial LevelDB option override for default/defaultM/defaultL.
+  // Uses boxed types so null means "not set by user, keep existing value".
+  @Getter
+  @Setter
+  public static class DbOptionOverride {
+    private Boolean createIfMissing;
+    private Boolean paranoidChecks;
+    private Boolean verifyChecksums;
+    private Integer compressionType;
+    private Integer blockSize;
+    private Integer writeBufferSize;
+    private Long cacheSize;
+    private Integer maxOpenFiles;
+  }
+
   // Read optional LevelDB option override (default/defaultM/defaultL).
   // Not bean-bound: users may only set a subset of keys (e.g. just maxOpenFiles),
   // ConfigBeanFactory requires all fields present so partial overrides would fail.
-  private static PropertyConfig readDbOption(Config section, String key) {
+  private static DbOptionOverride readDbOption(Config section, String key) {
     if (!section.hasPath(key)) {
       return null;
     }
     ConfigObject conf = section.getObject(key);
-    PropertyConfig pc = new PropertyConfig();
+    DbOptionOverride o = new DbOptionOverride();
     if (conf.containsKey("createIfMissing")) {
-      pc.setCreateIfMissing(
+      o.setCreateIfMissing(
           Boolean.parseBoolean(conf.get("createIfMissing").unwrapped().toString()));
     }
     if (conf.containsKey("paranoidChecks")) {
-      pc.setParanoidChecks(
+      o.setParanoidChecks(
           Boolean.parseBoolean(conf.get("paranoidChecks").unwrapped().toString()));
     }
     if (conf.containsKey("verifyChecksums")) {
-      pc.setVerifyChecksums(
+      o.setVerifyChecksums(
           Boolean.parseBoolean(conf.get("verifyChecksums").unwrapped().toString()));
     }
     if (conf.containsKey("compressionType")) {
-      pc.setCompressionType(
+      o.setCompressionType(
           Integer.parseInt(conf.get("compressionType").unwrapped().toString()));
     }
     if (conf.containsKey("blockSize")) {
-      pc.setBlockSize(
+      o.setBlockSize(
           Integer.parseInt(conf.get("blockSize").unwrapped().toString()));
     }
     if (conf.containsKey("writeBufferSize")) {
-      pc.setWriteBufferSize(
+      o.setWriteBufferSize(
           Integer.parseInt(conf.get("writeBufferSize").unwrapped().toString()));
     }
     if (conf.containsKey("cacheSize")) {
-      pc.setCacheSize(
-          Integer.parseInt(conf.get("cacheSize").unwrapped().toString()));
+      o.setCacheSize(
+          Long.parseLong(conf.get("cacheSize").unwrapped().toString()));
     }
     if (conf.containsKey("maxOpenFiles")) {
-      pc.setMaxOpenFiles(
+      o.setMaxOpenFiles(
           Integer.parseInt(conf.get("maxOpenFiles").unwrapped().toString()));
     }
-    return pc;
+    return o;
   }
 }