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

dbms: development [#CONV-2944].

Browse Source
This commit is contained in:
Alexey Milovidov 2012-08-08 20:12:29 +00:00
parent 36045c00c2
commit eb8d9b5a97
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dbms/include/DB/DataStreams/MergingSortedBlockInputStream.h
View File

@ -23,6 +23,7 @@ public:
}
Block readImpl();
void readSuffix();
String getName() const { return "MergingSortedBlockInputStream"; }

10
dbms/src/DataStreams/MergingSortedBlockInputStream.cpp
View File

@ -107,6 +107,13 @@ Block MergingSortedBlockInputStream::readImpl()
return merged_block;
}
inputs.clear();
return merged_block;
}
void MergingSortedBlockInputStream::readSuffix()
{
const BlockStreamProfileInfo & profile_info = getInfo();
double seconds = profile_info.work_stopwatch.elapsedSeconds();
LOG_DEBUG(log, std::fixed << std::setprecision(2)
@ -114,9 +121,6 @@ Block MergingSortedBlockInputStream::readImpl()
<< " in " << seconds << " sec., "
<< profile_info.rows / seconds << " rows/sec., "
<< profile_info.bytes / 1000000.0 / seconds << " MiB/sec.");
inputs.clear();
return merged_block;
}
}