From bbe4763ee44b539ef52bdd339d1dfccb0feec32e Mon Sep 17 00:00:00 2001 From: Akanksha Mahajan <43301668+akankshamahajan15@users.noreply.github.com> Date: Mon, 7 Feb 2022 12:00:54 -0800 Subject: [PATCH] Remove Deprecated overloads of DB::GetApproximateSizes (#9458) Summary: In RocksDB few overloads of DB::GetApproximateSizes 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/9458 Test Plan: CircleCI Reviewed By: riversand963 Differential Revision: D34043791 Pulled By: akankshamahajan15 fbshipit-source-id: 815c0ad283a6627c4b241479c7d40ce03a758493 --- HISTORY.md | 1 + include/rocksdb/db.h | 19 ------------------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 99338cba5..3b4d5aac0 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -29,6 +29,7 @@ * Remove default implementation of Name() from FileSystemWrapper. * Rename `SizeApproximationOptions.include_memtabtles` to `SizeApproximationOptions.include_memtables`. * Remove deprecated option DBOptions::max_mem_compaction_level. +* Remove deprecated overloads of API DB::GetApproximateSizes. ### 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 d721d70f7..c6bcf2bad 100644 --- a/include/rocksdb/db.h +++ b/include/rocksdb/db.h @@ -1164,25 +1164,6 @@ class DB { GetApproximateMemTableStats(DefaultColumnFamily(), range, count, size); } - // Deprecated versions of GetApproximateSizes - ROCKSDB_DEPRECATED_FUNC virtual void GetApproximateSizes( - const Range* range, int n, uint64_t* sizes, bool include_memtable) { - uint8_t include_flags = SizeApproximationFlags::INCLUDE_FILES; - if (include_memtable) { - include_flags |= SizeApproximationFlags::INCLUDE_MEMTABLES; - } - GetApproximateSizes(DefaultColumnFamily(), range, n, sizes, include_flags); - } - ROCKSDB_DEPRECATED_FUNC virtual void GetApproximateSizes( - ColumnFamilyHandle* column_family, const Range* range, int n, - uint64_t* sizes, bool include_memtable) { - uint8_t include_flags = SizeApproximationFlags::INCLUDE_FILES; - if (include_memtable) { - include_flags |= SizeApproximationFlags::INCLUDE_MEMTABLES; - } - GetApproximateSizes(column_family, range, n, sizes, include_flags); - } - // Compact the underlying storage for the key range [*begin,*end]. // The actual compaction interval might be superset of [*begin, *end]. // In particular, deleted and overwritten versions are discarded,