From 7ab0051835caa2527774ae3478015ad50b45205c Mon Sep 17 00:00:00 2001 From: Islam AbdelRahman Date: Fri, 17 Feb 2017 10:46:32 -0800 Subject: [PATCH] Remove deprecated DB::AddFile and DB::CompactRange Summary: Remove functions that we deprecated long time ago in db.h Closes https://github.com/facebook/rocksdb/pull/1878 Differential Revision: D4576521 Pulled By: IslamAbdelRahman fbshipit-source-id: dfddad1 --- HISTORY.md | 1 + include/rocksdb/db.h | 125 +------------------------------------------ 2 files changed, 2 insertions(+), 124 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index b984b5c2e..601c96972 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -2,6 +2,7 @@ ## Unreleased ### Public API Change * Remove disableDataSync option. +* Remove deprecated DB::AddFile and DB::CompactRange APIs; ## 5.2.0 (02/08/2017) ### Public API Change diff --git a/include/rocksdb/db.h b/include/rocksdb/db.h index cdbb8abf1..739cf53c5 100644 --- a/include/rocksdb/db.h +++ b/include/rocksdb/db.h @@ -586,7 +586,7 @@ class DB { virtual bool GetAggregatedIntProperty(const Slice& property, uint64_t* value) = 0; - // Flags for DB::GetSizeApproximation that specify whether memtable + // Flags for DB::GetSizeApproximation that specify whether memtable // stats should be included, or file stats approximation or both enum SizeApproximationFlags : uint8_t { NONE = 0, @@ -674,27 +674,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*/) { @@ -899,108 +878,6 @@ class DB { return IngestExternalFile(DefaultColumnFamily(), external_files, options); } - // AddFile() is deprecated, please use IngestExternalFile() - ROCKSDB_DEPRECATED_FUNC virtual Status AddFile( - ColumnFamilyHandle* column_family, - const std::vector& file_path_list, bool move_file = false, - bool skip_snapshot_check = false) { - IngestExternalFileOptions ifo; - ifo.move_files = move_file; - ifo.snapshot_consistency = !skip_snapshot_check; - ifo.allow_global_seqno = false; - ifo.allow_blocking_flush = false; - return IngestExternalFile(column_family, file_path_list, ifo); - } - - ROCKSDB_DEPRECATED_FUNC virtual Status AddFile( - const std::vector& file_path_list, bool move_file = false, - bool skip_snapshot_check = false) { - IngestExternalFileOptions ifo; - ifo.move_files = move_file; - ifo.snapshot_consistency = !skip_snapshot_check; - ifo.allow_global_seqno = false; - ifo.allow_blocking_flush = false; - return IngestExternalFile(DefaultColumnFamily(), file_path_list, ifo); - } - - // AddFile() is deprecated, please use IngestExternalFile() - ROCKSDB_DEPRECATED_FUNC virtual Status AddFile( - ColumnFamilyHandle* column_family, const std::string& file_path, - bool move_file = false, bool skip_snapshot_check = false) { - IngestExternalFileOptions ifo; - ifo.move_files = move_file; - ifo.snapshot_consistency = !skip_snapshot_check; - ifo.allow_global_seqno = false; - ifo.allow_blocking_flush = false; - return IngestExternalFile(column_family, {file_path}, ifo); - } - - ROCKSDB_DEPRECATED_FUNC virtual Status AddFile( - const std::string& file_path, bool move_file = false, - bool skip_snapshot_check = false) { - IngestExternalFileOptions ifo; - ifo.move_files = move_file; - ifo.snapshot_consistency = !skip_snapshot_check; - ifo.allow_global_seqno = false; - ifo.allow_blocking_flush = false; - return IngestExternalFile(DefaultColumnFamily(), {file_path}, ifo); - } - - // Load table file with information "file_info" into "column_family" - ROCKSDB_DEPRECATED_FUNC virtual Status AddFile( - ColumnFamilyHandle* column_family, - const std::vector& file_info_list, - bool move_file = false, bool skip_snapshot_check = false) { - std::vector external_files; - for (const ExternalSstFileInfo& file_info : file_info_list) { - external_files.push_back(file_info.file_path); - } - IngestExternalFileOptions ifo; - ifo.move_files = move_file; - ifo.snapshot_consistency = !skip_snapshot_check; - ifo.allow_global_seqno = false; - ifo.allow_blocking_flush = false; - return IngestExternalFile(column_family, external_files, ifo); - } - - ROCKSDB_DEPRECATED_FUNC virtual Status AddFile( - const std::vector& file_info_list, - bool move_file = false, bool skip_snapshot_check = false) { - std::vector external_files; - for (const ExternalSstFileInfo& file_info : file_info_list) { - external_files.push_back(file_info.file_path); - } - IngestExternalFileOptions ifo; - ifo.move_files = move_file; - ifo.snapshot_consistency = !skip_snapshot_check; - ifo.allow_global_seqno = false; - ifo.allow_blocking_flush = false; - return IngestExternalFile(DefaultColumnFamily(), external_files, ifo); - } - - ROCKSDB_DEPRECATED_FUNC virtual Status AddFile( - ColumnFamilyHandle* column_family, const ExternalSstFileInfo* file_info, - bool move_file = false, bool skip_snapshot_check = false) { - IngestExternalFileOptions ifo; - ifo.move_files = move_file; - ifo.snapshot_consistency = !skip_snapshot_check; - ifo.allow_global_seqno = false; - ifo.allow_blocking_flush = false; - return IngestExternalFile(column_family, {file_info->file_path}, ifo); - } - - ROCKSDB_DEPRECATED_FUNC virtual Status AddFile( - const ExternalSstFileInfo* file_info, bool move_file = false, - bool skip_snapshot_check = false) { - IngestExternalFileOptions ifo; - ifo.move_files = move_file; - ifo.snapshot_consistency = !skip_snapshot_check; - ifo.allow_global_seqno = false; - ifo.allow_blocking_flush = false; - return IngestExternalFile(DefaultColumnFamily(), {file_info->file_path}, - ifo); - } - #endif // ROCKSDB_LITE // Sets the globally unique ID created at database creation time by invoking