feat(lite):optimize DbLite tool (#5658)

tronprotocol · Jan 11, 2024 · 81fbe87 · 81fbe87
1 parent e14f3dd
commit 81fbe87
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/plugins/src/main/java/org/tron/plugins/DbLite.java b/plugins/src/main/java/org/tron/plugins/DbLite.java
@@ -355,15 +355,7 @@ private void generateInfoProperties(String propertyfile, long num)
   private long getLatestBlockHeaderNum(String databaseDir) throws IOException, RocksDBException {
     // query latest_block_header_number from checkpoint first
     final String latestBlockHeaderNumber = "latest_block_header_number";
-    List<String> cpList = getCheckpointV2List(databaseDir);
-    DBInterface checkpointDb;
-    if (cpList.size() > 0) {
-      String lastestCp = cpList.get(cpList.size() - 1);
-      checkpointDb = DbTool.getDB(
-          databaseDir + "/" + DBUtils.CHECKPOINT_DB_V2, lastestCp);
-    } else {
-      checkpointDb = DbTool.getDB(databaseDir, CHECKPOINT_DB);
-    }
+    DBInterface checkpointDb = getCheckpointDb(databaseDir);
     Long blockNumber = getLatestBlockHeaderNumFromCP(checkpointDb,
         latestBlockHeaderNumber.getBytes());
     if (blockNumber != null) {
@@ -594,7 +586,7 @@ private void mergeBak2Database(String liteDir, BlockNumInfo blockNumInfo) throws
   private byte[] getDataFromSourceDB(String sourceDir, String dbName, byte[] key)
           throws IOException, RocksDBException {
     DBInterface sourceDb = DbTool.getDB(sourceDir, dbName);
-    DBInterface checkpointDb = DbTool.getDB(sourceDir, CHECKPOINT_DB);
+    DBInterface checkpointDb = getCheckpointDb(sourceDir);
     // get data from tmp first.
     byte[] valueFromTmp = checkpointDb.get(Bytes.concat(simpleEncode(dbName), key));
     byte[] value;
@@ -672,6 +664,19 @@ private long getSecondBlock(String databaseDir) throws RocksDBException, IOExcep
     return num;
   }
 
+  private DBInterface getCheckpointDb(String sourceDir) throws IOException, RocksDBException {
+    List<String> cpList = getCheckpointV2List(sourceDir);
+    DBInterface checkpointDb;
+    if (cpList.size() > 0) {
+      String latestCp = cpList.get(cpList.size() - 1);
+      checkpointDb = DbTool.getDB(
+          sourceDir + "/" + DBUtils.CHECKPOINT_DB_V2, latestCp);
+    } else {
+      checkpointDb = DbTool.getDB(sourceDir, CHECKPOINT_DB);
+    }
+    return checkpointDb;
+  }
+
   @VisibleForTesting
   public static void setRecentBlks(long recentBlks) {
     RECENT_BLKS = recentBlks;