From d9ddb5398eaabb50f41bd3f6b69d083683074c43 Mon Sep 17 00:00:00 2001 From: anand76 Date: Wed, 2 Feb 2022 13:29:07 -0800 Subject: [PATCH] Remove default implementation of Name() from FileSystemWrapper (#9474) Summary: Remove default implementation of Name(), which is an abstract method inherited from Customizable, from FileSystemWrapper. Pull Request resolved: https://github.com/facebook/rocksdb/pull/9474 Reviewed By: pdillinger Differential Revision: D33896455 Pulled By: anand1976 fbshipit-source-id: bc3df3bc0cec580cf63c60a52c344f23ca651102 --- HISTORY.md | 1 + include/rocksdb/file_system.h | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 3875eaff0..bd110c637 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -22,6 +22,7 @@ * Remove DBOptions::preserved_deletes and DB::SetPreserveDeletesSequenceNumber(). * Remove deprecated API AdvancedColumnFamilyOptions::rate_limit_delay_max_milliseconds. * Removed timestamp from WriteOptions. Accordingly, added to DB APIs Put, Delete, SingleDelete, etc. accepting an additional argument 'timestamp'. Added Put, Delete, SingleDelete, etc to WriteBatch accepting an additional argument 'timestamp'. Removed WriteBatch::AssignTimestamps(vector) API. Renamed WriteBatch::AssignTimestamp() to WriteBatch::UpdateTimestamps() with clarified comments. +* Remove default implementation of Name() from FileSystemWrapper. ### 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/file_system.h b/include/rocksdb/file_system.h index ec908c4b0..e6cf8f9ce 100644 --- a/include/rocksdb/file_system.h +++ b/include/rocksdb/file_system.h @@ -1193,10 +1193,6 @@ class FileSystemWrapper : public FileSystem { explicit FileSystemWrapper(const std::shared_ptr& t); ~FileSystemWrapper() override {} - // Deprecated. Will be removed in a major release. Derived classes - // should implement this method. - const char* Name() const override { return target_->Name(); } - // Return the target to which this Env forwards all calls FileSystem* target() const { return target_.get(); }