From 27b450165e447af5ac62dc938cbfed9ad61c9dee Mon Sep 17 00:00:00 2001
From: Sagar Vemuri <svemuri@fb.com>
Date: Mon, 12 Jun 2017 12:51:19 -0700
Subject: [PATCH] Update HistogramTypes in the Java API

Summary:
This diff syncs the Histogram Types in the Java API with the ones in C++ API (`statistics.h`), and brings it up-to-date.

I also found that the enum ordering between Java and C++ has gotten out-of-sync, a few years back, with the addition of `SUBCOMPACTION_SETUP_TIME`. So updated the order as well.

`READ_NUM_MERGE_OPERANDS` added in #2373 is needed for Cassandra-on-RocksDB work.
Closes https://github.com/facebook/rocksdb/pull/2429

Differential Revision: D5215623

Pulled By: sagar0

fbshipit-source-id: bd136698c48197e53693275eb52acc9198ee5a4e
---
 .../main/java/org/rocksdb/HistogramType.java  | 45 ++++++++++++-------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/java/src/main/java/org/rocksdb/HistogramType.java b/java/src/main/java/org/rocksdb/HistogramType.java
index a4459eecc..b713e565f 100644
--- a/java/src/main/java/org/rocksdb/HistogramType.java
+++ b/java/src/main/java/org/rocksdb/HistogramType.java
@@ -9,24 +9,35 @@ public enum HistogramType {
   DB_GET(0),
   DB_WRITE(1),
   COMPACTION_TIME(2),
-  TABLE_SYNC_MICROS(3),
-  COMPACTION_OUTFILE_SYNC_MICROS(4),
-  WAL_FILE_SYNC_MICROS(5),
-  MANIFEST_FILE_SYNC_MICROS(6),
+  SUBCOMPACTION_SETUP_TIME(3),
+  TABLE_SYNC_MICROS(4),
+  COMPACTION_OUTFILE_SYNC_MICROS(5),
+  WAL_FILE_SYNC_MICROS(6),
+  MANIFEST_FILE_SYNC_MICROS(7),
   // TIME SPENT IN IO DURING TABLE OPEN
-  TABLE_OPEN_IO_MICROS(7),
-  DB_MULTIGET(8),
-  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),
-  DB_SEEK(18),
-  WRITE_STALL(19);
+  TABLE_OPEN_IO_MICROS(8),
+  DB_MULTIGET(9),
+  READ_BLOCK_COMPACTION_MICROS(10),
+  READ_BLOCK_GET_MICROS(11),
+  WRITE_RAW_BLOCK_MICROS(12),
+  STALL_L0_SLOWDOWN_COUNT(13),
+  STALL_MEMTABLE_COMPACTION_COUNT(14),
+  STALL_L0_NUM_FILES_COUNT(15),
+  HARD_RATE_LIMIT_DELAY_COUNT(16),
+  SOFT_RATE_LIMIT_DELAY_COUNT(17),
+  NUM_FILES_IN_SINGLE_COMPACTION(18),
+  DB_SEEK(19),
+  WRITE_STALL(20),
+  SST_READ_MICROS(21),
+  NUM_SUBCOMPACTIONS_SCHEDULED(22),
+  BYTES_PER_READ(23),
+  BYTES_PER_WRITE(24),
+  BYTES_PER_MULTIGET(25),
+  BYTES_COMPRESSED(26),
+  BYTES_DECOMPRESSED(27),
+  COMPRESSION_TIMES_NANOS(28),
+  DECOMPRESSION_TIMES_NANOS(29),
+  READ_NUM_MERGE_OPERANDS(30);
 
   private final int value_;