Skip to content

Commit 12b6696

Browse files
committed
Resolve missing/inconsistent tickers in Java (facebook#14012)
Summary: Pretty self-explanatory from the changes, including re-arranging the "COOL" entries for easier tracking of which values are used. I'm not touching the TICKER_ENUM_MAX issue because IIRC we've gotten in trouble in the past for changing any Java ticker values. Pull Request resolved: facebook#14012 Test Plan: CI, sufficient prompts to get AI to discover the known issues relayed by hx235, to help ensure we found any other outstanding issues. Reviewed By: hx235 Differential Revision: D83497503 Pulled By: pdillinger fbshipit-source-id: ec0bd7e28188e0430fb03fc5bd79c2ed7b28f3ad
1 parent 10985ce commit 12b6696

2 files changed

Lines changed: 34 additions & 10 deletions

File tree

java/rocksjni/portal.h

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5199,16 +5199,12 @@ class TickerTypeJni {
51995199
return -0x31;
52005200
case ROCKSDB_NAMESPACE::Tickers::WARM_FILE_READ_BYTES:
52015201
return -0x32;
5202-
case ROCKSDB_NAMESPACE::Tickers::COOL_FILE_READ_BYTES:
5203-
return -0x5B;
52045202
case ROCKSDB_NAMESPACE::Tickers::COLD_FILE_READ_BYTES:
52055203
return -0x33;
52065204
case ROCKSDB_NAMESPACE::Tickers::HOT_FILE_READ_COUNT:
52075205
return -0x34;
52085206
case ROCKSDB_NAMESPACE::Tickers::WARM_FILE_READ_COUNT:
52095207
return -0x35;
5210-
case ROCKSDB_NAMESPACE::Tickers::COOL_FILE_READ_COUNT:
5211-
return -0x5C;
52125208
case ROCKSDB_NAMESPACE::Tickers::COLD_FILE_READ_COUNT:
52135209
return -0x36;
52145210
case ROCKSDB_NAMESPACE::Tickers::LAST_LEVEL_READ_BYTES:
@@ -5283,6 +5279,14 @@ class TickerTypeJni {
52835279
return -0x59;
52845280
case ROCKSDB_NAMESPACE::Tickers::ICE_FILE_READ_COUNT:
52855281
return -0x5A;
5282+
case ROCKSDB_NAMESPACE::Tickers::COOL_FILE_READ_BYTES:
5283+
return -0x5B;
5284+
case ROCKSDB_NAMESPACE::Tickers::COOL_FILE_READ_COUNT:
5285+
return -0x5C;
5286+
case ROCKSDB_NAMESPACE::Tickers::NUMBER_WBWI_INGEST:
5287+
return -0x5D;
5288+
case ROCKSDB_NAMESPACE::Tickers::SST_USER_DEFINED_INDEX_LOAD_FAIL_COUNT:
5289+
return -0x5E;
52865290
case ROCKSDB_NAMESPACE::Tickers::TICKER_ENUM_MAX:
52875291
// -0x54 is the max value at this time. Since these values are exposed
52885292
// directly to Java clients, we'll keep the value the same till the next
@@ -5668,16 +5672,12 @@ class TickerTypeJni {
56685672
return ROCKSDB_NAMESPACE::Tickers::HOT_FILE_READ_BYTES;
56695673
case -0x32:
56705674
return ROCKSDB_NAMESPACE::Tickers::WARM_FILE_READ_BYTES;
5671-
case -0x5B:
5672-
return ROCKSDB_NAMESPACE::Tickers::COOL_FILE_READ_BYTES;
56735675
case -0x33:
56745676
return ROCKSDB_NAMESPACE::Tickers::COLD_FILE_READ_BYTES;
56755677
case -0x34:
56765678
return ROCKSDB_NAMESPACE::Tickers::HOT_FILE_READ_COUNT;
56775679
case -0x35:
56785680
return ROCKSDB_NAMESPACE::Tickers::WARM_FILE_READ_COUNT;
5679-
case -0x5C:
5680-
return ROCKSDB_NAMESPACE::Tickers::COOL_FILE_READ_COUNT;
56815681
case -0x36:
56825682
return ROCKSDB_NAMESPACE::Tickers::COLD_FILE_READ_COUNT;
56835683
case -0x37:
@@ -5755,6 +5755,15 @@ class TickerTypeJni {
57555755
return ROCKSDB_NAMESPACE::Tickers::ICE_FILE_READ_BYTES;
57565756
case -0x5A:
57575757
return ROCKSDB_NAMESPACE::Tickers::ICE_FILE_READ_COUNT;
5758+
case -0x5B:
5759+
return ROCKSDB_NAMESPACE::Tickers::COOL_FILE_READ_BYTES;
5760+
case -0x5C:
5761+
return ROCKSDB_NAMESPACE::Tickers::COOL_FILE_READ_COUNT;
5762+
case -0x5D:
5763+
return ROCKSDB_NAMESPACE::Tickers::NUMBER_WBWI_INGEST;
5764+
case -0x5E:
5765+
return ROCKSDB_NAMESPACE::Tickers::
5766+
SST_USER_DEFINED_INDEX_LOAD_FAIL_COUNT;
57585767
case -0x54:
57595768
// -0x54 is the max value at this time. Since these values are exposed
57605769
// directly to Java clients, we'll keep the value the same till the next

java/src/main/java/org/rocksdb/TickerType.java

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -766,12 +766,12 @@ public enum TickerType {
766766
WARM_FILE_READ_BYTES((byte) -0x32),
767767
COOL_FILE_READ_BYTES((byte) -0x5B),
768768
COLD_FILE_READ_BYTES((byte) -0x33),
769-
ICE_FILE_READ_BYTES((byte) -0x58),
769+
ICE_FILE_READ_BYTES((byte) -0x59),
770770
HOT_FILE_READ_COUNT((byte) -0x34),
771771
WARM_FILE_READ_COUNT((byte) -0x35),
772772
COOL_FILE_READ_COUNT((byte) -0x5C),
773773
COLD_FILE_READ_COUNT((byte) -0x36),
774-
ICE_FILE_READ_COUNT((byte) -0x59),
774+
ICE_FILE_READ_COUNT((byte) -0x5A),
775775

776776
/**
777777
* (non-)last level read statistics
@@ -874,6 +874,8 @@ public enum TickerType {
874874

875875
FIFO_TTL_COMPACTIONS((byte) -0x50),
876876

877+
FIFO_CHANGE_TEMPERATURE_COMPACTIONS((byte) -0x58),
878+
877879
PREFETCH_BYTES((byte) -0x51),
878880

879881
PREFETCH_BYTES_USEFUL((byte) -0x52),
@@ -886,6 +888,19 @@ public enum TickerType {
886888

887889
FILE_READ_CORRUPTION_RETRY_SUCCESS_COUNT((byte) -0x57),
888890

891+
/**
892+
* Counter for the number of times a WBWI is ingested into the DB. This
893+
* happens when IngestWriteBatchWithIndex() is used and when large
894+
* transaction optimization is enabled through
895+
* TransactionOptions::large_txn_commit_optimize_threshold.
896+
*/
897+
NUMBER_WBWI_INGEST((byte) -0x5D),
898+
899+
/**
900+
* Failure to load the UDI during SST table open
901+
*/
902+
SST_USER_DEFINED_INDEX_LOAD_FAIL_COUNT((byte) -0x5E),
903+
889904
TICKER_ENUM_MAX((byte) -0x54);
890905

891906
private final byte value;

0 commit comments

Comments
 (0)