treewide: include seastar/core/format.hh instead of seastar/core/print.hh
The later includes the former and in addition to `seastar::format()`, `print.hh` also provides helpers like `seastar::fprint()` and `seastar::print()`, which are deprecated and not used by scylladb. Previously, we include `seastar/core/print.hh` for using `seastar::format()`. and in seastar 5b04939e, we extracted `seastar::format()` into `seastar/core/format.hh`. this allows us to include a much smaller header. In this change, we just include `seastar/core/format.hh` in place of `seastar/core/print.hh`. Signed-off-by: Kefu Chai <kefu.chai@scylladb.com> Closes scylladb/scylladb#21574
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
|
||||
#include "seastarx.hh"
|
||||
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/util/log.hh>
|
||||
|
||||
#include <functional>
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#include <unordered_set>
|
||||
#include <variant>
|
||||
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/core/sstring.hh>
|
||||
|
||||
#include "seastarx.hh"
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#include <unordered_set>
|
||||
|
||||
#include <seastar/core/future.hh>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/core/sstring.hh>
|
||||
|
||||
#include "auth/resource.hh"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
#include "auth/roles-metadata.hh"
|
||||
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/core/shared_ptr.hh>
|
||||
#include <seastar/core/sstring.hh>
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#include <boost/algorithm/string/join.hpp>
|
||||
#include <seastar/core/future-util.hh>
|
||||
#include <seastar/core/on_internal_error.hh>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/core/sleep.hh>
|
||||
#include <seastar/core/sstring.hh>
|
||||
#include <seastar/core/thread.hh>
|
||||
|
||||
2
bytes.cc
2
bytes.cc
@@ -8,7 +8,7 @@
|
||||
|
||||
#include "bytes.hh"
|
||||
#include <fmt/ostream.h>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
|
||||
static inline int8_t hex_to_int(unsigned char c) {
|
||||
switch (c) {
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
#include "native_scalar_function.hh"
|
||||
#include "exceptions/exceptions.hh"
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/util/log.hh>
|
||||
#include "cql3/cql3_type.hh"
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "cql3/functions/function.hh"
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
|
||||
namespace cql3 {
|
||||
namespace functions {
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
*/
|
||||
|
||||
#include <set>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include "index_prop_defs.hh"
|
||||
#include "index/secondary_index.hh"
|
||||
#include "exceptions/exceptions.hh"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
* SPDX-License-Identifier: (AGPL-3.0-or-later and Apache-2.0)
|
||||
*/
|
||||
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include "cql3/statements/property_definitions.hh"
|
||||
#include "exceptions/exceptions.hh"
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "exceptions/exceptions.hh"
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
|
||||
#include <set>
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
#include <fmt/ranges.h>
|
||||
|
||||
#include <seastar/core/coroutine.hh>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/util/log.hh>
|
||||
#include <seastar/util/log-cli.hh>
|
||||
#include <seastar/net/tls.hh>
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include <seastar/core/file-types.hh>
|
||||
#include <seastar/core/future.hh>
|
||||
#include <seastar/core/sleep.hh>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/core/seastar.hh>
|
||||
|
||||
// Boost features.
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
#include "utils/assert.hh"
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/core/coroutine.hh>
|
||||
#include "db/system_keyspace.hh"
|
||||
#include "db/large_data_handler.hh"
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "duration.hh"
|
||||
|
||||
#include <boost/lexical_cast.hpp>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
|
||||
#include <cctype>
|
||||
#include <optional>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "exceptions.hh"
|
||||
|
||||
#include "bytes.hh"
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/util/log.hh>
|
||||
|
||||
namespace exceptions {
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include <boost/io/ios_state.hpp>
|
||||
#include <seastar/net/inet_address.hh>
|
||||
#include <seastar/net/dns.hh>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/core/future.hh>
|
||||
#include "inet_address.hh"
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include <seastar/util/modules.hh>
|
||||
#include <seastar/core/shard_id.hh>
|
||||
#include <seastar/core/on_internal_error.hh>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include "utils/log.hh"
|
||||
#include "seastarx.hh"
|
||||
#include "version_generator.hh"
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <exception>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
|
||||
#include "mutation/mutation_fragment_v2.hh"
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
#include <seastar/core/seastar.hh>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/core/file.hh>
|
||||
#include <seastar/util/lazy.hh>
|
||||
#include <seastar/util/log.hh>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
|
||||
#include "bytes.hh"
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
#include "db/system_keyspace.hh"
|
||||
#include "schema/schema.hh"
|
||||
#include "gms/gossiper.hh"
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include "db/config.hh"
|
||||
#include "data_dictionary/keyspace_metadata.hh"
|
||||
#include "replica/database.hh"
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "types/types.hh"
|
||||
#include "service/storage_proxy.hh"
|
||||
#include "schema/schema.hh"
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include "redis/keyspace_utils.hh"
|
||||
#include "redis/options.hh"
|
||||
#include "mutation/mutation.hh"
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "redis/options.hh"
|
||||
#include "service/storage_proxy.hh"
|
||||
#include "data_dictionary/data_dictionary.hh"
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include "redis/keyspace_utils.hh"
|
||||
|
||||
using namespace seastar;
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "bytes.hh"
|
||||
#include <seastar/core/sharded.hh>
|
||||
#include <seastar/core/shared_ptr.hh>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/core/scattered_message.hh>
|
||||
#include "redis/exceptions.hh"
|
||||
#include "utils/fmt-compat.hh"
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#include <boost/algorithm/string/classification.hpp>
|
||||
#include <boost/algorithm/string/split.hpp>
|
||||
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
|
||||
static const char scylla_product_str[] = SCYLLA_PRODUCT;
|
||||
static const char scylla_version_str[] = SCYLLA_VERSION;
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#include <variant>
|
||||
|
||||
#include <seastar/core/abort_source.hh>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/core/sstring.hh>
|
||||
#include <seastar/core/timed_out_error.hh>
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "db/consistency_level_type.hh"
|
||||
#include "seastarx.hh"
|
||||
#include <seastar/core/sstring.hh>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <map>
|
||||
#include <stdexcept>
|
||||
#include <string_view>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <concepts>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
|
||||
#include "seastarx.hh"
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
#include "integrity_checked_file_impl.hh"
|
||||
#include <seastar/core/do_with.hh>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <boost/algorithm/cxx11/all_of.hpp>
|
||||
#include "bytes.hh"
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <seastar/core/sstring.hh>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/util/log.hh>
|
||||
#include "seastarx.hh"
|
||||
#include <systemd/sd-daemon.h>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include <boost/test/unit_test.hpp>
|
||||
#include "sstables/checksum_utils.hh"
|
||||
#include "test/lib/make_random_string.hh"
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
|
||||
template<typename ReferenceImpl, typename Impl>
|
||||
static
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#include "utils/crc.hh"
|
||||
#include "utils/clmul.hh"
|
||||
#include "utils/gz/barrett.hh"
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
|
||||
constexpr uint32_t input_32_1_c = 0x12345678;
|
||||
uint32_t input_32_1 = input_32_1_c; // NOT constexpr
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
#include <seastar/core/circular_buffer.hh>
|
||||
#include <seastar/core/gate.hh>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/core/thread.hh>
|
||||
#include <seastar/core/timer.hh>
|
||||
#include <seastar/core/sleep.hh>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "test/lib/scylla_test_case.hh"
|
||||
#include <seastar/testing/thread_test_case.hh>
|
||||
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <fmt/core.h>
|
||||
#include <string>
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
#include "seastarx.hh"
|
||||
#include "test/lib/scylla_test_case.hh"
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include "utils/flush_queue.hh"
|
||||
|
||||
SEASTAR_TEST_CASE(test_queue_ordering_random_ops) {
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#include <algorithm>
|
||||
|
||||
#include <seastar/core/circular_buffer.hh>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/core/thread.hh>
|
||||
#include <seastar/core/timer.hh>
|
||||
#include <seastar/core/sleep.hh>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
#include "utils/murmur_hash.hh"
|
||||
#include "bytes.hh"
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
|
||||
static const bytes full_sequence("012345678901234567890123456789012345678901234567890123456789");
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
#include <seastar/util/file.hh>
|
||||
#include <boost/range/adaptor/map.hpp>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/util/backtrace.hh>
|
||||
#include "test/lib/log.hh"
|
||||
#include "test/lib/simple_schema.hh"
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
#include <boost/test/unit_test.hpp>
|
||||
#include "utils/streaming_histogram.hh"
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <map>
|
||||
#include <cmath>
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <ranges>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/core/future-util.hh>
|
||||
#include <seastar/core/distributed.hh>
|
||||
#include <seastar/core/weak_ptr.hh>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
#include <seastar/core/future.hh>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
|
||||
#include "tracing/traced_file.hh"
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
*/
|
||||
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include "transport/cql_protocol_extension.hh"
|
||||
#include "cql3/result_set.hh"
|
||||
#include "exceptions/exceptions.hh"
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "result_message.hh"
|
||||
#include "cql3/cql_statement.hh"
|
||||
#include "utils/to_string.hh"
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
|
||||
namespace cql_transport::messages {
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include "concrete_types.hh"
|
||||
#include <exception>
|
||||
#include <iterator>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/core/shared_ptr.hh>
|
||||
#include "types/types.hh"
|
||||
#include "utils/assert.hh"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/core/sstring.hh>
|
||||
#include <seastar/core/enum.hh>
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include <compare>
|
||||
|
||||
#include <seastar/core/sstring.hh>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/net/byteorder.hh>
|
||||
#include "bytes.hh"
|
||||
#include "utils/assert.hh"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
#include "base64.hh"
|
||||
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
|
||||
// Arrays for quickly converting to and from an integer between 0 and 63,
|
||||
// and the character used in base64 encoding to represent it.
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "big_decimal.hh"
|
||||
#include <cassert>
|
||||
#include "marshal_exception.hh"
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
|
||||
#ifdef __clang__
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "utils/assert.hh"
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include "exceptions/exceptions.hh"
|
||||
|
||||
namespace utils {
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <seastar/core/shared_ptr.hh>
|
||||
#include <seastar/core/fstream.hh>
|
||||
#include <seastar/core/do_with.hh>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/core/thread.hh>
|
||||
#include <seastar/util/defer.hh>
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include <chrono>
|
||||
#include <fmt/ostream.h>
|
||||
#include <seastar/core/metrics_types.hh>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include "seastarx.hh"
|
||||
#include <seastar/core/bitops.hh>
|
||||
#include <limits>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
/* SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
*/
|
||||
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/rpc/rpc.hh>
|
||||
#include <seastar/util/log.hh>
|
||||
#include <seastar/util/backtrace.hh>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#include <compare>
|
||||
#include <algorithm>
|
||||
#include <seastar/net/byteorder.hh>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/util/backtrace.hh>
|
||||
|
||||
#include "marshal_exception.hh"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include <vector>
|
||||
|
||||
#include <seastar/core/iostream.hh>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/core/temporary_buffer.hh>
|
||||
#include <seastar/core/simple-stream.hh>
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
#include "utils/assert.hh"
|
||||
#include "interval.hh"
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
|
||||
#include "seastarx.hh"
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#include <seastar/core/coroutine.hh>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/core/seastar.hh>
|
||||
#include <seastar/core/on_internal_error.hh>
|
||||
#include <seastar/util/log.hh>
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
#include <seastar/core/memory.hh>
|
||||
#include <seastar/core/align.hh>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/core/metrics.hh>
|
||||
#include <seastar/core/reactor.hh>
|
||||
#include <seastar/core/coroutine.hh>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
#include "rjson.hh"
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <seastar/core/coroutine.hh>
|
||||
#include <seastar/core/thread.hh>
|
||||
#include <seastar/core/iostream.hh>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <seastar/core/sstring.hh>
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/format.hh>
|
||||
#include <tuple>
|
||||
|
||||
namespace version {
|
||||
|
||||
Reference in New Issue
Block a user