diff --git a/pom.xml b/pom.xml index b5c77d1..caec99e 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ false 1.10.4 9.7.0 - 8.1.1.1 + 8.3.2 5.9.0 1.0.10 diff --git a/src/main/java/it/cavallium/dbengine/database/RocksDBLongProperty.java b/src/main/java/it/cavallium/dbengine/database/RocksDBLongProperty.java index d1c1c5d..77371b5 100644 --- a/src/main/java/it/cavallium/dbengine/database/RocksDBLongProperty.java +++ b/src/main/java/it/cavallium/dbengine/database/RocksDBLongProperty.java @@ -60,7 +60,8 @@ public enum RocksDBLongProperty implements RocksDBProperty { NUM_BLOB_FILES("num-blob-files"), TOTAL_BLOB_FILE_SIZE("total-blob-file-size"), LIVE_BLOB_FILE_SIZE("live-blob-file-size"), - LIVE_BLOB_FILE_GARBAGE_SIZE("live-blob-file-garbage-size") + LIVE_BLOB_FILE_GARBAGE_SIZE("live-blob-file-garbage-size"), + FILE_READ_DB_OPEN_MICROS("file.read.db.open.micros") ; private final String name; diff --git a/src/main/java/it/cavallium/dbengine/database/RocksDBProperty.java b/src/main/java/it/cavallium/dbengine/database/RocksDBProperty.java index 3b7e93d..98940d2 100644 --- a/src/main/java/it/cavallium/dbengine/database/RocksDBProperty.java +++ b/src/main/java/it/cavallium/dbengine/database/RocksDBProperty.java @@ -2,6 +2,10 @@ package it.cavallium.dbengine.database; public interface RocksDBProperty { + /** + * Get rocksdb property name + * @return name, with the "rocksdb." prefix included + */ String getName(); boolean isNumeric(); diff --git a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalDictionary.java b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalDictionary.java index 0f5815a..6e4ea61 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalDictionary.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalDictionary.java @@ -28,6 +28,7 @@ import it.cavallium.dbengine.database.LLRange; import it.cavallium.dbengine.database.LLSnapshot; import it.cavallium.dbengine.database.LLUtils; import it.cavallium.dbengine.database.OptionalBuf; +import it.cavallium.dbengine.database.RocksDBLongProperty; import it.cavallium.dbengine.database.SerializedKey; import it.cavallium.dbengine.database.UpdateMode; import it.cavallium.dbengine.database.UpdateReturnMode; @@ -976,7 +977,7 @@ public class LLLocalDictionary implements LLDictionary { if (USE_NUM_ENTRIES_PRECISE_COUNTER) { return getRocksDBNumEntries(); } - return db.getLongProperty("rocksdb.estimate-num-keys"); + return db.getLongProperty(RocksDBLongProperty.ESTIMATE_NUM_KEYS.getName()); } catch (RocksDBException e) { logger.error(MARKER_ROCKSDB, "Failed to get RocksDB estimated keys count property", e); return 0; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyValueDatabase.java b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyValueDatabase.java index e1e1e36..caf64c7 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyValueDatabase.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyValueDatabase.java @@ -1260,13 +1260,13 @@ public class LLLocalKeyValueDatabase extends Backuppable implements LLKeyValueDa try { if (closeRequested || closed || closeReadLock == 0) return null; ensureOpen(); - return new MemoryStats(db.getAggregatedLongProperty("rocksdb.estimate-table-readers-mem"), - db.getAggregatedLongProperty("rocksdb.size-all-mem-tables"), - db.getAggregatedLongProperty("rocksdb.cur-size-all-mem-tables"), - db.getAggregatedLongProperty("rocksdb.estimate-num-keys"), - db.getAggregatedLongProperty("rocksdb.block-cache-usage") / this.handles.size(), - db.getAggregatedLongProperty("rocksdb.block-cache-pinned-usage") / this.handles.size(), - db.getAggregatedLongProperty("rocksdb.num-live-versions") / this.handles.size() + return new MemoryStats(db.getAggregatedLongProperty(RocksDBLongProperty.ESTIMATE_TABLE_READERS_MEM.getName()), + db.getAggregatedLongProperty(RocksDBLongProperty.SIZE_ALL_MEM_TABLES.getName()), + db.getAggregatedLongProperty(RocksDBLongProperty.CUR_SIZE_ALL_MEM_TABLES.getName()), + db.getAggregatedLongProperty(RocksDBLongProperty.ESTIMATE_NUM_KEYS.getName()), + db.getAggregatedLongProperty(RocksDBLongProperty.BLOCK_CACHE_USAGE.getName()) / this.handles.size(), + db.getAggregatedLongProperty(RocksDBLongProperty.BLOCK_CACHE_PINNED_USAGE.getName()) / this.handles.size(), + db.getAggregatedLongProperty(RocksDBLongProperty.NUM_LIVE_VERSIONS.getName()) / this.handles.size() ); } catch (RocksDBException e) { throw new DBException("Failed to read memory stats", e);