From ed86cd5e78574c0815114c39158453001d3927d4 Mon Sep 17 00:00:00 2001 From: Akanksha Mahajan Date: Thu, 27 Jan 2022 23:11:36 -0800 Subject: [PATCH] Remove deprecated overloads of DB::CompactRange (#9444) Summary: In RocksDB few overloads of DB::CompactRange() are marked as DEPRECATED_FUNC, and we are removing it in the upcoming 7.0 release. Pull Request resolved: https://github.com/facebook/rocksdb/pull/9444 Test Plan: CircleCI Reviewed By: ajkr Differential Revision: D33788520 Pulled By: akankshamahajan15 fbshipit-source-id: 716e0d5f227f791605d4d91626c0cbf5b4571630 --- HISTORY.md | 1 + include/rocksdb/db.h | 21 --------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 5f3f0713e..130a3b960 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -15,6 +15,7 @@ * Remove deprecated API AdvancedColumnFamilyOptions::hard_rate_limit. * Remove deprecated API DBOption::base_background_compactions. * Remove deprecated API DBOptions::purge_redundant_kvs_while_flush. +* Remove deprecated overloads of API DB::CompactRange. ### Behavior Changes * Disallow the combination of DBOptions.use_direct_io_for_flush_and_compaction == true and DBOptions.writable_file_max_buffer_size == 0. This combination can cause WritableFileWriter::Append() to loop forever, and it does not make much sense in direct IO. diff --git a/include/rocksdb/db.h b/include/rocksdb/db.h index 30da287e1..c3773ef2a 100644 --- a/include/rocksdb/db.h +++ b/include/rocksdb/db.h @@ -1175,27 +1175,6 @@ class DB { return CompactRange(options, DefaultColumnFamily(), begin, end); } - ROCKSDB_DEPRECATED_FUNC virtual Status CompactRange( - ColumnFamilyHandle* column_family, const Slice* begin, const Slice* end, - bool change_level = false, int target_level = -1, - uint32_t target_path_id = 0) { - CompactRangeOptions options; - options.change_level = change_level; - options.target_level = target_level; - options.target_path_id = target_path_id; - return CompactRange(options, column_family, begin, end); - } - - ROCKSDB_DEPRECATED_FUNC virtual Status CompactRange( - const Slice* begin, const Slice* end, bool change_level = false, - int target_level = -1, uint32_t target_path_id = 0) { - CompactRangeOptions options; - options.change_level = change_level; - options.target_level = target_level; - options.target_path_id = target_path_id; - return CompactRange(options, DefaultColumnFamily(), begin, end); - } - virtual Status SetOptions( ColumnFamilyHandle* /*column_family*/, const std::unordered_map& /*new_options*/) {