From c6910f39b9102fa95fcee66178c55a700679f25c Mon Sep 17 00:00:00 2001 From: Alexander Tokmakov Date: Tue, 24 Jan 2023 01:11:58 +0100 Subject: [PATCH] fix --- src/Common/LoggingFormatStringHelpers.h | 6 +++--- src/Processors/Formats/Impl/AvroRowOutputFormat.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Common/LoggingFormatStringHelpers.h b/src/Common/LoggingFormatStringHelpers.h index e00f2463044..fd9eb43840e 100644 --- a/src/Common/LoggingFormatStringHelpers.h +++ b/src/Common/LoggingFormatStringHelpers.h @@ -5,11 +5,11 @@ /// Saves a format string for already formatted message struct PreformattedMessage { - String message; + std::string message; std::string_view format_string; - operator const String & () const { return message; } - operator String () && { return std::move(message); } + operator const std::string & () const { return message; } + operator std::string () && { return std::move(message); } operator fmt::format_string<> () const { UNREACHABLE(); } }; diff --git a/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp b/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp index 7f71cc6e947..8483a91df62 100644 --- a/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp +++ b/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp @@ -49,7 +49,7 @@ public: : string_to_string_regexp(settings_.avro.string_column_pattern) { if (!string_to_string_regexp.ok()) - throw DB::Exception(DB::ErrorCodes::CANNOT_COMPILE_REGEXP, "Avro: cannot compile re2: {}, error: {}. " + throw DB::Exception(DB::ErrorCodes::CANNOT_COMPILE_REGEXP, "Avro: cannot compile re2: {}, error: {}. " "Look at https://github.com/google/re2/wiki/Syntax for reference.", settings_.avro.string_column_pattern, string_to_string_regexp.error()); }