From 48b9de4a3e1288313abc2ec4c08e15ae280ae8ff Mon Sep 17 00:00:00 2001 From: Peter Dillinger Date: Thu, 17 Feb 2022 20:27:07 -0800 Subject: [PATCH] Mark more OldDefaults as deprecated (#9594) Summary: `ColumnFamilyOptions::OldDefaults` and `DBOptions::OldDefaults` now deprecated. Were previously overlooked with `Options::OldDefaults` in https://github.com/facebook/rocksdb/issues/9363 Pull Request resolved: https://github.com/facebook/rocksdb/pull/9594 Test Plan: comments only Reviewed By: jay-zhuang Differential Revision: D34318592 Pulled By: pdillinger fbshipit-source-id: 773c97a61e2a8290ae154f363dd61c1f35a9dd16 --- HISTORY.md | 1 + include/rocksdb/options.h | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/HISTORY.md b/HISTORY.md index 38ce20baa..57bc4f5d9 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -70,6 +70,7 @@ * Add Transaction::SetReadTimestampForValidation() and Transaction::SetCommitTimestamp(). Default impl returns NotSupported(). * Add support for decimal patterns to ObjectLibrary::PatternEntry * Remove deprecated remote compaction APIs `CompactionService::Start()` and `CompactionService::WaitForComplete()`. Please use `CompactionService::StartV2()`, `CompactionService::WaitForCompleteV2()` instead, which provides the same information plus extra data like priority, db_id, etc. +* `ColumnFamilyOptions::OldDefaults` and `DBOptions::OldDefaults` are marked deprecated, as they are no longer maintained. * Add subcompaction callback APIs: `OnSubcompactionBegin()` and `OnSubcompactionCompleted()`. ### Behavior Changes diff --git a/include/rocksdb/options.h b/include/rocksdb/options.h index bc47ba410..edbd40b9d 100644 --- a/include/rocksdb/options.h +++ b/include/rocksdb/options.h @@ -65,6 +65,10 @@ using FileTypeSet = SmallEnumSet; struct ColumnFamilyOptions : public AdvancedColumnFamilyOptions { // The function recovers options to a previous version. Only 4.6 or later // versions are supported. + // NOT MAINTAINED: This function has not been and is not maintained. + // DEPRECATED: This function might be removed in a future release. + // In general, defaults are changed to suit broad interests. Opting + // out of a change on upgrade should be deliberate and considered. ColumnFamilyOptions* OldDefaults(int rocksdb_major_version = 4, int rocksdb_minor_version = 6); @@ -427,6 +431,10 @@ class CompactionService : public Customizable { struct DBOptions { // The function recovers options to the option as in version 4.6. + // NOT MAINTAINED: This function has not been and is not maintained. + // DEPRECATED: This function might be removed in a future release. + // In general, defaults are changed to suit broad interests. Opting + // out of a change on upgrade should be deliberate and considered. DBOptions* OldDefaults(int rocksdb_major_version = 4, int rocksdb_minor_version = 6);