thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-25 17:12:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Limit value width in Pretty formats

Browse Source
This commit is contained in:
Alexey Milovidov 2020-05-31 22:22:59 +03:00
parent 463d2cf836
commit 2895cfb480
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Formats/FormatSettings.h
View File

@ -42,6 +42,7 @@ struct FormatSettings
{
UInt64 max_rows = 10000;
UInt64 max_column_pad_width = 250;
UInt64 max_value_width = 10000;
bool color = true;
};

22
src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp
View File

@ -32,7 +32,7 @@ void PrettyBlockOutputFormat::calculateWidths(
const Block & header, const Chunk & chunk,
WidthsPerColumn & widths, Widths & max_widths, Widths & name_widths)
{
size_t num_rows = chunk.getNumRows();
size_t num_rows = std::min(chunk.getNumRows(), format_settings.pretty.max_rows);
size_t num_columns = chunk.getNumColumns();
const auto & columns = chunk.getColumns();
@ -57,8 +57,9 @@ void PrettyBlockOutputFormat::calculateWidths(
elem.type->serializeAsText(*column, j, out_serialize, format_settings);
}
widths[i][j] = std::min<UInt64>(format_settings.pretty.max_column_pad_width,
UTF8::computeWidth(reinterpret_cast<const UInt8 *>(serialized_value.data()), serialized_value.size(), prefix));
widths[i][j] = std::min<UInt64>(format_settings.pretty.max_column_pad_width + 1,
std::min(format_settings.pretty.max_value_width,
UTF8::computeWidth(reinterpret_cast<const UInt8 *>(serialized_value.data()), serialized_value.size(), prefix)));
max_widths[i] = std::max(max_widths[i], widths[i][j]);
}
@ -203,14 +204,25 @@ void PrettyBlockOutputFormat::writeValueWithPadding(
writeChar(' ', out);
};
String serialized_value;
{
WriteBufferFromString out_serialize(serialized_value);
type.serializeAsText(column, row_num, out_serialize, format_settings);
}
if (serialized_value.size() > format_settings.pretty.max_value_width)
{
serialized_value.resize(format_settings.pretty.max_value_width);
serialized_value += "⋯";
}
if (type.shouldAlignRightInPrettyFormats())
{
write_padding();
type.serializeAsText(column, row_num, out, format_settings);
out.write(serialized_value.data(), serialized_value.size());
}
else
{
type.serializeAsText(column, row_num, out, format_settings);
out.write(serialized_value.data(), serialized_value.size());
write_padding();
}
}