Skip to content

Commit 221529a

Browse files
committed
Update enum values
1 parent 0b84e89 commit 221529a

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

db/db_impl/db_impl_compaction_flush.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3739,8 +3739,8 @@ Status DBImpl::BackgroundCompaction(bool* made_progress,
37393739
// 1) When flush or compaction finish. This case is covered by
37403740
// InstallSuperVersionAndScheduleWork
37413741
// 2) When MutableCFOptions changes. This case is also covered by
3742-
// InstallSuperVersionAndScheduleWork, because this is when the
3743-
// new options take effect.
3742+
// InstallSuperVersionAndScheduleWork, because this is when the new
3743+
// options take effect.
37443744
// 3) When we Pick a new compaction, we "remove" those files being
37453745
// compacted from the calculation, which then influences compaction
37463746
// score. Here we check if we need the new compaction even without the

java/rocksjni/portal.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5892,7 +5892,6 @@ class HistogramTypeJni {
58925892
case ROCKSDB_NAMESPACE::Histograms::NUM_COMPACTION_INPUT_ITERATORS:
58935893
return 0x3E;
58945894
case ROCKSDB_NAMESPACE::Histograms::HISTOGRAM_ENUM_MAX:
5895-
// 0x3F for backwards compatibility on current minor version.
58965895
return 0x3F;
58975896
default:
58985897
// undefined/default
@@ -6037,10 +6036,8 @@ class HistogramTypeJni {
60376036
TABLE_OPEN_PREFETCH_TAIL_READ_BYTES;
60386037
case 0x3E:
60396038
return ROCKSDB_NAMESPACE::Histograms::NUM_COMPACTION_INPUT_ITERATORS;
6040-
case 0x40:
6041-
// 0x40 for backwards compatibility on current minor version.
6039+
case 0x3F:
60426040
return ROCKSDB_NAMESPACE::Histograms::HISTOGRAM_ENUM_MAX;
6043-
60446041
default:
60456042
// undefined/default
60466043
return ROCKSDB_NAMESPACE::Histograms::DB_GET;

java/src/main/java/org/rocksdb/HistogramType.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,6 @@ public enum HistogramType {
216216
*/
217217
NUM_COMPACTION_INPUT_ITERATORS((byte) 0x3E),
218218

219-
// 0x3F for backwards compatibility on current minor version.
220219
HISTOGRAM_ENUM_MAX((byte) 0x3F);
221220

222221
private final byte value;

0 commit comments

Comments
 (0)