Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[submodule "rocksdb"]
path = librocksdb_sys/rocksdb
url = https://github.com/tikv/rocksdb.git
branch = 8.10.tikv
url = https://github.com/glorv/rocksdb.git
branch = manual-compact-bottom-check

[submodule "titan"]
path = librocksdb_sys/libtitan_sys/titan
Expand Down
5 changes: 5 additions & 0 deletions librocksdb_sys/crocksdb/c.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4120,6 +4120,11 @@ void crocksdb_compactoptions_set_bottommost_level_compaction(
static_cast<BottommostLevelCompaction>(v);
}

void crocksdb_compactoptions_set_bottom_level_check_range_overlap(
crocksdb_compactoptions_t* opt, unsigned char v) {
opt->rep.bottom_level_check_range_overlap = v;
}

crocksdb_flushoptions_t* crocksdb_flushoptions_create() {
return new crocksdb_flushoptions_t;
}
Expand Down
3 changes: 3 additions & 0 deletions librocksdb_sys/crocksdb/crocksdb/c.h
Original file line number Diff line number Diff line change
Expand Up @@ -1693,6 +1693,9 @@ crocksdb_compactoptions_set_max_subcompactions(crocksdb_compactoptions_t*, int);
extern C_ROCKSDB_LIBRARY_API void
crocksdb_compactoptions_set_bottommost_level_compaction(
crocksdb_compactoptions_t*, uint32_t);
extern C_ROCKSDB_LIBRARY_API void
crocksdb_compactoptions_set_bottom_level_check_range_overlap(
crocksdb_compactoptions_t*, unsigned char);

/* Flush options */

Expand Down
1 change: 1 addition & 0 deletions librocksdb_sys/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1680,6 +1680,7 @@ extern "C" {
opt: *mut DBCompactOptions,
v: DBBottommostLevelCompaction,
);
pub fn crocksdb_compactoptions_set_bottom_level_check_range_overlap(opt: *mut DBCompactOptions, v: bool);
pub fn crocksdb_set_global_manual_compaction_canceled(v: bool);

pub fn crocksdb_fifo_compaction_options_create() -> *mut DBFifoCompactionOptions;
Expand Down
6 changes: 6 additions & 0 deletions src/rocksdb_options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -856,6 +856,12 @@ impl CompactOptions {
crocksdb_ffi::crocksdb_compactoptions_set_bottommost_level_compaction(self.inner, v);
}
}

pub fn set_bottom_level_check_range_overlap(&mut self, v: bool) {
unsafe {
crocksdb_ffi::crocksdb_compactoptions_set_bottom_level_check_range_overlap(self.inner, v);
}
}
}

impl Drop for CompactOptions {
Expand Down