From 26c8470f65218914c129a20c3f2f7d582609d680 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Thu, 25 May 2023 23:05:53 +0300 Subject: [PATCH] treewide: use #include for seastar headers We treat Seastar as an external library, so fix the few places that didn't do so to use angle brackets. Closes #14037 --- cql3/expr/restrictions.cc | 2 +- cql3/statements/describe_statement.cc | 6 +++--- cql3/statements/describe_statement.hh | 2 +- data_dictionary/keyspace_element.hh | 2 +- lang/wasm_alien_thread_runner.cc | 2 +- lang/wasm_instance_cache.cc | 4 ++-- locator/token_metadata.cc | 2 +- query.cc | 4 ++-- replica/exceptions.hh | 4 ++-- schema/schema.hh | 2 +- service/forward_service.cc | 8 ++++---- streaming/stream_session.cc | 2 +- test/boost/expr_test.cc | 2 +- test/boost/group0_test.cc | 2 +- test/boost/row_cache_test.cc | 2 +- test/boost/wasm_alloc_test.cc | 2 +- test/boost/wasm_test.cc | 2 +- thrift/controller.cc | 2 +- transport/controller.cc | 2 +- 19 files changed, 27 insertions(+), 27 deletions(-) diff --git a/cql3/expr/restrictions.cc b/cql3/expr/restrictions.cc index a6af61d0fb..3b5dff7c66 100644 --- a/cql3/expr/restrictions.cc +++ b/cql3/expr/restrictions.cc @@ -9,7 +9,7 @@ #include "cql3/statements/request_validations.hh" #include "exceptions/exceptions.hh" #include "schema/schema.hh" -#include "seastar/util/defer.hh" +#include #include "cql3/prepare_context.hh" #include "types/list.hh" #include diff --git a/cql3/statements/describe_statement.cc b/cql3/statements/describe_statement.cc index e438e3d209..57bfb5cff0 100644 --- a/cql3/statements/describe_statement.cc +++ b/cql3/statements/describe_statement.cc @@ -18,15 +18,15 @@ #include "cql3/statements/prepared_statement.hh" #include "exceptions/exceptions.hh" #include "keys.hh" -#include "seastar/core/on_internal_error.hh" -#include "seastar/coroutine/maybe_yield.hh" +#include +#include #include "service/client_state.hh" #include "types/types.hh" #include "cql3/query_processor.hh" #include "cql3/cql_statement.hh" #include "cql3/statements/raw/describe_statement.hh" #include "cql3/statements/describe_statement.hh" -#include "seastar/core/shared_ptr.hh" +#include #include "transport/messages/result_message.hh" #include "transport/messages/result_message_base.hh" #include "service/query_state.hh" diff --git a/cql3/statements/describe_statement.hh b/cql3/statements/describe_statement.hh index e846d89d2f..51cc8b99e4 100644 --- a/cql3/statements/describe_statement.hh +++ b/cql3/statements/describe_statement.hh @@ -8,7 +8,7 @@ #pragma once -#include "seastar/core/sstring.hh" +#include #include "cql3/cql_statement.hh" #include "cql3/statements/raw/describe_statement.hh" #include diff --git a/data_dictionary/keyspace_element.hh b/data_dictionary/keyspace_element.hh index 91a40a0b4e..e7e70bfbcd 100644 --- a/data_dictionary/keyspace_element.hh +++ b/data_dictionary/keyspace_element.hh @@ -9,7 +9,7 @@ #pragma once #include -#include "seastar/core/sstring.hh" +#include namespace replica { class database; diff --git a/lang/wasm_alien_thread_runner.cc b/lang/wasm_alien_thread_runner.cc index 4a3966b413..8166a265ad 100644 --- a/lang/wasm_alien_thread_runner.cc +++ b/lang/wasm_alien_thread_runner.cc @@ -15,7 +15,7 @@ #include "log.hh" #include "lang/wasm.hh" #include "lang/wasm_alien_thread_runner.hh" -#include "seastar/core/posix.hh" +#include extern logging::logger wasm_logger; diff --git a/lang/wasm_instance_cache.cc b/lang/wasm_instance_cache.cc index 59d75911b2..2960ea8b24 100644 --- a/lang/wasm_instance_cache.cc +++ b/lang/wasm_instance_cache.cc @@ -8,8 +8,8 @@ #include "lang/wasm_instance_cache.hh" #include "lang/wasm.hh" -#include "seastar/core/metrics.hh" -#include "seastar/core/scheduling.hh" +#include +#include #include #include #include diff --git a/locator/token_metadata.cc b/locator/token_metadata.cc index 7574fcd78e..4a00a825e5 100644 --- a/locator/token_metadata.cc +++ b/locator/token_metadata.cc @@ -20,7 +20,7 @@ #include #include #include -#include "seastar/core/smp.hh" +#include #include "utils/stall_free.hh" #include "utils/fb_utilities.hh" diff --git a/query.cc b/query.cc index 68abce4765..dd8c1c8ee7 100644 --- a/query.cc +++ b/query.cc @@ -13,8 +13,8 @@ #include "query-result.hh" #include "query-result-writer.hh" #include "query-result-set.hh" -#include "seastar/core/shared_ptr.hh" -#include "seastar/core/thread.hh" +#include +#include #include "utils/to_string.hh" #include "bytes.hh" #include "mutation/mutation_partition_serializer.hh" diff --git a/replica/exceptions.hh b/replica/exceptions.hh index 1b3caf01ac..2ecc516d15 100644 --- a/replica/exceptions.hh +++ b/replica/exceptions.hh @@ -13,8 +13,8 @@ #include #include -#include "seastar/core/sstring.hh" -#include "seastar/core/timed_out_error.hh" +#include +#include #include "utils/exception_container.hh" #include "utils/result.hh" diff --git a/schema/schema.hh b/schema/schema.hh index 7615711fea..5a09ac3655 100644 --- a/schema/schema.hh +++ b/schema/schema.hh @@ -19,7 +19,7 @@ #include "cql3/column_specification.hh" #include #include -#include "seastar/core/sstring.hh" +#include #include "types/types.hh" #include "compound.hh" #include "gc_clock.hh" diff --git a/service/forward_service.cc b/service/forward_service.cc index cd4a45340a..3fa917824f 100644 --- a/service/forward_service.cc +++ b/service/forward_service.cc @@ -27,10 +27,10 @@ #include "replica/database.hh" #include "schema/schema.hh" #include "schema/schema_registry.hh" -#include "seastar/core/do_with.hh" -#include "seastar/core/future.hh" -#include "seastar/core/on_internal_error.hh" -#include "seastar/core/when_all.hh" +#include +#include +#include +#include #include "service/pager/query_pagers.hh" #include "tracing/trace_state.hh" #include "tracing/tracing.hh" diff --git a/streaming/stream_session.cc b/streaming/stream_session.cc index 5d52f77f4f..1d8f96d9bb 100644 --- a/streaming/stream_session.cc +++ b/streaming/stream_session.cc @@ -10,7 +10,7 @@ #include "log.hh" #include "message/messaging_service.hh" -#include "seastar/coroutine/maybe_yield.hh" +#include #include "streaming/stream_session.hh" #include "streaming/prepare_message.hh" #include "streaming/stream_result_future.hh" diff --git a/test/boost/expr_test.cc b/test/boost/expr_test.cc index b9f552365e..768e863c3f 100644 --- a/test/boost/expr_test.cc +++ b/test/boost/expr_test.cc @@ -1,6 +1,6 @@ #include "cql3/column_identifier.hh" #include "cql3/util.hh" -#include "seastar/core/shared_ptr.hh" +#include #include "types/types.hh" #include "types/list.hh" #include "types/map.hh" diff --git a/test/boost/group0_test.cc b/test/boost/group0_test.cc index 81cd2803b7..08ec20b7b9 100644 --- a/test/boost/group0_test.cc +++ b/test/boost/group0_test.cc @@ -16,7 +16,7 @@ #include "utils/error_injection.hh" #include "transport/messages/result_message.hh" #include "service/migration_manager.hh" -#include "seastar/core/metrics_api.hh" +#include static future>> fetch_rows(cql_test_env& e, std::string_view cql) { auto msg = co_await e.execute_cql(cql); diff --git a/test/boost/row_cache_test.cc b/test/boost/row_cache_test.cc index 77f1c6ffb0..6f1aecc23b 100644 --- a/test/boost/row_cache_test.cc +++ b/test/boost/row_cache_test.cc @@ -39,7 +39,7 @@ #include "readers/from_mutations_v2.hh" #include "readers/delegating_v2.hh" #include "readers/empty_v2.hh" -#include "seastar/testing/thread_test_case.hh" +#include using namespace std::chrono_literals; diff --git a/test/boost/wasm_alloc_test.cc b/test/boost/wasm_alloc_test.cc index 6b4cb065b0..1b4e819eb1 100644 --- a/test/boost/wasm_alloc_test.cc +++ b/test/boost/wasm_alloc_test.cc @@ -9,7 +9,7 @@ #include "lang/wasm.hh" #include "lang/wasm_instance_cache.hh" #include "rust/wasmtime_bindings.hh" -#include "seastar/core/reactor.hh" +#include #include "test/lib/scylla_test_case.hh" #include diff --git a/test/boost/wasm_test.cc b/test/boost/wasm_test.cc index fee6ff78a2..4f26bc4abc 100644 --- a/test/boost/wasm_test.cc +++ b/test/boost/wasm_test.cc @@ -9,7 +9,7 @@ #include "lang/wasm.hh" #include "lang/wasm_instance_cache.hh" #include "rust/wasmtime_bindings.hh" -#include "seastar/coroutine/maybe_yield.hh" +#include #include #include #include "test/lib/scylla_test_case.hh" diff --git a/thrift/controller.cc b/thrift/controller.cc index 1fe0c66416..a5b7eb0b48 100644 --- a/thrift/controller.cc +++ b/thrift/controller.cc @@ -7,7 +7,7 @@ */ #include "thrift/controller.hh" -#include "seastar/core/sharded.hh" +#include #include "thrift/server.hh" #include "replica/database.hh" #include "db/config.hh" diff --git a/transport/controller.cc b/transport/controller.cc index 93c3ccdc54..41daf728fd 100644 --- a/transport/controller.cc +++ b/transport/controller.cc @@ -7,7 +7,7 @@ */ #include "transport/controller.hh" -#include "seastar/core/sharded.hh" +#include #include "transport/server.hh" #include "service/memory_limiter.hh" #include "db/config.hh"