thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-22 01:30:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

dbms: fixed error [#CONV-7549].

Browse Source
This commit is contained in:
Alexey Milovidov 2013-05-31 17:34:30 +00:00
parent 37b679bb9a
commit 9848a42c82
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/include/DB/DataStreams/copyData.h
View File

@ -15,7 +15,5 @@ namespace DB
*/
void copyData(IBlockInputStream & from, IBlockOutputStream & to);
void copyData(IRowInputStream & from, IRowOutputStream & to);
void copyData(IBlockInputStream & from, IRowOutputStream & to);
void copyData(IRowInputStream & from, IBlockOutputStream & to, const Block & sample);
}

5
dbms/src/DataStreams/copyData.cpp
View File

@ -15,6 +15,11 @@ void copyData(IBlockInputStream & from, IBlockOutputStream & to)
while (Block block = from.read())
to.write(block);
/// Для вывода информации о количестве строк до LIMIT в некоторых форматах.
if (const IProfilingBlockInputStream * input = dynamic_cast<const IProfilingBlockInputStream *>(&from))
if (input->getInfo().hasAppliedLimit())
to.setRowsBeforeLimit(input->getInfo().getRowsBeforeLimit());
from.readSuffix();
to.writeSuffix();
}

6
dbms/src/Interpreters/InterpreterSelectQuery.cpp
View File

@ -581,11 +581,7 @@ BlockInputStreamPtr InterpreterSelectQuery::executeAndFormat(WriteBuffer & buf)
BlockInputStreamPtr in = execute();
BlockOutputStreamPtr out = context.getFormatFactory().getOutput(format_name, buf, sample);
if (const IProfilingBlockInputStream * input = dynamic_cast<const IProfilingBlockInputStream *>(&*in))
if (input->getInfo().hasAppliedLimit())
out->setRowsBeforeLimit(input->getInfo().getRowsBeforeLimit());
copyData(*in, *out);
return in;