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 <[email protected]> Message-Id: <5d22d964a7735696fb6bb7606ed88f35dde31413.1542731639.git.jhaberku@scylladb.com> "
StarostaGit · Nov 20, 2018 · 775b7e4 · 775b7e4
1 parent 42baf6a
commit 775b7e4
Show file tree

Hide file tree

Showing 193 changed files with 371 additions and 371 deletions.
diff --git 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 <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"

diff --git a/api/api.hh b/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"
 

diff --git 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 <seastar/http/httpd.hh>
 
 namespace api {
 

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

diff --git 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 <vector>
-#include "http/exception.hh"
+#include <seastar/http/exception.hh>
 #include "sstables/sstables.hh"
 #include "utils/estimated_histogram.hh"
 #include <algorithm>

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

diff --git 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 <seastar/http/exception.hh>
 #include "utils/logalloc.hh"
 #include "log.hh"
 

diff --git 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 <seastar/rpc/rpc_types.hh>
 #include "api/api-doc/messaging_service.json.hh"
 #include <iostream>
 #include <sstream>

diff --git a/api/storage_service.cc b/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"

diff --git 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 <seastar/http/exception.hh>
 #include "log.hh"
 
 namespace api {

diff --git 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 <seastar/net//byteorder.hh>
 #include <cstdint>
 #include <iosfwd>
 #include <seastar/util/gcc6-concepts.hh>

diff --git a/bytes.cc b/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) {

diff --git a/bytes.hh b/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>

diff --git a/bytes_ostream.hh b/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.
  *

diff --git a/caching_options.hh b/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"

diff --git a/compound.hh b/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 };

diff --git a/configure.py b/configure.py
@@ -1098,7 +1098,7 @@ def setup_first_pkg_of_list(pkglist):
             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 @@ def setup_first_pkg_of_list(pkglist):
     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 @@ def setup_first_pkg_of_list(pkglist):
         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 @@ def setup_first_pkg_of_list(pkglist):
             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 @@ def setup_first_pkg_of_list(pkglist):
                 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
@@ -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>

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

diff --git 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 <seastar/core/print.hh>
 #include "cql3/cql3_type.hh"
 
 namespace cql3 {

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

diff --git a/cql3/functions/function_name.hh b/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>

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

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

diff --git 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 <seastar/core/shared_ptr.hh>
 #include "cql3/cf_name.hh"
 
 namespace cql3 {

diff --git a/cql3/keyspace_element_name.hh b/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>

diff --git a/cql3/operation.hh b/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"

diff --git a/cql3/operator.hh b/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 {

diff --git a/cql3/restrictions/abstract_restriction.hh b/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"

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

diff --git 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 <seastar/core/shared_ptr.hh>
 #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
@@ -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"
 

diff --git 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 <seastar/core/shared_ptr.hh>
 #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
@@ -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"

diff --git 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 <seastar/core/shared_ptr.hh>
 
 #include <unordered_map>
 #include <utility>

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