Intermediate changes

1 files changed, 19 insertions, 3 deletions

diff --git a/contrib/clickhouse/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.cpp b/contrib/clickhouse/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.cpp
index 5b8f6cc1af..b805547201 100644
--- a/contrib/clickhouse/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.cpp
+++ b/contrib/clickhouse/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.cpp
@@ -14,10 +14,12 @@ JSONEachRowRowOutputFormat::JSONEachRowRowOutputFormat(
     const Block & header_,
     const FormatSettings & settings_,
     bool pretty_json_)
-        : RowOutputFormatWithUTF8ValidationAdaptor(settings_.json.validate_utf8, header_, out_),
-        pretty_json(pretty_json_),
-        settings(settings_)
+    : RowOutputFormatWithExceptionHandlerAdaptor<RowOutputFormatWithUTF8ValidationAdaptor, bool>(
+        header_, out_, settings_.json.valid_output_on_exception, settings_.json.validate_utf8)
+    , pretty_json(pretty_json_)
+    , settings(settings_)
 {
+    ostr = RowOutputFormatWithExceptionHandlerAdaptor::getWriteBufferPtr();
     fields = JSONUtils::makeNamesValidJSONStrings(getPort(PortKind::Main).getHeader().getNames(), settings, settings.json.validate_utf8);
 }
 
@@ -76,10 +78,24 @@ void JSONEachRowRowOutputFormat::writePrefix()
 
 void JSONEachRowRowOutputFormat::writeSuffix()
 {
+    if (!exception_message.empty())
+    {
+        if (haveWrittenData())
+            writeRowBetweenDelimiter();
+        writeRowStartDelimiter();
+        JSONUtils::writeException(exception_message, *ostr, settings, pretty_json ? 1 : 0);
+        writeRowEndDelimiter();
+    }
+
     if (settings.json.array_of_rows)
         writeCString("\n]\n", *ostr);
 }
 
+void JSONEachRowRowOutputFormat::resetFormatterImpl()
+{
+    RowOutputFormatWithExceptionHandlerAdaptor::resetFormatterImpl();
+    ostr = RowOutputFormatWithExceptionHandlerAdaptor::getWriteBufferPtr();
+}
 
 void registerOutputFormatJSONEachRow(FormatFactory & factory)
 {