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 <jhaberku@scylladb.com>
Message-Id: <5d22d964a7735696fb6bb7606ed88f35dde31413.1542731639.git.jhaberku@scylladb.com>
"

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 <seastar/http/file_handler.hh>
+#include <seastar/http/transformers.hh>
+#include <seastar/http/api_docs.hh>
 #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 <seastar/http/exception.hh>
 #include "stream_manager.hh"
 #include "system.hh"
 #include "api/config.hh"

api/api.hh

@@ -21,13 +21,13 @@
 
 #pragma once
 
-#include "json/json_elements.hh"
+#include <seastar/json/json_elements.hh>
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include "api/api-doc/utils.json.hh"
 #include "utils/histogram.hh"
-#include "http/exception.hh"
+#include <seastar/http/exception.hh>
 #include "api_init.hh"
 #include "seastarx.hh"
 

api/api_init.hh

@@ -21,7 +21,7 @@
 #pragma once
 #include "database.hh"
 #include "service/storage_proxy.hh"
-#include "http/httpd.hh"
+#include <seastar/http/httpd.hh>
 
 namespace api {
 

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 <seastar/core/scollectd.hh>
+#include <seastar/core/scollectd_api.hh>
 #include "endian.h"
 #include <boost/range/irange.hpp>
 #include <regex>

api/column_family.cc

@@ -22,7 +22,7 @@
 #include "column_family.hh"
 #include "api/api-doc/column_family.json.hh"
 #include <vector>
-#include "http/exception.hh"
+#include <seastar/http/exception.hh>
 #include "sstables/sstables.hh"
 #include "utils/estimated_histogram.hh"
 #include <algorithm>

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 <seastar/core/future-util.hh>
 #include <any>
 
 namespace api {

api/lsa.cc

@@ -23,7 +23,7 @@
 #include "api/lsa.hh"
 #include "api/api.hh"
 
-#include "http/exception.hh"
+#include <seastar/http/exception.hh>
 #include "utils/logalloc.hh"
 #include "log.hh"
 

api/messaging_service.cc

@@ -21,7 +21,7 @@
 
 #include "messaging_service.hh"
 #include "message/messaging_service.hh"
-#include "rpc/rpc_types.hh"
+#include <seastar/rpc/rpc_types.hh>
 #include "api/api-doc/messaging_service.json.hh"
 #include <iostream>
 #include <sstream>

api/storage_service.cc

@@ -28,7 +28,7 @@
 #include <db/commitlog/commitlog.hh>
 #include <gms/gossiper.hh>
 #include <db/system_keyspace.hh>
-#include "http/exception.hh"
+#include <seastar/http/exception.hh>
 #include "repair/repair.hh"
 #include "locator/snitch_base.hh"
 #include "column_family.hh"

api/system.cc

@@ -22,7 +22,7 @@
 #include "api/api-doc/system.json.hh"
 #include "api/api.hh"
 
-#include "http/exception.hh"
+#include <seastar/http/exception.hh>
 #include "log.hh"
 
 namespace api {

atomic_cell.hh

@@ -26,7 +26,7 @@
 #include "tombstone.hh"
 #include "gc_clock.hh"
 #include "utils/managed_bytes.hh"
-#include "net/byteorder.hh"
+#include <seastar/net//byteorder.hh>
 #include <cstdint>
 #include <iosfwd>
 #include <seastar/util/gcc6-concepts.hh>

bytes.cc

@@ -20,7 +20,7 @@
  */
 
 #include "bytes.hh"
-#include "core/print.hh"
+#include <seastar/core/print.hh>
 
 static inline int8_t hex_to_int(unsigned char c) {
     switch (c) {

bytes.hh

@@ -22,7 +22,7 @@
 #pragma once
 
 #include "seastarx.hh"
-#include "core/sstring.hh"
+#include <seastar/core/sstring.hh>
 #include "hashing.hh"
 #include <experimental/optional>
 #include <iosfwd>

bytes_ostream.hh

@@ -24,9 +24,9 @@
 #include <boost/range/iterator_range.hpp>
 
 #include "bytes.hh"
-#include "core/unaligned.hh"
+#include <seastar/core/unaligned.hh>
 #include "hashing.hh"
-#include "seastar/core/simple-stream.hh"
+#include <seastar/core/simple-stream.hh>
 /**
  * Utility for writing data into a buffer when its final size is not known up front.
  *

caching_options.hh

@@ -20,7 +20,7 @@
  */
 
 #pragma once
-#include <core/sstring.hh>
+#include <seastar/core/sstring.hh>
 #include <boost/lexical_cast.hpp>
 #include "exceptions/exceptions.hh"
 #include "json.hh"

compound.hh

@@ -28,7 +28,7 @@
 #include <boost/range/iterator_range.hpp>
 #include <boost/range/adaptor/transformed.hpp>
 #include "utils/serialization.hh"
-#include "util/backtrace.hh"
+#include <seastar/util/backtrace.hh>
 #include "unimplemented.hh"
 
 enum class allow_prefixes { no, yes };

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()))

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 <seastar/core/sstring.hh>
 #include "CqlLexer.hpp"
 
 #include <algorithm>

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 <seastar/core/shared_ptr.hh>
 
 namespace cql3 {
 

cql3/functions/bytes_conversion_fcts.hh

@@ -43,7 +43,7 @@
 
 #include "native_scalar_function.hh"
 #include "exceptions/exceptions.hh"
-#include "core/print.hh"
+#include <seastar/core/print.hh>
 #include "cql3/cql3_type.hh"
 
 namespace cql3 {

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 <seastar/core/print.hh>
 #include "cql3/cql3_type.hh"
 #include "cql3/selection/selector.hh"
 

cql3/functions/function_name.hh

@@ -41,7 +41,7 @@
 
 #pragma once
 
-#include "core/sstring.hh"
+#include <seastar/core/sstring.hh>
 #include "seastarx.hh"
 #include <iosfwd>
 #include <functional>

cql3/functions/native_aggregate_function.hh

@@ -43,7 +43,7 @@
 
 #include "types.hh"
 #include "native_function.hh"
-#include "core/shared_ptr.hh"
+#include <seastar/core/shared_ptr.hh>
 
 namespace cql3 {
 namespace functions {

cql3/functions/native_scalar_function.hh

@@ -43,7 +43,7 @@
 
 #include "native_function.hh"
 #include "scalar_function.hh"
-#include "core/shared_ptr.hh"
+#include <seastar/core/shared_ptr.hh>
 
 namespace cql3 {
 namespace functions {

cql3/index_name.hh

@@ -43,7 +43,7 @@
 
 #include "cql3/keyspace_element_name.hh"
 
-#include "core/shared_ptr.hh"
+#include <seastar/core/shared_ptr.hh>
 #include "cql3/cf_name.hh"
 
 namespace cql3 {

cql3/keyspace_element_name.hh

@@ -41,7 +41,7 @@
 
 #pragma once
 
-#include "core/sstring.hh"
+#include <seastar/core/sstring.hh>
 #include "seastarx.hh"
 
 #include <experimental/optional>

cql3/operation.hh

@@ -41,7 +41,7 @@
 
 #pragma once
 
-#include "core/shared_ptr.hh"
+#include <seastar/core/shared_ptr.hh>
 #include "exceptions/exceptions.hh"
 #include "database_fwd.hh"
 #include "term.hh"

cql3/operator.hh

@@ -43,7 +43,7 @@
 
 #include <cstddef>
 #include <iosfwd>
-#include "core/sstring.hh"
+#include <seastar/core/sstring.hh>
 #include "seastarx.hh"
 
 namespace cql3 {

cql3/restrictions/abstract_restriction.hh

@@ -43,8 +43,8 @@
 
 #include <vector>
 
-#include "core/shared_ptr.hh"
-#include "core/sstring.hh"
+#include <seastar/core/shared_ptr.hh>
+#include <seastar/core/sstring.hh>
 #include "cql3/restrictions/restriction.hh"
 #include "cql3/term.hh"
 #include "types.hh"

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 <seastar/core/shared_ptr.hh>
 
 namespace cql3 {
 namespace restrictions {

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 <seastar/core/shared_ptr.hh>
 #include "schema.hh"
 #include "to_string.hh"
 #include "exceptions/exceptions.hh"

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 <seastar/core/shared_ptr.hh>
 #include "to_string.hh"
 #include "exceptions/exceptions.hh"
 

cql3/selection/selectable.hh

@@ -43,7 +43,7 @@
 #pragma once
 
 #include "schema.hh"
-#include "core/shared_ptr.hh"
+#include <seastar/core/shared_ptr.hh>
 #include "cql3/selection/selector.hh"
 #include "cql3/cql3_type.hh"
 #include "cql3/functions/function.hh"

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 <seastar/core/shared_ptr.hh>
 #include "to_string.hh"
 
 #include "cql3/relation.hh"

cql3/statements/create_index_statement.hh

@@ -52,7 +52,7 @@
 #include "service/migration_manager.hh"
 #include "schema.hh"
 
-#include "core/shared_ptr.hh"
+#include <seastar/core/shared_ptr.hh>
 
 #include <unordered_map>
 #include <utility>

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 <seastar/core/shared_ptr.hh>
 
 namespace cql3 {
 

cql3/statements/create_table_statement.hh

@@ -50,7 +50,7 @@
 #include "service/migration_manager.hh"
 #include "schema.hh"
 
-#include "core/shared_ptr.hh"
+#include <seastar/core/shared_ptr.hh>
 
 #include <seastar/util/indirect.hh>
 #include <unordered_map>

cql3/statements/create_view_statement.hh

@@ -30,7 +30,7 @@
 #include "service/migration_manager.hh"
 #include "schema.hh"
 
-#include "core/shared_ptr.hh"
+#include <seastar/core/shared_ptr.hh>
 
 #include <utility>
 #include <vector>

cql3/statements/index_prop_defs.hh

@@ -42,7 +42,7 @@
 #pragma once
 
 #include "property_definitions.hh"
-#include "core/sstring.hh"
+#include <seastar/core/sstring.hh>
 
 #include <unordered_map>
 #include <experimental/optional>

cql3/statements/index_target.hh

@@ -41,7 +41,7 @@
 
 #pragma once
 
-#include "core/shared_ptr.hh"
+#include <seastar/core/shared_ptr.hh>
 #include "cql3/column_identifier.hh"
 
 namespace cql3 {

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 <seastar/core/shared_ptr.hh>
 #include "query-result-reader.hh"
 #include <boost/range/adaptor/transformed.hpp>
 #include <boost/range/algorithm_ext/push_back.hpp>

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 <seastar/core/shared_ptr.hh>
+#include <seastar/core/future-util.hh>
 
 #include "unimplemented.hh"
 #include "validation.hh"

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 <seastar/core/shared_ptr.hh>
 
 #include <seastar/core/weak_ptr.hh>
 #include <seastar/core/checked_ptr.hh>

cql3/statements/property_definitions.hh

@@ -42,8 +42,8 @@
 #pragma once
 
 #include "exceptions/exceptions.hh"
-#include "core/print.hh"
-#include "core/sstring.hh"
+#include <seastar/core/print.hh>
+#include <seastar/core/sstring.hh>
 
 #include <experimental/optional>
 #include <unordered_map>

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 <seastar/core/shared_ptr.hh>
+#include <seastar/core/future-util.hh>
 
 #include "unimplemented.hh"
 #include "validation.hh"

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 <seastar/core/shared_ptr.hh>
+#include <seastar/core/distributed.hh>
 #include "validation.hh"
 
 namespace cql3 {

cql3/statements/request_validations.hh

@@ -41,7 +41,7 @@
 #pragma once
 
 #include "exceptions/exceptions.hh"
-#include "core/print.hh"
+#include <seastar/core/print.hh>
 
 #include <boost/range/algorithm/count_if.hpp>
 

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 <seastar/core/shared_ptr.hh>
 
 #include <experimental/optional>
 

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 <seastar/core/shared_ptr.hh>
 #include "query-result-reader.hh"
 #include "query_result_merger.hh"
 #include "service/pager/query_pagers.hh"

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 <seastar/core/shared_ptr.hh>
+#include <seastar/core/distributed.hh>
 #include "validation.hh"
 
 namespace cql3 {

cql3/token_relation.hh

@@ -42,7 +42,7 @@
 
 #include <vector>
 
-#include "core/shared_ptr.hh"
+#include <seastar/core/shared_ptr.hh>
 #include "to_string.hh"
 
 #include "relation.hh"

cql3/ut_name.hh

@@ -41,7 +41,7 @@
 
 #pragma once
 
-#include "core/shared_ptr.hh"
+#include <seastar/core/shared_ptr.hh>
 #include "column_identifier.hh"
 
 #include <experimental/optional>

database.cc

@@ -23,7 +23,7 @@
 #include "lister.hh"
 #include "database.hh"
 #include "unimplemented.hh"
-#include "core/future-util.hh"
+#include <seastar/core/future-util.hh>
 #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 <seastar/core/seastar.hh>
 #include <seastar/core/sleep.hh>
 #include <seastar/core/rwlock.hh>
 #include <seastar/core/metrics.hh>
@@ -57,12 +57,12 @@
 #include <boost/range/adaptor/map.hpp>
 #include "frozen_mutation.hh"
 #include "mutation_partition_applier.hh"
-#include "core/do_with.hh"
+#include <seastar/core/do_with.hh>
 #include "service/migration_manager.hh"
 #include "service/storage_service.hh"
 #include "message/messaging_service.hh"
 #include "mutation_query.hh"
-#include <core/fstream.hh>
+#include <seastar/core/fstream.hh>
 #include <seastar/core/enum.hh>
 #include "utils/latency.hh"
 #include "schema_registry.hh"

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 <seastar/core/sstring.hh>
+#include <seastar/core/shared_ptr.hh>
 #include <seastar/core/execution_stage.hh>
-#include "net/byteorder.hh"
+#include <seastar/net/byteorder.hh>
 #include "utils/UUID_gen.hh"
 #include "utils/UUID.hh"
 #include "utils/hash.hh"
 #include "db_clock.hh"
 #include "gc_clock.hh"
 #include <chrono>
-#include "core/distributed.hh"
+#include <seastar/core/distributed.hh>
 #include <functional>
 #include <cstdint>
 #include <unordered_map>
@@ -48,8 +48,8 @@
 #include <string.h>
 #include "types.hh"
 #include "compound.hh"
-#include "core/future.hh"
-#include "core/gate.hh"
+#include <seastar/core/future.hh>
+#include <seastar/core/gate.hh>
 #include "cql3/column_specification.hh"
 #include "db/commitlog/replay_position.hh"
 #include <limits>

db/commitlog/commitlog.cc

@@ -49,19 +49,19 @@
 #include <unordered_set>
 #include <exception>
 
-#include <core/align.hh>
-#include <core/reactor.hh>
+#include <seastar/core/align.hh>
+#include <seastar/core/reactor.hh>
 #include <seastar/core/metrics.hh>
-#include <core/future-util.hh>
-#include <core/file.hh>
-#include <core/rwlock.hh>
-#include <core/gate.hh>
-#include <core/fstream.hh>
+#include <seastar/core/future-util.hh>
+#include <seastar/core/file.hh>
+#include <seastar/core/rwlock.hh>
+#include <seastar/core/gate.hh>
+#include <seastar/core/fstream.hh>
 #include <seastar/core/memory.hh>
 #include <seastar/core/chunked_fifo.hh>
 #include <seastar/core/queue.hh>
 #include <seastar/core/sleep.hh>
-#include <net/byteorder.hh>
+#include <seastar/net/byteorder.hh>
 
 #include "seastarx.hh"
 

db/commitlog/commitlog.hh

@@ -42,9 +42,9 @@
 
 #include <memory>
 
-#include "core/future.hh"
-#include "core/shared_ptr.hh"
-#include "core/stream.hh"
+#include <seastar/core/future.hh>
+#include <seastar/core/shared_ptr.hh>
+#include <seastar/core/stream.hh>
 #include "replay_position.hh"
 #include "commitlog_entry.hh"
 #include "db/timeout_clock.hh"

db/commitlog/commitlog_replayer.cc

@@ -45,8 +45,8 @@
 #include <unordered_map>
 #include <boost/range/adaptor/map.hpp>
 
-#include <core/future.hh>
-#include <core/sharded.hh>
+#include <seastar/core/future.hh>
+#include <seastar/core/sharded.hh>
 
 #include "commitlog.hh"
 #include "commitlog_replayer.hh"

db/commitlog/commitlog_replayer.hh

@@ -42,8 +42,8 @@
 #pragma once
 
 #include <memory>
-#include <core/future.hh>
-#include <core/sharded.hh>
+#include <seastar/core/future.hh>
+#include <seastar/core/sharded.hh>
 
 class database;
 

db/consistency_level.cc

@@ -45,7 +45,7 @@
 #include <boost/range/algorithm/find.hpp>
 #include <boost/range/algorithm/transform.hpp>
 #include "exceptions/exceptions.hh"
-#include "core/sstring.hh"
+#include <seastar/core/sstring.hh>
 #include "schema.hh"
 #include "database.hh"
 #include "unimplemented.hh"

db/large_partition_handler.cc

@@ -19,7 +19,7 @@
  * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "core/print.hh"
+#include <seastar/core/print.hh>
 #include "db/query_context.hh"
 #include "db/system_keyspace.hh"
 #include "db/large_partition_handler.hh"

db/marshal/type_parser.hh

@@ -43,7 +43,7 @@
 
 #include "types.hh"
 
-#include "core/sstring.hh"
+#include <seastar/core/sstring.hh>
 
 namespace db {
 

db/query_context.hh

@@ -21,8 +21,8 @@
 #pragma once
 
 #include <memory>
-#include "core/sharded.hh"
-#include "core/future.hh"
+#include <seastar/core/sharded.hh>
+#include <seastar/core/future.hh>
 #include "cql3/query_processor.hh"
 
 class database;

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 <seastar/core/do_with.hh>
+#include <seastar/core/thread.hh>
 #include "json.hh"
 #include "log.hh"
 #include "frozen_schema.hh"

db/system_keyspace.cc

@@ -67,7 +67,7 @@
 #include "release.hh"
 #include "log.hh"
 #include "serializer.hh"
-#include <core/enum.hh>
+#include <seastar/core/enum.hh>
 #include <seastar/net/inet_address.hh>
 #include <index/secondary_index.hh>
 #include "service/storage_proxy.hh"

dht/i_partitioner.cc

@@ -20,7 +20,7 @@
  */
 
 #include "i_partitioner.hh"
-#include "core/reactor.hh"
+#include <seastar/core/reactor.hh>
 #include "murmur3_partitioner.hh"
 #include "utils/class_registrator.hh"
 #include "types.hh"

dht/i_partitioner.hh

@@ -40,8 +40,8 @@
 
 #pragma once
 
-#include "core/shared_ptr.hh"
-#include "core/sstring.hh"
+#include <seastar/core/shared_ptr.hh>
+#include <seastar/core/sstring.hh>
 #include "types.hh"
 #include "keys.hh"
 #include "utils/managed_bytes.hh"

disk-error-handler.hh

@@ -25,7 +25,7 @@
 #include <type_traits>
 
 #include "utils/exceptions.hh"
-#include <core/future.hh>
+#include <seastar/core/future.hh>
 
 #include "seastarx.hh"
 

exceptions/exceptions.hh

@@ -44,8 +44,8 @@
 #include "db/consistency_level_type.hh"
 #include "db/write_type.hh"
 #include <stdexcept>
-#include "core/sstring.hh"
-#include "core/print.hh"
+#include <seastar/core/sstring.hh>
+#include <seastar/core/print.hh>
 #include "bytes.hh"
 
 namespace exceptions {

exceptions/unrecognized_entity_exception.hh

@@ -42,7 +42,7 @@
 #pragma once
 
 #include "exceptions.hh"
-#include "core/shared_ptr.hh"
+#include <seastar/core/shared_ptr.hh>
 #include "cql3/column_identifier.hh"
 #include "cql3/relation.hh"
 

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 <seastar/core/sstring.hh>
+#include <seastar/core/shared_ptr.hh>
+#include <seastar/core/distributed.hh>
 #include "utils/bounded_stats_deque.hh"
 #include "gms/i_failure_detector.hh"
 #include <iosfwd>

gms/gossip_digest.hh

@@ -38,7 +38,7 @@
 
 #pragma once
 
-#include "core/sstring.hh"
+#include <seastar/core/sstring.hh>
 #include "utils/serialization.hh"
 #include "gms/inet_address.hh"
 

gms/gossip_digest_syn.hh

@@ -38,7 +38,7 @@
 
 #pragma once
 
-#include "core/sstring.hh"
+#include <seastar/core/sstring.hh>
 #include "utils/serialization.hh"
 #include "gms/gossip_digest.hh"
 #include "utils/chunked_vector.hh"

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 <seastar/core/distributed.hh>
+#include <seastar/core/shared_ptr.hh>
+#include <seastar/core/print.hh>
 #include "utils/UUID.hh"
 #include "utils/fb_utilities.hh"
 #include "gms/i_failure_detection_event_listener.hh"

gms/inet_address.hh

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "net/ip.hh"
+#include <seastar/net/ip.hh>
 #include "utils/serialization.hh"
 #include <sstream>
 

gms/versioned_value.hh

@@ -38,7 +38,7 @@
 
 #pragma once
 
-#include "core/sstring.hh"
+#include <seastar/core/sstring.hh>
 #include "utils/serialization.hh"
 #include "utils/UUID.hh"
 #include "version_generator.hh"

index/secondary_index.hh

@@ -41,7 +41,7 @@
 
 #pragma once
 
-#include "core/sstring.hh"
+#include <seastar/core/sstring.hh>
 #include "seastarx.hh"
 
 namespace db {

json.hh

@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include "core/sstring.hh"
-#include "core/print.hh"
+#include <seastar/core/sstring.hh>
+#include <seastar/core/print.hh>
 
 #include <json/json.h>
 

locator/ec2_snitch.hh

@@ -21,7 +21,7 @@
 #pragma once
 
 #include "locator/production_snitch_base.hh"
-#include "http/http_response_parser.hh"
+#include <seastar/http/response_parser.hh>
 
 namespace locator {
 class ec2_snitch : public production_snitch_base {

locator/gce_snitch.hh

@@ -40,7 +40,7 @@
 #pragma once
 
 #include "locator/production_snitch_base.hh"
-#include "http/http_response_parser.hh"
+#include <seastar/http/response_parser.hh>
 
 namespace locator {
 

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 <seastar/core/file.hh>
 #include "log.hh"
 #include "locator/reconnectable_snitch_helper.hh"
 

locator/production_snitch_base.hh

@@ -46,7 +46,7 @@
 
 #include "gms/endpoint_state.hh"
 #include "locator/token_metadata.hh"
-#include "core/sstring.hh"
+#include <seastar/core/sstring.hh>
 #include "snitch_base.hh"
 
 namespace locator {

locator/rack_inferring_snitch.hh

@@ -38,7 +38,7 @@
 
 #pragma once
 
-#include "core/sstring.hh"
+#include <seastar/core/sstring.hh>
 #include "gms/inet_address.hh"
 #include "snitch_base.hh"
 #include "utils/fb_utilities.hh"

locator/snitch_base.hh

@@ -42,9 +42,9 @@
 #include <vector>
 
 #include "gms/inet_address.hh"
-#include "core/shared_ptr.hh"
-#include "core/thread.hh"
-#include "core/distributed.hh"
+#include <seastar/core/shared_ptr.hh>
+#include <seastar/core/thread.hh>
+#include <seastar/core/distributed.hh>
 #include "utils/class_registrator.hh"
 #include "log.hh"
 

main.cc

@@ -21,11 +21,11 @@
 
 #include "supervisor.hh"
 #include "database.hh"
-#include "core/app-template.hh"
-#include "core/distributed.hh"
+#include <seastar/core/app-template.hh>
+#include <seastar/core/distributed.hh>
 #include "thrift/server.hh"
 #include "transport/server.hh"
-#include "http/httpd.hh"
+#include <seastar/http/httpd.hh>
 #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 <cstdio>
-#include <core/file.hh>
+#include <seastar/core/file.hh>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include "disk-error-handler.hh"
 #include "tracing/tracing.hh"
-#include "core/prometheus.hh"
+#include <seastar/core/prometheus.hh>
 #include "message/messaging_service.hh"
 #include <seastar/net/dns.hh>
 #include <seastar/core/memory.hh>

message/messaging_service.cc

@@ -20,7 +20,7 @@
  */
 
 #include "message/messaging_service.hh"
-#include "core/distributed.hh"
+#include <seastar/core/distributed.hh>
 #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 <seastar/rpc/rpc.hh>
 #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 <seastar/rpc/lz4_compressor.hh>
+#include <seastar/rpc/multi_algo_compressor_factory.hh>
 #include "partition_range_compat.hh"
 #include "stdx.hh"
 #include <boost/range/adaptor/filtered.hpp>

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 <seastar/core/reactor.hh>
+#include <seastar/core/distributed.hh>
+#include <seastar/core/sstring.hh>
 #include "gms/inet_address.hh"
-#include "rpc/rpc_types.hh"
+#include <seastar/rpc/rpc_types.hh>
 #include <unordered_map>
 #include "query-request.hh"
 #include "mutation_query.hh"

mutation_reader.cc

@@ -25,7 +25,7 @@
 #include <variant>
 
 #include "mutation_reader.hh"
-#include "core/future-util.hh"
+#include <seastar/core/future-util.hh>
 #include "stdx.hh"
 #include "flat_mutation_reader.hh"
 

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 <seastar/core/future.hh>
+#include <seastar/core/future-util.hh>
+#include <seastar/core/do_with.hh>
 #include "tracing/trace_state.hh"
 #include "flat_mutation_reader.hh"
 #include "reader_concurrency_semaphore.hh"

query-result-set.hh

@@ -22,7 +22,7 @@
 #pragma once
 
 
-#include "core/shared_ptr.hh"
+#include <seastar/core/shared_ptr.hh>
 #include "query-request.hh"
 #include "query-result.hh"
 #include "schema.hh"

query_result_merger.hh

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "core/distributed.hh"
+#include <seastar/core/distributed.hh>
 #include "query-result.hh"
 
 namespace query {

reader_concurrency_semaphore.hh

@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include <core/file.hh>
-#include <core/semaphore.hh>
+#include <seastar/core/file.hh>
+#include <seastar/core/semaphore.hh>
 #include "db/timeout_clock.hh"
 
 /// Specific semaphore for controlling reader concurrency

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 <seastar/core/memory.hh>
+#include <seastar/core/do_with.hh>
+#include <seastar/core/future-util.hh>
 #include <seastar/core/metrics.hh>
 #include <seastar/util/defer.hh>
 #include "memtable.hh"

row_cache.hh

@@ -25,7 +25,7 @@
 #include <boost/intrusive/set.hpp>
 #include <boost/intrusive/parent_from_member.hpp>
 
-#include "core/memory.hh"
+#include <seastar/core/memory.hh>
 #include <seastar/core/thread.hh>
 #include <seastar/util/noncopyable_function.hh>
 

schema.hh

@@ -28,7 +28,7 @@
 #include <boost/lexical_cast.hpp>
 
 #include "cql3/column_specification.hh"
-#include "core/shared_ptr.hh"
+#include <seastar/core/shared_ptr.hh>
 #include "types.hh"
 #include "compound.hh"
 #include "gc_clock.hh"

serializer.hh

@@ -22,13 +22,13 @@
 
 #include <vector>
 #include <array>
-#include "core/sstring.hh"
+#include <seastar/core/sstring.hh>
 #include <unordered_map>
 #include <experimental/optional>
 #include "enum_set.hh"
 #include "utils/managed_bytes.hh"
 #include "bytes_ostream.hh"
-#include "core/simple-stream.hh"
+#include <seastar/core/simple-stream.hh>
 #include "boost/variant/variant.hpp"
 #include "bytes_ostream.hh"
 #include "utils/input_stream.hh"

service/cache_hitrate_calculator.hh

@@ -22,8 +22,8 @@
 #pragma  once
 
 #include "database.hh"
-#include "core/timer.hh"
-#include "core/sharded.hh"
+#include <seastar/core/timer.hh>
+#include <seastar/core/sharded.hh>
 
 namespace service {
 

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 <seastar/core/distributed.hh>
 #include "gms/inet_address.hh"
 #include "message/msg_addr.hh"
 #include "utils/UUID.hh"

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 <seastar/core/simple-stream.hh>
 #include "idl/keys.dist.hh"
 #include "idl/uuid.dist.hh"
 #include "idl/paging_state.dist.hh"

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 <seastar/core/do_with.hh>
 #include "message/messaging_service.hh"
 #include "gms/failure_detector.hh"
 #include "gms/gossiper.hh"
 #include "storage_service.hh"
-#include "core/future-util.hh"
+#include <seastar/core/future-util.hh>
 #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 <seastar/util/lazy.hh>
-#include "core/metrics.hh"
+#include <seastar/core/metrics.hh>
 #include <seastar/core/execution_stage.hh>
 #include "db/timeout_clock.hh"
 #include "multishard_mutation_query.hh"