thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 00:22:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added setting "output_format_pretty_max_value_width"

Browse Source
This commit is contained in:
Alexey Milovidov 2020-06-01 01:12:13 +03:00
parent 4c2950b438
commit a76bd99e84
9 changed files with 206 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Common/UTF8Helpers.cpp
View File

@ -143,7 +143,7 @@ static size_t computeWidthImpl(const UInt8 * data, size_t size, size_t prefix, s
++i;
}
if (mode == BytesBeforLimit && width >= limit)
if (mode == BytesBeforLimit && width > limit)
return i - (width - limit);
switch (decoder.decode(data[i]))
@ -172,7 +172,7 @@ static size_t computeWidthImpl(const UInt8 * data, size_t size, size_t prefix, s
else
next_width += wcwidth(decoder.codepoint);
if (mode == BytesBeforLimit && next_width >= limit)
if (mode == BytesBeforLimit && next_width > limit)
return i - rollback;
width = next_width;

3
src/Common/UTF8Helpers.h
View File

@ -99,6 +99,9 @@ int queryConvert(const CharT * bytes, int length)
/// and include `\t` to the nearest longer length with multiple of eight.
size_t computeWidth(const UInt8 * data, size_t size, size_t prefix = 0) noexcept;
/// Calculate the maximum number of bytes, so that substring of this size fits in 'limit' width.
size_t computeBytesBeforeWidth(const UInt8 * data, size_t size, size_t prefix, size_t limit) noexcept;
}

1
src/Core/Settings.h
View File

@ -211,6 +211,7 @@ struct Settings : public SettingsCollection<Settings>
\
M(SettingUInt64, output_format_pretty_max_rows, 10000, "Rows limit for Pretty formats.", 0) \
M(SettingUInt64, output_format_pretty_max_column_pad_width, 250, "Maximum width to pad all values in a column in Pretty formats.", 0) \
M(SettingUInt64, output_format_pretty_max_value_width, 10000, "Maximum width of value to display in Pretty formats. If greater - it will be cut.", 0) \
M(SettingBool, output_format_pretty_color, true, "Use ANSI escape sequences to paint colors in Pretty formats", 0) \
M(SettingUInt64, output_format_parquet_row_group_size, 1000000, "Row group size in rows.", 0) \
M(SettingString, output_format_avro_codec, "", "Compression codec used for output. Possible values: 'null', 'deflate', 'snappy'.", 0) \

1
src/Formats/FormatFactory.cpp
View File

