@ -545,6 +545,9 @@ DEFINE_int64(max_num_range_tombstones, 0,
" Maximum number of range tombstones "
" Maximum number of range tombstones "
" to insert. " ) ;
" to insert. " ) ;
DEFINE_bool ( expand_range_tombstones , false ,
" Expand range tombstone into sequential regular tombstones. " ) ;
# ifndef ROCKSDB_LITE
# ifndef ROCKSDB_LITE
DEFINE_bool ( optimistic_transaction_db , false ,
DEFINE_bool ( optimistic_transaction_db , false ,
" Open a OptimisticTransactionDB instance. "
" Open a OptimisticTransactionDB instance. "
@ -3232,6 +3235,14 @@ class Benchmark {
Slice begin_key = AllocateKey ( & begin_key_guard ) ;
Slice begin_key = AllocateKey ( & begin_key_guard ) ;
std : : unique_ptr < const char [ ] > end_key_guard ;
std : : unique_ptr < const char [ ] > end_key_guard ;
Slice end_key = AllocateKey ( & end_key_guard ) ;
Slice end_key = AllocateKey ( & end_key_guard ) ;
std : : vector < std : : unique_ptr < const char [ ] > > expanded_key_guards ;
std : : vector < Slice > expanded_keys ;
if ( FLAGS_expand_range_tombstones ) {
expanded_key_guards . resize ( range_tombstone_width_ ) ;
for ( auto & expanded_key_guard : expanded_key_guards ) {
expanded_keys . emplace_back ( AllocateKey ( & expanded_key_guard ) ) ;
}
}
int64_t stage = 0 ;
int64_t stage = 0 ;
int64_t num_written = 0 ;
int64_t num_written = 0 ;
@ -3283,6 +3294,22 @@ class Benchmark {
max_num_range_tombstones_ & &
max_num_range_tombstones_ & &
num_written % writes_per_range_tombstone_ = = 0 ) {
num_written % writes_per_range_tombstone_ = = 0 ) {
int64_t begin_num = key_gens [ id ] - > Next ( ) ;
int64_t begin_num = key_gens [ id ] - > Next ( ) ;
if ( FLAGS_expand_range_tombstones ) {
for ( int64_t offset = 0 ; offset < range_tombstone_width_ ;
+ + offset ) {
GenerateKeyFromInt ( begin_num + offset , FLAGS_num ,
& expanded_keys [ offset ] ) ;
if ( FLAGS_use_blob_db ) {
s = db_with_cfh - > db - > Delete ( write_options_ ,
expanded_keys [ offset ] ) ;
} else if ( FLAGS_num_column_families < = 1 ) {
batch . Delete ( expanded_keys [ offset ] ) ;
} else {
batch . Delete ( db_with_cfh - > GetCfh ( rand_num ) ,
expanded_keys [ offset ] ) ;
}
}
} else {
GenerateKeyFromInt ( begin_num , FLAGS_num , & begin_key ) ;
GenerateKeyFromInt ( begin_num , FLAGS_num , & begin_key ) ;
GenerateKeyFromInt ( begin_num + range_tombstone_width_ , FLAGS_num ,
GenerateKeyFromInt ( begin_num + range_tombstone_width_ , FLAGS_num ,
& end_key ) ;
& end_key ) ;
@ -3298,6 +3325,7 @@ class Benchmark {
}
}
}
}
}
}
}
if ( ! FLAGS_use_blob_db ) {
if ( ! FLAGS_use_blob_db ) {
s = db_with_cfh - > db - > Write ( write_options_ , & batch ) ;
s = db_with_cfh - > db - > Write ( write_options_ , & batch ) ;
}
}