From daeddda7ccd55c18aadb3dce3388eae866e317e8 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Tue, 20 Apr 2021 20:35:46 +0300 Subject: [PATCH] treewide: remove inclusions of storage_proxy.hh from headers storage_proxy.hh is huge and includes many headers itself, so remove its inclusions from headers and re-add smaller headers where needed (and storage_proxy.hh itself in source files that need it). Ref #1. --- alternator/executor.hh | 3 ++- alternator/server.hh | 1 + cdc/log.cc | 1 + connection_notifier.cc | 1 + cql3/cql_statement.hh | 7 ++++++- cql3/statements/alter_keyspace_statement.cc | 1 + cql3/statements/alter_table_statement.cc | 1 + cql3/statements/alter_view_statement.cc | 1 + cql3/statements/batch_statement.hh | 1 - cql3/statements/create_function_statement.cc | 1 + cql3/statements/create_keyspace_statement.cc | 1 + cql3/statements/create_type_statement.cc | 1 + cql3/statements/drop_index_statement.cc | 1 + cql3/statements/drop_table_statement.cc | 1 + cql3/statements/drop_type_statement.cc | 1 + cql3/statements/drop_view_statement.cc | 1 + cql3/statements/function_statement.cc | 1 + cql3/statements/modification_statement.hh | 1 - cql3/statements/raw/batch_statement.hh | 1 - cql3/statements/raw/modification_statement.hh | 1 - cql3/statements/select_statement.cc | 1 + cql3/statements/truncate_statement.cc | 1 + database.cc | 2 ++ db/legacy_schema_migrator.cc | 1 + db/query_context.hh | 1 + db/schema_tables.cc | 1 + db/schema_tables.hh | 9 ++++++++- db/system_distributed_keyspace.cc | 1 + db/view/view.cc | 1 + redis/keyspace_utils.cc | 1 + redis/server.cc | 1 + redis/server.hh | 8 +++++++- redis/service.cc | 1 + service/migration_manager.cc | 1 + service/migration_task.cc | 1 + service/pager/query_pager.hh | 3 ++- service/storage_service.cc | 1 + table.cc | 2 ++ test/boost/batchlog_manager_test.cc | 1 + test/boost/database_test.cc | 1 + test/boost/schema_change_test.cc | 1 + test/boost/user_types_test.cc | 2 ++ test/lib/cql_test_env.cc | 1 + test/perf/perf_fast_forward.cc | 3 +++ test/perf/perf_simple_query.cc | 1 + thrift/handler.cc | 1 + thrift/server.cc | 1 + tracing/trace_keyspace_helper.cc | 1 + transport/server.cc | 1 + transport/server.hh | 2 +- 50 files changed, 71 insertions(+), 10 deletions(-) diff --git a/alternator/executor.hh b/alternator/executor.hh index bbe84910e6..0b638772ab 100644 --- a/alternator/executor.hh +++ b/alternator/executor.hh @@ -27,9 +27,9 @@ #include #include -#include "service/storage_proxy.hh" #include "service/migration_manager.hh" #include "service/client_state.hh" +#include "service_permit.hh" #include "db/timeout_clock.hh" #include "alternator/error.hh" @@ -51,6 +51,7 @@ namespace cql3::selection { namespace service { class storage_service; + class storage_proxy; } namespace cdc { diff --git a/alternator/server.hh b/alternator/server.hh index 335ab889cc..e764febc8b 100644 --- a/alternator/server.hh +++ b/alternator/server.hh @@ -23,6 +23,7 @@ #include "alternator/executor.hh" #include +#include #include #include #include diff --git a/cdc/log.cc b/cdc/log.cc index 0829e595c0..72d94cfa4f 100644 --- a/cdc/log.cc +++ b/cdc/log.cc @@ -42,6 +42,7 @@ #include "schema_builder.hh" #include "service/migration_listener.hh" #include "service/storage_service.hh" +#include "service/storage_proxy.hh" #include "types/tuple.hh" #include "cql3/statements/select_statement.hh" #include "cql3/multi_column_relation.hh" diff --git a/connection_notifier.cc b/connection_notifier.cc index d9d0a7f2b6..7acb5bd390 100644 --- a/connection_notifier.cc +++ b/connection_notifier.cc @@ -22,6 +22,7 @@ #include "connection_notifier.hh" #include "cql3/constants.hh" #include "database.hh" +#include "service/storage_proxy.hh" #include diff --git a/cql3/cql_statement.hh b/cql3/cql_statement.hh index e749217338..23950a046d 100644 --- a/cql3/cql_statement.hh +++ b/cql3/cql_statement.hh @@ -43,10 +43,15 @@ #include "service/client_state.hh" #include "service/query_state.hh" -#include "service/storage_proxy.hh" #include "cql3/query_options.hh" #include "timeout_config.hh" +namespace service { + +class storage_proxy; + +} + namespace cql_transport { namespace messages { diff --git a/cql3/statements/alter_keyspace_statement.cc b/cql3/statements/alter_keyspace_statement.cc index 62f8b285a4..fde8d37a31 100644 --- a/cql3/statements/alter_keyspace_statement.cc +++ b/cql3/statements/alter_keyspace_statement.cc @@ -42,6 +42,7 @@ #include "alter_keyspace_statement.hh" #include "prepared_statement.hh" #include "service/migration_manager.hh" +#include "service/storage_proxy.hh" #include "db/system_keyspace.hh" #include "database.hh" #include "cql3/query_processor.hh" diff --git a/cql3/statements/alter_table_statement.cc b/cql3/statements/alter_table_statement.cc index f6f8c48c5d..801281abbf 100644 --- a/cql3/statements/alter_table_statement.cc +++ b/cql3/statements/alter_table_statement.cc @@ -43,6 +43,7 @@ #include "index/secondary_index_manager.hh" #include "prepared_statement.hh" #include "service/migration_manager.hh" +#include "service/storage_proxy.hh" #include "validation.hh" #include "db/extensions.hh" #include diff --git a/cql3/statements/alter_view_statement.cc b/cql3/statements/alter_view_statement.cc index dd6d93af4b..fdecdd0478 100644 --- a/cql3/statements/alter_view_statement.cc +++ b/cql3/statements/alter_view_statement.cc @@ -42,6 +42,7 @@ #include "cql3/statements/alter_view_statement.hh" #include "cql3/statements/prepared_statement.hh" #include "service/migration_manager.hh" +#include "service/storage_proxy.hh" #include "validation.hh" #include "view_info.hh" #include "db/extensions.hh" diff --git a/cql3/statements/batch_statement.hh b/cql3/statements/batch_statement.hh index eada6fbe82..4b94442d74 100644 --- a/cql3/statements/batch_statement.hh +++ b/cql3/statements/batch_statement.hh @@ -41,7 +41,6 @@ #include "modification_statement.hh" #include "raw/modification_statement.hh" #include "raw/batch_statement.hh" -#include "service/storage_proxy.hh" #include "transport/messages/result_message.hh" #include "timestamp.hh" #include "log.hh" diff --git a/cql3/statements/create_function_statement.cc b/cql3/statements/create_function_statement.cc index 45ede4e3ab..3ad412aeff 100644 --- a/cql3/statements/create_function_statement.cc +++ b/cql3/statements/create_function_statement.cc @@ -23,6 +23,7 @@ #include "cql3/functions/functions.hh" #include "prepared_statement.hh" #include "service/migration_manager.hh" +#include "service/storage_proxy.hh" #include "lua.hh" #include "database.hh" #include "cql3/query_processor.hh" diff --git a/cql3/statements/create_keyspace_statement.cc b/cql3/statements/create_keyspace_statement.cc index 0d836d2667..6e06a9a864 100644 --- a/cql3/statements/create_keyspace_statement.cc +++ b/cql3/statements/create_keyspace_statement.cc @@ -43,6 +43,7 @@ #include "prepared_statement.hh" #include "database.hh" #include "service/migration_manager.hh" +#include "service/storage_proxy.hh" #include "transport/messages/result_message.hh" #include "cql3/query_processor.hh" diff --git a/cql3/statements/create_type_statement.cc b/cql3/statements/create_type_statement.cc index 3546cd7736..c84fd32ccd 100644 --- a/cql3/statements/create_type_statement.cc +++ b/cql3/statements/create_type_statement.cc @@ -41,6 +41,7 @@ #include "prepared_statement.hh" #include "database.hh" #include "service/migration_manager.hh" +#include "service/storage_proxy.hh" #include "user_types_metadata.hh" #include "cql3/query_processor.hh" diff --git a/cql3/statements/drop_index_statement.cc b/cql3/statements/drop_index_statement.cc index 643c40a59f..5cf721c4ce 100644 --- a/cql3/statements/drop_index_statement.cc +++ b/cql3/statements/drop_index_statement.cc @@ -42,6 +42,7 @@ #include "cql3/statements/drop_index_statement.hh" #include "cql3/statements/prepared_statement.hh" #include "service/migration_manager.hh" +#include "service/storage_proxy.hh" #include "schema_builder.hh" #include "database.hh" #include "gms/feature_service.hh" diff --git a/cql3/statements/drop_table_statement.cc b/cql3/statements/drop_table_statement.cc index 5f1210d858..c396762560 100644 --- a/cql3/statements/drop_table_statement.cc +++ b/cql3/statements/drop_table_statement.cc @@ -43,6 +43,7 @@ #include "cql3/statements/prepared_statement.hh" #include "cql3/query_processor.hh" #include "service/migration_manager.hh" +#include "service/storage_proxy.hh" namespace cql3 { diff --git a/cql3/statements/drop_type_statement.cc b/cql3/statements/drop_type_statement.cc index 5f74c3e458..f371119ff5 100644 --- a/cql3/statements/drop_type_statement.cc +++ b/cql3/statements/drop_type_statement.cc @@ -44,6 +44,7 @@ #include "boost/range/adaptor/map.hpp" #include "service/migration_manager.hh" +#include "service/storage_proxy.hh" #include "database.hh" #include "user_types_metadata.hh" diff --git a/cql3/statements/drop_view_statement.cc b/cql3/statements/drop_view_statement.cc index dcf61be994..19a8c3b4ab 100644 --- a/cql3/statements/drop_view_statement.cc +++ b/cql3/statements/drop_view_statement.cc @@ -43,6 +43,7 @@ #include "cql3/statements/prepared_statement.hh" #include "cql3/query_processor.hh" #include "service/migration_manager.hh" +#include "service/storage_proxy.hh" #include "view_info.hh" #include "database.hh" diff --git a/cql3/statements/function_statement.cc b/cql3/statements/function_statement.cc index 70a4452b10..cbd0249120 100644 --- a/cql3/statements/function_statement.cc +++ b/cql3/statements/function_statement.cc @@ -24,6 +24,7 @@ #include "db/config.hh" #include "database.hh" #include "gms/feature_service.hh" +#include "service/storage_proxy.hh" namespace cql3 { namespace statements { diff --git a/cql3/statements/modification_statement.hh b/cql3/statements/modification_statement.hh index dfcfa8f214..2d4f0ba072 100644 --- a/cql3/statements/modification_statement.hh +++ b/cql3/statements/modification_statement.hh @@ -60,7 +60,6 @@ #include "unimplemented.hh" #include "validation.hh" -#include "service/storage_proxy.hh" #include #include diff --git a/cql3/statements/raw/batch_statement.hh b/cql3/statements/raw/batch_statement.hh index 6390b982ee..b42bd91588 100644 --- a/cql3/statements/raw/batch_statement.hh +++ b/cql3/statements/raw/batch_statement.hh @@ -39,7 +39,6 @@ #include "cql3/cql_statement.hh" #include "modification_statement.hh" -#include "service/storage_proxy.hh" #include "transport/messages/result_message.hh" #include "timestamp.hh" #include "log.hh" diff --git a/cql3/statements/raw/modification_statement.hh b/cql3/statements/raw/modification_statement.hh index bb625e7577..c50a8c0a11 100644 --- a/cql3/statements/raw/modification_statement.hh +++ b/cql3/statements/raw/modification_statement.hh @@ -56,7 +56,6 @@ #include "unimplemented.hh" #include "validation.hh" -#include "service/storage_proxy.hh" #include diff --git a/cql3/statements/select_statement.cc b/cql3/statements/select_statement.cc index 5607fc136f..4666be501b 100644 --- a/cql3/statements/select_statement.cc +++ b/cql3/statements/select_statement.cc @@ -52,6 +52,7 @@ #include "query-result-reader.hh" #include "query_result_merger.hh" #include "service/pager/query_pagers.hh" +#include "service/storage_proxy.hh" #include #include "view_info.hh" #include "partition_slice_builder.hh" diff --git a/cql3/statements/truncate_statement.cc b/cql3/statements/truncate_statement.cc index 51b5da5b4a..b39e6b6128 100644 --- a/cql3/statements/truncate_statement.cc +++ b/cql3/statements/truncate_statement.cc @@ -44,6 +44,7 @@ #include "cql3/cql_statement.hh" #include "database.hh" #include "cql3/query_processor.hh" +#include "service/storage_proxy.hh" #include namespace cql3 { diff --git a/database.cc b/database.cc index 4426e5572f..f3629d1c3b 100644 --- a/database.cc +++ b/database.cc @@ -35,6 +35,7 @@ #include #include #include +#include #include "sstables/sstables.hh" #include "sstables/sstables_manager.hh" #include "sstables/compaction.hh" @@ -54,6 +55,7 @@ #include "gms/feature_service.hh" #include "utils/human_readable.hh" +#include "utils/fb_utilities.hh" #include "db/timeout_clock.hh" #include "db/large_data_handler.hh" diff --git a/db/legacy_schema_migrator.cc b/db/legacy_schema_migrator.cc index 02e4b6a41f..914d122079 100644 --- a/db/legacy_schema_migrator.cc +++ b/db/legacy_schema_migrator.cc @@ -61,6 +61,7 @@ #include "system_keyspace.hh" #include "schema_tables.hh" #include "schema_builder.hh" +#include "service/storage_proxy.hh" #include "utils/rjson.hh" #include "cql3/query_processor.hh" #include "cql3/untyped_result_set.hh" diff --git a/db/query_context.hh b/db/query_context.hh index 46d706e664..ed1151f071 100644 --- a/db/query_context.hh +++ b/db/query_context.hh @@ -22,6 +22,7 @@ #include #include +#include #include #include "cql3/query_processor.hh" #include "cql3/query_options.hh" diff --git a/db/schema_tables.cc b/db/schema_tables.cc index e46cf3f4d2..163acc778a 100644 --- a/db/schema_tables.cc +++ b/db/schema_tables.cc @@ -41,6 +41,7 @@ #include "db/schema_tables.hh" #include "service/migration_manager.hh" +#include "service/storage_proxy.hh" #include "gms/feature_service.hh" #include "partition_slice_builder.hh" #include "dht/i_partitioner.hh" diff --git a/db/schema_tables.hh b/db/schema_tables.hh index 0d51a88869..3df2e55409 100644 --- a/db/schema_tables.hh +++ b/db/schema_tables.hh @@ -40,7 +40,6 @@ #pragma once -#include "service/storage_proxy.hh" #include "mutation.hh" #include "cql3/functions/user_function.hh" #include "schema_fwd.hh" @@ -48,6 +47,7 @@ #include "hashing.hh" #include "schema_mutations.hh" #include "types/map.hh" +#include "query-result-set.hh" #include #include @@ -61,6 +61,13 @@ class result_set; namespace service { class storage_service; +class storage_proxy; + +} + +namespace gms { + +class feature_service; } diff --git a/db/system_distributed_keyspace.cc b/db/system_distributed_keyspace.cc index b677d2b9b2..0c11990906 100644 --- a/db/system_distributed_keyspace.cc +++ b/db/system_distributed_keyspace.cc @@ -32,6 +32,7 @@ #include "types/set.hh" #include "cdc/generation.hh" #include "cql3/query_processor.hh" +#include "service/storage_proxy.hh" #include #include diff --git a/db/view/view.cc b/db/view/view.cc index 5b67651e16..45d95f68b3 100644 --- a/db/view/view.cc +++ b/db/view/view.cc @@ -70,6 +70,7 @@ #include "mutation_partition.hh" #include "service/migration_manager.hh" #include "service/storage_service.hh" +#include "service/storage_proxy.hh" #include "view_info.hh" #include "view_update_checks.hh" #include "types/user.hh" diff --git a/redis/keyspace_utils.cc b/redis/keyspace_utils.cc index 09057638ab..fe75b533f9 100644 --- a/redis/keyspace_utils.cc +++ b/redis/keyspace_utils.cc @@ -30,6 +30,7 @@ #include "db/query_context.hh" #include "auth/service.hh" #include "service/migration_manager.hh" +#include "service/storage_proxy.hh" #include "service/client_state.hh" #include "transport/server.hh" #include "db/system_keyspace.hh" diff --git a/redis/server.cc b/redis/server.cc index 83c89528c8..1725008625 100644 --- a/redis/server.cc +++ b/redis/server.cc @@ -31,6 +31,7 @@ #include "exceptions/exceptions.hh" #include "service/query_state.hh" #include "service/storage_service.hh" +#include "service/storage_proxy.hh" #include #include diff --git a/redis/server.hh b/redis/server.hh index e0f8b899a9..7614f02667 100644 --- a/redis/server.hh +++ b/redis/server.hh @@ -32,7 +32,6 @@ #include "auth/service.hh" #include "cql3/values.hh" #include "service/client_state.hh" -#include "service/storage_proxy.hh" #include "service_permit.hh" #include "timeout_config.hh" #include "utils/estimated_histogram.hh" @@ -42,6 +41,7 @@ #include #include #include +#include #include #include @@ -50,6 +50,12 @@ db::consistency_level make_consistency_level(const sstring&); class redis_exception; +namespace service { + +class storage_proxy; + +} + namespace redis_transport { struct redis_server_config { diff --git a/redis/service.cc b/redis/service.cc index 1ac09c4ccd..a336a87101 100644 --- a/redis/service.cc +++ b/redis/service.cc @@ -23,6 +23,7 @@ #include "redis/service.hh" #include "redis/keyspace_utils.hh" #include "redis/server.hh" +#include "service/storage_proxy.hh" #include "db/config.hh" #include "log.hh" #include "auth/common.hh" diff --git a/service/migration_manager.cc b/service/migration_manager.cc index b725286e72..a59dea06c2 100644 --- a/service/migration_manager.cc +++ b/service/migration_manager.cc @@ -42,6 +42,7 @@ #include #include "schema_registry.hh" #include "service/migration_manager.hh" +#include "service/storage_proxy.hh" #include "service/migration_listener.hh" #include "message/messaging_service.hh" diff --git a/service/migration_task.cc b/service/migration_task.cc index 890db77078..8ea2586709 100644 --- a/service/migration_task.cc +++ b/service/migration_task.cc @@ -43,6 +43,7 @@ #include "message/messaging_service.hh" #include "gms/failure_detector.hh" +#include "gms/gossiper.hh" #include "db/schema_tables.hh" #include "frozen_mutation.hh" #include "migration_manager.hh" diff --git a/service/pager/query_pager.hh b/service/pager/query_pager.hh index 9d11b0105d..470ed5afa0 100644 --- a/service/pager/query_pager.hh +++ b/service/pager/query_pager.hh @@ -44,11 +44,12 @@ #include "paging_state.hh" #include "cql3/result_set.hh" #include "cql3/selection/selection.hh" -#include "service/storage_proxy.hh" #include "service/query_state.hh" namespace service { +class storage_proxy_coordinator_query_result; + namespace pager { /** diff --git a/service/storage_service.cc b/service/storage_service.cc index 199de47e95..a4ac80fd3f 100644 --- a/service/storage_service.cc +++ b/service/storage_service.cc @@ -47,6 +47,7 @@ #include "gms/inet_address.hh" #include "log.hh" #include "service/migration_manager.hh" +#include "service/storage_proxy.hh" #include "to_string.hh" #include "gms/gossiper.hh" #include "gms/failure_detector.hh" diff --git a/table.cc b/table.cc index d9d1381895..4d545e9295 100644 --- a/table.cc +++ b/table.cc @@ -42,7 +42,9 @@ #include #include "utils/error_injection.hh" #include "utils/histogram_metrics_helper.hh" +#include "utils/fb_utilities.hh" #include "mutation_source_metadata.hh" +#include "gms/gossiper.hh" static logging::logger tlogger("table"); static seastar::metrics::label column_family_label("cf"); diff --git a/test/boost/batchlog_manager_test.cc b/test/boost/batchlog_manager_test.cc index ce8389bcfd..38c7e4bf8f 100644 --- a/test/boost/batchlog_manager_test.cc +++ b/test/boost/batchlog_manager_test.cc @@ -36,6 +36,7 @@ #include "cql3/query_processor.hh" #include "cql3/untyped_result_set.hh" #include "db/batchlog_manager.hh" +#include "service/storage_proxy.hh" #include "message/messaging_service.hh" diff --git a/test/boost/database_test.cc b/test/boost/database_test.cc index 4dcd0a7f90..bdb8e98d61 100644 --- a/test/boost/database_test.cc +++ b/test/boost/database_test.cc @@ -31,6 +31,7 @@ #include "test/lib/log.hh" #include "database.hh" +#include "lister.hh" #include "partition_slice_builder.hh" #include "frozen_mutation.hh" #include "test/lib/mutation_source_test.hh" diff --git a/test/boost/schema_change_test.cc b/test/boost/schema_change_test.cc index 802e3ae9d7..48bf3beda4 100644 --- a/test/boost/schema_change_test.cc +++ b/test/boost/schema_change_test.cc @@ -30,6 +30,7 @@ #include "test/lib/mutation_source_test.hh" #include "test/lib/result_set_assertions.hh" #include "service/migration_manager.hh" +#include "service/storage_proxy.hh" #include "schema_builder.hh" #include "schema_registry.hh" #include "db/schema_tables.hh" diff --git a/test/boost/user_types_test.cc b/test/boost/user_types_test.cc index 30f2b502c6..cfcccbc8f1 100644 --- a/test/boost/user_types_test.cc +++ b/test/boost/user_types_test.cc @@ -28,6 +28,8 @@ #include "types/list.hh" #include "test/lib/exception_utils.hh" +#include + // Specifies that the given 'cql' query fails with the 'msg' message. // Requires a cql_test_env. The caller must be inside thread. #define REQUIRE_INVALID(e, cql, msg) \ diff --git a/test/lib/cql_test_env.cc b/test/lib/cql_test_env.cc index 29a6ed32c2..7ffcc47272 100644 --- a/test/lib/cql_test_env.cc +++ b/test/lib/cql_test_env.cc @@ -42,6 +42,7 @@ #include "sstables/compaction_manager.hh" #include "message/messaging_service.hh" #include "service/storage_service.hh" +#include "service/storage_proxy.hh" #include "auth/service.hh" #include "auth/common.hh" #include "db/config.hh" diff --git a/test/perf/perf_fast_forward.cc b/test/perf/perf_fast_forward.cc index 1e70c35474..ef0fb99d65 100644 --- a/test/perf/perf_fast_forward.cc +++ b/test/perf/perf_fast_forward.cc @@ -20,6 +20,8 @@ */ #include +#include +#include #include #include #include @@ -45,6 +47,7 @@ using namespace std::chrono_literals; using namespace seastar; +namespace fs = std::filesystem; using int_range = nonwrapping_range; reactor::io_stats s; diff --git a/test/perf/perf_simple_query.cc b/test/perf/perf_simple_query.cc index a92ea41eec..c47d3747f8 100644 --- a/test/perf/perf_simple_query.cc +++ b/test/perf/perf_simple_query.cc @@ -20,6 +20,7 @@ */ #include +#include #include #include diff --git a/thrift/handler.cc b/thrift/handler.cc index 8d1199162d..45c8ef5063 100644 --- a/thrift/handler.cc +++ b/thrift/handler.cc @@ -35,6 +35,7 @@ #include #include "db/marshal/type_parser.hh" #include "service/migration_manager.hh" +#include "service/storage_proxy.hh" #include "utils/class_registrator.hh" #include "noexcept_traits.hh" #include "schema_registry.hh" diff --git a/thrift/server.cc b/thrift/server.cc index c7aa534bac..e7d7db343c 100644 --- a/thrift/server.cc +++ b/thrift/server.cc @@ -21,6 +21,7 @@ #include "server.hh" #include "handler.hh" +#include "db/config.hh" #include #include #include diff --git a/tracing/trace_keyspace_helper.cc b/tracing/trace_keyspace_helper.cc index d4fdaf0e9d..0ee0a1ee10 100644 --- a/tracing/trace_keyspace_helper.cc +++ b/tracing/trace_keyspace_helper.cc @@ -49,6 +49,7 @@ #include "types/set.hh" #include "types/map.hh" #include "utils/UUID_gen.hh" +#include "utils/fb_utilities.hh" namespace tracing { diff --git a/transport/server.cc b/transport/server.cc index 8794e0ccbe..1ed801d7b8 100644 --- a/transport/server.cc +++ b/transport/server.cc @@ -35,6 +35,7 @@ #include "dht/token-sharding.hh" #include "service/migration_manager.hh" #include "service/memory_limiter.hh" +#include "service/storage_proxy.hh" #include "db/consistency_level_type.hh" #include "database.hh" #include "db/write_type.hh" diff --git a/transport/server.hh b/transport/server.hh index 469dd2df0c..beb1aca515 100644 --- a/transport/server.hh +++ b/transport/server.hh @@ -25,7 +25,6 @@ #include #include "service/endpoint_lifecycle_subscriber.hh" #include "service/migration_listener.hh" -#include "service/storage_proxy.hh" #include "cql3/query_processor.hh" #include "cql3/values.hh" #include "auth/authenticator.hh" @@ -39,6 +38,7 @@ #include "utils/fragmented_temporary_buffer.hh" #include "service_permit.hh" #include +#include #include "utils/updateable_value.hh" #include "service/qos/service_level_controller.hh" #include "generic_server.hh"