Skip to content
Merged
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: 0 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,3 @@ crc = "1.8"
lazy_static = "1.4.0"
rand = "0.7"
tempfile = "3.1"

[patch.crates-io]
# Remove this when a new version is release. We need to solve rust-lang/cmake-rs#143.
cmake = { git = "https://github.com/rust-lang/cmake-rs" }
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_check_range_overlap_on_bottom_level(
crocksdb_compactoptions_t* opt, unsigned char v) {
opt->rep.check_range_overlap_on_bottom_level = 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_check_range_overlap_on_bottom_level(
crocksdb_compactoptions_t*, unsigned char);

/* Flush options */

Expand Down
4 changes: 4 additions & 0 deletions librocksdb_sys/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1680,6 +1680,10 @@ extern "C" {
opt: *mut DBCompactOptions,
v: DBBottommostLevelCompaction,
);
pub fn crocksdb_compactoptions_set_check_range_overlap_on_bottom_level(
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
8 changes: 8 additions & 0 deletions src/rocksdb_options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -856,6 +856,14 @@ impl CompactOptions {
crocksdb_ffi::crocksdb_compactoptions_set_bottommost_level_compaction(self.inner, v);
}
}

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

impl Drop for CompactOptions {
Expand Down