tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix COUNT overflow bug

Browse Source 
Reviewers: buda

Reviewed By: buda

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D2769
This commit is contained in:
Matej Ferencevic 2020-05-20 15:19:30 +02:00
parent f047f55020
commit f92dee6e7b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/query/plan/operator.cpp
View File

@ -2673,7 +2673,10 @@ class AggregateCursor : public Cursor {
// how many input rows have been aggregated in respective values_ element so
// far
utils::pmr::vector<int> counts_;
// TODO: The counting value type should be changed to an unsigned type once
// TypedValue can support signed integer values larger than 64bits so that
// precision isn't lost.
utils::pmr::vector<int64_t> counts_;
// aggregated values. Initially Null (until at least one input row with a
// valid value gets processed)
utils::pmr::vector<TypedValue> values_;
@ -2718,17 +2721,17 @@ class AggregateCursor : public Cursor {
}
// calculate AVG aggregations (so far they have only been summed)
for (int pos = 0; pos < static_cast<int>(self_.aggregations_.size());
++pos) {
for (size_t pos = 0; pos < self_.aggregations_.size(); ++pos) {
if (self_.aggregations_[pos].op != Aggregation::Op::AVG) continue;
for (auto &kv : aggregation_) {
AggregationValue &agg_value = kv.second;
int count = agg_value.counts_[pos];
auto count = agg_value.counts_[pos];
auto *pull_memory = context->evaluation_context.memory;
if (count > 0)
if (count > 0) {
agg_value.values_[pos] =
agg_value.values_[pos] /
TypedValue(static_cast<double>(count), pull_memory);
}
}
}
}