From d3296260c220195552023142edfca09c11e5f1bf Mon Sep 17 00:00:00 2001 From: Jay Huh Date: Mon, 18 Nov 2024 11:23:17 -0800 Subject: [PATCH] Remove EXPERIMENTAL tag for MultiCfIterators (#13142) Summary: As title Pull Request resolved: https://github.com/facebook/rocksdb/pull/13142 Test Plan: N/A Reviewed By: jowlyzhang Differential Revision: D66107254 Pulled By: jaykorean fbshipit-source-id: 3927a411f62ba965017ac726ed818cc9f8d24f2d --- db/coalescing_iterator.h | 1 - db/db_impl/db_impl.h | 2 -- include/rocksdb/attribute_groups.h | 1 - include/rocksdb/db.h | 2 -- unreleased_history/new_features/multi_cf_iterator.md | 1 + 5 files changed, 1 insertion(+), 6 deletions(-) create mode 100644 unreleased_history/new_features/multi_cf_iterator.md diff --git a/db/coalescing_iterator.h b/db/coalescing_iterator.h index ae00f004ca..f32a045692 100644 --- a/db/coalescing_iterator.h +++ b/db/coalescing_iterator.h @@ -9,7 +9,6 @@ namespace ROCKSDB_NAMESPACE { -// EXPERIMENTAL class CoalescingIterator : public Iterator { public: CoalescingIterator( diff --git a/db/db_impl/db_impl.h b/db/db_impl/db_impl.h index f82d8761aa..1492fe7a4a 100644 --- a/db/db_impl/db_impl.h +++ b/db/db_impl/db_impl.h @@ -363,12 +363,10 @@ class DBImpl : public DB { const Snapshot* GetSnapshot() override; void ReleaseSnapshot(const Snapshot* snapshot) override; - // EXPERIMENTAL std::unique_ptr NewCoalescingIterator( const ReadOptions& options, const std::vector& column_families) override; - // EXPERIMENTAL std::unique_ptr NewAttributeGroupIterator( const ReadOptions& options, const std::vector& column_families) override; diff --git a/include/rocksdb/attribute_groups.h b/include/rocksdb/attribute_groups.h index c7944eb503..8da8e3c349 100644 --- a/include/rocksdb/attribute_groups.h +++ b/include/rocksdb/attribute_groups.h @@ -116,7 +116,6 @@ using IteratorAttributeGroups = std::vector; extern const IteratorAttributeGroups kNoIteratorAttributeGroups; -// EXPERIMENTAL // A cross-column-family iterator that collects and returns attribute groups for // each key in order provided by comparator class AttributeGroupIterator : public IteratorBase { diff --git a/include/rocksdb/db.h b/include/rocksdb/db.h index f6af49b562..2f73813874 100644 --- a/include/rocksdb/db.h +++ b/include/rocksdb/db.h @@ -1007,7 +1007,6 @@ class DB { const std::vector& column_families, std::vector* iterators) = 0; - // EXPERIMENTAL // Return a cross-column-family iterator from a consistent database state. // // If a key exists in more than one column family, value() will be determined @@ -1025,7 +1024,6 @@ class DB { const ReadOptions& options, const std::vector& column_families) = 0; - // EXPERIMENTAL // A cross-column-family iterator that collects and returns attribute groups // for each key in order provided by comparator virtual std::unique_ptr NewAttributeGroupIterator( diff --git a/unreleased_history/new_features/multi_cf_iterator.md b/unreleased_history/new_features/multi_cf_iterator.md new file mode 100644 index 0000000000..78dd32655d --- /dev/null +++ b/unreleased_history/new_features/multi_cf_iterator.md @@ -0,0 +1 @@ +Multi-Column-Family-Iterator (CoalescingIterator/AttributeGroupIterator) is no longer marked as experimental