aebb532906
in seastar e96932b05f394b27cd0101e24f0584736795b50f, we stopped including unused `fmt/ostream.h`. this helped to reduce the header dependency. but this also broke the build of scylladb, as we rely on the `fmt/ostream.h` indirectly included by seastar's header project. in this change, we include `fmt/iostream.h` and `iostream` explictly when we are using the declarations in them. this enables us to - bump up the seastar submodule - potentially reduce the header dependency as we will be able to include seastar/core/format.hh instead of a more bloated seastar/core/print.hh after bumping up seastar submodule Signed-off-by: Kefu Chai <kefu.chai@scylladb.com> Closes scylladb/scylladb#21494
73 lines
1.8 KiB
C++
73 lines
1.8 KiB
C++
/*
|
|
* Copyright (C) 2014-present ScyllaDB
|
|
*/
|
|
|
|
/*
|
|
* SPDX-License-Identifier: AGPL-3.0-or-later
|
|
*/
|
|
|
|
#include "bytes.hh"
|
|
#include <fmt/ostream.h>
|
|
#include <seastar/core/print.hh>
|
|
|
|
static inline int8_t hex_to_int(unsigned char c) {
|
|
switch (c) {
|
|
case '0': return 0;
|
|
case '1': return 1;
|
|
case '2': return 2;
|
|
case '3': return 3;
|
|
case '4': return 4;
|
|
case '5': return 5;
|
|
case '6': return 6;
|
|
case '7': return 7;
|
|
case '8': return 8;
|
|
case '9': return 9;
|
|
case 'a': case 'A': return 10;
|
|
case 'b': case 'B': return 11;
|
|
case 'c': case 'C': return 12;
|
|
case 'd': case 'D': return 13;
|
|
case 'e': case 'E': return 14;
|
|
case 'f': case 'F': return 15;
|
|
default:
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
bytes from_hex(sstring_view s) {
|
|
if (s.length() % 2 == 1) {
|
|
throw std::invalid_argument("An hex string representing bytes must have an even length");
|
|
}
|
|
bytes out{bytes::initialized_later(), s.length() / 2};
|
|
unsigned end = out.size();
|
|
for (unsigned i = 0; i != end; i++) {
|
|
auto half_byte1 = hex_to_int(s[i * 2]);
|
|
auto half_byte2 = hex_to_int(s[i * 2 + 1]);
|
|
if (half_byte1 == -1 || half_byte2 == -1) {
|
|
throw std::invalid_argument(fmt::format("Non-hex characters in {}", s));
|
|
}
|
|
out[i] = (half_byte1 << 4) | half_byte2;
|
|
}
|
|
return out;
|
|
}
|
|
|
|
sstring to_hex(bytes_view b) {
|
|
return fmt::to_string(fmt_hex(b));
|
|
}
|
|
|
|
sstring to_hex(const bytes& b) {
|
|
return to_hex(bytes_view(b));
|
|
}
|
|
|
|
sstring to_hex(const bytes_opt& b) {
|
|
return !b ? "null" : to_hex(*b);
|
|
}
|
|
|
|
namespace std {
|
|
|
|
std::ostream& operator<<(std::ostream& os, const bytes_view& b) {
|
|
fmt::print(os, "{}", fmt_hex(b));
|
|
return os;
|
|
}
|
|
|
|
}
|