Merge branch 'master' of github.com:yandex/ClickHouse

This commit is contained in:
Alexey Milovidov 2018-09-18 19:17:36 +03:00
commit a918461216
2 changed files with 8 additions and 6 deletions

View File

@ -55,13 +55,15 @@ struct ArrayCumSumNonNegativeImpl
// skip empty arrays
if (pos < offsets[i])
{
accum_sum = data[pos];
res_values[pos] = accum_sum > 0 ? accum_sum : 0;
accum_sum = data[pos] > 0 ? data[pos] : 0;
res_values[pos] = accum_sum;
for (++pos; pos < offsets[i]; ++pos)
{
accum_sum = accum_sum + data[pos];
res_values[pos] = accum_sum > 0 ? accum_sum : 0;
if (accum_sum < 0)
accum_sum = 0;
res_values[pos] = accum_sum;
}
}
}

View File

@ -1,8 +1,8 @@
[1,3,6,10]
[1,0,1,0]
[1,0,5,3]
[0,1,1,1]
[0,6,93,-95]
[1,0,0,0]
[1,0,0,1]
[1,1.4,1.2999999999999998]
[1,4,5]
[0,-4,3,1]