thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-24 10:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unify mysql output format checks

Browse Source
This commit is contained in:
Raúl Marín 2021-08-09 14:29:35 +02:00
parent bba600903b
commit 65bb4ff744
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Formats/FormatFactory.cpp
View File

@ -212,13 +212,11 @@ BlockOutputStreamPtr FormatFactory::getOutputStreamParallelIfPossible(
const Settings & settings = context->getSettingsRef(); const Settings & settings = context->getSettingsRef();
bool parallel_formatting = settings.output_format_parallel_formatting; bool parallel_formatting = settings.output_format_parallel_formatting;
auto format_settings = _format_settings ? *_format_settings : getFormatSettings(context);
if (output_getter && parallel_formatting && getCreators(name).supports_parallel_formatting if (output_getter && parallel_formatting && getCreators(name).supports_parallel_formatting && !settings.output_format_json_array_of_rows
&& !settings.output_format_json_array_of_rows) && !format_settings.mysql_wire.sequence_id)
{ {
auto format_settings = _format_settings
? *_format_settings : getFormatSettings(context);
auto formatter_creator = [output_getter, sample, callback, format_settings] auto formatter_creator = [output_getter, sample, callback, format_settings]
(WriteBuffer & output) -> OutputFormatPtr (WriteBuffer & output) -> OutputFormatPtr
{ return output_getter(output, sample, {std::move(callback)}, format_settings);}; { return output_getter(output, sample, {std::move(callback)}, format_settings);};
@ -314,14 +312,10 @@ OutputFormatPtr FormatFactory::getOutputFormatParallelIfPossible(
auto format_settings = _format_settings ? *_format_settings : getFormatSettings(context); auto format_settings = _format_settings ? *_format_settings : getFormatSettings(context);
/// If we're handling MySQL protocol connection right now then MySQLWire is only allowed output format.
if (format_settings.mysql_wire.sequence_id && (name != "MySQLWire"))
throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "MySQL protocol does not support custom output formats");
const Settings & settings = context->getSettingsRef(); const Settings & settings = context->getSettingsRef();
if (settings.output_format_parallel_formatting && getCreators(name).supports_parallel_formatting if (settings.output_format_parallel_formatting && getCreators(name).supports_parallel_formatting
&& !settings.output_format_json_array_of_rows) && !settings.output_format_json_array_of_rows && !format_settings.mysql_wire.sequence_id)
{ {
auto formatter_creator = [output_getter, sample, callback, format_settings] auto formatter_creator = [output_getter, sample, callback, format_settings]
(WriteBuffer & output) -> OutputFormatPtr (WriteBuffer & output) -> OutputFormatPtr