feat(db): optimize internal db log print

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

@@ -73,7 +73,13 @@ public class LevelDbDataSourceImpl extends DbStat implements DbSourceInter<byte[
   private WriteOptions writeOptions;
   private ReadWriteLock resetDbLock = new ReentrantReadWriteLock();
   private static final String LEVELDB = "LEVELDB";
-  private static final Logger leveldbLogger = LoggerFactory.getLogger(LEVELDB)::info;
+  private static final org.slf4j.Logger innerLogger = LoggerFactory.getLogger(LEVELDB);
+  private Logger leveldbLogger = new Logger() {
+    @Override
+    public void log(String message) {
+      innerLogger.info("{} {}", dataBaseName, message);
+    }
+  };
 
   /**
    * constructor.
@@ -155,21 +161,6 @@ private void openDatabase(Options dbOptions) throws IOException {
     }
   }
 
-  @Deprecated
-  private Options createDbOptions() {
-    Options dbOptions = new Options();
-    dbOptions.createIfMissing(true);
-    dbOptions.compressionType(CompressionType.NONE);
-    dbOptions.blockSize(10 * 1024 * 1024);
-    dbOptions.writeBufferSize(10 * 1024 * 1024);
-    dbOptions.cacheSize(0);
-    dbOptions.paranoidChecks(true);
-    dbOptions.verifyChecksums(true);
-    dbOptions.maxOpenFiles(32);
-    dbOptions.logger(leveldbLogger);
-    return dbOptions;
-  }
-
   public Path getDbPath() {
     return Paths.get(parentPath, dataBaseName);
   }
@@ -193,24 +184,6 @@ public boolean isAlive() {
     return alive;
   }
 
-  /**
-   * destroy database.
-   */
-  public void destroyDb(File fileLocation) {
-    resetDbLock.writeLock().lock();
-    try {
-      logger.debug("Destroying existing database: " + fileLocation);
-      Options options = new Options().logger(leveldbLogger);
-      try {
-        factory.destroy(fileLocation, options);
-      } catch (IOException e) {
-        logger.error(e.getMessage(), e);
-      }
-    } finally {
-      resetDbLock.writeLock().unlock();
-    }
-  }
-
   @Override
   public String getDBName() {
     return dataBaseName;
@@ -490,10 +463,6 @@ public Stream<Entry<byte[], byte[]>> stream() {
     return StreamSupport.stream(spliterator(), false);
   }
 
-  public Stream<Entry<byte[], byte[]>> parallelStream() {
-    return StreamSupport.stream(spliterator(), true);
-  }
-
   @Override
   public LevelDbDataSourceImpl newInstance() {
     return new LevelDbDataSourceImpl(StorageUtils.getOutputDirectoryByDbName(dataBaseName),

chainbase/src/main/java/org/tron/common/storage/rocksdb/RocksDbDataSourceImpl.java

@@ -236,7 +236,7 @@ public void initDB(RocksDbSettings settings) {
         options.setLogger(new Logger(options) {
           @Override
           protected void log(InfoLogLevel infoLogLevel, String logMsg) {
-            rocksDbLogger.info(logMsg);
+            rocksDbLogger.info("{} {}", dataBaseName, logMsg);
           }
         });
 

common/src/main/java/org/tron/common/log/layout/MultiLayoutPattern.java

@@ -0,0 +1,106 @@
+package org.tron.common.log.layout;
+
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.Layout;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class MultiLayoutPattern extends PatternLayoutEncoder {
+  private List<Rule> rules = new ArrayList<>();
+  private Map<String, Layout<ILoggingEvent>> layoutMap = new HashMap<>();
+
+  public void addRule(Rule rule) {
+    this.rules.add(rule);
+    rule.start(context);
+  }
+
+  public byte[] encode(ILoggingEvent event) {
+    Layout<ILoggingEvent> layout = getLayout(event.getLoggerName());
+    String txt = layout.doLayout(event);
+    return convertToBytes(txt);
+  }
+
+  private byte[] convertToBytes(String s) {
+    Charset charset = getCharset();
+    if (charset == null) {
+      return s.getBytes();
+    } else {
+      return s.getBytes(charset);
+    }
+  }
+
+  private Layout<ILoggingEvent> getLayout(final String name) {
+    if (name == null) {
+      throw new IllegalArgumentException("name cannot be null");
+    }
+    if (Logger.ROOT_LOGGER_NAME.equalsIgnoreCase(name)) {
+      return this.getLayout();
+    }
+    if (layoutMap.containsKey(name)) {
+      return layoutMap.get(name);
+    }
+    Layout<ILoggingEvent> layout = getLayout();
+    for (Rule rule : rules) {
+      if (rule.logger.equals(name)) {
+        layout = rule.getPatternLayoutEncoder().getLayout();
+        break;
+      }
+    }
+    layoutMap.put(name, layout);
+    return layout;
+  }
+
+  @Override
+  public void start() {
+    super.start();
+  }
+
+  public static class Rule {
+    private String logger;
+    private String pattern;
+    private PatternLayoutEncoder patternLayoutEncoder;
+    private boolean outputPatternAsHeader = false;
+
+    public String getLogger() {
+      return logger;
+    }
+
+    public void setLogger(String logger) {
+      this.logger = logger;
+    }
+
+    public String getPattern() {
+      return pattern;
+    }
+
+    public void setPattern(String pattern) {
+      this.pattern = pattern;
+    }
+
+    public boolean isOutputPatternAsHeader() {
+      return outputPatternAsHeader;
+    }
+
+    public void setOutputPatternAsHeader(boolean outputPatternAsHeader) {
+      this.outputPatternAsHeader = outputPatternAsHeader;
+    }
+
+    public PatternLayoutEncoder getPatternLayoutEncoder() {
+      return patternLayoutEncoder;
+    }
+
+    public void start(Context context) {
+      patternLayoutEncoder = new PatternLayoutEncoder();
+      patternLayoutEncoder.setPattern(pattern);
+      patternLayoutEncoder.setContext(context);
+      patternLayoutEncoder.setOutputPatternAsHeader(outputPatternAsHeader);
+      patternLayoutEncoder.start();
+    }
+  }
+}

framework/src/main/resources/logback.xml

@@ -26,8 +26,16 @@
       <maxHistory>7</maxHistory>
       <totalSizeCap>50GB</totalSizeCap>
     </rollingPolicy>
-    <encoder>
+    <encoder class="org.tron.common.log.layout.MultiLayoutPattern">
       <pattern>%d{HH:mm:ss.SSS} %-5level [%t] [%c{1}]\(%F:%L\) %m%n</pattern>
+      <rule>
+        <logger>LEVELDB</logger>
+        <pattern>%d{HH:mm:ss.SSS} %m%n</pattern>
+      </rule>
+      <rule>
+        <logger>ROCKSDB</logger>
+        <pattern>%d{HH:mm:ss.SSS} %m%n</pattern>
+      </rule>
     </encoder>
     <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
       <level>TRACE</level>
@@ -69,7 +77,8 @@
   <logger level="INFO" name="DB"/>
   <logger level="INFO" name="capsule"/>
   <logger level="INFO" name="VM"/>
-
+  <logger level="INFO" name="LEVELDB"/>
+  <logger level="INFO" name="ROCKSDB"/>
   <logger level="INFO" name="tool" additivity="false">
     <appender-ref ref="CONSOLE"/>
   </logger>