IWYU

GehaFearless · Nov 8, 2023 · faec076 · faec076
1 parent 686f90a
commit faec076
Show file tree

Hide file tree

Showing 104 changed files with 155 additions and 45 deletions.
diff --git a/src/client/partition_resolver.cpp b/src/client/partition_resolver.cpp
@@ -31,6 +31,7 @@
 #include "partition_resolver_manager.h"
 #include "runtime/api_layer1.h"
 #include "runtime/api_task.h"
+#include "runtime/rpc/dns_resolver.h"
 #include "runtime/task/task_spec.h"
 #include "utils/fmt_logging.h"
 #include "utils/threadpool_code.h"

diff --git a/src/client/partition_resolver.h b/src/client/partition_resolver.h
@@ -29,13 +29,12 @@
 #include <stdint.h>
 #include <chrono>
 #include <functional>
+#include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "common/gpid.h"
-#include "runtime/rpc/dns_resolver.h"
-#include "runtime/rpc/rpc_address.h"
 #include "runtime/rpc/rpc_host_port.h"
 #include "runtime/rpc/rpc_message.h"
 #include "runtime/rpc/serialization.h"
@@ -46,6 +45,7 @@
 #include "utils/error_code.h"
 
 namespace dsn {
+class dns_resolver;
 class task_tracker;
 
 namespace replication {

diff --git a/src/client/partition_resolver_manager.cpp b/src/client/partition_resolver_manager.cpp
@@ -35,6 +35,8 @@
 #include "utils/fmt_logging.h"
 
 namespace dsn {
+class dns_resolver;
+
 namespace replication {
 
 template <typename T>

diff --git a/src/client/partition_resolver_manager.h b/src/client/partition_resolver_manager.h
@@ -27,6 +27,7 @@
 #pragma once
 
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -35,7 +36,8 @@
 #include "utils/zlocks.h"
 
 namespace dsn {
-class rpc_address;
+class dns_resolver;
+class host_port;
 
 namespace replication {
 

diff --git a/src/client/partition_resolver_simple.cpp b/src/client/partition_resolver_simple.cpp
@@ -35,6 +35,7 @@
 #include "dsn.layer2_types.h"
 #include "partition_resolver_simple.h"
 #include "runtime/api_layer1.h"
+#include "runtime/rpc/dns_resolver.h"
 #include "runtime/rpc/rpc_message.h"
 #include "runtime/rpc/serialization.h"
 #include "runtime/task/async_calls.h"

diff --git a/src/client/partition_resolver_simple.h b/src/client/partition_resolver_simple.h
@@ -42,6 +42,7 @@
 #include "utils/zlocks.h"
 
 namespace dsn {
+class dns_resolver;
 class message_ex;
 
 namespace replication {

diff --git a/src/client/replication_ddl_client.cpp b/src/client/replication_ddl_client.cpp
@@ -49,6 +49,7 @@
 #include "meta/meta_rpc_types.h"
 #include "runtime/api_layer1.h"
 #include "runtime/rpc/group_host_port.h"
+#include "runtime/rpc/rpc_address.h"
 #include "utils/error_code.h"
 #include "utils/fmt_logging.h"
 #include "utils/output_utils.h"

diff --git a/src/client/test/ddl_client_test.cpp b/src/client/test/ddl_client_test.cpp
@@ -23,6 +23,7 @@
 #include <algorithm>
 #include <deque>
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "client/replication_ddl_client.h"

diff --git a/src/client_lib/mutation.cpp b/src/client_lib/mutation.cpp
@@ -24,7 +24,7 @@
 #include <vector>
 
 #include "../base/pegasus_utils.h"
-#include "utils/string_view.h"
+#include "utils/enum_helper.h"
 
 using namespace ::dsn;
 

diff --git a/src/client_lib/pegasus_client_impl.cpp b/src/client_lib/pegasus_client_impl.cpp
@@ -34,6 +34,7 @@
 #include "pegasus_key_schema.h"
 #include "pegasus_utils.h"
 #include "rrdb/rrdb.client.h"
+#include "runtime/rpc/dns_resolver.h"
 #include "runtime/rpc/group_host_port.h"
 #include "runtime/rpc/serialization.h"
 #include "runtime/task/async_calls.h"

diff --git a/src/client_lib/pegasus_client_impl.h b/src/client_lib/pegasus_client_impl.h
@@ -32,12 +32,12 @@
 #include <vector>
 
 #include "rrdb/rrdb_types.h"
-#include "runtime/rpc/dns_resolver.h"
 #include "runtime/rpc/rpc_host_port.h"
 #include "utils/blob.h"
 #include "utils/zlocks.h"
 
 namespace dsn {
+class dns_resolver;
 class error_code;
 class message_ex;
 class task_tracker;

diff --git a/src/common/replication_common.cpp b/src/common/replication_common.cpp
@@ -31,12 +31,14 @@
 #include <memory>
 #include <set>
 #include <unordered_set>
+#include <utility>
 
 #include "common/gpid.h"
 #include "common/replica_envs.h"
 #include "common/replication_other_types.h"
 #include "dsn.layer2_types.h"
 #include "fmt/core.h"
+#include "runtime/rpc/rpc_address.h"
 #include "runtime/service_app.h"
 #include "utils/config_api.h"
 #include "utils/filesystem.h"

diff --git a/src/failure_detector/failure_detector.cpp b/src/failure_detector/failure_detector.cpp
@@ -37,6 +37,8 @@
 #include "fd_types.h"
 #include "perf_counter/perf_counter.h"
 #include "runtime/api_layer1.h"
+#include "runtime/rpc/dns_resolver.h"
+#include "runtime/rpc/rpc_address.h"
 #include "runtime/serverlet.h"
 #include "runtime/task/async_calls.h"
 #include "runtime/task/task_spec.h"

diff --git a/src/failure_detector/failure_detector.h b/src/failure_detector/failure_detector.h
@@ -72,7 +72,6 @@
 #include "failure_detector/fd.server.h"
 #include "perf_counter/perf_counter_wrapper.h"
 #include "runtime/rpc/rpc_host_port.h"
-#include "runtime/rpc/dns_resolver.h"
 #include "runtime/task/task.h"
 #include "runtime/task/task_code.h"
 #include "runtime/task/task_tracker.h"
@@ -82,6 +81,7 @@
 
 namespace dsn {
 class command_deregister;
+class dns_resolver;
 template <typename TResponse>
 class rpc_replier;
 

diff --git a/src/failure_detector/failure_detector_multimaster.cpp b/src/failure_detector/failure_detector_multimaster.cpp
@@ -38,12 +38,13 @@
 
 #include "failure_detector/failure_detector_multimaster.h"
 #include "fd_types.h"
-#include "runtime/rpc/group_address.h"
 #include "runtime/rpc/rpc_host_port.h"
 #include "utils/error_code.h"
 #include "utils/rand.h"
 
 namespace dsn {
+class dns_resolver;
+
 namespace dist {
 
 slave_failure_detector_with_multimaster::slave_failure_detector_with_multimaster(

diff --git a/src/failure_detector/failure_detector_multimaster.h b/src/failure_detector/failure_detector_multimaster.h
@@ -27,6 +27,7 @@
 #pragma once
 
 #include <functional>
+#include <memory>
 #include <vector>
 
 #include "failure_detector/failure_detector.h"
@@ -36,7 +37,9 @@
 #include "utils/zlocks.h"
 
 namespace dsn {
+class dns_resolver;
 class error_code;
+
 namespace fd {
 class beacon_ack;
 } // namespace fd

diff --git a/src/failure_detector/test/failure_detector.cpp b/src/failure_detector/test/failure_detector.cpp
@@ -49,9 +49,10 @@
 #include "meta/meta_server_failure_detector.h"
 #include "replica/replica_stub.h"
 #include "runtime/api_layer1.h"
-#include "runtime/rpc/group_address.h"
-#include "runtime/rpc/network.h"
 #include "runtime/rpc/dns_resolver.h"
+#include "runtime/rpc/group_host_port.h"
+#include "runtime/rpc/network.h"
+#include "runtime/rpc/rpc_address.h"
 #include "runtime/rpc/rpc_host_port.h"
 #include "runtime/rpc/rpc_message.h"
 #include "runtime/serverlet.h"

diff --git a/src/meta/app_balance_policy.cpp b/src/meta/app_balance_policy.cpp
@@ -25,12 +25,14 @@
 #include "app_balance_policy.h"
 #include "common/gpid.h"
 #include "meta/load_balance_policy.h"
+#include "meta/meta_service.h"
 #include "metadata_types.h"
+#include "runtime/rpc/rpc_host_port.h"
 #include "utils/flags.h"
 #include "utils/fmt_logging.h"
 
 namespace dsn {
-class rpc_address;
+class dns_resolver;
 
 namespace replication {
 DSN_DEFINE_bool(meta_server, balancer_in_turn, false, "balance the apps one-by-one/concurrently");

diff --git a/src/meta/app_balance_policy.h b/src/meta/app_balance_policy.h
@@ -27,6 +27,7 @@
 #include "utils/command_manager.h"
 
 namespace dsn {
+class dns_resolver;
 class gpid;
 class host_port;
 

diff --git a/src/meta/backup_engine.cpp b/src/meta/backup_engine.cpp
@@ -36,8 +36,9 @@
 #include "meta/meta_data.h"
 #include "meta/meta_service.h"
 #include "runtime/api_layer1.h"
-#include "runtime/rpc/rpc_host_port.h"
+#include "runtime/rpc/dns_resolver.h"
 #include "runtime/rpc/rpc_holder.h"
+#include "runtime/rpc/rpc_host_port.h"
 #include "runtime/task/async_calls.h"
 #include "runtime/task/task.h"
 #include "runtime/task/task_code.h"

diff --git a/src/meta/backup_engine.h b/src/meta/backup_engine.h
@@ -20,6 +20,7 @@
 #include <gtest/gtest_prod.h>
 #include <stdint.h>
 #include <map>
+#include <memory>
 #include <string>
 
 #include "backup_types.h"
@@ -30,8 +31,10 @@
 
 namespace dsn {
 class blob;
+class dns_resolver;
 class gpid;
 class host_port;
+
 namespace dist {
 namespace block_service {
 class block_filesystem;

diff --git a/src/meta/cluster_balance_policy.cpp b/src/meta/cluster_balance_policy.cpp
@@ -26,13 +26,14 @@
 
 #include "dsn.layer2_types.h"
 #include "meta/load_balance_policy.h"
+#include "meta/meta_service.h"
+#include "runtime/rpc/dns_resolver.h"
 #include "utils/flags.h"
 #include "utils/fmt_logging.h"
 #include "utils/utils.h"
 
 namespace dsn {
 namespace replication {
-class meta_service;
 
 DSN_DEFINE_uint32(meta_server,
                   balance_op_count_per_round,

diff --git a/src/meta/duplication/duplication_info.h b/src/meta/duplication/duplication_info.h
@@ -30,7 +30,6 @@
 #include "common/json_helper.h"
 #include "common/replication_other_types.h"
 #include "duplication_types.h"
-#include "runtime/rpc/rpc_address.h"
 #include "runtime/rpc/rpc_host_port.h"
 #include "utils/blob.h"
 #include "utils/error_code.h"

diff --git a/src/meta/duplication/meta_duplication_service.cpp b/src/meta/duplication/meta_duplication_service.cpp
@@ -34,8 +34,10 @@
 #include "meta_duplication_service.h"
 #include "metadata_types.h"
 #include "runtime/api_layer1.h"
+#include "runtime/rpc/dns_resolver.h"
 #include "runtime/rpc/group_host_port.h"
 #include "runtime/rpc/rpc_address.h"
+#include "runtime/rpc/rpc_host_port.h"
 #include "runtime/rpc/rpc_message.h"
 #include "runtime/rpc/serialization.h"
 #include "runtime/task/async_calls.h"

diff --git a/src/meta/duplication/meta_duplication_service.h b/src/meta/duplication/meta_duplication_service.h
@@ -28,12 +28,11 @@
 #include "meta/duplication/duplication_info.h"
 #include "meta/meta_data.h"
 #include "meta/server_state.h"
-#include "runtime/rpc/rpc_host_port.h"
-#include "runtime/rpc/dns_resolver.h"
 #include "utils/fmt_logging.h"
 
 namespace dsn {
-class rpc_address;
+class dns_resolver;
+class host_port;
 class zrwlock_nr;
 
 namespace replication {

diff --git a/src/meta/greedy_load_balancer.cpp b/src/meta/greedy_load_balancer.cpp
@@ -40,7 +40,7 @@
 #include "meta_admin_types.h"
 #include "meta_data.h"
 #include "perf_counter/perf_counter.h"
-#include "runtime/rpc/rpc_address.h"
+#include "runtime/rpc/rpc_host_port.h"
 #include "utils/command_manager.h"
 #include "utils/flags.h"
 #include "utils/fmt_logging.h"

diff --git a/src/meta/greedy_load_balancer.h b/src/meta/greedy_load_balancer.h
@@ -45,6 +45,7 @@
 
 namespace dsn {
 class command_deregister;
+class host_port;
 class rpc_address;
 
 namespace replication {

diff --git a/src/meta/load_balance_policy.cpp b/src/meta/load_balance_policy.cpp
@@ -28,7 +28,9 @@
 #include "dsn.layer2_types.h"
 #include "meta/greedy_load_balancer.h"
 #include "meta/meta_data.h"
+#include "meta/meta_service.h"
 #include "meta_admin_types.h"
+#include "runtime/rpc/dns_resolver.h"
 #include "utils/command_manager.h"
 #include "utils/fail_point.h"
 #include "utils/flags.h"
@@ -38,6 +40,8 @@
 #include "utils/strings.h"
 
 namespace dsn {
+class rpc_address;
+
 namespace replication {
 DSN_DECLARE_uint64(min_live_node_count_for_unfreeze);
 

diff --git a/src/meta/load_balance_policy.h b/src/meta/load_balance_policy.h
@@ -33,17 +33,19 @@
 #include "common/gpid.h"
 #include "common/replication_other_types.h"
 #include "meta_data.h"
-#include "meta_service.h"
 #include "runtime/rpc/rpc_host_port.h"
 #include "utils/enum_helper.h"
 #include "utils/zlocks.h"
 
 namespace dsn {
 class command_deregister;
+class dns_resolver;
 class partition_configuration;
+class rpc_address;
 
 namespace replication {
 class configuration_balancer_request;
+class meta_service;
 
 // disk_tag->primary_count/total_count_on_this_disk
 typedef std::map<std::string, int> disk_load;

diff --git a/src/meta/meta_bulk_load_service.cpp b/src/meta/meta_bulk_load_service.cpp
@@ -37,6 +37,8 @@
 #include "meta/meta_state_service.h"
 #include "meta/server_state.h"
 #include "meta_admin_types.h"
+#include "runtime/rpc/dns_resolver.h"
+#include "runtime/rpc/rpc_address.h"
 #include "runtime/rpc/rpc_holder.h"
 #include "runtime/rpc/rpc_message.h"
 #include "runtime/rpc/serialization.h"

diff --git a/src/meta/meta_data.cpp b/src/meta/meta_data.cpp
@@ -39,6 +39,8 @@
 #include "common/replication_enums.h"
 #include "meta_data.h"
 #include "runtime/api_layer1.h"
+#include "runtime/rpc/dns_resolver.h"
+#include "runtime/rpc/rpc_address.h"
 #include "runtime/rpc/rpc_message.h"
 #include "utils/flags.h"
 #include "utils/fmt_logging.h"

diff --git a/src/meta/meta_data.h b/src/meta/meta_data.h
@@ -62,8 +62,10 @@
 #include "utils/enum_helper.h"
 #include "utils/error_code.h"
 #include "utils/extensible_object.h"
+#include "utils/fmt_logging.h"
 
 namespace dsn {
+class dns_resolver;
 class message_ex;
 
 namespace replication {