thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-28 18:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

dbms: development [#CONV-2944].

Browse Source
This commit is contained in:
Alexey Milovidov 2011-09-26 11:49:39 +00:00
parent c9d2d96d6d
commit 5fd8e4c12e
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,5 @@
#include <DB/Columns/ColumnsNumber.h>
#include <DB/DataStreams/AggregatingBlockInputStream.h> #include <DB/DataStreams/AggregatingBlockInputStream.h>
@ -45,9 +47,15 @@ Block AggregatingBlockInputStream::readImpl()
AggregatedDataWithUInt64Key & data = data_variants.key64; AggregatedDataWithUInt64Key & data = data_variants.key64;
rows = data.size(); rows = data.size();
IColumn & first_column = *res.getByPosition(0).column; IColumn & first_column = *res.getByPosition(0).column;
bool is_signed = dynamic_cast<ColumnInt8 *>(&first_column) || dynamic_cast<ColumnInt16 *>(&first_column)
|| dynamic_cast<ColumnInt32 *>(&first_column) || dynamic_cast<ColumnInt64 *>(&first_column);
for (AggregatedDataWithUInt64Key::const_iterator it = data.begin(); it != data.end(); ++it) for (AggregatedDataWithUInt64Key::const_iterator it = data.begin(); it != data.end(); ++it)
{ {
first_column.insert(it->first); if (is_signed)
first_column.insert(static_cast<Int64>(it->first));
else
first_column.insert(it->first);
size_t i = 1; size_t i = 1;
for (AggregateFunctions::const_iterator jt = it->second.begin(); jt != it->second.end(); ++jt, ++i) for (AggregateFunctions::const_iterator jt = it->second.begin(); jt != it->second.end(); ++jt, ++i)