andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix compatibility of public ticker stats (#4701)

Browse Source 
Summary:
- Added back the `NO_ITERATORS` that was removed in 5945e16dfc.
- Marked it as deprecated since it is no longer populated, but kept for API compatibility.
- Made sure the new tickers, `NO_ITERATOR_CREATED` and `NO_ITERATOR_DELETED`, are appended at the end of the enum, in case people are relying on the int values.

The change where `NO_ITERATOR_CREATED` and `NO_ITERATOR_DELETED` were introduced is unreleased so I believe it is ok to change their ordering.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/4701

Differential Revision: D13142887

Pulled By: ajkr

fbshipit-source-id: 29a336ce5b46632ce50ad42ccc4a29013f71d6d6
This commit is contained in:
Andrew Kryczka 2018-11-20 13:10:05 -08:00 committed by Facebook Github Bot
parent 327097c952
commit a138e351bc
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/rocksdb/statistics.h
View File

@ -155,7 +155,8 @@ enum Tickers : uint32_t {
// Disabled by default. To enable it set stats level to kAll // Disabled by default. To enable it set stats level to kAll
DB_MUTEX_WAIT_MICROS, DB_MUTEX_WAIT_MICROS,
RATE_LIMIT_DELAY_MILLIS, RATE_LIMIT_DELAY_MILLIS,
NO_ITERATOR_CREATED, // number of iterators created // DEPRECATED number of iterators currently open
NO_ITERATORS,
// Number of MultiGet calls, keys read, and bytes read // Number of MultiGet calls, keys read, and bytes read
NUMBER_MULTIGET_CALLS, NUMBER_MULTIGET_CALLS,
@ -323,6 +324,7 @@ enum Tickers : uint32_t {
// NUMBER_MULTIGET_KEYS_READ gives the number requested by caller // NUMBER_MULTIGET_KEYS_READ gives the number requested by caller
NUMBER_MULTIGET_KEYS_FOUND, NUMBER_MULTIGET_KEYS_FOUND,
NO_ITERATOR_CREATED, // number of iterators created
NO_ITERATOR_DELETED, // number of iterators deleted NO_ITERATOR_DELETED, // number of iterators deleted
TICKER_ENUM_MAX TICKER_ENUM_MAX
}; };
@ -394,7 +396,7 @@ const std::vector<std::pair<Tickers, std::string>> TickersNameMap = {
{STALL_MICROS, "rocksdb.stall.micros"}, {STALL_MICROS, "rocksdb.stall.micros"},
{DB_MUTEX_WAIT_MICROS, "rocksdb.db.mutex.wait.micros"}, {DB_MUTEX_WAIT_MICROS, "rocksdb.db.mutex.wait.micros"},
{RATE_LIMIT_DELAY_MILLIS, "rocksdb.rate.limit.delay.millis"}, {RATE_LIMIT_DELAY_MILLIS, "rocksdb.rate.limit.delay.millis"},
{NO_ITERATOR_CREATED, "rocksdb.num.iterator.created"}, {NO_ITERATORS, "rocksdb.num.iterators"},
{NUMBER_MULTIGET_CALLS, "rocksdb.number.multiget.get"}, {NUMBER_MULTIGET_CALLS, "rocksdb.number.multiget.get"},
{NUMBER_MULTIGET_KEYS_READ, "rocksdb.number.multiget.keys.read"}, {NUMBER_MULTIGET_KEYS_READ, "rocksdb.number.multiget.keys.read"},
{NUMBER_MULTIGET_BYTES_READ, "rocksdb.number.multiget.bytes.read"}, {NUMBER_MULTIGET_BYTES_READ, "rocksdb.number.multiget.bytes.read"},
@ -476,6 +478,7 @@ const std::vector<std::pair<Tickers, std::string>> TickersNameMap = {
{TXN_DUPLICATE_KEY_OVERHEAD, "rocksdb.txn.overhead.duplicate.key"}, {TXN_DUPLICATE_KEY_OVERHEAD, "rocksdb.txn.overhead.duplicate.key"},
{TXN_SNAPSHOT_MUTEX_OVERHEAD, "rocksdb.txn.overhead.mutex.snapshot"}, {TXN_SNAPSHOT_MUTEX_OVERHEAD, "rocksdb.txn.overhead.mutex.snapshot"},
{NUMBER_MULTIGET_KEYS_FOUND, "rocksdb.number.multiget.keys.found"}, {NUMBER_MULTIGET_KEYS_FOUND, "rocksdb.number.multiget.keys.found"},
{NO_ITERATOR_CREATED, "rocksdb.num.iterator.created"},
{NO_ITERATOR_DELETED, "rocksdb.num.iterator.deleted"}, {NO_ITERATOR_DELETED, "rocksdb.num.iterator.deleted"},
}; };

8
java/rocksjni/portal.h
View File

@ -3301,7 +3301,7 @@ class TickerTypeJni {
return 0x36; return 0x36;
case rocksdb::Tickers::RATE_LIMIT_DELAY_MILLIS: case rocksdb::Tickers::RATE_LIMIT_DELAY_MILLIS:
return 0x37; return 0x37;
case rocksdb::Tickers::NO_ITERATOR_CREATED: case rocksdb::Tickers::NO_ITERATORS:
return 0x38; return 0x38;
case rocksdb::Tickers::NUMBER_MULTIGET_CALLS: case rocksdb::Tickers::NUMBER_MULTIGET_CALLS:
return 0x39; return 0x39;
@ -3379,10 +3379,12 @@ class TickerTypeJni {
return 0x5D; return 0x5D;
case rocksdb::Tickers::NUMBER_MULTIGET_KEYS_FOUND: case rocksdb::Tickers::NUMBER_MULTIGET_KEYS_FOUND:
return 0x5E; return 0x5E;
case rocksdb::Tickers::NO_ITERATOR_DELETED: case rocksdb::Tickers::NO_ITERATOR_CREATED:
return 0x5F; return 0x5F;
case rocksdb::Tickers::TICKER_ENUM_MAX: case rocksdb::Tickers::NO_ITERATOR_DELETED:
return 0x60; return 0x60;
case rocksdb::Tickers::TICKER_ENUM_MAX:
return 0x61;
default: default:
// undefined/default // undefined/default