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

dbms: fixed error with Aggregator [#CONV-2944].

Browse Source
This commit is contained in:
Alexey Milovidov 2013-02-13 20:13:28 +00:00
parent 427be97e00
commit 105962f514
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -823,7 +823,7 @@ void Aggregator::merge(BlockInputStreamPtr stream, AggregatedDataVariants & resu
/// Добавляем значения
for (size_t j = 0; j < aggregates_size; ++j)
aggregate_functions[i]->merge(it->second + offsets_of_aggregate_states[j], (*aggregate_columns[j])[i]);
aggregate_functions[j]->merge(it->second + offsets_of_aggregate_states[j], (*aggregate_columns[j])[i]);
}
}
else if (result.type == AggregatedDataVariants::KEY_STRING)
@ -857,7 +857,7 @@ void Aggregator::merge(BlockInputStreamPtr stream, AggregatedDataVariants & resu
/// Добавляем значения
for (size_t j = 0; j < aggregates_size; ++j)
aggregate_functions[i]->merge(it->second + offsets_of_aggregate_states[j], (*aggregate_columns[j])[i]);
aggregate_functions[j]->merge(it->second + offsets_of_aggregate_states[j], (*aggregate_columns[j])[i]);
}
}
else if (const ColumnFixedString * column_string = dynamic_cast<const ColumnFixedString *>(&column))
@ -886,7 +886,7 @@ void Aggregator::merge(BlockInputStreamPtr stream, AggregatedDataVariants & resu
/// Добавляем значения
for (size_t j = 0; j < aggregates_size; ++j)
aggregate_functions[i]->merge(it->second + offsets_of_aggregate_states[j], (*aggregate_columns[j])[i]);
aggregate_functions[j]->merge(it->second + offsets_of_aggregate_states[j], (*aggregate_columns[j])[i]);
}
}
else
@ -922,7 +922,7 @@ void Aggregator::merge(BlockInputStreamPtr stream, AggregatedDataVariants & resu
/// Добавляем значения
for (size_t j = 0; j < aggregates_size; ++j)
aggregate_functions[i]->merge(it->second.second + offsets_of_aggregate_states[j], (*aggregate_columns[j])[i]);
aggregate_functions[j]->merge(it->second.second + offsets_of_aggregate_states[j], (*aggregate_columns[j])[i]);
}
}
else if (result.type == AggregatedDataVariants::GENERIC)
@ -950,7 +950,7 @@ void Aggregator::merge(BlockInputStreamPtr stream, AggregatedDataVariants & resu
/// Добавляем значения
for (size_t j = 0; j < aggregates_size; ++j)
aggregate_functions[i]->merge(it->second + offsets_of_aggregate_states[j], (*aggregate_columns[j])[i]);
aggregate_functions[j]->merge(it->second + offsets_of_aggregate_states[j], (*aggregate_columns[j])[i]);
}
}
else