From 775b7e41f4b2fbf10045b36dd914690dd980a56d Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Tue, 20 Nov 2018 20:41:35 +0200 Subject: [PATCH] Update seastar submodule * seastar d59fcef...b924495 (2): > build: Fix protobuf generation rules > Merge "Restructure files" from Jesse Includes fixup patch from Jesse: " Update Seastar `#include`s to reflect restructure All Seastar header files are now prefixed with "seastar" and the configure script reflects the new locations of files. Signed-off-by: Jesse Haber-Kucharsky Message-Id: <5d22d964a7735696fb6bb7606ed88f35dde31413.1542731639.git.jhaberku@scylladb.com> " --- api/api.cc | 8 ++++---- api/api.hh | 4 ++-- api/api_init.hh | 2 +- api/collectd.cc | 4 ++-- api/column_family.cc | 2 +- api/column_family.hh | 2 +- api/lsa.cc | 2 +- api/messaging_service.cc | 2 +- api/storage_service.cc | 2 +- api/system.cc | 2 +- atomic_cell.hh | 2 +- bytes.cc | 2 +- bytes.hh | 2 +- bytes_ostream.hh | 4 ++-- caching_options.hh | 2 +- compound.hh | 2 +- configure.py | 14 +++++++------- cql3/Cql.g | 2 +- cql3/constants.hh | 2 +- cql3/functions/bytes_conversion_fcts.hh | 2 +- cql3/functions/castas_fcts.hh | 2 +- cql3/functions/function_name.hh | 2 +- cql3/functions/native_aggregate_function.hh | 2 +- cql3/functions/native_scalar_function.hh | 2 +- cql3/index_name.hh | 2 +- cql3/keyspace_element_name.hh | 2 +- cql3/operation.hh | 2 +- cql3/operator.hh | 2 +- cql3/restrictions/abstract_restriction.hh | 4 ++-- cql3/restrictions/primary_key_restrictions.hh | 2 +- cql3/restrictions/single_column_restriction.hh | 2 +- cql3/restrictions/term_slice.hh | 2 +- cql3/selection/selectable.hh | 2 +- cql3/single_column_relation.hh | 2 +- cql3/statements/create_index_statement.hh | 2 +- cql3/statements/create_keyspace_statement.hh | 2 +- cql3/statements/create_table_statement.hh | 2 +- cql3/statements/create_view_statement.hh | 2 +- cql3/statements/index_prop_defs.hh | 2 +- cql3/statements/index_target.hh | 2 +- cql3/statements/modification_statement.cc | 2 +- cql3/statements/modification_statement.hh | 4 ++-- cql3/statements/prepared_statement.hh | 2 +- cql3/statements/property_definitions.hh | 4 ++-- cql3/statements/raw/modification_statement.hh | 4 ++-- cql3/statements/raw/select_statement.hh | 4 ++-- cql3/statements/request_validations.hh | 2 +- cql3/statements/schema_altering_statement.hh | 2 +- cql3/statements/select_statement.cc | 2 +- cql3/statements/select_statement.hh | 4 ++-- cql3/token_relation.hh | 2 +- cql3/ut_name.hh | 2 +- database.cc | 8 ++++---- database.hh | 12 ++++++------ db/commitlog/commitlog.cc | 16 ++++++++-------- db/commitlog/commitlog.hh | 6 +++--- db/commitlog/commitlog_replayer.cc | 4 ++-- db/commitlog/commitlog_replayer.hh | 4 ++-- db/consistency_level.cc | 2 +- db/large_partition_handler.cc | 2 +- db/marshal/type_parser.hh | 2 +- db/query_context.hh | 4 ++-- db/schema_tables.cc | 4 ++-- db/system_keyspace.cc | 2 +- dht/i_partitioner.cc | 2 +- dht/i_partitioner.hh | 4 ++-- disk-error-handler.hh | 2 +- exceptions/exceptions.hh | 4 ++-- exceptions/unrecognized_entity_exception.hh | 2 +- gms/failure_detector.hh | 6 +++--- gms/gossip_digest.hh | 2 +- gms/gossip_digest_syn.hh | 2 +- gms/gossiper.hh | 6 +++--- gms/inet_address.hh | 2 +- gms/versioned_value.hh | 2 +- index/secondary_index.hh | 2 +- json.hh | 4 ++-- locator/ec2_snitch.hh | 2 +- locator/gce_snitch.hh | 2 +- locator/gossiping_property_file_snitch.hh | 2 +- locator/production_snitch_base.hh | 2 +- locator/rack_inferring_snitch.hh | 2 +- locator/snitch_base.hh | 6 +++--- main.cc | 10 +++++----- message/messaging_service.cc | 8 ++++---- message/messaging_service.hh | 8 ++++---- mutation_reader.cc | 2 +- mutation_reader.hh | 6 +++--- query-result-set.hh | 2 +- query_result_merger.hh | 2 +- reader_concurrency_semaphore.hh | 4 ++-- row_cache.cc | 6 +++--- row_cache.hh | 2 +- schema.hh | 2 +- seastar | 2 +- serializer.hh | 4 ++-- service/cache_hitrate_calculator.hh | 4 ++-- service/migration_manager.hh | 2 +- service/pager/paging_state.cc | 2 +- service/storage_proxy.cc | 6 +++--- service/storage_proxy.hh | 2 +- service/storage_service.cc | 2 +- service/storage_service.hh | 6 +++--- sstables/column_name_helper.hh | 2 +- sstables/compaction.cc | 4 ++-- sstables/compaction_manager.hh | 12 ++++++------ sstables/consumer.hh | 4 ++-- sstables/key.hh | 2 +- sstables/partition.cc | 4 ++-- sstables/row.hh | 2 +- sstables/sstables.cc | 16 ++++++++-------- sstables/sstables.hh | 18 +++++++++--------- sstables/types.hh | 2 +- sstables/writer.hh | 4 ++-- streaming/progress_info.hh | 2 +- streaming/stream_manager.cc | 2 +- streaming/stream_manager.hh | 4 ++-- streaming/stream_plan.hh | 2 +- streaming/stream_request.hh | 2 +- streaming/stream_result_future.hh | 4 ++-- streaming/stream_session.cc | 4 ++-- streaming/stream_session.hh | 2 +- streaming/stream_task.hh | 2 +- tests/aggregate_fcts_test.cc | 2 +- tests/batchlog_manager_test.cc | 4 ++-- tests/cache_flat_mutation_reader_test.cc | 2 +- tests/castas_fcts_test.cc | 2 +- tests/commitlog_test.cc | 10 +++++----- tests/config_test.cc | 2 +- tests/cql_assertions.hh | 4 ++-- tests/cql_query_test.cc | 4 ++-- tests/cql_test_env.cc | 6 +++--- tests/cql_test_env.hh | 8 ++++---- tests/gossip.cc | 4 ++-- tests/gossip_test.cc | 4 ++-- tests/hint_test.cc | 10 +++++----- tests/json_cql_query_test.cc | 4 ++-- tests/lsa_async_eviction_test.cc | 8 ++++---- tests/lsa_sync_eviction_test.cc | 8 ++++---- tests/memtable_test.cc | 2 +- tests/message.cc | 4 ++-- tests/murmur_hash_test.cc | 2 +- tests/mutation_query_test.cc | 4 ++-- tests/mutation_reader_test.cc | 6 +++--- tests/mutation_test.cc | 6 +++--- tests/network_topology_strategy_test.cc | 2 +- tests/normalizing_reader.cc | 2 +- tests/normalizing_reader.hh | 2 +- tests/perf/perf.hh | 6 +++--- tests/perf/perf_cache_eviction.cc | 2 +- tests/perf/perf_fast_forward.cc | 2 +- tests/perf/perf_simple_query.cc | 2 +- tests/perf/perf_sstable.cc | 6 +++--- tests/perf_row_cache_update.cc | 8 ++++---- tests/query_processor_test.cc | 2 +- tests/row_cache_alloc_stress.cc | 8 ++++---- tests/row_cache_stress_test.cc | 2 +- tests/row_cache_test.cc | 2 +- tests/sstable_datafile_test.cc | 10 +++++----- tests/sstable_mutation_test.cc | 4 ++-- tests/sstable_resharding_test.cc | 8 ++++---- tests/sstable_test.cc | 10 +++++----- tests/sstable_test.hh | 2 +- tests/types_test.cc | 2 +- tests/virtual_reader_test.cc | 2 +- thrift/handler.cc | 6 +++--- thrift/handler.hh | 2 +- thrift/server.cc | 8 ++++---- thrift/server.hh | 4 ++-- to_string.hh | 2 +- transport/event_notifier.cc | 2 +- transport/messages/result_message.hh | 4 ++-- transport/server.cc | 6 +++--- transport/server.hh | 4 ++-- types.cc | 4 ++-- types.hh | 10 +++++----- unimplemented.cc | 4 ++-- unimplemented.hh | 6 +++--- utils/UUID.hh | 6 +++--- utils/big_decimal.cc | 2 +- utils/bloom_filter.cc | 2 +- utils/data_input.hh | 2 +- utils/estimated_histogram.hh | 2 +- utils/exponential_backoff_retry.hh | 6 +++--- utils/file_lock.cc | 4 ++-- utils/file_lock.hh | 4 ++-- utils/hash.hh | 2 +- utils/histogram.hh | 2 +- utils/rate_limiter.hh | 6 +++--- utils/serialization.hh | 4 ++-- utils/uuid.cc | 4 ++-- validation.hh | 2 +- version.hh | 4 ++-- 193 files changed, 371 insertions(+), 371 deletions(-) diff --git a/api/api.cc b/api/api.cc index 860b2fb803..68be7ac8a5 100644 --- a/api/api.cc +++ b/api/api.cc @@ -20,9 +20,9 @@ */ #include "api.hh" -#include "http/file_handler.hh" -#include "http/transformers.hh" -#include "http/api_docs.hh" +#include +#include +#include #include "storage_service.hh" #include "commitlog.hh" #include "gossiper.hh" @@ -36,7 +36,7 @@ #include "endpoint_snitch.hh" #include "compaction_manager.hh" #include "hinted_handoff.hh" -#include "http/exception.hh" +#include #include "stream_manager.hh" #include "system.hh" #include "api/config.hh" diff --git a/api/api.hh b/api/api.hh index 27433596a6..fd5a37294d 100644 --- a/api/api.hh +++ b/api/api.hh @@ -21,13 +21,13 @@ #pragma once -#include "json/json_elements.hh" +#include #include #include #include #include "api/api-doc/utils.json.hh" #include "utils/histogram.hh" -#include "http/exception.hh" +#include #include "api_init.hh" #include "seastarx.hh" diff --git a/api/api_init.hh b/api/api_init.hh index a0fce7a9d9..3389ab75be 100644 --- a/api/api_init.hh +++ b/api/api_init.hh @@ -21,7 +21,7 @@ #pragma once #include "database.hh" #include "service/storage_proxy.hh" -#include "http/httpd.hh" +#include namespace api { diff --git a/api/collectd.cc b/api/collectd.cc index 8dce92c8dc..4c70bb47fd 100644 --- a/api/collectd.cc +++ b/api/collectd.cc @@ -21,8 +21,8 @@ #include "collectd.hh" #include "api/api-doc/collectd.json.hh" -#include "core/scollectd.hh" -#include "core/scollectd_api.hh" +#include +#include #include "endian.h" #include #include diff --git a/api/column_family.cc b/api/column_family.cc index 6c1abc4be2..b67d991d3c 100644 --- a/api/column_family.cc +++ b/api/column_family.cc @@ -22,7 +22,7 @@ #include "column_family.hh" #include "api/api-doc/column_family.json.hh" #include -#include "http/exception.hh" +#include #include "sstables/sstables.hh" #include "utils/estimated_histogram.hh" #include diff --git a/api/column_family.hh b/api/column_family.hh index da699a9593..09f64a7e33 100644 --- a/api/column_family.hh +++ b/api/column_family.hh @@ -24,7 +24,7 @@ #include "api.hh" #include "api/api-doc/column_family.json.hh" #include "database.hh" -#include "core/future-util.hh" +#include #include namespace api { diff --git a/api/lsa.cc b/api/lsa.cc index c6bb624a9f..33872ee1c0 100644 --- a/api/lsa.cc +++ b/api/lsa.cc @@ -23,7 +23,7 @@ #include "api/lsa.hh" #include "api/api.hh" -#include "http/exception.hh" +#include #include "utils/logalloc.hh" #include "log.hh" diff --git a/api/messaging_service.cc b/api/messaging_service.cc index 8aed2977ef..fbea419e1c 100644 --- a/api/messaging_service.cc +++ b/api/messaging_service.cc @@ -21,7 +21,7 @@ #include "messaging_service.hh" #include "message/messaging_service.hh" -#include "rpc/rpc_types.hh" +#include #include "api/api-doc/messaging_service.json.hh" #include #include diff --git a/api/storage_service.cc b/api/storage_service.cc index aaf579360d..a8efcc37a2 100644 --- a/api/storage_service.cc +++ b/api/storage_service.cc @@ -28,7 +28,7 @@ #include #include #include -#include "http/exception.hh" +#include #include "repair/repair.hh" #include "locator/snitch_base.hh" #include "column_family.hh" diff --git a/api/system.cc b/api/system.cc index c51f8203a7..606625590e 100644 --- a/api/system.cc +++ b/api/system.cc @@ -22,7 +22,7 @@ #include "api/api-doc/system.json.hh" #include "api/api.hh" -#include "http/exception.hh" +#include #include "log.hh" namespace api { diff --git a/atomic_cell.hh b/atomic_cell.hh index 056eaacab0..4fd8b03c42 100644 --- a/atomic_cell.hh +++ b/atomic_cell.hh @@ -26,7 +26,7 @@ #include "tombstone.hh" #include "gc_clock.hh" #include "utils/managed_bytes.hh" -#include "net/byteorder.hh" +#include #include #include #include diff --git a/bytes.cc b/bytes.cc index adce6b7af6..932e5de678 100644 --- a/bytes.cc +++ b/bytes.cc @@ -20,7 +20,7 @@ */ #include "bytes.hh" -#include "core/print.hh" +#include static inline int8_t hex_to_int(unsigned char c) { switch (c) { diff --git a/bytes.hh b/bytes.hh index d1c05a3b6a..77ae7bc81e 100644 --- a/bytes.hh +++ b/bytes.hh @@ -22,7 +22,7 @@ #pragma once #include "seastarx.hh" -#include "core/sstring.hh" +#include #include "hashing.hh" #include #include diff --git a/bytes_ostream.hh b/bytes_ostream.hh index 97ba623974..44963e789f 100644 --- a/bytes_ostream.hh +++ b/bytes_ostream.hh @@ -24,9 +24,9 @@ #include #include "bytes.hh" -#include "core/unaligned.hh" +#include #include "hashing.hh" -#include "seastar/core/simple-stream.hh" +#include /** * Utility for writing data into a buffer when its final size is not known up front. * diff --git a/caching_options.hh b/caching_options.hh index c7bc37020a..5f05b06a13 100644 --- a/caching_options.hh +++ b/caching_options.hh @@ -20,7 +20,7 @@ */ #pragma once -#include +#include #include #include "exceptions/exceptions.hh" #include "json.hh" diff --git a/compound.hh b/compound.hh index a0f72155a4..06d4cb4d58 100644 --- a/compound.hh +++ b/compound.hh @@ -28,7 +28,7 @@ #include #include #include "utils/serialization.hh" -#include "util/backtrace.hh" +#include #include "unimplemented.hh" enum class allow_prefixes { no, yes }; diff --git a/configure.py b/configure.py index 10574130a1..028048a7fb 100755 --- a/configure.py +++ b/configure.py @@ -1098,7 +1098,7 @@ with open(buildfile, 'w') as f: command = echo -e $text > $out description = GEN $out rule swagger - command = seastar/json/json2code.py -f $in -o $out + command = seastar/scripts/seastar-json2code.py -f $in -o $out description = SWAGGER $out rule serializer command = {python} ./idl-compiler.py --ns ser -f $in -o $out @@ -1116,7 +1116,7 @@ with open(buildfile, 'w') as f: for mode in build_modes: modeval = modes[mode] f.write(textwrap.dedent('''\ - cxxflags_{mode} = {opt} -DXXH_PRIVATE_API -I. -I $builddir/{mode}/gen -I seastar -I seastar/build/{mode}/gen + cxxflags_{mode} = {opt} -DXXH_PRIVATE_API -I. -I $builddir/{mode}/gen -I seastar/include -I seastar/include -I seastar/build/{mode}/gen/include rule cxx.{mode} command = $cxx -MD -MT $out -MF $out.d {seastar_cflags} $cxxflags $cxxflags_{mode} $obj_cxxflags -c -o $out $in description = CXX $out @@ -1223,8 +1223,8 @@ with open(buildfile, 'w') as f: for obj in compiles: src = compiles[obj] gen_headers = list(ragels.keys()) - gen_headers += ['seastar/build/{}/gen/http/request_parser.hh'.format(mode)] - gen_headers += ['seastar/build/{}/gen/http/http_response_parser.hh'.format(mode)] + gen_headers += ['seastar/build/{}/gen/include/seastar/http/request_parser.hh'.format(mode)] + gen_headers += ['seastar/build/{}/gen/include/seastar/http/response_parser.hh'.format(mode)] for th in thrifts: gen_headers += th.headers('$builddir/{}/gen'.format(mode)) for g in antlr3_grammars: @@ -1239,7 +1239,7 @@ with open(buildfile, 'w') as f: f.write('build {}: ragel {}\n'.format(hh, src)) for hh in swaggers: src = swaggers[hh] - f.write('build {}: swagger {} | seastar/json/json2code.py\n'.format(hh, src)) + f.write('build {}: swagger {} | seastar/scripts/seastar-json2code.py\n'.format(hh, src)) for hh in serializers: src = serializers[hh] f.write('build {}: serializer {} | idl-compiler.py\n'.format(hh, src)) @@ -1259,11 +1259,11 @@ with open(buildfile, 'w') as f: if cc.endswith('Parser.cpp') and has_sanitize_address_use_after_scope: # Parsers end up using huge amounts of stack space and overflowing their stack f.write(' obj_cxxflags = -fno-sanitize-address-use-after-scope\n') - f.write('build seastar/build/{mode}/libseastar.a seastar/build/{mode}/apps/iotune/iotune seastar/build/{mode}/gen/http/request_parser.hh seastar/build/{mode}/gen/http/http_response_parser.hh: ninja {seastar_deps}\n' + f.write('build seastar/build/{mode}/libseastar.a seastar/build/{mode}/apps/iotune/iotune seastar/build/{mode}/gen/include/seastar/http/request_parser.hh seastar/build/{mode}/gen/include/seastar/http/response_parser.hh: ninja {seastar_deps}\n' .format(**locals())) f.write(' pool = seastar_pool\n') f.write(' subdir = seastar\n') - f.write(' target = build/{mode}/libseastar.a build/{mode}/apps/iotune/iotune build/{mode}/gen/http/request_parser.hh build/{mode}/gen/http/http_response_parser.hh\n'.format(**locals())) + f.write(' target = build/{mode}/libseastar.a build/{mode}/apps/iotune/iotune build/{mode}/gen/include/seastar/http/request_parser.hh build/{mode}/gen/include/seastar/http/response_parser.hh\n'.format(**locals())) f.write(textwrap.dedent('''\ build build/{mode}/iotune: copy seastar/build/{mode}/apps/iotune/iotune ''').format(**locals())) diff --git a/cql3/Cql.g b/cql3/Cql.g index 4f2a03f100..dff660e9b7 100644 --- a/cql3/Cql.g +++ b/cql3/Cql.g @@ -91,7 +91,7 @@ options { #include "cql3/ut_name.hh" #include "cql3/functions/function_name.hh" #include "cql3/functions/function_call.hh" -#include "core/sstring.hh" +#include #include "CqlLexer.hpp" #include diff --git a/cql3/constants.hh b/cql3/constants.hh index 216509ec3a..07919e406a 100644 --- a/cql3/constants.hh +++ b/cql3/constants.hh @@ -46,7 +46,7 @@ #include "cql3/operation.hh" #include "cql3/values.hh" #include "cql3/term.hh" -#include "core/shared_ptr.hh" +#include namespace cql3 { diff --git a/cql3/functions/bytes_conversion_fcts.hh b/cql3/functions/bytes_conversion_fcts.hh index d28b7e35a1..0ecf95d11f 100644 --- a/cql3/functions/bytes_conversion_fcts.hh +++ b/cql3/functions/bytes_conversion_fcts.hh @@ -43,7 +43,7 @@ #include "native_scalar_function.hh" #include "exceptions/exceptions.hh" -#include "core/print.hh" +#include #include "cql3/cql3_type.hh" namespace cql3 { diff --git a/cql3/functions/castas_fcts.hh b/cql3/functions/castas_fcts.hh index 3374bca7aa..e63efe9137 100644 --- a/cql3/functions/castas_fcts.hh +++ b/cql3/functions/castas_fcts.hh @@ -47,7 +47,7 @@ #include "cql3/functions/function.hh" #include "cql3/functions/abstract_function.hh" #include "exceptions/exceptions.hh" -#include "core/print.hh" +#include #include "cql3/cql3_type.hh" #include "cql3/selection/selector.hh" diff --git a/cql3/functions/function_name.hh b/cql3/functions/function_name.hh index 2c29801397..ff3659fd51 100644 --- a/cql3/functions/function_name.hh +++ b/cql3/functions/function_name.hh @@ -41,7 +41,7 @@ #pragma once -#include "core/sstring.hh" +#include #include "seastarx.hh" #include #include diff --git a/cql3/functions/native_aggregate_function.hh b/cql3/functions/native_aggregate_function.hh index b252c2e31f..4bcabf3723 100644 --- a/cql3/functions/native_aggregate_function.hh +++ b/cql3/functions/native_aggregate_function.hh @@ -43,7 +43,7 @@ #include "types.hh" #include "native_function.hh" -#include "core/shared_ptr.hh" +#include namespace cql3 { namespace functions { diff --git a/cql3/functions/native_scalar_function.hh b/cql3/functions/native_scalar_function.hh index 20446bc344..47378bf0f4 100644 --- a/cql3/functions/native_scalar_function.hh +++ b/cql3/functions/native_scalar_function.hh @@ -43,7 +43,7 @@ #include "native_function.hh" #include "scalar_function.hh" -#include "core/shared_ptr.hh" +#include namespace cql3 { namespace functions { diff --git a/cql3/index_name.hh b/cql3/index_name.hh index f8ddbb5900..f4e7dde0b2 100644 --- a/cql3/index_name.hh +++ b/cql3/index_name.hh @@ -43,7 +43,7 @@ #include "cql3/keyspace_element_name.hh" -#include "core/shared_ptr.hh" +#include #include "cql3/cf_name.hh" namespace cql3 { diff --git a/cql3/keyspace_element_name.hh b/cql3/keyspace_element_name.hh index f47df2f81f..347cd94972 100644 --- a/cql3/keyspace_element_name.hh +++ b/cql3/keyspace_element_name.hh @@ -41,7 +41,7 @@ #pragma once -#include "core/sstring.hh" +#include #include "seastarx.hh" #include diff --git a/cql3/operation.hh b/cql3/operation.hh index 728cd7fbc4..11d728e6d0 100644 --- a/cql3/operation.hh +++ b/cql3/operation.hh @@ -41,7 +41,7 @@ #pragma once -#include "core/shared_ptr.hh" +#include #include "exceptions/exceptions.hh" #include "database_fwd.hh" #include "term.hh" diff --git a/cql3/operator.hh b/cql3/operator.hh index 952540874f..b287ba45a7 100644 --- a/cql3/operator.hh +++ b/cql3/operator.hh @@ -43,7 +43,7 @@ #include #include -#include "core/sstring.hh" +#include #include "seastarx.hh" namespace cql3 { diff --git a/cql3/restrictions/abstract_restriction.hh b/cql3/restrictions/abstract_restriction.hh index cd2255e9a4..64a4fad5e6 100644 --- a/cql3/restrictions/abstract_restriction.hh +++ b/cql3/restrictions/abstract_restriction.hh @@ -43,8 +43,8 @@ #include -#include "core/shared_ptr.hh" -#include "core/sstring.hh" +#include +#include #include "cql3/restrictions/restriction.hh" #include "cql3/term.hh" #include "types.hh" diff --git a/cql3/restrictions/primary_key_restrictions.hh b/cql3/restrictions/primary_key_restrictions.hh index cb4208d36a..bc60484fe9 100644 --- a/cql3/restrictions/primary_key_restrictions.hh +++ b/cql3/restrictions/primary_key_restrictions.hh @@ -51,7 +51,7 @@ #include "cql3/restrictions/abstract_restriction.hh" #include "types.hh" #include "query-request.hh" -#include "core/shared_ptr.hh" +#include namespace cql3 { namespace restrictions { diff --git a/cql3/restrictions/single_column_restriction.hh b/cql3/restrictions/single_column_restriction.hh index f53a70395a..25c139daa7 100644 --- a/cql3/restrictions/single_column_restriction.hh +++ b/cql3/restrictions/single_column_restriction.hh @@ -45,7 +45,7 @@ #include "cql3/restrictions/term_slice.hh" #include "cql3/term.hh" #include "cql3/abstract_marker.hh" -#include "core/shared_ptr.hh" +#include #include "schema.hh" #include "to_string.hh" #include "exceptions/exceptions.hh" diff --git a/cql3/restrictions/term_slice.hh b/cql3/restrictions/term_slice.hh index 0eab99e86f..05f45ffa64 100644 --- a/cql3/restrictions/term_slice.hh +++ b/cql3/restrictions/term_slice.hh @@ -43,7 +43,7 @@ #include "cql3/restrictions/abstract_restriction.hh" #include "cql3/term.hh" -#include "core/shared_ptr.hh" +#include #include "to_string.hh" #include "exceptions/exceptions.hh" diff --git a/cql3/selection/selectable.hh b/cql3/selection/selectable.hh index f3623cff52..9b606e9d2b 100644 --- a/cql3/selection/selectable.hh +++ b/cql3/selection/selectable.hh @@ -43,7 +43,7 @@ #pragma once #include "schema.hh" -#include "core/shared_ptr.hh" +#include #include "cql3/selection/selector.hh" #include "cql3/cql3_type.hh" #include "cql3/functions/function.hh" diff --git a/cql3/single_column_relation.hh b/cql3/single_column_relation.hh index 11bb627e21..17cc8a9a43 100644 --- a/cql3/single_column_relation.hh +++ b/cql3/single_column_relation.hh @@ -45,7 +45,7 @@ #include "cql3/restrictions/single_column_restriction.hh" #include "statements/request_validations.hh" -#include "core/shared_ptr.hh" +#include #include "to_string.hh" #include "cql3/relation.hh" diff --git a/cql3/statements/create_index_statement.hh b/cql3/statements/create_index_statement.hh index fc7b37aba6..9193db5957 100644 --- a/cql3/statements/create_index_statement.hh +++ b/cql3/statements/create_index_statement.hh @@ -52,7 +52,7 @@ #include "service/migration_manager.hh" #include "schema.hh" -#include "core/shared_ptr.hh" +#include #include #include diff --git a/cql3/statements/create_keyspace_statement.hh b/cql3/statements/create_keyspace_statement.hh index 65e21d37e8..55b2e74e5a 100644 --- a/cql3/statements/create_keyspace_statement.hh +++ b/cql3/statements/create_keyspace_statement.hh @@ -45,7 +45,7 @@ #include "cql3/statements/ks_prop_defs.hh" #include "transport/event.hh" -#include "core/shared_ptr.hh" +#include namespace cql3 { diff --git a/cql3/statements/create_table_statement.hh b/cql3/statements/create_table_statement.hh index a090c8d8f7..b95e64d759 100644 --- a/cql3/statements/create_table_statement.hh +++ b/cql3/statements/create_table_statement.hh @@ -50,7 +50,7 @@ #include "service/migration_manager.hh" #include "schema.hh" -#include "core/shared_ptr.hh" +#include #include #include diff --git a/cql3/statements/create_view_statement.hh b/cql3/statements/create_view_statement.hh index a20dfcd036..a5f11e2c8e 100644 --- a/cql3/statements/create_view_statement.hh +++ b/cql3/statements/create_view_statement.hh @@ -30,7 +30,7 @@ #include "service/migration_manager.hh" #include "schema.hh" -#include "core/shared_ptr.hh" +#include #include #include diff --git a/cql3/statements/index_prop_defs.hh b/cql3/statements/index_prop_defs.hh index 85c6a019d1..1acaff8353 100644 --- a/cql3/statements/index_prop_defs.hh +++ b/cql3/statements/index_prop_defs.hh @@ -42,7 +42,7 @@ #pragma once #include "property_definitions.hh" -#include "core/sstring.hh" +#include #include #include diff --git a/cql3/statements/index_target.hh b/cql3/statements/index_target.hh index 5228b9b520..f8ad556f24 100644 --- a/cql3/statements/index_target.hh +++ b/cql3/statements/index_target.hh @@ -41,7 +41,7 @@ #pragma once -#include "core/shared_ptr.hh" +#include #include "cql3/column_identifier.hh" namespace cql3 { diff --git a/cql3/statements/modification_statement.cc b/cql3/statements/modification_statement.cc index 4622ce1312..f009061a0a 100644 --- a/cql3/statements/modification_statement.cc +++ b/cql3/statements/modification_statement.cc @@ -44,7 +44,7 @@ #include "cql3/statements/prepared_statement.hh" #include "cql3/restrictions/single_column_restriction.hh" #include "validation.hh" -#include "core/shared_ptr.hh" +#include #include "query-result-reader.hh" #include #include diff --git a/cql3/statements/modification_statement.hh b/cql3/statements/modification_statement.hh index ee3f698239..ec94b9f25e 100644 --- a/cql3/statements/modification_statement.hh +++ b/cql3/statements/modification_statement.hh @@ -57,8 +57,8 @@ #include "db/consistency_level.hh" -#include "core/shared_ptr.hh" -#include "core/future-util.hh" +#include +#include #include "unimplemented.hh" #include "validation.hh" diff --git a/cql3/statements/prepared_statement.hh b/cql3/statements/prepared_statement.hh index 1856534a4c..fe04f38ba2 100644 --- a/cql3/statements/prepared_statement.hh +++ b/cql3/statements/prepared_statement.hh @@ -46,7 +46,7 @@ #include "cql3/column_identifier.hh" #include "cql3/cql_statement.hh" -#include "core/shared_ptr.hh" +#include #include #include diff --git a/cql3/statements/property_definitions.hh b/cql3/statements/property_definitions.hh index 024f088b0c..807737ca11 100644 --- a/cql3/statements/property_definitions.hh +++ b/cql3/statements/property_definitions.hh @@ -42,8 +42,8 @@ #pragma once #include "exceptions/exceptions.hh" -#include "core/print.hh" -#include "core/sstring.hh" +#include +#include #include #include diff --git a/cql3/statements/raw/modification_statement.hh b/cql3/statements/raw/modification_statement.hh index 56e8ec2738..0d23a71a88 100644 --- a/cql3/statements/raw/modification_statement.hh +++ b/cql3/statements/raw/modification_statement.hh @@ -53,8 +53,8 @@ #include "db/consistency_level.hh" -#include "core/shared_ptr.hh" -#include "core/future-util.hh" +#include +#include #include "unimplemented.hh" #include "validation.hh" diff --git a/cql3/statements/raw/select_statement.hh b/cql3/statements/raw/select_statement.hh index 2e155f0a3e..ce8e52fa71 100644 --- a/cql3/statements/raw/select_statement.hh +++ b/cql3/statements/raw/select_statement.hh @@ -50,8 +50,8 @@ #include "cql3/result_set.hh" #include "exceptions/unrecognized_entity_exception.hh" #include "service/client_state.hh" -#include "core/shared_ptr.hh" -#include "core/distributed.hh" +#include +#include #include "validation.hh" namespace cql3 { diff --git a/cql3/statements/request_validations.hh b/cql3/statements/request_validations.hh index 24408ae408..4e6beba971 100644 --- a/cql3/statements/request_validations.hh +++ b/cql3/statements/request_validations.hh @@ -41,7 +41,7 @@ #pragma once #include "exceptions/exceptions.hh" -#include "core/print.hh" +#include #include diff --git a/cql3/statements/schema_altering_statement.hh b/cql3/statements/schema_altering_statement.hh index d857f94d09..929e96c6ce 100644 --- a/cql3/statements/schema_altering_statement.hh +++ b/cql3/statements/schema_altering_statement.hh @@ -47,7 +47,7 @@ #include "cql3/statements/raw/cf_statement.hh" #include "cql3/cql_statement.hh" -#include "core/shared_ptr.hh" +#include #include diff --git a/cql3/statements/select_statement.cc b/cql3/statements/select_statement.cc index ba747f0e39..ae95af1f1c 100644 --- a/cql3/statements/select_statement.cc +++ b/cql3/statements/select_statement.cc @@ -47,7 +47,7 @@ #include "cql3/selection/selection.hh" #include "cql3/util.hh" #include "cql3/restrictions/single_column_primary_key_restrictions.hh" -#include "core/shared_ptr.hh" +#include #include "query-result-reader.hh" #include "query_result_merger.hh" #include "service/pager/query_pagers.hh" diff --git a/cql3/statements/select_statement.hh b/cql3/statements/select_statement.hh index 066d241592..83bda3bffa 100644 --- a/cql3/statements/select_statement.hh +++ b/cql3/statements/select_statement.hh @@ -50,8 +50,8 @@ #include "cql3/result_set.hh" #include "exceptions/unrecognized_entity_exception.hh" #include "service/client_state.hh" -#include "core/shared_ptr.hh" -#include "core/distributed.hh" +#include +#include #include "validation.hh" namespace cql3 { diff --git a/cql3/token_relation.hh b/cql3/token_relation.hh index 28e98489cd..2d9b03cf80 100644 --- a/cql3/token_relation.hh +++ b/cql3/token_relation.hh @@ -42,7 +42,7 @@ #include -#include "core/shared_ptr.hh" +#include #include "to_string.hh" #include "relation.hh" diff --git a/cql3/ut_name.hh b/cql3/ut_name.hh index 104589c18d..f8c21a472d 100644 --- a/cql3/ut_name.hh +++ b/cql3/ut_name.hh @@ -41,7 +41,7 @@ #pragma once -#include "core/shared_ptr.hh" +#include #include "column_identifier.hh" #include diff --git a/database.cc b/database.cc index 3e3430d59a..d37fb5a710 100644 --- a/database.cc +++ b/database.cc @@ -23,7 +23,7 @@ #include "lister.hh" #include "database.hh" #include "unimplemented.hh" -#include "core/future-util.hh" +#include #include "db/commitlog/commitlog_entry.hh" #include "db/system_keyspace.hh" #include "db/consistency_level.hh" @@ -32,7 +32,7 @@ #include "to_string.hh" #include "query-result-writer.hh" #include "cql3/column_identifier.hh" -#include "core/seastar.hh" +#include #include #include #include @@ -57,12 +57,12 @@ #include #include "frozen_mutation.hh" #include "mutation_partition_applier.hh" -#include "core/do_with.hh" +#include #include "service/migration_manager.hh" #include "service/storage_service.hh" #include "message/messaging_service.hh" #include "mutation_query.hh" -#include +#include #include #include "utils/latency.hh" #include "schema_registry.hh" diff --git a/database.hh b/database.hh index afe21191ec..aa0c81f330 100644 --- a/database.hh +++ b/database.hh @@ -25,17 +25,17 @@ #include "dht/i_partitioner.hh" #include "locator/abstract_replication_strategy.hh" #include "index/secondary_index_manager.hh" -#include "core/sstring.hh" -#include "core/shared_ptr.hh" +#include +#include #include -#include "net/byteorder.hh" +#include #include "utils/UUID_gen.hh" #include "utils/UUID.hh" #include "utils/hash.hh" #include "db_clock.hh" #include "gc_clock.hh" #include -#include "core/distributed.hh" +#include #include #include #include @@ -48,8 +48,8 @@ #include #include "types.hh" #include "compound.hh" -#include "core/future.hh" -#include "core/gate.hh" +#include +#include #include "cql3/column_specification.hh" #include "db/commitlog/replay_position.hh" #include diff --git a/db/commitlog/commitlog.cc b/db/commitlog/commitlog.cc index 6fbed2ae56..671a6f5d28 100644 --- a/db/commitlog/commitlog.cc +++ b/db/commitlog/commitlog.cc @@ -49,19 +49,19 @@ #include #include -#include -#include +#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include #include -#include +#include #include "seastarx.hh" diff --git a/db/commitlog/commitlog.hh b/db/commitlog/commitlog.hh index e7a2739421..8e1a6f6e96 100644 --- a/db/commitlog/commitlog.hh +++ b/db/commitlog/commitlog.hh @@ -42,9 +42,9 @@ #include -#include "core/future.hh" -#include "core/shared_ptr.hh" -#include "core/stream.hh" +#include +#include +#include #include "replay_position.hh" #include "commitlog_entry.hh" #include "db/timeout_clock.hh" diff --git a/db/commitlog/commitlog_replayer.cc b/db/commitlog/commitlog_replayer.cc index 7d09f0a553..62e615cb75 100644 --- a/db/commitlog/commitlog_replayer.cc +++ b/db/commitlog/commitlog_replayer.cc @@ -45,8 +45,8 @@ #include #include -#include -#include +#include +#include #include "commitlog.hh" #include "commitlog_replayer.hh" diff --git a/db/commitlog/commitlog_replayer.hh b/db/commitlog/commitlog_replayer.hh index 83146f5cb5..d3e0d835cb 100644 --- a/db/commitlog/commitlog_replayer.hh +++ b/db/commitlog/commitlog_replayer.hh @@ -42,8 +42,8 @@ #pragma once #include -#include -#include +#include +#include class database; diff --git a/db/consistency_level.cc b/db/consistency_level.cc index 92d4de9fd9..87f3a6b29c 100644 --- a/db/consistency_level.cc +++ b/db/consistency_level.cc @@ -45,7 +45,7 @@ #include #include #include "exceptions/exceptions.hh" -#include "core/sstring.hh" +#include #include "schema.hh" #include "database.hh" #include "unimplemented.hh" diff --git a/db/large_partition_handler.cc b/db/large_partition_handler.cc index 3af1f3849a..806ef0c199 100644 --- a/db/large_partition_handler.cc +++ b/db/large_partition_handler.cc @@ -19,7 +19,7 @@ * along with Scylla. If not, see . */ -#include "core/print.hh" +#include #include "db/query_context.hh" #include "db/system_keyspace.hh" #include "db/large_partition_handler.hh" diff --git a/db/marshal/type_parser.hh b/db/marshal/type_parser.hh index b7ceb82108..be0156f929 100644 --- a/db/marshal/type_parser.hh +++ b/db/marshal/type_parser.hh @@ -43,7 +43,7 @@ #include "types.hh" -#include "core/sstring.hh" +#include namespace db { diff --git a/db/query_context.hh b/db/query_context.hh index d9a18e7860..31c8ab3a34 100644 --- a/db/query_context.hh +++ b/db/query_context.hh @@ -21,8 +21,8 @@ #pragma once #include -#include "core/sharded.hh" -#include "core/future.hh" +#include +#include #include "cql3/query_processor.hh" class database; diff --git a/db/schema_tables.cc b/db/schema_tables.cc index b4bd2c58c1..239c2ffdf2 100644 --- a/db/schema_tables.cc +++ b/db/schema_tables.cc @@ -50,8 +50,8 @@ #include "schema_builder.hh" #include "map_difference.hh" #include "utils/UUID_gen.hh" -#include "core/do_with.hh" -#include "core/thread.hh" +#include +#include #include "json.hh" #include "log.hh" #include "frozen_schema.hh" diff --git a/db/system_keyspace.cc b/db/system_keyspace.cc index 09e051d65d..ba5b1ae119 100644 --- a/db/system_keyspace.cc +++ b/db/system_keyspace.cc @@ -67,7 +67,7 @@ #include "release.hh" #include "log.hh" #include "serializer.hh" -#include +#include #include #include #include "service/storage_proxy.hh" diff --git a/dht/i_partitioner.cc b/dht/i_partitioner.cc index 8599f98eb7..ce27140867 100644 --- a/dht/i_partitioner.cc +++ b/dht/i_partitioner.cc @@ -20,7 +20,7 @@ */ #include "i_partitioner.hh" -#include "core/reactor.hh" +#include #include "murmur3_partitioner.hh" #include "utils/class_registrator.hh" #include "types.hh" diff --git a/dht/i_partitioner.hh b/dht/i_partitioner.hh index abde31f65c..ef6a4dbf7e 100644 --- a/dht/i_partitioner.hh +++ b/dht/i_partitioner.hh @@ -40,8 +40,8 @@ #pragma once -#include "core/shared_ptr.hh" -#include "core/sstring.hh" +#include +#include #include "types.hh" #include "keys.hh" #include "utils/managed_bytes.hh" diff --git a/disk-error-handler.hh b/disk-error-handler.hh index 3ff1c9918a..91d7a823f3 100644 --- a/disk-error-handler.hh +++ b/disk-error-handler.hh @@ -25,7 +25,7 @@ #include #include "utils/exceptions.hh" -#include +#include #include "seastarx.hh" diff --git a/exceptions/exceptions.hh b/exceptions/exceptions.hh index 4e6b7f6109..555703e477 100644 --- a/exceptions/exceptions.hh +++ b/exceptions/exceptions.hh @@ -44,8 +44,8 @@ #include "db/consistency_level_type.hh" #include "db/write_type.hh" #include -#include "core/sstring.hh" -#include "core/print.hh" +#include +#include #include "bytes.hh" namespace exceptions { diff --git a/exceptions/unrecognized_entity_exception.hh b/exceptions/unrecognized_entity_exception.hh index fb6aa06433..5bf3ef8373 100644 --- a/exceptions/unrecognized_entity_exception.hh +++ b/exceptions/unrecognized_entity_exception.hh @@ -42,7 +42,7 @@ #pragma once #include "exceptions.hh" -#include "core/shared_ptr.hh" +#include #include "cql3/column_identifier.hh" #include "cql3/relation.hh" diff --git a/gms/failure_detector.hh b/gms/failure_detector.hh index 8a2163858e..875ccb9344 100644 --- a/gms/failure_detector.hh +++ b/gms/failure_detector.hh @@ -39,9 +39,9 @@ #pragma once #include "unimplemented.hh" -#include "core/sstring.hh" -#include "core/shared_ptr.hh" -#include "core/distributed.hh" +#include +#include +#include #include "utils/bounded_stats_deque.hh" #include "gms/i_failure_detector.hh" #include diff --git a/gms/gossip_digest.hh b/gms/gossip_digest.hh index d9402f8080..f5f137eef3 100644 --- a/gms/gossip_digest.hh +++ b/gms/gossip_digest.hh @@ -38,7 +38,7 @@ #pragma once -#include "core/sstring.hh" +#include #include "utils/serialization.hh" #include "gms/inet_address.hh" diff --git a/gms/gossip_digest_syn.hh b/gms/gossip_digest_syn.hh index efbb3bacbf..79430cdda1 100644 --- a/gms/gossip_digest_syn.hh +++ b/gms/gossip_digest_syn.hh @@ -38,7 +38,7 @@ #pragma once -#include "core/sstring.hh" +#include #include "utils/serialization.hh" #include "gms/gossip_digest.hh" #include "utils/chunked_vector.hh" diff --git a/gms/gossiper.hh b/gms/gossiper.hh index ee416b5a99..b0a29945c1 100644 --- a/gms/gossiper.hh +++ b/gms/gossiper.hh @@ -39,9 +39,9 @@ #pragma once #include "unimplemented.hh" -#include "core/distributed.hh" -#include "core/shared_ptr.hh" -#include "core/print.hh" +#include +#include +#include #include "utils/UUID.hh" #include "utils/fb_utilities.hh" #include "gms/i_failure_detection_event_listener.hh" diff --git a/gms/inet_address.hh b/gms/inet_address.hh index 37130d47ee..9269af83a3 100644 --- a/gms/inet_address.hh +++ b/gms/inet_address.hh @@ -21,7 +21,7 @@ #pragma once -#include "net/ip.hh" +#include #include "utils/serialization.hh" #include diff --git a/gms/versioned_value.hh b/gms/versioned_value.hh index 878eb78daa..cecd9e3c28 100644 --- a/gms/versioned_value.hh +++ b/gms/versioned_value.hh @@ -38,7 +38,7 @@ #pragma once -#include "core/sstring.hh" +#include #include "utils/serialization.hh" #include "utils/UUID.hh" #include "version_generator.hh" diff --git a/index/secondary_index.hh b/index/secondary_index.hh index ee373da0ee..332d532f59 100644 --- a/index/secondary_index.hh +++ b/index/secondary_index.hh @@ -41,7 +41,7 @@ #pragma once -#include "core/sstring.hh" +#include #include "seastarx.hh" namespace db { diff --git a/json.hh b/json.hh index 643f0a1539..d16bc43d63 100644 --- a/json.hh +++ b/json.hh @@ -21,8 +21,8 @@ #pragma once -#include "core/sstring.hh" -#include "core/print.hh" +#include +#include #include diff --git a/locator/ec2_snitch.hh b/locator/ec2_snitch.hh index 954ca0632f..6423ba2a30 100644 --- a/locator/ec2_snitch.hh +++ b/locator/ec2_snitch.hh @@ -21,7 +21,7 @@ #pragma once #include "locator/production_snitch_base.hh" -#include "http/http_response_parser.hh" +#include namespace locator { class ec2_snitch : public production_snitch_base { diff --git a/locator/gce_snitch.hh b/locator/gce_snitch.hh index 1ec7c2563e..dbc76d6cd1 100644 --- a/locator/gce_snitch.hh +++ b/locator/gce_snitch.hh @@ -40,7 +40,7 @@ #pragma once #include "locator/production_snitch_base.hh" -#include "http/http_response_parser.hh" +#include namespace locator { diff --git a/locator/gossiping_property_file_snitch.hh b/locator/gossiping_property_file_snitch.hh index c23f273f36..e36763532b 100644 --- a/locator/gossiping_property_file_snitch.hh +++ b/locator/gossiping_property_file_snitch.hh @@ -46,7 +46,7 @@ #include "production_snitch_base.hh" #include "exceptions/exceptions.hh" #include "service/storage_service.hh" -#include "core/file.hh" +#include #include "log.hh" #include "locator/reconnectable_snitch_helper.hh" diff --git a/locator/production_snitch_base.hh b/locator/production_snitch_base.hh index 1d4caf76c9..96f8b8e319 100644 --- a/locator/production_snitch_base.hh +++ b/locator/production_snitch_base.hh @@ -46,7 +46,7 @@ #include "gms/endpoint_state.hh" #include "locator/token_metadata.hh" -#include "core/sstring.hh" +#include #include "snitch_base.hh" namespace locator { diff --git a/locator/rack_inferring_snitch.hh b/locator/rack_inferring_snitch.hh index c842c6213d..0b60c96d66 100644 --- a/locator/rack_inferring_snitch.hh +++ b/locator/rack_inferring_snitch.hh @@ -38,7 +38,7 @@ #pragma once -#include "core/sstring.hh" +#include #include "gms/inet_address.hh" #include "snitch_base.hh" #include "utils/fb_utilities.hh" diff --git a/locator/snitch_base.hh b/locator/snitch_base.hh index 19cf6c4f99..56060d736c 100644 --- a/locator/snitch_base.hh +++ b/locator/snitch_base.hh @@ -42,9 +42,9 @@ #include #include "gms/inet_address.hh" -#include "core/shared_ptr.hh" -#include "core/thread.hh" -#include "core/distributed.hh" +#include +#include +#include #include "utils/class_registrator.hh" #include "log.hh" diff --git a/main.cc b/main.cc index 1325cdbdda..a7b2968d1b 100644 --- a/main.cc +++ b/main.cc @@ -21,11 +21,11 @@ #include "supervisor.hh" #include "database.hh" -#include "core/app-template.hh" -#include "core/distributed.hh" +#include +#include #include "thrift/server.hh" #include "transport/server.hh" -#include "http/httpd.hh" +#include #include "api/api_init.hh" #include "db/config.hh" #include "db/extensions.hh" @@ -49,12 +49,12 @@ #include "release.hh" #include "repair/repair.hh" #include -#include +#include #include #include #include "disk-error-handler.hh" #include "tracing/tracing.hh" -#include "core/prometheus.hh" +#include #include "message/messaging_service.hh" #include #include diff --git a/message/messaging_service.cc b/message/messaging_service.cc index e92c4196de..80a486a442 100644 --- a/message/messaging_service.cc +++ b/message/messaging_service.cc @@ -20,7 +20,7 @@ */ #include "message/messaging_service.hh" -#include "core/distributed.hh" +#include #include "gms/failure_detector.hh" #include "gms/gossiper.hh" #include "service/storage_service.hh" @@ -31,7 +31,7 @@ #include "gms/gossiper.hh" #include "query-request.hh" #include "query-result.hh" -#include "rpc/rpc.hh" +#include #include "db/config.hh" #include "db/system_keyspace.hh" #include "dht/i_partitioner.hh" @@ -75,8 +75,8 @@ #include "idl/partition_checksum.dist.impl.hh" #include "idl/query.dist.impl.hh" #include "idl/cache_temperature.dist.impl.hh" -#include "rpc/lz4_compressor.hh" -#include "rpc/multi_algo_compressor_factory.hh" +#include +#include #include "partition_range_compat.hh" #include "stdx.hh" #include diff --git a/message/messaging_service.hh b/message/messaging_service.hh index 708b6cc585..c8a7f2c55b 100644 --- a/message/messaging_service.hh +++ b/message/messaging_service.hh @@ -23,11 +23,11 @@ #include "messaging_service_fwd.hh" #include "msg_addr.hh" -#include "core/reactor.hh" -#include "core/distributed.hh" -#include "core/sstring.hh" +#include +#include +#include #include "gms/inet_address.hh" -#include "rpc/rpc_types.hh" +#include #include #include "query-request.hh" #include "mutation_query.hh" diff --git a/mutation_reader.cc b/mutation_reader.cc index 5f14b995a8..b79631ac44 100644 --- a/mutation_reader.cc +++ b/mutation_reader.cc @@ -25,7 +25,7 @@ #include #include "mutation_reader.hh" -#include "core/future-util.hh" +#include #include "stdx.hh" #include "flat_mutation_reader.hh" diff --git a/mutation_reader.hh b/mutation_reader.hh index 2acd81f4b1..1a37d711fd 100644 --- a/mutation_reader.hh +++ b/mutation_reader.hh @@ -25,9 +25,9 @@ #include "mutation.hh" #include "clustering_key_filter.hh" -#include "core/future.hh" -#include "core/future-util.hh" -#include "core/do_with.hh" +#include +#include +#include #include "tracing/trace_state.hh" #include "flat_mutation_reader.hh" #include "reader_concurrency_semaphore.hh" diff --git a/query-result-set.hh b/query-result-set.hh index d2ba4bb0ec..e2a5618dd1 100644 --- a/query-result-set.hh +++ b/query-result-set.hh @@ -22,7 +22,7 @@ #pragma once -#include "core/shared_ptr.hh" +#include #include "query-request.hh" #include "query-result.hh" #include "schema.hh" diff --git a/query_result_merger.hh b/query_result_merger.hh index 3745299fd7..658f206ac1 100644 --- a/query_result_merger.hh +++ b/query_result_merger.hh @@ -21,7 +21,7 @@ #pragma once -#include "core/distributed.hh" +#include #include "query-result.hh" namespace query { diff --git a/reader_concurrency_semaphore.hh b/reader_concurrency_semaphore.hh index 158f57f6d9..09dd0f4d1c 100644 --- a/reader_concurrency_semaphore.hh +++ b/reader_concurrency_semaphore.hh @@ -21,8 +21,8 @@ #pragma once -#include -#include +#include +#include #include "db/timeout_clock.hh" /// Specific semaphore for controlling reader concurrency diff --git a/row_cache.cc b/row_cache.cc index 2e114059f1..ee1c45127a 100644 --- a/row_cache.cc +++ b/row_cache.cc @@ -20,9 +20,9 @@ */ #include "row_cache.hh" -#include "core/memory.hh" -#include "core/do_with.hh" -#include "core/future-util.hh" +#include +#include +#include #include #include #include "memtable.hh" diff --git a/row_cache.hh b/row_cache.hh index c5b5e06be9..690a611042 100644 --- a/row_cache.hh +++ b/row_cache.hh @@ -25,7 +25,7 @@ #include #include -#include "core/memory.hh" +#include #include #include diff --git a/schema.hh b/schema.hh index 8839507791..8e434de0e9 100644 --- a/schema.hh +++ b/schema.hh @@ -28,7 +28,7 @@ #include #include "cql3/column_specification.hh" -#include "core/shared_ptr.hh" +#include #include "types.hh" #include "compound.hh" #include "gc_clock.hh" diff --git a/seastar b/seastar index d59fcef44a..b924495aef 160000 --- a/seastar +++ b/seastar @@ -1 +1 @@ -Subproject commit d59fcef44a2b403227f76c9ceacd366b6fd2ed6f +Subproject commit b924495aef4553c95250ffbd34834e99aceef3ea diff --git a/serializer.hh b/serializer.hh index 2c8351f635..d79f68dbae 100644 --- a/serializer.hh +++ b/serializer.hh @@ -22,13 +22,13 @@ #include #include -#include "core/sstring.hh" +#include #include #include #include "enum_set.hh" #include "utils/managed_bytes.hh" #include "bytes_ostream.hh" -#include "core/simple-stream.hh" +#include #include "boost/variant/variant.hpp" #include "bytes_ostream.hh" #include "utils/input_stream.hh" diff --git a/service/cache_hitrate_calculator.hh b/service/cache_hitrate_calculator.hh index 13f45eb33f..90ca5ab8cd 100644 --- a/service/cache_hitrate_calculator.hh +++ b/service/cache_hitrate_calculator.hh @@ -22,8 +22,8 @@ #pragma once #include "database.hh" -#include "core/timer.hh" -#include "core/sharded.hh" +#include +#include namespace service { diff --git a/service/migration_manager.hh b/service/migration_manager.hh index 52ed2abf05..49a6ba5b29 100644 --- a/service/migration_manager.hh +++ b/service/migration_manager.hh @@ -44,7 +44,7 @@ #include "service/migration_listener.hh" #include "gms/endpoint_state.hh" #include "db/schema_tables.hh" -#include "core/distributed.hh" +#include #include "gms/inet_address.hh" #include "message/msg_addr.hh" #include "utils/UUID.hh" diff --git a/service/pager/paging_state.cc b/service/pager/paging_state.cc index e3232ea43f..f4b53ddbce 100644 --- a/service/pager/paging_state.cc +++ b/service/pager/paging_state.cc @@ -42,7 +42,7 @@ #include "bytes.hh" #include "keys.hh" #include "paging_state.hh" -#include "core/simple-stream.hh" +#include #include "idl/keys.dist.hh" #include "idl/uuid.dist.hh" #include "idl/paging_state.dist.hh" diff --git a/service/storage_proxy.cc b/service/storage_proxy.cc index 620d555026..b2e0d40e94 100644 --- a/service/storage_proxy.cc +++ b/service/storage_proxy.cc @@ -47,12 +47,12 @@ #include "frozen_mutation.hh" #include "supervisor.hh" #include "query_result_merger.hh" -#include "core/do_with.hh" +#include #include "message/messaging_service.hh" #include "gms/failure_detector.hh" #include "gms/gossiper.hh" #include "storage_service.hh" -#include "core/future-util.hh" +#include #include "db/read_repair_decision.hh" #include "db/config.hh" #include "db/batchlog_manager.hh" @@ -80,7 +80,7 @@ #include "schema_registry.hh" #include "utils/joinpoint.hh" #include -#include "core/metrics.hh" +#include #include #include "db/timeout_clock.hh" #include "multishard_mutation_query.hh" diff --git a/service/storage_proxy.hh b/service/storage_proxy.hh index 646b71ed5f..6664006078 100644 --- a/service/storage_proxy.hh +++ b/service/storage_proxy.hh @@ -45,7 +45,7 @@ #include "query-request.hh" #include "query-result.hh" #include "query-result-set.hh" -#include "core/distributed.hh" +#include #include "db/consistency_level_type.hh" #include "db/read_repair_decision.hh" #include "db/write_type.hh" diff --git a/service/storage_service.cc b/service/storage_service.cc index 965d918640..ad462a553d 100644 --- a/service/storage_service.cc +++ b/service/storage_service.cc @@ -39,7 +39,7 @@ #include "storage_service.hh" #include "dht/boot_strapper.hh" -#include "core/distributed.hh" +#include #include "locator/snitch_base.hh" #include "db/system_keyspace.hh" #include "utils/UUID.hh" diff --git a/service/storage_service.hh b/service/storage_service.hh index 70e3650185..839a0d665f 100644 --- a/service/storage_service.hh +++ b/service/storage_service.hh @@ -45,13 +45,13 @@ #include "locator/token_metadata.hh" #include "gms/gossiper.hh" #include "utils/UUID_gen.hh" -#include "core/distributed.hh" +#include #include "dht/i_partitioner.hh" #include "dht/token_range_endpoints.hh" -#include "core/sleep.hh" +#include #include "gms/application_state.hh" #include "db/system_distributed_keyspace.hh" -#include "core/semaphore.hh" +#include #include "utils/fb_utilities.hh" #include "utils/serialized_action.hh" #include "database.hh" diff --git a/sstables/column_name_helper.hh b/sstables/column_name_helper.hh index d2e6ee0669..23e7d4d279 100644 --- a/sstables/column_name_helper.hh +++ b/sstables/column_name_helper.hh @@ -39,7 +39,7 @@ #pragma once -#include "core/sstring.hh" +#include #include "schema.hh" #include "compound_compat.hh" #include diff --git a/sstables/compaction.cc b/sstables/compaction.cc index 5612bcbf48..386cb0b8a4 100644 --- a/sstables/compaction.cc +++ b/sstables/compaction.cc @@ -49,8 +49,8 @@ #include #include -#include "core/future-util.hh" -#include "core/pipe.hh" +#include +#include #include #include "sstables.hh" diff --git a/sstables/compaction_manager.hh b/sstables/compaction_manager.hh index 931ad7a908..e76f80dcbb 100644 --- a/sstables/compaction_manager.hh +++ b/sstables/compaction_manager.hh @@ -21,12 +21,12 @@ #pragma once -#include "core/semaphore.hh" -#include "core/sstring.hh" -#include "core/shared_ptr.hh" -#include "core/gate.hh" -#include "core/shared_future.hh" -#include "core/rwlock.hh" +#include +#include +#include +#include +#include +#include #include #include #include "log.hh" diff --git a/sstables/consumer.hh b/sstables/consumer.hh index ffaa788bde..2e68e49aaa 100644 --- a/sstables/consumer.hh +++ b/sstables/consumer.hh @@ -22,8 +22,8 @@ #pragma once #include "vint-serialization.hh" -#include "core/future.hh" -#include "core/iostream.hh" +#include +#include #include "sstables/exceptions.hh" #include "sstables/progress_monitor.hh" #include diff --git a/sstables/key.hh b/sstables/key.hh index cfadd3e2e4..a8fb18e27b 100644 --- a/sstables/key.hh +++ b/sstables/key.hh @@ -22,7 +22,7 @@ #pragma once #include "bytes.hh" #include "schema.hh" -#include "core/future.hh" +#include #include "database_fwd.hh" #include "keys.hh" #include "compound_compat.hh" diff --git a/sstables/partition.cc b/sstables/partition.cc index dd2a2e0348..d59920fe2f 100644 --- a/sstables/partition.cc +++ b/sstables/partition.cc @@ -21,10 +21,10 @@ #include "mutation.hh" #include "sstables.hh" #include "types.hh" -#include "core/future-util.hh" +#include #include "key.hh" #include "keys.hh" -#include "core/do_with.hh" +#include #include "unimplemented.hh" #include "dht/i_partitioner.hh" #include diff --git a/sstables/row.hh b/sstables/row.hh index d05c6f7449..a2b0193be0 100644 --- a/sstables/row.hh +++ b/sstables/row.hh @@ -26,7 +26,7 @@ #include "bytes.hh" #include "key.hh" -#include "core/temporary_buffer.hh" +#include #include "consumer.hh" #include "sstables/types.hh" #include "reader_concurrency_semaphore.hh" diff --git a/sstables/sstables.cc b/sstables/sstables.cc index 7f720ee2f9..08b943fcf1 100644 --- a/sstables/sstables.cc +++ b/sstables/sstables.cc @@ -23,13 +23,13 @@ #include #include #include -#include "core/future.hh" -#include "core/future-util.hh" -#include "core/sstring.hh" -#include "core/fstream.hh" -#include "core/shared_ptr.hh" -#include "core/do_with.hh" -#include "core/thread.hh" +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include "range_tombstone_list.hh" #include "counters.hh" #include "binary_search.hh" diff --git a/sstables/sstables.hh b/sstables/sstables.hh index c601c5ee47..278285c0b1 100644 --- a/sstables/sstables.hh +++ b/sstables/sstables.hh @@ -24,25 +24,25 @@ #include "version.hh" #include "shared_sstable.hh" -#include "core/file.hh" -#include "core/fstream.hh" -#include "core/future.hh" -#include "core/sstring.hh" -#include "core/enum.hh" -#include "core/shared_ptr.hh" -#include "core/distributed.hh" +#include +#include +#include +#include +#include +#include +#include #include #include #include #include "types.hh" #include "clustering_key_filter.hh" -#include "core/enum.hh" +#include #include "compress.hh" #include "dht/i_partitioner.hh" #include "schema.hh" #include "mutation.hh" #include "utils/i_filter.hh" -#include "core/stream.hh" +#include #include "writer.hh" #include "metadata_collector.hh" #include "encoding_stats.hh" diff --git a/sstables/types.hh b/sstables/types.hh index 819645f401..38a3e7fd41 100644 --- a/sstables/types.hh +++ b/sstables/types.hh @@ -22,7 +22,7 @@ #pragma once #include "disk_types.hh" -#include "core/enum.hh" +#include #include "bytes.hh" #include "gc_clock.hh" #include "tombstone.hh" diff --git a/sstables/writer.hh b/sstables/writer.hh index ee7846a039..89c665f37c 100644 --- a/sstables/writer.hh +++ b/sstables/writer.hh @@ -21,8 +21,8 @@ #pragma once -#include "core/iostream.hh" -#include "core/fstream.hh" +#include +#include #include "types.hh" #include "checksum_utils.hh" #include "progress_monitor.hh" diff --git a/streaming/progress_info.hh b/streaming/progress_info.hh index 1062ca6a17..14438ec18f 100644 --- a/streaming/progress_info.hh +++ b/streaming/progress_info.hh @@ -39,7 +39,7 @@ #pragma once #include "gms/inet_address.hh" -#include "core/sstring.hh" +#include namespace streaming { diff --git a/streaming/stream_manager.cc b/streaming/stream_manager.cc index e699fd95d3..883c480352 100644 --- a/streaming/stream_manager.cc +++ b/streaming/stream_manager.cc @@ -36,7 +36,7 @@ * along with Scylla. If not, see . */ -#include "core/distributed.hh" +#include #include "streaming/stream_manager.hh" #include "streaming/stream_result_future.hh" #include "log.hh" diff --git a/streaming/stream_manager.hh b/streaming/stream_manager.hh index 5db4a48d71..342d638c45 100644 --- a/streaming/stream_manager.hh +++ b/streaming/stream_manager.hh @@ -38,8 +38,8 @@ #pragma once #include "streaming/progress_info.hh" -#include "core/shared_ptr.hh" -#include "core/distributed.hh" +#include +#include #include "utils/UUID.hh" #include "gms/i_endpoint_state_change_subscriber.hh" #include "gms/inet_address.hh" diff --git a/streaming/stream_plan.hh b/streaming/stream_plan.hh index 3f2efd17c4..48c1342fab 100644 --- a/streaming/stream_plan.hh +++ b/streaming/stream_plan.hh @@ -40,7 +40,7 @@ #include "utils/UUID.hh" #include "utils/UUID_gen.hh" -#include "core/sstring.hh" +#include #include "gms/inet_address.hh" #include "query-request.hh" #include "dht/i_partitioner.hh" diff --git a/streaming/stream_request.hh b/streaming/stream_request.hh index 1eae0b91a7..88a50231bb 100644 --- a/streaming/stream_request.hh +++ b/streaming/stream_request.hh @@ -38,7 +38,7 @@ #pragma once -#include "core/sstring.hh" +#include #include "range.hh" #include "dht/i_partitioner.hh" #include "partition_range_compat.hh" diff --git a/streaming/stream_result_future.hh b/streaming/stream_result_future.hh index 1dad8fab3a..06cceae35b 100644 --- a/streaming/stream_result_future.hh +++ b/streaming/stream_result_future.hh @@ -37,8 +37,8 @@ #pragma once -#include "core/sstring.hh" -#include "core/shared_ptr.hh" +#include +#include #include "utils/UUID.hh" #include "gms/inet_address.hh" #include "streaming/stream_coordinator.hh" diff --git a/streaming/stream_session.cc b/streaming/stream_session.cc index af32aefaa5..31d0ade9ef 100644 --- a/streaming/stream_session.cc +++ b/streaming/stream_session.cc @@ -47,9 +47,9 @@ #include "database.hh" #include "utils/fb_utilities.hh" #include "streaming/stream_plan.hh" -#include "core/sleep.hh" +#include #include "service/storage_service.hh" -#include "core/thread.hh" +#include #include "cql3/query_processor.hh" #include "streaming/stream_state.hh" #include "streaming/stream_session_state.hh" diff --git a/streaming/stream_session.hh b/streaming/stream_session.hh index e3a0ea9eb7..cf4171dd9e 100644 --- a/streaming/stream_session.hh +++ b/streaming/stream_session.hh @@ -39,7 +39,7 @@ #pragma once #include "gms/i_endpoint_state_change_subscriber.hh" -#include "core/distributed.hh" +#include #include "cql3/query_processor.hh" #include "message/messaging_service_fwd.hh" #include "utils/UUID.hh" diff --git a/streaming/stream_task.hh b/streaming/stream_task.hh index ad6fd982f2..981dfc11d0 100644 --- a/streaming/stream_task.hh +++ b/streaming/stream_task.hh @@ -41,7 +41,7 @@ #include "utils/UUID.hh" #include "streaming/stream_summary.hh" #include -#include "core/shared_ptr.hh" +#include namespace streaming { diff --git a/tests/aggregate_fcts_test.cc b/tests/aggregate_fcts_test.cc index de81641e2b..73dbe86e8d 100644 --- a/tests/aggregate_fcts_test.cc +++ b/tests/aggregate_fcts_test.cc @@ -33,7 +33,7 @@ #include "tests/cql_test_env.hh" #include "tests/cql_assertions.hh" -#include "core/future-util.hh" +#include #include "transport/messages/result_message.hh" #include "db/config.hh" diff --git a/tests/batchlog_manager_test.cc b/tests/batchlog_manager_test.cc index 6da42e0224..09fdf9199d 100644 --- a/tests/batchlog_manager_test.cc +++ b/tests/batchlog_manager_test.cc @@ -30,8 +30,8 @@ #include "tests/cql_test_env.hh" #include "tests/cql_assertions.hh" -#include "core/future-util.hh" -#include "core/shared_ptr.hh" +#include +#include #include "transport/messages/result_message.hh" #include "cql3/query_processor.hh" #include "cql3/untyped_result_set.hh" diff --git a/tests/cache_flat_mutation_reader_test.cc b/tests/cache_flat_mutation_reader_test.cc index c3444d85c4..8a5839a012 100644 --- a/tests/cache_flat_mutation_reader_test.cc +++ b/tests/cache_flat_mutation_reader_test.cc @@ -24,7 +24,7 @@ #include #include "tests/test-utils.hh" -#include "core/thread.hh" +#include #include "schema_builder.hh" #include "keys.hh" #include "mutation_partition.hh" diff --git a/tests/castas_fcts_test.cc b/tests/castas_fcts_test.cc index 2380e02d5a..af6b97db36 100644 --- a/tests/castas_fcts_test.cc +++ b/tests/castas_fcts_test.cc @@ -32,7 +32,7 @@ #include "tests/cql_test_env.hh" #include "tests/cql_assertions.hh" -#include "core/future-util.hh" +#include #include "transport/messages/result_message.hh" #include "db/config.hh" diff --git a/tests/commitlog_test.cc b/tests/commitlog_test.cc index 198102df79..6bbda44fbd 100644 --- a/tests/commitlog_test.cc +++ b/tests/commitlog_test.cc @@ -30,11 +30,11 @@ #include #include "tests/test-utils.hh" -#include "core/future-util.hh" -#include "core/do_with.hh" -#include "core/scollectd_api.hh" -#include "core/file.hh" -#include "core/reactor.hh" +#include +#include +#include +#include +#include #include "utils/UUID_gen.hh" #include "tmpdir.hh" #include "db/commitlog/commitlog.hh" diff --git a/tests/config_test.cc b/tests/config_test.cc index 4049989923..7a7f955975 100644 --- a/tests/config_test.cc +++ b/tests/config_test.cc @@ -25,7 +25,7 @@ #include #include "tests/test-utils.hh" -#include "core/future-util.hh" +#include #include "db/config.hh" using namespace db; diff --git a/tests/cql_assertions.hh b/tests/cql_assertions.hh index eabd6dbe5f..e1b068769c 100644 --- a/tests/cql_assertions.hh +++ b/tests/cql_assertions.hh @@ -24,8 +24,8 @@ #include "transport/messages/result_message_base.hh" #include "bytes.hh" -#include "core/shared_ptr.hh" -#include "core/future.hh" +#include +#include class rows_assertions { shared_ptr _rows; diff --git a/tests/cql_query_test.cc b/tests/cql_query_test.cc index edb47a3d33..2eee57c769 100644 --- a/tests/cql_query_test.cc +++ b/tests/cql_query_test.cc @@ -32,8 +32,8 @@ #include "tests/cql_test_env.hh" #include "tests/cql_assertions.hh" -#include "core/future-util.hh" -#include "core/sleep.hh" +#include +#include #include "transport/messages/result_message.hh" #include "utils/big_decimal.hh" diff --git a/tests/cql_test_env.cc b/tests/cql_test_env.cc index ffb9897968..d1e2697461 100644 --- a/tests/cql_test_env.cc +++ b/tests/cql_test_env.cc @@ -22,12 +22,12 @@ #include #include #include -#include "core/do_with.hh" +#include #include "cql_test_env.hh" #include "cql3/query_processor.hh" #include "cql3/query_options.hh" -#include "core/distributed.hh" -#include "core/shared_ptr.hh" +#include +#include #include "utils/UUID_gen.hh" #include "service/migration_manager.hh" #include "message/messaging_service.hh" diff --git a/tests/cql_test_env.hh b/tests/cql_test_env.hh index 212bc889a6..4f2c6e5422 100644 --- a/tests/cql_test_env.hh +++ b/tests/cql_test_env.hh @@ -24,10 +24,10 @@ #include #include -#include -#include "core/sstring.hh" -#include "core/future.hh" -#include "core/shared_ptr.hh" +#include +#include +#include +#include #include "transport/messages/result_message_base.hh" #include "cql3/query_options_fwd.hh" diff --git a/tests/gossip.cc b/tests/gossip.cc index b4310f5612..446a89e2c1 100644 --- a/tests/gossip.cc +++ b/tests/gossip.cc @@ -20,8 +20,8 @@ * along with Scylla. If not, see . */ -#include "core/reactor.hh" -#include "core/app-template.hh" +#include +#include #include "db/system_distributed_keyspace.hh" #include "message/messaging_service.hh" #include "gms/failure_detector.hh" diff --git a/tests/gossip_test.cc b/tests/gossip_test.cc index 1337d0a197..3a85051efa 100644 --- a/tests/gossip_test.cc +++ b/tests/gossip_test.cc @@ -29,9 +29,9 @@ #include "message/messaging_service.hh" #include "gms/failure_detector.hh" #include "gms/gossiper.hh" -#include "core/reactor.hh" +#include #include "service/storage_service.hh" -#include "core/distributed.hh" +#include #include "database.hh" #include "db/system_distributed_keyspace.hh" diff --git a/tests/hint_test.cc b/tests/hint_test.cc index 3183ed806d..ddfe465f5f 100644 --- a/tests/hint_test.cc +++ b/tests/hint_test.cc @@ -33,11 +33,11 @@ #include "tests/mutation_source_test.hh" #include "tests/mutation_assertions.hh" -#include "core/future-util.hh" -#include "core/do_with.hh" -#include "core/scollectd_api.hh" -#include "core/file.hh" -#include "core/reactor.hh" +#include +#include +#include +#include +#include #include "utils/UUID_gen.hh" #include "tmpdir.hh" #include "db/commitlog/commitlog.hh" diff --git a/tests/json_cql_query_test.cc b/tests/json_cql_query_test.cc index 4f8276bfeb..130a25bb17 100644 --- a/tests/json_cql_query_test.cc +++ b/tests/json_cql_query_test.cc @@ -32,8 +32,8 @@ #include "tests/cql_test_env.hh" #include "tests/cql_assertions.hh" -#include "core/future-util.hh" -#include "core/sleep.hh" +#include +#include #include "transport/messages/result_message.hh" #include "utils/big_decimal.hh" diff --git a/tests/lsa_async_eviction_test.cc b/tests/lsa_async_eviction_test.cc index 914cdd97d3..4871f9474b 100644 --- a/tests/lsa_async_eviction_test.cc +++ b/tests/lsa_async_eviction_test.cc @@ -19,10 +19,10 @@ * along with Scylla. If not, see . */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include "utils/managed_bytes.hh" diff --git a/tests/lsa_sync_eviction_test.cc b/tests/lsa_sync_eviction_test.cc index 997d982ce1..7d36ac8ef5 100644 --- a/tests/lsa_sync_eviction_test.cc +++ b/tests/lsa_sync_eviction_test.cc @@ -19,10 +19,10 @@ * along with Scylla. If not, see . */ -#include -#include -#include -#include +#include +#include +#include +#include #include "utils/managed_bytes.hh" #include "utils/logalloc.hh" diff --git a/tests/memtable_test.cc b/tests/memtable_test.cc index 4978d418f1..26a4b1d202 100644 --- a/tests/memtable_test.cc +++ b/tests/memtable_test.cc @@ -27,7 +27,7 @@ #include "tests/test-utils.hh" #include "schema_builder.hh" -#include "core/thread.hh" +#include #include "memtable.hh" #include "mutation_source_test.hh" #include "mutation_assertions.hh" diff --git a/tests/message.cc b/tests/message.cc index b5851f1ace..aa2832e90c 100644 --- a/tests/message.cc +++ b/tests/message.cc @@ -20,8 +20,8 @@ * along with Scylla. If not, see . */ -#include -#include +#include +#include #include #include #include "message/messaging_service.hh" diff --git a/tests/murmur_hash_test.cc b/tests/murmur_hash_test.cc index 9e22c2634f..fbe341479c 100644 --- a/tests/murmur_hash_test.cc +++ b/tests/murmur_hash_test.cc @@ -25,7 +25,7 @@ #include "utils/murmur_hash.hh" #include "bytes.hh" -#include "core/print.hh" +#include static const bytes full_sequence("012345678901234567890123456789012345678901234567890123456789"); diff --git a/tests/mutation_query_test.cc b/tests/mutation_query_test.cc index b39e5ac469..6f345ecd56 100644 --- a/tests/mutation_query_test.cc +++ b/tests/mutation_query_test.cc @@ -35,8 +35,8 @@ #include "tests/mutation_source_test.hh" #include "mutation_query.hh" -#include "core/do_with.hh" -#include "core/thread.hh" +#include +#include #include "schema_builder.hh" #include "partition_slice_builder.hh" diff --git a/tests/mutation_reader_test.cc b/tests/mutation_reader_test.cc index d3dcefe5e1..b029741374 100644 --- a/tests/mutation_reader_test.cc +++ b/tests/mutation_reader_test.cc @@ -24,9 +24,9 @@ #include #include -#include "core/sleep.hh" -#include "core/do_with.hh" -#include "core/thread.hh" +#include +#include +#include #include "tests/test-utils.hh" #include "tests/mutation_assertions.hh" diff --git a/tests/mutation_test.cc b/tests/mutation_test.cc index 074b46433c..58eae1d04f 100644 --- a/tests/mutation_test.cc +++ b/tests/mutation_test.cc @@ -28,9 +28,9 @@ #include "md5_hasher.hh" #include "xx_hasher.hh" -#include "core/sstring.hh" -#include "core/do_with.hh" -#include "core/thread.hh" +#include +#include +#include #include #include "database.hh" diff --git a/tests/network_topology_strategy_test.cc b/tests/network_topology_strategy_test.cc index 8af6d68f02..59cb8f9ff8 100644 --- a/tests/network_topology_strategy_test.cc +++ b/tests/network_topology_strategy_test.cc @@ -23,7 +23,7 @@ #include "utils/fb_utilities.hh" #include "locator/network_topology_strategy.hh" #include "tests/test-utils.hh" -#include "core/sstring.hh" +#include #include "log.hh" #include #include diff --git a/tests/normalizing_reader.cc b/tests/normalizing_reader.cc index 5372b5300e..b6d9e1cb84 100644 --- a/tests/normalizing_reader.cc +++ b/tests/normalizing_reader.cc @@ -20,7 +20,7 @@ */ #include "normalizing_reader.hh" -#include "core/future-util.hh" +#include normalizing_reader::normalizing_reader(flat_mutation_reader rd) : impl(rd.schema()) diff --git a/tests/normalizing_reader.hh b/tests/normalizing_reader.hh index 74c531857b..d69870b0dd 100644 --- a/tests/normalizing_reader.hh +++ b/tests/normalizing_reader.hh @@ -22,7 +22,7 @@ #pragma once #include "mutation_reader.hh" -#include "core/future.hh" +#include #include "flat_mutation_reader.hh" /* diff --git a/tests/perf/perf.hh b/tests/perf/perf.hh index 0cf6a6ef95..adac82217b 100644 --- a/tests/perf/perf.hh +++ b/tests/perf/perf.hh @@ -21,9 +21,9 @@ #pragma once -#include "core/print.hh" -#include "core/future-util.hh" -#include "core/distributed.hh" +#include +#include +#include #include "seastarx.hh" #include diff --git a/tests/perf/perf_cache_eviction.cc b/tests/perf/perf_cache_eviction.cc index 50c51dfb0f..7490a3040a 100644 --- a/tests/perf/perf_cache_eviction.cc +++ b/tests/perf/perf_cache_eviction.cc @@ -23,7 +23,7 @@ #include "seastarx.hh" #include "tests/simple_schema.hh" #include "tests/cql_test_env.hh" -#include "core/app-template.hh" +#include #include "database.hh" #include "db/config.hh" #include "partition_slice_builder.hh" diff --git a/tests/perf/perf_fast_forward.cc b/tests/perf/perf_fast_forward.cc index d0aa1cad68..54d598f177 100644 --- a/tests/perf/perf_fast_forward.cc +++ b/tests/perf/perf_fast_forward.cc @@ -28,7 +28,7 @@ #include #include "tests/cql_test_env.hh" #include "tests/perf/perf.hh" -#include "core/app-template.hh" +#include #include "schema_builder.hh" #include "database.hh" #include "release.hh" diff --git a/tests/perf/perf_simple_query.cc b/tests/perf/perf_simple_query.cc index 18f0ffb83d..820185062d 100644 --- a/tests/perf/perf_simple_query.cc +++ b/tests/perf/perf_simple_query.cc @@ -22,7 +22,7 @@ #include #include "tests/cql_test_env.hh" #include "tests/perf/perf.hh" -#include "core/app-template.hh" +#include #include "schema_builder.hh" static const sstring table_name = "cf"; diff --git a/tests/perf/perf_sstable.cc b/tests/perf/perf_sstable.cc index 5c8c17b7dd..99674a7d73 100644 --- a/tests/perf/perf_sstable.cc +++ b/tests/perf/perf_sstable.cc @@ -19,9 +19,9 @@ * along with Scylla. If not, see . */ -#include -#include -#include +#include +#include +#include #include // hack: perf_sstable falsely depends on Boost.Test, but we can't include it with diff --git a/tests/perf_row_cache_update.cc b/tests/perf_row_cache_update.cc index 1b96940436..aa7b6f4ec4 100644 --- a/tests/perf_row_cache_update.cc +++ b/tests/perf_row_cache_update.cc @@ -20,10 +20,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include "utils/managed_bytes.hh" diff --git a/tests/query_processor_test.cc b/tests/query_processor_test.cc index 5f2e6cb8b8..84a2361e0d 100644 --- a/tests/query_processor_test.cc +++ b/tests/query_processor_test.cc @@ -30,7 +30,7 @@ #include "tests/cql_test_env.hh" #include "tests/cql_assertions.hh" -#include "core/future-util.hh" +#include #include "transport/messages/result_message.hh" #include "cql3/query_processor.hh" #include "cql3/untyped_result_set.hh" diff --git a/tests/row_cache_alloc_stress.cc b/tests/row_cache_alloc_stress.cc index eaae12496c..e58ab38b20 100644 --- a/tests/row_cache_alloc_stress.cc +++ b/tests/row_cache_alloc_stress.cc @@ -19,10 +19,10 @@ * along with Scylla. If not, see . */ -#include -#include -#include -#include +#include +#include +#include +#include #include "utils/managed_bytes.hh" #include "utils/logalloc.hh" diff --git a/tests/row_cache_stress_test.cc b/tests/row_cache_stress_test.cc index 318554def4..81c46713de 100644 --- a/tests/row_cache_stress_test.cc +++ b/tests/row_cache_stress_test.cc @@ -22,7 +22,7 @@ #include #include "seastarx.hh" #include "tests/simple_schema.hh" -#include "core/app-template.hh" +#include #include "memtable.hh" #include "row_cache.hh" #include "partition_slice_builder.hh" diff --git a/tests/row_cache_test.cc b/tests/row_cache_test.cc index f4a16d9df9..7985b5df0e 100644 --- a/tests/row_cache_test.cc +++ b/tests/row_cache_test.cc @@ -34,7 +34,7 @@ #include "schema_builder.hh" #include "simple_schema.hh" #include "row_cache.hh" -#include "core/thread.hh" +#include #include "memtable.hh" #include "partition_slice_builder.hh" #include "tests/memtable_snapshot_source.hh" diff --git a/tests/sstable_datafile_test.cc b/tests/sstable_datafile_test.cc index 01e2a85c07..70f8053160 100644 --- a/tests/sstable_datafile_test.cc +++ b/tests/sstable_datafile_test.cc @@ -19,9 +19,9 @@ * along with Scylla. If not, see . */ -#include "core/sstring.hh" -#include "core/future-util.hh" -#include "core/align.hh" +#include +#include +#include #include "sstables/sstables.hh" #include "sstables/key.hh" #include "sstables/compress.hh" @@ -33,8 +33,8 @@ #include "sstables/leveled_manifest.hh" #include #include "sstable_test.hh" -#include "core/seastar.hh" -#include "core/do_with.hh" +#include +#include #include "sstables/compaction_manager.hh" #include "tmpdir.hh" #include "dht/i_partitioner.hh" diff --git a/tests/sstable_mutation_test.cc b/tests/sstable_mutation_test.cc index 566864eb43..0979478513 100644 --- a/tests/sstable_mutation_test.cc +++ b/tests/sstable_mutation_test.cc @@ -25,8 +25,8 @@ #include "tests/test-utils.hh" #include "sstable_test.hh" #include "sstables/key.hh" -#include "core/do_with.hh" -#include "core/thread.hh" +#include +#include #include "sstables/sstables.hh" #include "database.hh" #include "timestamp.hh" diff --git a/tests/sstable_resharding_test.cc b/tests/sstable_resharding_test.cc index 25737fac3c..553efec574 100644 --- a/tests/sstable_resharding_test.cc +++ b/tests/sstable_resharding_test.cc @@ -2,10 +2,10 @@ #include #include -#include "core/sstring.hh" -#include "core/future-util.hh" -#include "core/do_with.hh" -#include "core/distributed.hh" +#include +#include +#include +#include #include "sstables/sstables.hh" #include "tests/test-utils.hh" #include "schema.hh" diff --git a/tests/sstable_test.cc b/tests/sstable_test.cc index 82f89fe728..f4a6fac2d9 100644 --- a/tests/sstable_test.cc +++ b/tests/sstable_test.cc @@ -22,11 +22,11 @@ #include -#include "core/sstring.hh" -#include "core/future-util.hh" -#include "core/align.hh" -#include "core/do_with.hh" -#include "core/sleep.hh" +#include +#include +#include +#include +#include #include "sstables/sstables.hh" #include "sstables/compaction_manager.hh" #include "sstables/key.hh" diff --git a/tests/sstable_test.hh b/tests/sstable_test.hh index 8ada214a22..d2688c3200 100644 --- a/tests/sstable_test.hh +++ b/tests/sstable_test.hh @@ -28,7 +28,7 @@ #include "database.hh" #include "schema.hh" #include "schema_builder.hh" -#include "core/thread.hh" +#include #include "sstables/index_reader.hh" #include "tests/test_services.hh" #include "tmpdir.hh" diff --git a/tests/types_test.cc b/tests/types_test.cc index 600476ea39..900eb20d0e 100644 --- a/tests/types_test.cc +++ b/tests/types_test.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include "types.hh" #include "compound.hh" diff --git a/tests/virtual_reader_test.cc b/tests/virtual_reader_test.cc index 0a52c8fefd..57d80d327c 100644 --- a/tests/virtual_reader_test.cc +++ b/tests/virtual_reader_test.cc @@ -36,7 +36,7 @@ #include "db/size_estimates_virtual_reader.hh" #include "db/system_keyspace.hh" #include "db/view/view_builder.hh" -#include "core/future-util.hh" +#include #include "cql3/query_processor.hh" #include "cql3/untyped_result_set.hh" #include "dht/i_partitioner.hh" diff --git a/thrift/handler.cc b/thrift/handler.cc index f411d9f06f..fd5ccabc82 100644 --- a/thrift/handler.cc +++ b/thrift/handler.cc @@ -25,10 +25,10 @@ #include // end thrift workaround #include "Cassandra.h" -#include "core/distributed.hh" +#include #include "database.hh" -#include "core/sstring.hh" -#include "core/print.hh" +#include +#include #include "frozen_mutation.hh" #include "utils/UUID_gen.hh" #include diff --git a/thrift/handler.hh b/thrift/handler.hh index 2a607a7717..6dbcd63a4b 100644 --- a/thrift/handler.hh +++ b/thrift/handler.hh @@ -25,7 +25,7 @@ #include "Cassandra.h" #include "auth/service.hh" #include "database.hh" -#include "core/distributed.hh" +#include #include "cql3/query_processor.hh" #include diff --git a/thrift/server.cc b/thrift/server.cc index 3ca500c90a..a59f9e2b2f 100644 --- a/thrift/server.cc +++ b/thrift/server.cc @@ -21,11 +21,11 @@ #include "server.hh" #include "handler.hh" -#include "core/future-util.hh" -#include "core/circular_buffer.hh" +#include +#include #include -#include "net/byteorder.hh" -#include "core/scattered_message.hh" +#include +#include #include "log.hh" #include #include diff --git a/thrift/server.hh b/thrift/server.hh index cf713756a8..af37c4e601 100644 --- a/thrift/server.hh +++ b/thrift/server.hh @@ -22,8 +22,8 @@ #ifndef APPS_SEASTAR_THRIFT_SERVER_HH_ #define APPS_SEASTAR_THRIFT_SERVER_HH_ -#include "core/reactor.hh" -#include "core/distributed.hh" +#include +#include #include "cql3/query_processor.hh" #include "timeout_config.hh" #include diff --git a/to_string.hh b/to_string.hh index c6243f386f..1dcd4b81d0 100644 --- a/to_string.hh +++ b/to_string.hh @@ -21,7 +21,7 @@ #pragma once -#include "core/sstring.hh" +#include #include #include #include diff --git a/transport/event_notifier.cc b/transport/event_notifier.cc index 5229a5db05..96392ecbbd 100644 --- a/transport/event_notifier.cc +++ b/transport/event_notifier.cc @@ -20,7 +20,7 @@ */ #include "transport/server.hh" -#include "core/gate.hh" +#include #include "service/migration_manager.hh" #include "service/storage_service.hh" #include "transport/response.hh" diff --git a/transport/messages/result_message.hh b/transport/messages/result_message.hh index 46850f54e9..4c9ecc5f71 100644 --- a/transport/messages/result_message.hh +++ b/transport/messages/result_message.hh @@ -28,8 +28,8 @@ #include "transport/messages/result_message_base.hh" #include "transport/event.hh" -#include "core/shared_ptr.hh" -#include "core/sstring.hh" +#include +#include namespace cql_transport { diff --git a/transport/server.cc b/transport/server.cc index 2ec6d7497e..69d96623a0 100644 --- a/transport/server.cc +++ b/transport/server.cc @@ -32,10 +32,10 @@ #include "service/storage_service.hh" #include "db/consistency_level_type.hh" #include "db/write_type.hh" -#include "core/future-util.hh" -#include "core/reactor.hh" +#include +#include #include "utils/UUID.hh" -#include "net/byteorder.hh" +#include #include #include #include diff --git a/transport/server.hh b/transport/server.hh index 9a56fbc3d4..380f3868fa 100644 --- a/transport/server.hh +++ b/transport/server.hh @@ -22,14 +22,14 @@ #pragma once #include "auth/service.hh" -#include "core/reactor.hh" +#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" -#include "core/distributed.hh" +#include #include "timeout_config.hh" #include #include diff --git a/types.cc b/types.cc index dac20de0c9..1a054d3500 100644 --- a/types.cc +++ b/types.cc @@ -27,8 +27,8 @@ #include "cql3/maps.hh" #include "cql3/sets.hh" #include "types.hh" -#include "core/print.hh" -#include "net/ip.hh" +#include +#include #include "utils/serialization.hh" #include "vint-serialization.hh" #include "combine.hh" diff --git a/types.hh b/types.hh index 88ea07bd1b..db0cd922ac 100644 --- a/types.hh +++ b/types.hh @@ -27,10 +27,10 @@ #include "data/cell.hh" #include -#include "core/sstring.hh" -#include "core/shared_ptr.hh" +#include +#include #include "utils/UUID.hh" -#include "net/byteorder.hh" +#include #include "db_clock.hh" #include "bytes.hh" #include "log.hh" @@ -44,9 +44,9 @@ #include #include #include -#include "net/ip.hh" +#include #include -#include "util/backtrace.hh" +#include #include "hashing.hh" #include // FIXME: remove somehow #include "stdx.hh" diff --git a/unimplemented.cc b/unimplemented.cc index 524ec07342..a2f488a5bd 100644 --- a/unimplemented.cc +++ b/unimplemented.cc @@ -21,8 +21,8 @@ #include #include "unimplemented.hh" -#include "core/sstring.hh" -#include "core/enum.hh" +#include +#include #include "log.hh" #include "seastarx.hh" diff --git a/unimplemented.hh b/unimplemented.hh index 6edd00ec54..9863f73c97 100644 --- a/unimplemented.hh +++ b/unimplemented.hh @@ -22,9 +22,9 @@ #pragma once #include -#include "core/print.hh" -#include "core/sstring.hh" -#include "core/enum.hh" +#include +#include +#include namespace unimplemented { diff --git a/utils/UUID.hh b/utils/UUID.hh index e3248cd920..55ec843e75 100644 --- a/utils/UUID.hh +++ b/utils/UUID.hh @@ -28,9 +28,9 @@ #include #include -#include "core/sstring.hh" -#include "core/print.hh" -#include "net/byteorder.hh" +#include +#include +#include #include "bytes.hh" #include "hashing.hh" #include "utils/serialization.hh" diff --git a/utils/big_decimal.cc b/utils/big_decimal.cc index 80b1f97fd0..019c23063b 100644 --- a/utils/big_decimal.cc +++ b/utils/big_decimal.cc @@ -22,7 +22,7 @@ #include "big_decimal.hh" #include #include "marshal_exception.hh" -#include "core/print.hh" +#include #include diff --git a/utils/bloom_filter.cc b/utils/bloom_filter.cc index ce5e54f0df..8c7eff7ec8 100644 --- a/utils/bloom_filter.cc +++ b/utils/bloom_filter.cc @@ -43,7 +43,7 @@ #include "fb_utilities.hh" #include "bytes.hh" #include "utils/murmur_hash.hh" -#include "core/shared_ptr.hh" +#include #include "utils/large_bitset.hh" #include #include diff --git a/utils/data_input.hh b/utils/data_input.hh index a566a42511..e1b5050bdb 100644 --- a/utils/data_input.hh +++ b/utils/data_input.hh @@ -23,7 +23,7 @@ #define UTILS_DATA_INPUT_HH_ #include "bytes.hh" -#include "net/byteorder.hh" +#include class data_input { public: diff --git a/utils/estimated_histogram.hh b/utils/estimated_histogram.hh index dd6c1c53f7..13300b4615 100644 --- a/utils/estimated_histogram.hh +++ b/utils/estimated_histogram.hh @@ -45,7 +45,7 @@ #include #include #include -#include "core/metrics_types.hh" +#include #include namespace utils { diff --git a/utils/exponential_backoff_retry.hh b/utils/exponential_backoff_retry.hh index 2ccec84670..d4292f062b 100644 --- a/utils/exponential_backoff_retry.hh +++ b/utils/exponential_backoff_retry.hh @@ -22,8 +22,8 @@ #pragma once -#include "core/abort_source.hh" -#include "core/sleep.hh" +#include +#include #include "seastarx.hh" #include @@ -90,4 +90,4 @@ public: }); }); } -}; \ No newline at end of file +}; diff --git a/utils/file_lock.cc b/utils/file_lock.cc index d063b91d2d..b8df3654a0 100644 --- a/utils/file_lock.cc +++ b/utils/file_lock.cc @@ -20,8 +20,8 @@ */ -#include -#include +#include +#include #include #include diff --git a/utils/file_lock.hh b/utils/file_lock.hh index d25def263d..73b612796a 100644 --- a/utils/file_lock.hh +++ b/utils/file_lock.hh @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include #include "seastarx.hh" diff --git a/utils/hash.hh b/utils/hash.hh index f00514154e..054962aae6 100644 --- a/utils/hash.hh +++ b/utils/hash.hh @@ -23,7 +23,7 @@ #define UTILS_HASH_HH_ #include -#include "core/apply.hh" +#include namespace utils { diff --git a/utils/histogram.hh b/utils/histogram.hh index 098229d4f5..3828cbd619 100644 --- a/utils/histogram.hh +++ b/utils/histogram.hh @@ -24,7 +24,7 @@ #include #include "latency.hh" #include -#include "core/timer.hh" +#include #include #include "seastarx.hh" diff --git a/utils/rate_limiter.hh b/utils/rate_limiter.hh index 6d1a4c0d68..ceb0b0ae6f 100644 --- a/utils/rate_limiter.hh +++ b/utils/rate_limiter.hh @@ -21,9 +21,9 @@ #pragma once -#include "core/timer.hh" -#include "core/semaphore.hh" -#include "core/reactor.hh" +#include +#include +#include #include "seastarx.hh" namespace utils { diff --git a/utils/serialization.hh b/utils/serialization.hh index 34c9e7c31d..cafc74d494 100644 --- a/utils/serialization.hh +++ b/utils/serialization.hh @@ -41,8 +41,8 @@ #include #include -#include "core/sstring.hh" -#include "net/byteorder.hh" +#include +#include #include "bytes.hh" #include #include diff --git a/utils/uuid.cc b/utils/uuid.cc index 4892c68bc9..8c0e060c5a 100644 --- a/utils/uuid.cc +++ b/utils/uuid.cc @@ -21,12 +21,12 @@ #include "UUID.hh" -#include "net/byteorder.hh" +#include #include #include #include #include -#include "core/sstring.hh" +#include #include "utils/serialization.hh" #include "marshal_exception.hh" diff --git a/validation.hh b/validation.hh index 17efd92951..f6847b8916 100644 --- a/validation.hh +++ b/validation.hh @@ -43,7 +43,7 @@ #include "database_fwd.hh" #include "schema.hh" -#include "core/sstring.hh" +#include namespace validation { diff --git a/version.hh b/version.hh index 17a4158fee..307c84b388 100644 --- a/version.hh +++ b/version.hh @@ -22,8 +22,8 @@ #pragma once -#include "core/sstring.hh" -#include "core/print.hh" +#include +#include #include #include "seastarx.hh"