Rename merger.h -> merging_iterator.h

Summary: merger.h was always a confusing name for me, simply give the file a better name Closes facebook#1836 Differential Revision: D4505357 Pulled By: IslamAbdelRahman fbshipit-source-id: 07b28d8
wpc · Feb 3, 2017 · 574b543 · 574b543
1 parent add8b50
commit 574b543
Show file tree

Hide file tree

Showing 16 changed files with 15 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -338,7 +338,7 @@ set(SOURCES
         table/full_filter_block.cc
         table/get_context.cc
         table/iterator.cc
-        table/merger.cc
+        table/merging_iterator.cc
         table/sst_file_writer.cc
         table/meta_blocks.cc
         table/plain_table_builder.cc

diff --git a/db/compaction_job.cc b/db/compaction_job.cc
@@ -45,7 +45,7 @@
 #include "rocksdb/table.h"
 #include "table/block.h"
 #include "table/block_based_table_factory.h"
-#include "table/merger.h"
+#include "table/merging_iterator.h"
 #include "table/table_builder.h"
 #include "util/coding.h"
 #include "util/file_reader_writer.h"

diff --git a/db/db_impl.cc b/db/db_impl.cc
@@ -76,7 +76,7 @@
 #include "rocksdb/write_buffer_manager.h"
 #include "table/block.h"
 #include "table/block_based_table_factory.h"
-#include "table/merger.h"
+#include "table/merging_iterator.h"
 #include "table/table_builder.h"
 #include "table/two_level_iterator.h"
 #include "util/autovector.h"

diff --git a/db/db_iter_test.cc b/db/db_iter_test.cc
@@ -16,7 +16,7 @@
 #include "rocksdb/slice.h"
 #include "rocksdb/statistics.h"
 #include "table/iterator_wrapper.h"
-#include "table/merger.h"
+#include "table/merging_iterator.h"
 #include "util/string_util.h"
 #include "util/sync_point.h"
 #include "util/testharness.h"

diff --git a/db/external_sst_file_ingestion_job.cc b/db/external_sst_file_ingestion_job.cc
@@ -13,7 +13,7 @@
 #include <vector>
 
 #include "db/version_edit.h"
-#include "table/merger.h"
+#include "table/merging_iterator.h"
 #include "table/scoped_arena_iterator.h"
 #include "table/sst_file_writer_collectors.h"
 #include "table/table_builder.h"

diff --git a/db/flush_job.cc b/db/flush_job.cc
@@ -38,7 +38,7 @@
 #include "rocksdb/table.h"
 #include "table/block.h"
 #include "table/block_based_table_factory.h"
-#include "table/merger.h"
+#include "table/merging_iterator.h"
 #include "table/table_builder.h"
 #include "table/two_level_iterator.h"
 #include "util/coding.h"

diff --git a/db/forward_iterator.cc b/db/forward_iterator.cc
@@ -18,7 +18,7 @@
 #include "rocksdb/env.h"
 #include "rocksdb/slice.h"
 #include "rocksdb/slice_transform.h"
-#include "table/merger.h"
+#include "table/merging_iterator.h"
 #include "util/string_util.h"
 #include "util/sync_point.h"
 

diff --git a/db/managed_iterator.cc b/db/managed_iterator.cc
@@ -19,7 +19,7 @@
 #include "rocksdb/env.h"
 #include "rocksdb/slice.h"
 #include "rocksdb/slice_transform.h"
-#include "table/merger.h"
+#include "table/merging_iterator.h"
 #include "util/xfunc.h"
 
 namespace rocksdb {

diff --git a/db/memtable.cc b/db/memtable.cc
@@ -26,7 +26,7 @@
 #include "rocksdb/write_buffer_manager.h"
 #include "table/internal_iterator.h"
 #include "table/iterator_wrapper.h"
-#include "table/merger.h"
+#include "table/merging_iterator.h"
 #include "util/arena.h"
 #include "util/autovector.h"
 #include "util/coding.h"

diff --git a/db/memtable_list.cc b/db/memtable_list.cc
@@ -16,7 +16,7 @@
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
 #include "rocksdb/iterator.h"
-#include "table/merger.h"
+#include "table/merging_iterator.h"
 #include "util/coding.h"
 #include "util/log_buffer.h"
 #include "util/sync_point.h"

diff --git a/db/version_set.cc b/db/version_set.cc
@@ -40,7 +40,7 @@
 #include "table/format.h"
 #include "table/get_context.h"
 #include "table/internal_iterator.h"
-#include "table/merger.h"
+#include "table/merging_iterator.h"
 #include "table/meta_blocks.h"
 #include "table/plain_table_factory.h"
 #include "table/table_reader.h"

diff --git a/src.mk b/src.mk
@@ -74,7 +74,7 @@ LIB_SOURCES =                                                   \
   table/full_filter_block.cc                                    \
   table/get_context.cc                                          \
   table/iterator.cc                                             \
-  table/merger.cc                                               \
+  table/merging_iterator.cc                                     \
   table/meta_blocks.cc                                          \
   table/sst_file_writer.cc                                      \
   table/plain_table_builder.cc                                  \

diff --git a/table/merger_test.cc b/table/merger_test.cc
@@ -6,7 +6,7 @@
 #include <vector>
 #include <string>
 
-#include "table/merger.h"
+#include "table/merging_iterator.h"
 #include "util/testharness.h"
 #include "util/testutil.h"
 

diff --git a/table/merger.cc → table/merging_iterator.cc b/table/merger.cc → table/merging_iterator.cc
@@ -7,7 +7,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "table/merger.h"
+#include "table/merging_iterator.h"
 #include <string>
 #include <vector>
 #include "db/pinned_iterators_manager.h"

diff --git a/table/merger.h → table/merging_iterator.h b/table/merger.h → table/merging_iterator.h
diff --git a/utilities/date_tiered/date_tiered_db_impl.cc b/utilities/date_tiered/date_tiered_db_impl.cc
@@ -15,7 +15,7 @@
 #include "rocksdb/env.h"
 #include "rocksdb/iterator.h"
 #include "rocksdb/utilities/date_tiered_db.h"
-#include "table/merger.h"
+#include "table/merging_iterator.h"
 #include "util/coding.h"
 #include "util/instrumented_mutex.h"
 #include "util/options_helper.h"