mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

types: add formatter for data_value

Browse Source 
before this change, we rely on the default-generated fmt::formatter
created from operator<<, but fmt v10 dropped the default-generated
formatter.

in this change, we define a formatter for data_value, but its
its operator<<() is preserved as we are still using the generic
homebrew formatter for formatting std::vector, which in turn uses
operator<< of the element type.

Refs #13245

Signed-off-by: Kefu Chai <kefu.chai@scylladb.com>

Closes scylladb/scylladb#16767
This commit is contained in:
Kefu Chai
2024-01-14 12:32:11 +08:00
committed by Botond Dénes
parent 218334eaf5
commit f344e13066
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
types/types.cc
View File

@@ -3679,11 +3679,17 @@ make_user_value(data_type type, user_type_impl::native_type value) {
return data_value::make_new(std::move(type), std::move(value));
}
std::ostream& operator<<(std::ostream& out, const data_value& v) {
auto fmt::formatter<data_value>::format(const data_value& v,
fmt::format_context& ctx) const -> decltype(ctx.out()) {
if (v.is_null()) {
return out << "null";
return fmt::format_to(ctx.out(), "null");
}
return out << v.type()->to_string_impl(v);
return fmt::format_to(ctx.out(), "{}", v.type()->to_string_impl(v));
}
std::ostream& operator<<(std::ostream& out, const data_value& v) {
fmt::print(out, "{}", v);
return out;
}
shared_ptr<const reversed_type_impl> reversed_type_impl::get_instance(data_type type) {

9
types/types.hh
View File

@@ -269,7 +269,6 @@ public:
friend class empty_type_impl;
template <typename T> friend const T& value_cast(const data_value&);
template <typename T> friend T&& value_cast(data_value&&);
friend std::ostream& operator<<(std::ostream&, const data_value&);
friend data_value make_tuple_value(data_type, maybe_empty<std::vector<data_value>>);
friend data_value make_set_value(data_type, maybe_empty<std::vector<data_value>>);
friend data_value make_list_value(data_type, maybe_empty<std::vector<data_value>>);
@@ -1034,4 +1033,12 @@ struct fmt::formatter<data_value_or_unset> : fmt::formatter<std::string_view> {
}
};
template <> struct fmt::formatter<data_value> {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
auto format(const data_value&, fmt::format_context& ctx) const -> decltype(ctx.out());
};
std::ostream& operator<<(std::ostream& out, const data_value& v);
using data_value_list = std::initializer_list<data_value_or_unset>;