Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed bug in cumsum and cumprod when there are multiple initial null values #5464

Merged
merged 1 commit into from
May 8, 2024
Merged

Fixed bug in cumsum and cumprod when there are multiple initial null values #5464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions engine/function/src/templates/Numeric.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1934,10 +1934,10 @@ public class Numeric {
if (isNaN(v) || isNaN(result[i - 1])) {
Arrays.fill(result, i, n, Double.NaN);
return result;
} else if (isNull(result[i - 1])) {
result[i] = v;
} else if (isNull(v)) {
result[i] = result[i - 1];
} else if (isNull(result[i - 1])) {
result[i] = v;
} else {
result[i] = result[i - 1] + v;
}
Expand Down Expand Up @@ -1969,10 +1969,10 @@ public class Numeric {
while (vi.hasNext()) {
final ${pt.primitive} v = vi.${pt.iteratorNext}();

if (isNull(result[i - 1])) {
result[i] = v;
} else if (isNull(v)) {
if (isNull(v)) {
result[i] = result[i - 1];
} else if (isNull(result[i - 1])) {
result[i] = v;
} else {
result[i] = result[i - 1] + v;
}
Expand Down Expand Up @@ -2055,10 +2055,10 @@ public class Numeric {
if (isNaN(v) || isNaN(result[i - 1])) {
Arrays.fill(result, i, n, Double.NaN);
return result;
} else if (isNull(result[i - 1])) {
result[i] = v;
} else if (isNull(v)) {
result[i] = result[i - 1];
} else if (isNull(result[i - 1])) {
result[i] = v;
} else {
result[i] = result[i - 1] * v;
}
Expand Down Expand Up @@ -2090,10 +2090,10 @@ public class Numeric {
while (vi.hasNext()) {
final ${pt.primitive} v = vi.${pt.iteratorNext}();

if (isNull(result[i - 1])) {
result[i] = v;
} else if (isNull(v)) {
if (isNull(v)) {
result[i] = result[i - 1];
} else if (isNull(result[i - 1])) {
result[i] = v;
} else {
result[i] = result[i - 1] * v;
}
Expand Down
6 changes: 6 additions & 0 deletions engine/function/src/templates/TestNumeric.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,13 +805,15 @@ public class TestNumeric extends BaseArrayTestCase {
assertEquals(new double[]{1, 3, 6, 10, 15}, cumsum(new ${pt.primitive}[]{1, 2, 3, 4, 5}));
assertEquals(new double[]{1, 3, 6, 6, 11}, cumsum(new ${pt.primitive}[]{1, 2, 3, ${pt.null}, 5}));
assertEquals(new double[]{NULL_DOUBLE, 2, 5, 9, 14}, cumsum(new ${pt.primitive}[]{${pt.null}, 2, 3, 4, 5}));
assertEquals(new double[]{NULL_DOUBLE, NULL_DOUBLE, 2, 5, 9, 14}, cumsum(new ${pt.primitive}[]{${pt.null}, ${pt.null}, 2, 3, 4, 5}));
assertEquals(new double[0], cumsum(new ${pt.primitive}[0]));
assertEquals(new double[0], cumsum(new ${pt.boxed}[0]));
assertEquals(null, cumsum((${pt.primitive}[]) null));

assertEquals(new double[]{1, 3, 6, 10, 15}, cumsum(new ${pt.vectorDirect}(new ${pt.primitive}[]{1, 2, 3, 4, 5})));
assertEquals(new double[]{1, 3, 6, 6, 11}, cumsum(new ${pt.vectorDirect}(new ${pt.primitive}[]{1, 2, 3, ${pt.null}, 5})));
assertEquals(new double[]{NULL_DOUBLE, 2, 5, 9, 14}, cumsum(new ${pt.vectorDirect}(new ${pt.primitive}[]{${pt.null}, 2, 3, 4, 5})));
assertEquals(new double[]{NULL_DOUBLE, NULL_DOUBLE, 2, 5, 9, 14}, cumsum(new ${pt.vectorDirect}(new ${pt.primitive}[]{${pt.null}, ${pt.null}, 2, 3, 4, 5})));
assertEquals(new double[0], cumsum(new ${pt.vectorDirect}()));
assertEquals(null, cumsum((${pt.vector}) null));

Expand All @@ -832,13 +834,15 @@ public class TestNumeric extends BaseArrayTestCase {
assertEquals(new long[]{1, 3, 6, 10, 15}, cumsum(new ${pt.primitive}[]{1, 2, 3, 4, 5}));
assertEquals(new long[]{1, 3, 6, 6, 11}, cumsum(new ${pt.primitive}[]{1, 2, 3, ${pt.null}, 5}));
assertEquals(new long[]{NULL_LONG, 2, 5, 9, 14}, cumsum(new ${pt.primitive}[]{${pt.null}, 2, 3, 4, 5}));
assertEquals(new long[]{NULL_LONG, NULL_LONG, 2, 5, 9, 14}, cumsum(new ${pt.primitive}[]{${pt.null}, ${pt.null}, 2, 3, 4, 5}));
assertEquals(new long[0], cumsum(new ${pt.primitive}[0]));
assertEquals(new long[0], cumsum(new ${pt.boxed}[0]));
assertEquals(null, cumsum((${pt.primitive}[]) null));

assertEquals(new long[]{1, 3, 6, 10, 15}, cumsum(new ${pt.vectorDirect}(new ${pt.primitive}[]{1, 2, 3, 4, 5})));
assertEquals(new long[]{1, 3, 6, 6, 11}, cumsum(new ${pt.vectorDirect}(new ${pt.primitive}[]{1, 2, 3, ${pt.null}, 5})));
assertEquals(new long[]{NULL_LONG, 2, 5, 9, 14}, cumsum(new ${pt.vectorDirect}(new ${pt.primitive}[]{${pt.null}, 2, 3, 4, 5})));
assertEquals(new long[]{NULL_LONG, NULL_LONG, 2, 5, 9, 14}, cumsum(new ${pt.vectorDirect}(new ${pt.primitive}[]{${pt.null}, ${pt.null}, 2, 3, 4, 5})));
assertEquals(new long[0], cumsum(new ${pt.vectorDirect}()));
assertEquals(null, cumsum((${pt.vector}) null));

Expand All @@ -852,6 +856,7 @@ public class TestNumeric extends BaseArrayTestCase {
assertEquals(new double[]{1, 2, 6, 24, 120}, cumprod(new ${pt.primitive}[]{1, 2, 3, 4, 5}));
assertEquals(new double[]{1, 2, 6, 6, 30}, cumprod(new ${pt.primitive}[]{1, 2, 3, ${pt.null}, 5}));
assertEquals(new double[]{NULL_DOUBLE, 2, 6, 24, 120}, cumprod(new ${pt.primitive}[]{${pt.null}, 2, 3, 4, 5}));
assertEquals(new double[]{NULL_DOUBLE, NULL_DOUBLE, 2, 6, 24, 120}, cumprod(new ${pt.primitive}[]{${pt.null}, ${pt.null}, 2, 3, 4, 5}));
assertEquals(new double[0], cumprod(new ${pt.primitive}[0]));
assertEquals(new double[0], cumprod(new ${pt.boxed}[0]));
assertEquals(null, cumprod((${pt.primitive}[]) null));
Expand All @@ -860,6 +865,7 @@ public class TestNumeric extends BaseArrayTestCase {
assertEquals(new double[]{1, 2, 6, 24, 120}, cumprod(new ${pt.vectorDirect}(new ${pt.primitive}[]{1, 2, 3, 4, 5})));
assertEquals(new double[]{1, 2, 6, 6, 30}, cumprod(new ${pt.vectorDirect}(new ${pt.primitive}[]{1, 2, 3, ${pt.null}, 5})));
assertEquals(new double[]{NULL_DOUBLE, 2, 6, 24, 120}, cumprod(new ${pt.vectorDirect}(new ${pt.primitive}[]{${pt.null}, 2, 3, 4, 5})));
assertEquals(new double[]{NULL_DOUBLE, NULL_DOUBLE, 2, 6, 24, 120}, cumprod(new ${pt.vectorDirect}(new ${pt.primitive}[]{${pt.null}, ${pt.null}, 2, 3, 4, 5})));
assertEquals(new double[0], cumprod(new ${pt.vectorDirect}()));
assertEquals(null, cumprod((${pt.vector}) null));
assertEquals(new double[]{1, Double.NaN, Double.NaN, Double.NaN, Double.NaN}, cumprod(new ${pt.vectorDirect}(new ${pt.primitive}[]{1, Float.NaN, 3, 4, 5})));
Expand Down
Loading