mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-12 19:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

cql3/expr: print expressions in user-friendly way by default

Browse Source 
When a CQL expression is printed, it can be done using
either the `debug` mode, or the `user` mode.

`user` mode is basically how you would expect the CQL
to be printed, it can be printed and then parsed back.

`debug` mode is more detailed, for example in `debug`
mode a column name can be displayed as
`unresolved_identifier(my_column)`, which can't
be parsed back to CQL.

The default way of printing is the `debug` mode,
but this requires us to remember to enable the `user`
mode each time we're printing a user-facing message,
for example for an invalid_request_exception.

It's cumbersome and people forget about it,
so let's change the default to `user`.

There issues about expressions being printed
in a `strange` way, this fixes them.

Signed-off-by: Jan Ciolek <jan.ciolek@scylladb.com>

Closes #13916
This commit is contained in:
Jan Ciolek
2023-05-17 11:14:12 +02:00
committed by Nadav Har'El
parent 64dc76db55
commit 1bcb4c024c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cql3/expr/expression.cc
View File

@@ -1017,7 +1017,7 @@ std::ostream& operator<<(std::ostream& os, const column_value& cv) {
std::ostream& operator<<(std::ostream& os, const expression& expr) {
expression::printer pr {
.expr_to_print = expr,
.debug_mode = true
.debug_mode = false
};
return os << pr;

4
cql3/expr/expression.hh
View File

@@ -828,12 +828,12 @@ bool has_only_eq_binops(const expression&);
} // namespace cql3
/// Custom formatter for an expression. Use {:user} for user-oriented
/// output, {:debug} for debug-oriented output. Debug is the default.
/// output, {:debug} for debug-oriented output. User is the default.
///
/// Required for fmt::join() to work on expression.
template <>
class fmt::formatter<cql3::expr::expression> {
bool _debug = true;
bool _debug = false;
private:
constexpr static bool try_match_and_advance(format_parse_context& ctx, std::string_view s) {
auto [ctx_end, s_end] = std::ranges::mismatch(ctx, s);