diff --git a/CMakeLists.txt b/CMakeLists.txt index 93ab814fefad7e887931ae002accf7aeb4cd5ce8..bf9c781f2f826f690e1402eb4f8b4f0cae2d4fe1 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 b1cd9fce5c7b2232a4c62a3f87aa982c1fd1833a..ff4f4cb6454af13e63c49187749efe40e8755574 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 cbe052a952d7993eca54e52082a3a0d2aa0248dd..3c20566cdf09bd1a0e638e7c251985ac97edad75 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 35da751fde2e4df027e829fdd20f1951959fe0c5..c8abd0d25abfb2f18cf5d695ea56358eff787b0e 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 a612b91c84a8edef45b4f97dfa349b87aebda73f..f71b830a62d066ad6a4e2c9214edbbb0e6a11107 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 e957fd7af11a0a5bada1831915cc7327c3f99a0a..f7eb20f6f5ecd9bc4f99ba6bd3b0f315f13e11e4 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 415a5b857b5af05bf15f122fa01bf3b6215a9362..8eae808e853798ef707d3a7d14feaaca77f158b2 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 e8837fce34fcd76c66cf1bc69941254a785ef7fd..09697f4be41401e5b07680cc8f62ae99189480fa 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 6da600e8241d0505a3b2b09e0176256e247ea33c..776c8d8e7e87c326e4160ab533b1bf3f33dad263 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 7252c9730c5ab5f1e3a1cae7a794fd6f81f2a767..1398d7e7d70a702515a633a20a8c1ca3f982d55f 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 ad57974b3dcdaee5acdc57631b67f8de2cec8ac9..432653adbae1d49f602eebc0d42bbe096bf8b4b5 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 94a02ab60d71c7596ee28ea740083cc25305a716..7a0ba03665d65c2313839ac9077d5f6a37f14dc3 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 97979af7ce364dfeedc553bbe64f7be164f292dc..4a079d85d305b214e36f97041df0e05fd14046ac 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 e22a16e66564dde01f21a7c20bb79ac53d76cf39..5a56fbf66920d4bccbd9c7c29f0237bc0fa887b7 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 ea5e933433f248512c560d84b5dc33da830cd675..4b4ac6c6b8322d1ad904a9816df29cb9372d6819 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"