rename MultiCfIteratorImpl to MultiCfIterator

jaykorean · Mar 4, 2024 · 461589c · 461589c
1 parent d221bf3
commit 461589c
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -692,7 +692,7 @@ set(SOURCES
         db/memtable_list.cc
         db/merge_helper.cc
         db/merge_operator.cc
-        db/multi_cf_iterator_impl.cc
+        db/multi_cf_iterator.cc
         db/output_validator.cc
         db/periodic_task_scheduler.cc
         db/range_del_aggregator.cc

diff --git a/TARGETS b/TARGETS
@@ -83,7 +83,7 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
         "db/memtable_list.cc",
         "db/merge_helper.cc",
         "db/merge_operator.cc",
-        "db/multi_cf_iterator_impl.cc",
+        "db/multi_cf_iterator.cc",
         "db/output_validator.cc",
         "db/periodic_task_scheduler.cc",
         "db/range_del_aggregator.cc",

diff --git a/db/db_impl/db_impl.cc b/db/db_impl/db_impl.cc
@@ -46,7 +46,7 @@
 #include "db/memtable.h"
 #include "db/memtable_list.h"
 #include "db/merge_context.h"
-#include "db/multi_cf_iterator_impl.h"
+#include "db/multi_cf_iterator.h"
 #include "db/periodic_task_scheduler.h"
 #include "db/range_tombstone_fragmenter.h"
 #include "db/table_cache.h"
@@ -3756,8 +3756,8 @@ std::unique_ptr<Iterator> DBImpl::NewMultiCfIterator(
   std::vector<Iterator*> child_iterators;
   Status s = NewIterators(_read_options, column_families, &child_iterators);
   if (s.ok()) {
-    return std::make_unique<MultiCfIteratorImpl>(
-        first_comparator, column_families, std::move(child_iterators));
+    return std::make_unique<MultiCfIterator>(first_comparator, column_families,
+                                             std::move(child_iterators));
   }
   return std::unique_ptr<Iterator>(NewErrorIterator(s));
 }

diff --git a/db/multi_cf_iterator_impl.cc → db/multi_cf_iterator.cc b/db/multi_cf_iterator_impl.cc → db/multi_cf_iterator.cc
@@ -3,13 +3,13 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
 
-#include "db/multi_cf_iterator_impl.h"
+#include "db/multi_cf_iterator.h"
 
 #include <cassert>
 
 namespace ROCKSDB_NAMESPACE {
 
-void MultiCfIteratorImpl::SeekToFirst() {
+void MultiCfIterator::SeekToFirst() {
   Reset();
   int i = 0;
   for (auto& cfh_iter_pair : cfh_iter_pairs_) {
@@ -26,7 +26,7 @@ void MultiCfIteratorImpl::SeekToFirst() {
   }
 }
 
-void MultiCfIteratorImpl::Next() {
+void MultiCfIterator::Next() {
   assert(Valid());
   // 1. Keep the top iterator (by popping it from the heap)
   // 2. Make sure all others have iterated past the top iterator key slice

diff --git a/db/multi_cf_iterator_impl.h → db/multi_cf_iterator.h b/db/multi_cf_iterator_impl.h → db/multi_cf_iterator.h
@@ -17,9 +17,9 @@ namespace ROCKSDB_NAMESPACE {
 // When the same key exists in more than one column families, the iterator
 // selects the value from the first column family containing the key, in the
 // order provided in the `column_families` parameter.
-class MultiCfIteratorImpl : public Iterator {
+class MultiCfIterator : public Iterator {
  public:
-  MultiCfIteratorImpl(const Comparator* comparator,
+  MultiCfIterator(const Comparator* comparator,
                       const std::vector<ColumnFamilyHandle*>& column_families,
                       const std::vector<Iterator*>& child_iterators)
       : comparator_(comparator),
@@ -32,11 +32,11 @@ class MultiCfIteratorImpl : public Iterator {
           column_families[i], std::unique_ptr<Iterator>(child_iterators[i]));
     }
   }
-  ~MultiCfIteratorImpl() override { status_.PermitUncheckedError(); }
+  ~MultiCfIterator() override { status_.PermitUncheckedError(); }
 
   // No copy allowed
-  MultiCfIteratorImpl(const MultiCfIteratorImpl&) = delete;
-  MultiCfIteratorImpl& operator=(const MultiCfIteratorImpl&) = delete;
+  MultiCfIterator(const MultiCfIterator&) = delete;
+  MultiCfIterator& operator=(const MultiCfIterator&) = delete;
 
  private:
   std::vector<std::pair<ColumnFamilyHandle*, std::unique_ptr<Iterator>>>

diff --git a/src.mk b/src.mk
@@ -76,7 +76,7 @@ LIB_SOURCES =                                                   \
   db/memtable_list.cc                                           \
   db/merge_helper.cc                                            \
   db/merge_operator.cc                                          \
-  db/multi_cf_iterator_impl.cc                                  \
+  db/multi_cf_iterator.cc                                       \
   db/output_validator.cc                                        \
   db/periodic_task_scheduler.cc                                 \
   db/range_del_aggregator.cc                                    \