diff --git a/HISTORY.md b/HISTORY.md index 092a4333e..1befdd2dd 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -5,6 +5,7 @@ * Remove librados support from main repo. * Remove deprecated API DB::AddFile from main repo. * Remove deprecated API ObjectLibrary::Register() and the (now obsolete) Regex public API. Use ObjectLibrary::AddFactory() with PatternEntry instead. +* Remove deprecated option DBOption::table_cache_remove_scan_count_limit. ## 6.29.0 (01/21/2022) Note: The next release will be major release 7.0. See https://github.com/facebook/rocksdb/issues/9390 for more info. diff --git a/db/c.cc b/db/c.cc index 29a635830..9702917a9 100644 --- a/db/c.cc +++ b/db/c.cc @@ -3338,11 +3338,6 @@ int rocksdb_options_get_table_cache_numshardbits(rocksdb_options_t* opt) { return opt->rep.table_cache_numshardbits; } -void rocksdb_options_set_table_cache_remove_scan_count_limit( - rocksdb_options_t* /*opt*/, int /*v*/) { - // this option is deprecated -} - void rocksdb_options_set_arena_block_size( rocksdb_options_t* opt, size_t v) { opt->rep.arena_block_size = v; diff --git a/include/rocksdb/c.h b/include/rocksdb/c.h index 5b12449b7..c8b4a1eb6 100644 --- a/include/rocksdb/c.h +++ b/include/rocksdb/c.h @@ -1223,9 +1223,6 @@ extern ROCKSDB_LIBRARY_API void rocksdb_options_set_table_cache_numshardbits( rocksdb_options_t*, int); extern ROCKSDB_LIBRARY_API int rocksdb_options_get_table_cache_numshardbits( rocksdb_options_t*); -extern ROCKSDB_LIBRARY_API void -rocksdb_options_set_table_cache_remove_scan_count_limit(rocksdb_options_t*, - int); extern ROCKSDB_LIBRARY_API void rocksdb_options_set_arena_block_size( rocksdb_options_t*, size_t); extern ROCKSDB_LIBRARY_API size_t diff --git a/include/rocksdb/options.h b/include/rocksdb/options.h index 6aa89c833..06c45eab3 100644 --- a/include/rocksdb/options.h +++ b/include/rocksdb/options.h @@ -748,9 +748,6 @@ struct DBOptions { // Number of shards used for table cache. int table_cache_numshardbits = 6; - // NOT SUPPORTED ANYMORE - // int table_cache_remove_scan_count_limit; - // The following two fields affect how archived logs will be deleted. // 1. If both set to 0, logs will be deleted asap and will not get into // the archive.