andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename merger.h -> merging_iterator.h

Browse Source 
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
This commit is contained in:
Islam AbdelRahman 2017-02-02 16:38:40 -08:00 committed by Facebook Github Bot
parent add8b50cc9
commit 574b543f80
16 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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

2
db/compaction_job.cc
View File

@ -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"

2
db/db_impl.cc
View File

@ -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"

2
db/db_iter_test.cc
View File

@ -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"

2
db/external_sst_file_ingestion_job.cc
View File

@ -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"

2
db/flush_job.cc
View File

@ -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"

2
db/forward_iterator.cc
View File

@ -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"

2
db/managed_iterator.cc
View File

@ -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 {

2
db/memtable.cc
View File

@ -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"

2
db/memtable_list.cc
View File

@ -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"

2
db/version_set.cc
View File

@ -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"

2
src.mk
View File

@ -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 \

2
table/merger_test.cc
View File

@ -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"

2
table/merger.cc → table/merging_iterator.cc
View File

@ -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"

0
table/merger.h → table/merging_iterator.h
View File

2
utilities/date_tiered/date_tiered_db_impl.cc
View File

@ -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"