Remove unnecessary externs

facebook · Feb 12, 2024 · a703206 · a703206
1 parent fc3a4f0
commit a703206
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 23 deletions.
diff --git a/db/db_impl/db_impl.cc b/db/db_impl/db_impl.cc
@@ -45,6 +45,7 @@
 #include "db/memtable_list.h"
 #include "db/merge_context.h"
 #include "db/merge_helper.h"
+#include "db/multi_cf_iterator_impl.h"
 #include "db/periodic_task_scheduler.h"
 #include "db/range_tombstone_fragmenter.h"
 #include "db/table_cache.h"
@@ -4002,10 +4003,11 @@ MultiCfIterator* DBImpl::NewMultiCfIterator(
   std::vector<Iterator*> child_iterators;
   Status s = NewIterators(_read_options, column_families, &child_iterators);
   if (s.ok()) {
-    return NewMultiColumnFamilyIterator(comparator, column_families,
-                                        child_iterators);
+    MultiCfIterator* iterator =
+        new MultiCfIteratorImpl(comparator, column_families, child_iterators);
+    return iterator;
   }
-  return NewErrorMultiColumnFamilyIterator(s);
+  return new EmptyMultiCfIterator(s);
 }
 
 Status DBImpl::NewIterators(

diff --git a/db/multi_cf_iterator_impl.cc b/db/multi_cf_iterator_impl.cc
@@ -50,21 +50,4 @@ void MultiCfIteratorImpl::Next() {
 
 const AttributeGroups kNoAttributeGroups;
 
-MultiCfIterator* NewEmptyMultiColumnFamilyIterator() {
-  return new EmptyMultiCfIterator(Status::OK());
-}
-
-MultiCfIterator* NewErrorMultiColumnFamilyIterator(const Status& status) {
-  return new EmptyMultiCfIterator(status);
-}
-
-MultiCfIterator* NewMultiColumnFamilyIterator(
-    const Comparator* comparator,
-    const std::vector<ColumnFamilyHandle*>& column_families,
-    const std::vector<Iterator*>& child_iterators) {
-  MultiCfIterator* iterator =
-      new MultiCfIteratorImpl(comparator, column_families, child_iterators);
-  return iterator;
-}
-
 }  // namespace ROCKSDB_NAMESPACE
diff --git a/include/rocksdb/multi_cf_iterator.h b/include/rocksdb/multi_cf_iterator.h
@@ -34,15 +34,15 @@ class MultiCfIterator : public Iterator {
 
   virtual const AttributeGroups& attribute_groups() const = 0;
 };
-extern MultiCfIterator* NewMultiColumnFamilyIterator(
+MultiCfIterator* NewMultiColumnFamilyIterator(
     const Comparator* comparator,
     const std::vector<ColumnFamilyHandle*>& column_families,
     const std::vector<Iterator*>& child_iterators);
 
 // Return an empty MultiCfIterator (yields nothing)
-extern MultiCfIterator* NewEmptyMultiColumnFamilyIterator();
+MultiCfIterator* NewEmptyMultiColumnFamilyIterator();
 
 // Return an empty MultiCfIterator with the specified status.
-extern MultiCfIterator* NewErrorMultiColumnFamilyIterator(const Status& status);
+MultiCfIterator* NewErrorMultiColumnFamilyIterator(const Status& status);
 
 }  // namespace ROCKSDB_NAMESPACE