diff options
| author | Peter Dillinger <peterd@fb.com> | 2023-05-17 11:27:09 -0700 |
|---|---|---|
| committer | Facebook GitHub Bot <facebook-github-bot@users.noreply.github.com> | 2023-05-17 11:27:09 -0700 |
| commit | 206fdea3d9bb9fb05ed191d0419d5f701f73a8d7 (patch) | |
| tree | e815cdea51a87eb83469c03c40bb27f067fb7bac /monitoring | |
| parent | 5fc57eec2b44337289f25c1b5687beb54ad709a2 (diff) | |
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: https://github.com/facebook/rocksdb/pull/11408
Test Plan: existing tests
Reviewed By: ltamasi
Differential Revision: D45456696
Pulled By: pdillinger
fbshipit-source-id: 809d931253f3272c908cf5facf7e1d32fc507373
Diffstat (limited to 'monitoring')
| -rw-r--r-- | monitoring/instrumented_mutex.h | 2 | ||||
| -rw-r--r-- | monitoring/perf_step_timer.h | 2 | ||||
| -rw-r--r-- | monitoring/statistics.cc | 4 | ||||
| -rw-r--r-- | monitoring/statistics_impl.h (renamed from monitoring/statistics.h) | 0 |
4 files changed, 4 insertions, 4 deletions
diff --git a/monitoring/instrumented_mutex.h b/monitoring/instrumented_mutex.h index e5aae34df..b97d2502e 100644 --- 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 index 8deb31252..f6c45d773 100644 --- 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 index 927cf9895..7459dc46f 100644 --- 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 b/monitoring/statistics_impl.h index e0dc29d28..e0dc29d28 100644 --- a/monitoring/statistics.h +++ b/monitoring/statistics_impl.h |