@ -101,6 +101,7 @@ static FormatSettings getOutputFormatSetting(const Settings & settings, const Co
format_settings.csv.crlf_end_of_line = settings.output_format_csv_crlf_end_of_line;
format_settings.pretty.max_rows = settings.output_format_pretty_max_rows;
format_settings.pretty.max_column_pad_width = settings.output_format_pretty_max_column_pad_width;
format_settings.pretty.max_value_width = settings.output_format_pretty_max_value_width;
format_settings.pretty.color = settings.output_format_pretty_color;
format_settings.template_settings.resultset_format = settings.format_template_resultset;
format_settings.template_settings.row_format = settings.format_template_row;

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

@ -30,14 +30,14 @@ PrettyBlockOutputFormat::PrettyBlockOutputFormat(
/// Note that number of code points is just a rough approximation of visible string width.
void PrettyBlockOutputFormat::calculateWidths(
const Block & header, const Chunk & chunk,
WidthsPerColumn & widths, Widths & max_widths, Widths & name_widths)
WidthsPerColumn & widths, Widths & max_padded_widths, Widths & name_widths)
{
size_t num_rows = std::min(chunk.getNumRows(), format_settings.pretty.max_rows);
size_t num_columns = chunk.getNumColumns();
const auto & columns = chunk.getColumns();
widths.resize(num_columns);
max_widths.resize_fill(num_columns);
max_padded_widths.resize_fill(num_columns);
name_widths.resize(num_columns);
/// Calculate widths of all values.
@ -57,10 +57,10 @@ 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 + 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]);
widths[i][j] = UTF8::computeWidth(reinterpret_cast<const UInt8 *>(serialized_value.data()), serialized_value.size(), prefix);
max_padded_widths[i] = std::max(max_padded_widths[i],
std::min(format_settings.pretty.max_column_pad_width,
std::min<UInt64>(format_settings.pretty.max_value_width, widths[i][j])));
}
/// And also calculate widths for names of columns.
@ -68,9 +68,9 @@ void PrettyBlockOutputFormat::calculateWidths(
// name string doesn't contain Tab, no need to pass `prefix`
name_widths[i] = std::min<UInt64>(format_settings.pretty.max_column_pad_width,
UTF8::computeWidth(reinterpret_cast<const UInt8 *>(elem.name.data()), elem.name.size()));
max_widths[i] = std::max(max_widths[i], name_widths[i]);
max_padded_widths[i] = std::max(max_padded_widths[i], name_widths[i]);
}
prefix += max_widths[i] + 3;
prefix += max_padded_widths[i] + 3;
}
}
@ -183,7 +183,9 @@ void PrettyBlockOutputFormat::write(const Chunk & chunk, PortKind port_kind)
writeCString("│", out);
const auto & type = *header.getByPosition(j).type;
writeValueWithPadding(*columns[j], type, i, widths[j].empty() ? max_widths[j] : widths[j][i], max_widths[j]);
writeValueWithPadding(*columns[j], type, i,
widths[j].empty() ? max_widths[j] : widths[j][i],
max_widths[j]);
}
writeCString("│\n", out);
@ -198,23 +200,34 @@ void PrettyBlockOutputFormat::write(const Chunk & chunk, PortKind port_kind)
void PrettyBlockOutputFormat::writeValueWithPadding(
const IColumn & column, const IDataType & type, size_t row_num, size_t value_width, size_t pad_to_width)
{
String serialized_value = " ";
{
WriteBufferFromString out_serialize(serialized_value, WriteBufferFromString::AppendModeTag());
type.serializeAsText(column, row_num, out_serialize, format_settings);
}
if (value_width > format_settings.pretty.max_value_width)
{
serialized_value.resize(UTF8::computeBytesBeforeWidth(
reinterpret_cast<const UInt8 *>(serialized_value.data()), serialized_value.size(), 0, 1 + format_settings.pretty.max_value_width));
if (format_settings.pretty.color)
serialized_value += "\033[31;1m⋯\033[0m";
else
serialized_value += "⋯";
value_width = format_settings.pretty.max_value_width;
}
else
serialized_value += ' ';
auto write_padding = [&]()
{
if (pad_to_width > value_width)
for (size_t k = 0; k < pad_to_width - value_width; ++k)
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();

2
src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp
View File

@ -34,6 +34,8 @@ void PrettySpaceBlockOutputFormat::write(const Chunk & chunk, PortKind port_kind
{
if (i != 0)
writeCString(" ", out);
else
writeChar(' ', out);
const ColumnWithTypeAndName & col = header.getByPosition(i);

114
tests/queries/0_stateless/01293_pretty_max_value_width.reference Normal file
View File

@ -0,0 +1,114 @@
┏━━━━━━━━┳━━━━━┓
┃ x  ┃ y  ┃
┡━━━━━━━━╇━━━━━┩
│ привет │ мир │
└────────┴─────┘
┏━━━━━━━┳━━━━━┓
┃ x  ┃ y  ┃
┡━━━━━━━╇━━━━━┩
│ приве⋯│ мир │
└───────┴─────┘
┌─x─────┬─y───┐
│ приве⋯│ мир │
└───────┴─────┘
x y
приве⋯ мир
┏━━━━━━━┳━━━━━━━┓
┃ x  ┃ y  ┃
┡━━━━━━━╇━━━━━━━┩
│ приве⋯│ мир │
├───────┼───────┤
│ мир │ приве⋯│
└───────┴───────┘
┌─x─────┬─y─────┐
│ приве⋯│ мир │
│ мир │ приве⋯│
└───────┴───────┘
x y
приве⋯ мир
мир приве⋯
┏━━━━━━━━┳━━━━━┓
┃ x  ┃ y  ┃
┡━━━━━━━━╇━━━━━┩
│ привет │ мир │
└────────┴─────┘
┌─x──────┬─y───┐
│ привет │ мир │
└────────┴─────┘
x y
привет мир
┏━━━━━━━━┳━━━━━━━━┓
┃ x  ┃ y  ┃
┡━━━━━━━━╇━━━━━━━━┩
│ привет │ мир │
├────────┼────────┤
│ мир │ привет │
└────────┴────────┘
┌─x──────┬─y──────┐
│ привет │ мир │
│ мир │ привет │
└────────┴────────┘
x y
привет мир
мир привет
┏━━━┳━━━┓
┃ x ┃ y ┃
┡━━━╇━━━┩
│ п⋯│ м⋯│
└───┴───┘
┌─x─┬─y─┐
│ п⋯│ м⋯│
└───┴───┘
x y
п⋯ м⋯
┏━━━┳━━━┓
┃ x ┃ y ┃
┡━━━╇━━━┩
│ п⋯│ м⋯│
├───┼───┤
│ м⋯│ п⋯│
└───┴───┘
┌─x─┬─y─┐
│ п⋯│ м⋯│
│ м⋯│ п⋯│
└───┴───┘
x y
п⋯ м⋯
м⋯ п⋯
┏━━━┳━━━┓
┃ x ┃ y ┃
┡━━━╇━━━┩
│ ⋯ │ ⋯ │
└───┴───┘
┌─x─┬─y─┐
│ ⋯ │ ⋯ │
└───┴───┘
x y
⋯ ⋯
┏━━━┳━━━┓
┃ x ┃ y ┃
┡━━━╇━━━┩
│ ⋯ │ ⋯ │
├───┼───┤
│ ⋯ │ ⋯ │
└───┴───┘
┌─x─┬─y─┐
│ ⋯ │ ⋯ │
│ ⋯ │ ⋯ │
└───┴───┘
x y
⋯ ⋯
⋯ ⋯
┏━━━┳━━━┓
┃ x ┃ y ┃
┡━━━╇━━━┩
│ ⋯ │ ⋯ │
└───┴───┘

43
tests/queries/0_stateless/01293_pretty_max_value_width.sql Normal file
View File

@ -0,0 +1,43 @@
SELECT 'привет' AS x, 'мир' AS y FORMAT Pretty;
SET output_format_pretty_max_value_width = 5;
SELECT 'привет' AS x, 'мир' AS y FORMAT Pretty;
SELECT 'привет' AS x, 'мир' AS y FORMAT PrettyCompact;
SELECT 'привет' AS x, 'мир' AS y FORMAT PrettySpace;
SELECT * FROM VALUES('x String, y String', ('привет', 'мир'), ('мир', 'привет')) FORMAT Pretty;
SELECT * FROM VALUES('x String, y String', ('привет', 'мир'), ('мир', 'привет')) FORMAT PrettyCompact;
SELECT * FROM VALUES('x String, y String', ('привет', 'мир'), ('мир', 'привет')) FORMAT PrettySpace;
SET output_format_pretty_max_value_width = 6;
SELECT 'привет' AS x, 'мир' AS y FORMAT Pretty;
SELECT 'привет' AS x, 'мир' AS y FORMAT PrettyCompact;
SELECT 'привет' AS x, 'мир' AS y FORMAT PrettySpace;
SELECT * FROM VALUES('x String, y String', ('привет', 'мир'), ('мир', 'привет')) FORMAT Pretty;
SELECT * FROM VALUES('x String, y String', ('привет', 'мир'), ('мир', 'привет')) FORMAT PrettyCompact;
SELECT * FROM VALUES('x String, y String', ('привет', 'мир'), ('мир', 'привет')) FORMAT PrettySpace;
SET output_format_pretty_max_value_width = 1;
SELECT 'привет' AS x, 'мир' AS y FORMAT Pretty;
SELECT 'привет' AS x, 'мир' AS y FORMAT PrettyCompact;
SELECT 'привет' AS x, 'мир' AS y FORMAT PrettySpace;
SELECT * FROM VALUES('x String, y String', ('привет', 'мир'), ('мир', 'привет')) FORMAT Pretty;
SELECT * FROM VALUES('x String, y String', ('привет', 'мир'), ('мир', 'привет')) FORMAT PrettyCompact;
SELECT * FROM VALUES('x String, y String', ('привет', 'мир'), ('мир', 'привет')) FORMAT PrettySpace;
SET output_format_pretty_max_value_width = 0;
SELECT 'привет' AS x, 'мир' AS y FORMAT Pretty;
SELECT 'привет' AS x, 'мир' AS y FORMAT PrettyCompact;
SELECT 'привет' AS x, 'мир' AS y FORMAT PrettySpace;
SELECT * FROM VALUES('x String, y String', ('привет', 'мир'), ('мир', 'привет')) FORMAT Pretty;
SELECT * FROM VALUES('x String, y String', ('привет', 'мир'), ('мир', 'привет')) FORMAT PrettyCompact;
SELECT * FROM VALUES('x String, y String', ('привет', 'мир'), ('мир', 'привет')) FORMAT PrettySpace;
SET output_format_pretty_color = 0;
SELECT 'привет' AS x, 'мир' AS y FORMAT Pretty;