Skip to content

Commit 3ddc482

Browse files
committed
Fix ClockCacheShard::Erase
Fix db_bench
1 parent a1df6cf commit 3ddc482

2 files changed

Lines changed: 1 addition & 14 deletions

File tree

cache/clock_cache.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ bool ClockCacheShard::Release(Cache::Handle* h, bool force_erase) {
649649

650650
bool ClockCacheShard::Erase(const Slice& key, uint32_t hash) {
651651
CleanupContext context;
652-
bool ret EraseAndConfirm(key, hash, &context);
652+
bool ret = EraseAndConfirm(key, hash, &context);
653653
Cleanup(context);
654654
return ret;
655655
}

tools/db_bench_tool.cc

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -510,10 +510,6 @@ DEFINE_double(data_block_hash_table_util_ratio, 0.75,
510510
DEFINE_int64(compressed_cache_size, -1,
511511
"Number of bytes to use as a cache of compressed data.");
512512

513-
DEFINE_int64(row_cache_size, 0,
514-
"Number of bytes to use as a cache of individual rows"
515-
" (0 = disabled).");
516-
517513
DEFINE_int32(open_files, TERARKDB_NAMESPACE::Options().max_open_files,
518514
"Maximum number of files to keep open at the same time"
519515
" (use default if == 0)");
@@ -735,7 +731,6 @@ DEFINE_string(
735731
"that are related to RocksDB options will be ignored:\n"
736732
"\t--use_existing_db\n"
737733
"\t--statistics\n"
738-
"\t--row_cache_size\n"
739734
"\t--row_cache_numshardbits\n"
740735
"\t--enable_io_prio\n"
741736
"\t--dump_malloc_stats\n"
@@ -3661,14 +3656,6 @@ class Benchmark {
36613656
FLAGS_bloom_bits, FLAGS_use_block_based_filter));
36623657
}
36633658
}
3664-
if (FLAGS_row_cache_size) {
3665-
if (FLAGS_cache_numshardbits >= 1) {
3666-
options.row_cache =
3667-
NewLRUCache(FLAGS_row_cache_size, FLAGS_cache_numshardbits);
3668-
} else {
3669-
options.row_cache = NewLRUCache(FLAGS_row_cache_size);
3670-
}
3671-
}
36723659
if (FLAGS_enable_io_prio) {
36733660
FLAGS_env->LowerThreadPoolIOPriority(Env::LOW);
36743661
FLAGS_env->LowerThreadPoolIOPriority(Env::HIGH);

0 commit comments

Comments
 (0)