From 574b543f809d2bc017b765da416c4bda88c143d3 Mon Sep 17 00:00:00 2001 From: Islam AbdelRahman Date: Thu, 2 Feb 2017 16:38:40 -0800 Subject: [PATCH] Rename merger.h -> merging_iterator.h Summary: merger.h was always a confusing name for me, simply give the file a better name Closes https://github.com/facebook/rocksdb/pull/1836 Differential Revision: D4505357 Pulled By: IslamAbdelRahman fbshipit-source-id: 07b28d8 --- CMakeLists.txt | 2 +- db/compaction_job.cc | 2 +- db/db_impl.cc | 2 +- db/db_iter_test.cc | 2 +- db/external_sst_file_ingestion_job.cc | 2 +- db/flush_job.cc | 2 +- db/forward_iterator.cc | 2 +- db/managed_iterator.cc | 2 +- db/memtable.cc | 2 +- db/memtable_list.cc | 2 +- db/version_set.cc | 2 +- src.mk | 2 +- table/merger_test.cc | 2 +- table/{merger.cc => merging_iterator.cc} | 2 +- table/{merger.h => merging_iterator.h} | 0 utilities/date_tiered/date_tiered_db_impl.cc | 2 +- 16 files changed, 15 insertions(+), 15 deletions(-) rename table/{merger.cc => merging_iterator.cc} (99%) rename table/{merger.h => merging_iterator.h} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 93ab814fe..bf9c781f2 100644 --- 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 index b1cd9fce5..ff4f4cb64 100644 --- 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 index cbe052a95..3c20566cd 100644 --- 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 index 35da751fd..c8abd0d25 100644 --- 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 index a612b91c8..f71b830a6 100644 --- a/db/external_sst_file_ingestion_job.cc +++ b/db/external_sst_file_ingestion_job.cc @@ -13,7 +13,7 @@ #include #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 index e957fd7af..f7eb20f6f 100644 --- 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 index 415a5b857..8eae808e8 100644 --- 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 index e8837fce3..09697f4be 100644 --- 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 index 6da600e82..776c8d8e7 100644 --- 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 index 7252c9730..1398d7e7d 100644 --- 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 index ad57974b3..432653adb 100644 --- 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 index 94a02ab60..7a0ba0366 100644 --- 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 index 97979af7c..4a079d85d 100644 --- a/table/merger_test.cc +++ b/table/merger_test.cc @@ -6,7 +6,7 @@ #include #include -#include "table/merger.h" +#include "table/merging_iterator.h" #include "util/testharness.h" #include "util/testutil.h" diff --git a/table/merger.cc b/table/merging_iterator.cc similarity index 99% rename from table/merger.cc rename to table/merging_iterator.cc index e22a16e66..5a56fbf66 100644 --- a/table/merger.cc +++ b/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 #include #include "db/pinned_iterators_manager.h" diff --git a/table/merger.h b/table/merging_iterator.h similarity index 100% rename from table/merger.h rename to table/merging_iterator.h diff --git a/utilities/date_tiered/date_tiered_db_impl.cc b/utilities/date_tiered/date_tiered_db_impl.cc index ea5e93343..4b4ac6c6b 100644 --- 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"