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

Allowed to switch between 'basic' and 'best effort' methods of parsing DateTime from text #1710

Browse Source
This commit is contained in:
Alexey Milovidov 2018-06-08 06:27:34 +03:00
parent 101276e541
commit 96fbe1d716
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dbms/src/DataStreams/PrettyBlockOutputStream.cpp
View File

@ -74,6 +74,8 @@ void PrettyBlockOutputStream::calculateWidths(
void PrettyBlockOutputStream::write(const Block & block)
{
UInt64 max_rows = format_settings.pretty.max_rows;
if (total_rows >= max_rows)
{
total_rows += block.rows();
@ -210,10 +212,10 @@ void PrettyBlockOutputStream::writeValueWithPadding(const ColumnWithTypeAndName
void PrettyBlockOutputStream::writeSuffix()
{
if (total_rows >= max_rows)
if (total_rows >= format_settings.pretty.max_rows)
{
writeCString(" Showed first ", ostr);
writeIntText(max_rows, ostr);
writeIntText(format_settings.pretty.max_rows, ostr);
writeCString(".\n", ostr);
}

1
dbms/src/DataStreams/PrettyBlockOutputStream.h
View File

@ -35,7 +35,6 @@ protected:
WriteBuffer & ostr;
const Block header;
size_t max_rows;
size_t total_rows = 0;
size_t terminal_width = 0;

2
dbms/src/DataStreams/PrettyCompactBlockOutputStream.cpp
View File

@ -95,6 +95,8 @@ void PrettyCompactBlockOutputStream::writeRow(
void PrettyCompactBlockOutputStream::write(const Block & block)
{
UInt64 max_rows = format_settings.pretty.max_rows;
if (total_rows >= max_rows)
{
total_rows += block.rows();

6
dbms/src/DataStreams/PrettySpaceBlockOutputStream.cpp
View File

@ -9,6 +9,8 @@ namespace DB
void PrettySpaceBlockOutputStream::write(const Block & block)
{
UInt64 max_rows = format_settings.pretty.max_rows;
if (total_rows >= max_rows)
{
total_rows += block.rows();
@ -81,10 +83,10 @@ void PrettySpaceBlockOutputStream::write(const Block & block)
void PrettySpaceBlockOutputStream::writeSuffix()
{
if (total_rows >= max_rows)
if (total_rows >= format_settings.pretty.max_rows)
{
writeCString("\nShowed first ", ostr);
writeIntText(max_rows, ostr);
writeIntText(format_settings.pretty.max_rows, ostr);
writeCString(".\n", ostr);
}