diff --git a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/storage/RocksDbSubCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/storage/RocksDbSubCommand.java index e7bfe05cf1d..9ca55cbc38b 100644 --- a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/storage/RocksDbSubCommand.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/storage/RocksDbSubCommand.java @@ -74,9 +74,8 @@ public void run() { .storageSubCommand .besuCommand .dataDir() - .toString() - .concat("/") - .concat(DATABASE_PATH); + .resolve(DATABASE_PATH) + .toString(); RocksDbHelper.printTableHeader(out); @@ -120,9 +119,8 @@ public void run() { .storageSubCommand .besuCommand .dataDir() - .toString() - .concat("/") - .concat(DATABASE_PATH); + .resolve(DATABASE_PATH) + .toString(); out.println("Column Family Stats..."); RocksDbHelper.forEachColumnFamily( diff --git a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/storage/TrieLogSubCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/storage/TrieLogSubCommand.java index 5ff5396508c..47bad2292e4 100644 --- a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/storage/TrieLogSubCommand.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/storage/TrieLogSubCommand.java @@ -180,10 +180,13 @@ private long estimatedSizeOfTrieLogs() { (rocksdb, cfHandle) -> { try { if (Arrays.equals(cfHandle.getName(), TRIE_LOG_STORAGE.getId())) { - // TODO SLD use sst + blob? - estimatedSaving.set( - Long.parseLong( - rocksdb.getProperty(cfHandle, "rocksdb.estimate-live-data-size"))); + + final long sstSize = + Long.parseLong(rocksdb.getProperty(cfHandle, "rocksdb.total-sst-files-size")); + final long blobSize = + Long.parseLong(rocksdb.getProperty(cfHandle, "rocksdb.total-blob-file-size")); + + estimatedSaving.set(sstSize + blobSize); } } catch (RocksDBException | NumberFormatException e) { throw new RuntimeException(e);