From a2dec2ed08c1d1f5dbab04e8c3ecdad9fc18332c Mon Sep 17 00:00:00 2001 From: Sagar Vemuri Date: Tue, 27 Nov 2018 10:12:11 -0800 Subject: [PATCH] Fix Java to C++ ticker conversions (#4719) Summary: Added back `NO_ITERATORS` and moved `NO_ITERATOR_CREATED` to the end of `toCppTickers`. This is a leftover fix which is needed in addition to a138e351bcc017667560c7ecbb295800b30881c2 to correctly convert java tickers to c++ tickers. a138e351bcc017667560c7ecbb295800b30881c2 only updated `toJavaTickerType` but both `toJavaTickerType` and `toCppTickers` need to be changed. Pull Request resolved: https://github.com/facebook/rocksdb/pull/4719 Differential Revision: D13208847 Pulled By: sagar0 fbshipit-source-id: 53a42f3d6ffe04034acfde972d73040b92b4c1af --- java/rocksjni/portal.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/java/rocksjni/portal.h b/java/rocksjni/portal.h index 97842a97d..0bf2867c1 100644 --- a/java/rocksjni/portal.h +++ b/java/rocksjni/portal.h @@ -3509,7 +3509,7 @@ class TickerTypeJni { case 0x37: return rocksdb::Tickers::RATE_LIMIT_DELAY_MILLIS; case 0x38: - return rocksdb::Tickers::NO_ITERATOR_CREATED; + return rocksdb::Tickers::NO_ITERATORS; case 0x39: return rocksdb::Tickers::NUMBER_MULTIGET_CALLS; case 0x3A: @@ -3587,8 +3587,10 @@ class TickerTypeJni { case 0x5E: return rocksdb::Tickers::NUMBER_MULTIGET_KEYS_FOUND; case 0x5F: - return rocksdb::Tickers::NO_ITERATOR_DELETED; + return rocksdb::Tickers::NO_ITERATOR_CREATED; case 0x60: + return rocksdb::Tickers::NO_ITERATOR_DELETED; + case 0x61: return rocksdb::Tickers::TICKER_ENUM_MAX; default: