Change internal headers with duplicate names (#11408)

Summary: In IDE navigation I find it annoying that there are two statistics.h files (etc.) and often land on the wrong one. Here I migrate several headers to use the blah.h <- blah_impl.h <- blah.cc idiom. Although clang-format wants "blah.h" to be the top include for "blah.cc", I think overall this is an improvement. No public API changes. Pull Request resolved: #11408 Test Plan: existing tests Reviewed By: ltamasi Differential Revision: D45456696 Pulled By: pdillinger fbshipit-source-id: 809d931253f3272c908cf5facf7e1d32fc507373
facebook · May 17, 2023 · 206fdea · 206fdea
1 parent 5fc57ee
commit 206fdea
Show file tree

Hide file tree

Showing 60 changed files with 62 additions and 64 deletions.
diff --git a/cache/clock_cache.cc b/cache/clock_cache.cc
@@ -16,7 +16,7 @@
 #include "cache/secondary_cache_adapter.h"
 #include "logging/logging.h"
 #include "monitoring/perf_context_imp.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "port/lang.h"
 #include "rocksdb/env.h"
 #include "util/hash.h"

diff --git a/cache/compressed_secondary_cache.cc b/cache/compressed_secondary_cache.cc
@@ -9,7 +9,7 @@
 #include <cstdint>
 #include <memory>
 
-#include "memory/memory_allocator.h"
+#include "memory/memory_allocator_impl.h"
 #include "monitoring/perf_context_imp.h"
 #include "util/compression.h"
 #include "util/string_util.h"

diff --git a/cache/compressed_secondary_cache.h b/cache/compressed_secondary_cache.h
@@ -10,7 +10,7 @@
 #include <memory>
 
 #include "cache/lru_cache.h"
-#include "memory/memory_allocator.h"
+#include "memory/memory_allocator_impl.h"
 #include "rocksdb/secondary_cache.h"
 #include "rocksdb/slice.h"
 #include "rocksdb/status.h"

diff --git a/cache/lru_cache.cc b/cache/lru_cache.cc
@@ -16,7 +16,7 @@
 
 #include "cache/secondary_cache_adapter.h"
 #include "monitoring/perf_context_imp.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "port/lang.h"
 #include "util/distributed_mutex.h"
 

diff --git a/db/blob/blob_contents.h b/db/blob/blob_contents.h
@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include "memory/memory_allocator.h"
+#include "memory/memory_allocator_impl.h"
 #include "rocksdb/advanced_cache.h"
 #include "rocksdb/rocksdb_namespace.h"
 #include "rocksdb/slice.h"

diff --git a/db/blob/blob_file_reader.cc b/db/blob/blob_file_reader.cc
@@ -12,7 +12,7 @@
 #include "db/blob/blob_log_format.h"
 #include "file/file_prefetch_buffer.h"
 #include "file/filename.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "options/cf_options.h"
 #include "rocksdb/file_system.h"
 #include "rocksdb/slice.h"

diff --git a/db/blob/blob_log_sequential_reader.cc b/db/blob/blob_log_sequential_reader.cc
@@ -7,7 +7,7 @@
 #include "db/blob/blob_log_sequential_reader.h"
 
 #include "file/random_access_file_reader.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "util/stop_watch.h"
 
 namespace ROCKSDB_NAMESPACE {

diff --git a/db/blob/blob_log_writer.cc b/db/blob/blob_log_writer.cc
@@ -10,7 +10,7 @@
 
 #include "db/blob/blob_log_format.h"
 #include "file/writable_file_writer.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "rocksdb/system_clock.h"
 #include "test_util/sync_point.h"
 #include "util/coding.h"

diff --git a/db/blob/blob_source.cc b/db/blob/blob_source.cc
@@ -13,7 +13,7 @@
 #include "db/blob/blob_contents.h"
 #include "db/blob/blob_file_reader.h"
 #include "db/blob/blob_log_format.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "options/cf_options.h"
 #include "table/get_context.h"
 #include "table/multiget_context.h"

diff --git a/db/compaction/compaction_job_stats_test.cc b/db/compaction/compaction_job_stats_test.cc
@@ -24,7 +24,7 @@
 #include "db/write_batch_internal.h"
 #include "env/mock_env.h"
 #include "file/filename.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "monitoring/thread_status_util.h"
 #include "port/stack_trace.h"
 #include "rocksdb/cache.h"
@@ -54,7 +54,7 @@
 #include "util/compression.h"
 #include "util/hash.h"
 #include "util/mutexlock.h"
-#include "util/rate_limiter.h"
+#include "util/rate_limiter_impl.h"
 #include "util/string_util.h"
 #include "utilities/merge_operators.h"
 

diff --git a/db/compaction/compaction_picker.cc b/db/compaction/compaction_picker.cc
@@ -20,7 +20,7 @@
 #include "file/filename.h"
 #include "logging/log_buffer.h"
 #include "logging/logging.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "test_util/sync_point.h"
 #include "util/random.h"
 #include "util/string_util.h"

diff --git a/db/compaction/compaction_picker_universal.cc b/db/compaction/compaction_picker_universal.cc
@@ -19,7 +19,7 @@
 #include "file/filename.h"
 #include "logging/log_buffer.h"
 #include "logging/logging.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "test_util/sync_point.h"
 #include "util/random.h"
 #include "util/string_util.h"

diff --git a/db/db_impl/db_impl_open.cc b/db/db_impl/db_impl_open.cc
@@ -24,7 +24,7 @@
 #include "rocksdb/table.h"
 #include "rocksdb/wal_filter.h"
 #include "test_util/sync_point.h"
-#include "util/rate_limiter.h"
+#include "util/rate_limiter_impl.h"
 
 namespace ROCKSDB_NAMESPACE {
 Options SanitizeOptions(const std::string& dbname, const Options& src,

diff --git a/db/db_iterator_test.cc b/db/db_iterator_test.cc
@@ -16,7 +16,7 @@
 #include "port/stack_trace.h"
 #include "rocksdb/iostats_context.h"
 #include "rocksdb/perf_context.h"
-#include "table/block_based/flush_block_policy.h"
+#include "table/block_based/flush_block_policy_impl.h"
 #include "util/random.h"
 #include "utilities/merge_operators/string_append/stringappend2.h"
 

diff --git a/db/db_test.cc b/db/db_test.cc
@@ -66,7 +66,7 @@
 #include "util/compression.h"
 #include "util/mutexlock.h"
 #include "util/random.h"
-#include "util/rate_limiter.h"
+#include "util/rate_limiter_impl.h"
 #include "util/string_util.h"
 #include "utilities/merge_operators.h"
 

diff --git a/db/listener_test.cc b/db/listener_test.cc
@@ -12,7 +12,7 @@
 #include "db/version_set.h"
 #include "db/write_batch_internal.h"
 #include "file/filename.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/compaction_filter.h"
 #include "rocksdb/db.h"
@@ -29,7 +29,7 @@
 #include "test_util/testutil.h"
 #include "util/hash.h"
 #include "util/mutexlock.h"
-#include "util/rate_limiter.h"
+#include "util/rate_limiter_impl.h"
 #include "util/string_util.h"
 #include "utilities/merge_operators.h"
 

diff --git a/db/memtable.cc b/db/memtable.cc
@@ -26,7 +26,7 @@
 #include "memory/arena.h"
 #include "memory/memory_usage.h"
 #include "monitoring/perf_context_imp.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "port/lang.h"
 #include "port/port.h"
 #include "rocksdb/comparator.h"

diff --git a/db/merge_helper.cc b/db/merge_helper.cc
@@ -15,7 +15,7 @@
 #include "db/wide/wide_column_serialization.h"
 #include "logging/logging.h"
 #include "monitoring/perf_context_imp.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "port/likely.h"
 #include "rocksdb/comparator.h"
 #include "rocksdb/db.h"

diff --git a/db/write_batch.cc b/db/write_batch.cc
@@ -59,7 +59,7 @@
 #include "db/wide/wide_column_serialization.h"
 #include "db/write_batch_internal.h"
 #include "monitoring/perf_context_imp.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "port/lang.h"
 #include "rocksdb/merge_operator.h"
 #include "rocksdb/system_clock.h"

diff --git a/env/mock_env.cc b/env/mock_env.cc
@@ -21,7 +21,7 @@
 #include "util/cast_util.h"
 #include "util/hash.h"
 #include "util/random.h"
-#include "util/rate_limiter.h"
+#include "util/rate_limiter_impl.h"
 #include "util/string_util.h"
 
 namespace ROCKSDB_NAMESPACE {

diff --git a/file/file_prefetch_buffer.cc b/file/file_prefetch_buffer.cc
@@ -18,7 +18,7 @@
 #include "port/port.h"
 #include "test_util/sync_point.h"
 #include "util/random.h"
-#include "util/rate_limiter.h"
+#include "util/rate_limiter_impl.h"
 
 namespace ROCKSDB_NAMESPACE {
 

diff --git a/file/file_prefetch_buffer.h b/file/file_prefetch_buffer.h
@@ -15,7 +15,7 @@
 #include <string>
 
 #include "file/readahead_file_info.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "port/port.h"
 #include "rocksdb/env.h"
 #include "rocksdb/file_system.h"

diff --git a/file/random_access_file_reader.cc b/file/random_access_file_reader.cc
@@ -19,7 +19,7 @@
 #include "table/format.h"
 #include "test_util/sync_point.h"
 #include "util/random.h"
-#include "util/rate_limiter.h"
+#include "util/rate_limiter_impl.h"
 
 namespace ROCKSDB_NAMESPACE {
 const std::array<Histograms, std::size_t(Env::IOActivity::kUnknown)>

diff --git a/file/readahead_raf.cc b/file/readahead_raf.cc
@@ -15,7 +15,7 @@
 #include "file/read_write_util.h"
 #include "rocksdb/file_system.h"
 #include "util/aligned_buffer.h"
-#include "util/rate_limiter.h"
+#include "util/rate_limiter_impl.h"
 
 namespace ROCKSDB_NAMESPACE {
 namespace {

diff --git a/file/sequence_file_reader.cc b/file/sequence_file_reader.cc
@@ -19,7 +19,7 @@
 #include "test_util/sync_point.h"
 #include "util/aligned_buffer.h"
 #include "util/random.h"
-#include "util/rate_limiter.h"
+#include "util/rate_limiter_impl.h"
 
 namespace ROCKSDB_NAMESPACE {
 IOStatus SequentialFileReader::Create(

diff --git a/file/writable_file_writer.cc b/file/writable_file_writer.cc
@@ -21,7 +21,7 @@
 #include "test_util/sync_point.h"
 #include "util/crc32c.h"
 #include "util/random.h"
-#include "util/rate_limiter.h"
+#include "util/rate_limiter_impl.h"
 
 namespace ROCKSDB_NAMESPACE {
 IOStatus WritableFileWriter::Create(const std::shared_ptr<FileSystem>& fs,

diff --git a/java/rocksjni/statisticsjni.h b/java/rocksjni/statisticsjni.h
@@ -13,7 +13,7 @@
 #include <set>
 #include <string>
 
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "rocksdb/statistics.h"
 
 namespace ROCKSDB_NAMESPACE {

diff --git a/memory/memory_allocator.h → memory/memory_allocator_impl.h b/memory/memory_allocator.h → memory/memory_allocator_impl.h
diff --git a/monitoring/instrumented_mutex.h b/monitoring/instrumented_mutex.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "port/port.h"
 #include "rocksdb/statistics.h"
 #include "rocksdb/system_clock.h"

diff --git a/monitoring/perf_step_timer.h b/monitoring/perf_step_timer.h
@@ -5,7 +5,7 @@
 //
 #pragma once
 #include "monitoring/perf_level_imp.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "rocksdb/system_clock.h"
 
 namespace ROCKSDB_NAMESPACE {

diff --git a/monitoring/statistics.cc b/monitoring/statistics.cc
@@ -3,14 +3,14 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
 //
-#include "monitoring/statistics.h"
+#include "rocksdb/statistics.h"
 
 #include <algorithm>
 #include <cinttypes>
 #include <cstdio>
 
+#include "monitoring/statistics_impl.h"
 #include "rocksdb/convenience.h"
-#include "rocksdb/statistics.h"
 #include "rocksdb/utilities/customizable_util.h"
 #include "rocksdb/utilities/options_type.h"
 #include "util/string_util.h"

diff --git a/monitoring/statistics.h → monitoring/statistics_impl.h b/monitoring/statistics.h → monitoring/statistics_impl.h
diff --git a/options/customizable_test.cc b/options/customizable_test.cc
@@ -35,7 +35,7 @@
 #include "rocksdb/utilities/object_registry.h"
 #include "rocksdb/utilities/options_type.h"
 #include "table/block_based/filter_policy_internal.h"
-#include "table/block_based/flush_block_policy.h"
+#include "table/block_based/flush_block_policy_impl.h"
 #include "table/mock_table.h"
 #include "test_util/mock_time_env.h"
 #include "test_util/testharness.h"

diff --git a/options/options.cc b/options/options.cc
@@ -13,7 +13,7 @@
 #include <limits>
 
 #include "logging/logging.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "options/db_options.h"
 #include "options/options_helper.h"
 #include "rocksdb/cache.h"

diff --git a/table/block_based/block_based_table_builder.cc b/table/block_based/block_based_table_builder.cc
@@ -29,7 +29,7 @@
 #include "db/dbformat.h"
 #include "index_builder.h"
 #include "logging/logging.h"
-#include "memory/memory_allocator.h"
+#include "memory/memory_allocator_impl.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/comparator.h"
 #include "rocksdb/env.h"

diff --git a/table/block_based/flush_block_policy.cc b/table/block_based/flush_block_policy.cc
@@ -13,7 +13,7 @@
 #include "rocksdb/utilities/customizable_util.h"
 #include "table/block_based/block_based_table_reader.h"
 #include "table/block_based/block_builder.h"
-#include "table/block_based/flush_block_policy.h"
+#include "table/block_based/flush_block_policy_impl.h"
 #include "table/format.h"
 
 namespace ROCKSDB_NAMESPACE {

diff --git a/table/block_based/flush_block_policy.h → table/block_based/flush_block_policy_impl.h b/table/block_based/flush_block_policy.h → table/block_based/flush_block_policy_impl.h
diff --git a/table/block_fetcher.cc b/table/block_fetcher.cc
@@ -14,7 +14,7 @@
 #include <string>
 
 #include "logging/logging.h"
-#include "memory/memory_allocator.h"
+#include "memory/memory_allocator_impl.h"
 #include "monitoring/perf_context_imp.h"
 #include "rocksdb/compression_type.h"
 #include "rocksdb/env.h"

diff --git a/table/block_fetcher.h b/table/block_fetcher.h
@@ -8,7 +8,7 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
 #pragma once
-#include "memory/memory_allocator.h"
+#include "memory/memory_allocator_impl.h"
 #include "table/block_based/block.h"
 #include "table/block_based/block_type.h"
 #include "table/format.h"

diff --git a/table/format.cc b/table/format.cc
@@ -14,9 +14,9 @@
 
 #include "block_fetcher.h"
 #include "file/random_access_file_reader.h"
-#include "memory/memory_allocator.h"
+#include "memory/memory_allocator_impl.h"
 #include "monitoring/perf_context_imp.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "options/options_helper.h"
 #include "rocksdb/env.h"
 #include "rocksdb/options.h"

diff --git a/table/format.h b/table/format.h
@@ -15,7 +15,7 @@
 
 #include "file/file_prefetch_buffer.h"
 #include "file/random_access_file_reader.h"
-#include "memory/memory_allocator.h"
+#include "memory/memory_allocator_impl.h"
 #include "options/cf_options.h"
 #include "port/malloc.h"
 #include "port/port.h"  // noexcept

diff --git a/table/get_context.cc b/table/get_context.cc
@@ -12,7 +12,7 @@
 #include "db/wide/wide_column_serialization.h"
 #include "monitoring/file_read_sample.h"
 #include "monitoring/perf_context_imp.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "rocksdb/merge_operator.h"
 #include "rocksdb/statistics.h"
 #include "rocksdb/system_clock.h"

diff --git a/table/persistent_cache_helper.h b/table/persistent_cache_helper.h
@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "table/format.h"
 #include "table/persistent_cache_options.h"
 

diff --git a/table/persistent_cache_options.h b/table/persistent_cache_options.h
@@ -7,7 +7,7 @@
 #include <string>
 
 #include "cache/cache_key.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "rocksdb/persistent_cache.h"
 
 namespace ROCKSDB_NAMESPACE {