From 8c76844742744042b297425d825fa4214929263c Mon Sep 17 00:00:00 2001 From: fyrz Date: Wed, 25 Feb 2015 23:34:10 +0100 Subject: [PATCH] [RocksJava] Updated TickerTypes and Histogram to 3.10 Updated tickers and histogram types to 3.10. --- .../main/java/org/rocksdb/HistogramType.java | 6 +- .../src/main/java/org/rocksdb/TickerType.java | 93 +++++++++++-------- 2 files changed, 58 insertions(+), 41 deletions(-) diff --git a/java/src/main/java/org/rocksdb/HistogramType.java b/java/src/main/java/org/rocksdb/HistogramType.java index 751c03a11..e0a3db095 100644 --- a/java/src/main/java/org/rocksdb/HistogramType.java +++ b/java/src/main/java/org/rocksdb/HistogramType.java @@ -19,13 +19,15 @@ public enum HistogramType { READ_BLOCK_COMPACTION_MICROS(9), READ_BLOCK_GET_MICROS(10), WRITE_RAW_BLOCK_MICROS(11), - STALL_L0_SLOWDOWN_COUNT(12), STALL_MEMTABLE_COMPACTION_COUNT(13), STALL_L0_NUM_FILES_COUNT(14), HARD_RATE_LIMIT_DELAY_COUNT(15), SOFT_RATE_LIMIT_DELAY_COUNT(16), - NUM_FILES_IN_SINGLE_COMPACTION(17); + NUM_FILES_IN_SINGLE_COMPACTION(17), + DB_SEEK(18), + WRITE_STALL(19), + HISTOGRAM_ENUM_MAX(20); private final int value_; diff --git a/java/src/main/java/org/rocksdb/TickerType.java b/java/src/main/java/org/rocksdb/TickerType.java index 5ad714d30..46d87dc7d 100644 --- a/java/src/main/java/org/rocksdb/TickerType.java +++ b/java/src/main/java/org/rocksdb/TickerType.java @@ -38,78 +38,93 @@ public enum TickerType { // # of memtable misses. MEMTABLE_MISS(11), + // # of Get() queries served by L0 + GET_HIT_L0(12), + // # of Get() queries served by L1 + GET_HIT_L1(13), + // # of Get() queries served by L2 and up + GET_HIT_L2_AND_UP(14), + /** * COMPACTION_KEY_DROP_* count the reasons for key drop during compaction * There are 3 reasons currently. */ - COMPACTION_KEY_DROP_NEWER_ENTRY(12), // key was written with a newer value. - COMPACTION_KEY_DROP_OBSOLETE(13), // The key is obsolete. - COMPACTION_KEY_DROP_USER(14), // user compaction function has dropped the key. + COMPACTION_KEY_DROP_NEWER_ENTRY(15), // key was written with a newer value. + COMPACTION_KEY_DROP_OBSOLETE(16), // The key is obsolete. + COMPACTION_KEY_DROP_USER(17), // user compaction function has dropped the key. // Number of keys written to the database via the Put and Write call's - NUMBER_KEYS_WRITTEN(15), + NUMBER_KEYS_WRITTEN(18), // Number of Keys read, - NUMBER_KEYS_READ(16), + NUMBER_KEYS_READ(19), // Number keys updated, if inplace update is enabled - NUMBER_KEYS_UPDATED(17), + NUMBER_KEYS_UPDATED(20), // Bytes written / read - BYTES_WRITTEN(18), - BYTES_READ(19), - NO_FILE_CLOSES(20), - NO_FILE_OPENS(21), - NO_FILE_ERRORS(22), + BYTES_WRITTEN(21), + BYTES_READ(22), + NO_FILE_CLOSES(23), + NO_FILE_OPENS(24), + NO_FILE_ERRORS(25), // Time system had to wait to do LO-L1 compactions - STALL_L0_SLOWDOWN_MICROS(23), + STALL_L0_SLOWDOWN_MICROS(26), // Time system had to wait to move memtable to L1. - STALL_MEMTABLE_COMPACTION_MICROS(24), + STALL_MEMTABLE_COMPACTION_MICROS(27), // write throttle because of too many files in L0 - STALL_L0_NUM_FILES_MICROS(25), - RATE_LIMIT_DELAY_MILLIS(26), - NO_ITERATORS(27), // number of iterators currently open + STALL_L0_NUM_FILES_MICROS(28), + // Writer has to wait for compaction or flush to finish. + STALL_MICROS(29), + // The wait time for db mutex. + DB_MUTEX_WAIT_MICROS(30), + RATE_LIMIT_DELAY_MILLIS(31), + NO_ITERATORS(32), // number of iterators currently open // Number of MultiGet calls, keys read, and bytes read - NUMBER_MULTIGET_CALLS(28), - NUMBER_MULTIGET_KEYS_READ(29), - NUMBER_MULTIGET_BYTES_READ(30), + NUMBER_MULTIGET_CALLS(33), + NUMBER_MULTIGET_KEYS_READ(34), + NUMBER_MULTIGET_BYTES_READ(35), // Number of deletes records that were not required to be // written to storage because key does not exist - NUMBER_FILTERED_DELETES(31), - NUMBER_MERGE_FAILURES(32), - SEQUENCE_NUMBER(33), + NUMBER_FILTERED_DELETES(36), + NUMBER_MERGE_FAILURES(37), + SEQUENCE_NUMBER(38), // number of times bloom was checked before creating iterator on a // file, and the number of times the check was useful in avoiding // iterator creation (and thus likely IOPs). - BLOOM_FILTER_PREFIX_CHECKED(34), - BLOOM_FILTER_PREFIX_USEFUL(35), + BLOOM_FILTER_PREFIX_CHECKED(39), + BLOOM_FILTER_PREFIX_USEFUL(40), // Number of times we had to reseek inside an iteration to skip // over large number of keys with same userkey. - NUMBER_OF_RESEEKS_IN_ITERATION(36), + NUMBER_OF_RESEEKS_IN_ITERATION(41), // Record the number of calls to GetUpadtesSince. Useful to keep track of // transaction log iterator refreshes - GET_UPDATES_SINCE_CALLS(37), - BLOCK_CACHE_COMPRESSED_MISS(38), // miss in the compressed block cache - BLOCK_CACHE_COMPRESSED_HIT(39), // hit in the compressed block cache - WAL_FILE_SYNCED(40), // Number of times WAL sync is done - WAL_FILE_BYTES(41), // Number of bytes written to WAL + GET_UPDATES_SINCE_CALLS(42), + BLOCK_CACHE_COMPRESSED_MISS(43), // miss in the compressed block cache + BLOCK_CACHE_COMPRESSED_HIT(44), // hit in the compressed block cache + WAL_FILE_SYNCED(45), // Number of times WAL sync is done + WAL_FILE_BYTES(46), // Number of bytes written to WAL // Writes can be processed by requesting thread or by the thread at the // head of the writers queue. - WRITE_DONE_BY_SELF(42), - WRITE_DONE_BY_OTHER(43), - WRITE_WITH_WAL(44), // Number of Write calls that request WAL - COMPACT_READ_BYTES(45), // Bytes read during compaction - COMPACT_WRITE_BYTES(46), // Bytes written during compaction + WRITE_DONE_BY_SELF(47), + WRITE_DONE_BY_OTHER(48), + WRITE_TIMEDOUT(49), // Number of writes ending up with timed-out. + WRITE_WITH_WAL(50), // Number of Write calls that request WAL + COMPACT_READ_BYTES(51), // Bytes read during compaction + COMPACT_WRITE_BYTES(52), // Bytes written during compaction + FLUSH_WRITE_BYTES(53), // Bytes written during flush // Number of table's properties loaded directly from file, without creating // table reader object. - NUMBER_DIRECT_LOAD_TABLE_PROPERTIES(47), - NUMBER_SUPERVERSION_ACQUIRES(48), - NUMBER_SUPERVERSION_RELEASES(49), - NUMBER_SUPERVERSION_CLEANUPS(50); + NUMBER_DIRECT_LOAD_TABLE_PROPERTIES(54), + NUMBER_SUPERVERSION_ACQUIRES(55), + NUMBER_SUPERVERSION_RELEASES(56), + NUMBER_SUPERVERSION_CLEANUPS(57), + NUMBER_BLOCK_NOT_COMPRESSED(58), + TICKER_ENUM_MAX(59); private final int value_;