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

dbms: fixed error [#CONV-2944].

Browse Source
This commit is contained in:
Alexey Milovidov 2012-09-12 19:58:38 +00:00
parent c584e302e5
commit 20d1415938
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -514,7 +514,7 @@ AggregatedDataVariantsPtr Aggregator::merge(ManyAggregatedDataVariants & data_va
} }
} }
else else
res_it->second = it->second; new(&res_it->second) AggregateFunctionsPlainPtrs(it->second);
} }
} }
else if (res->type == AggregatedDataVariants::KEY_STRING) else if (res->type == AggregatedDataVariants::KEY_STRING)
@ -538,7 +538,7 @@ AggregatedDataVariantsPtr Aggregator::merge(ManyAggregatedDataVariants & data_va
} }
} }
else else
res_it->second = it->second; new(&res_it->second) AggregateFunctionsPlainPtrs(it->second);
} }
} }
else if (res->type == AggregatedDataVariants::HASHED) else if (res->type == AggregatedDataVariants::HASHED)
@ -562,7 +562,7 @@ AggregatedDataVariantsPtr Aggregator::merge(ManyAggregatedDataVariants & data_va
} }
} }
else else
res_it->second = it->second; new(&res_it->second) AggregatedDataHashed::mapped_type(it->second);
} }
} }
else if (res->type == AggregatedDataVariants::GENERIC) else if (res->type == AggregatedDataVariants::GENERIC)