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

Make Numeric.sum return null when there are no inputs or all null inputs #5461

Merged
merged 2 commits into from
May 7, 2024
Merged

Make Numeric.sum return null when there are no inputs or all null inputs #5461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c479fd
Make sum of nulls or no values return null
chipkent May 7, 2024
e083c45
Another unit test.
chipkent May 7, 2024
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
14 changes: 14 additions & 0 deletions engine/function/src/templates/Numeric.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1488,6 +1488,7 @@ public class Numeric {
}

double sum = 0;
long nullCount = 0;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to handle infinities the way aggBy does?

    private double currentValueWithSum(long totalNormalCount, long totalNanCount, long totalPositiveInfinityCount,
            long totalNegativeInfinityCount, double newSum) {
        if (totalNanCount > 0 || (totalPositiveInfinityCount > 0 && totalNegativeInfinityCount > 0)) {
            return Double.NaN;
        }
        if (totalNegativeInfinityCount > 0) {
            return Double.NEGATIVE_INFINITY;
        }
        if (totalPositiveInfinityCount > 0) {
            return Double.POSITIVE_INFINITY;
        }
        if (totalNormalCount == 0) {
            return QueryConstants.NULL_DOUBLE;
        }
        return (double) newSum;
    }

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Larry and I had a discussion on this before the prior fix. It is unnecessary because of how IEEE754 does things. Look at the unit tests.


try ( final ${pt.vectorIterator} vi = values.iterator() ) {
while ( vi.hasNext() ) {
Expand All @@ -1499,10 +1500,16 @@ public class Numeric {

if (!isNull(c)) {
sum += c;
} else {
nullCount++;
}
}
}

if (nullCount == values.size()) {
return NULL_DOUBLE;
}

return sum;
}
<#else>
Expand All @@ -1512,17 +1519,24 @@ public class Numeric {
}

long sum = 0;
long nullCount = 0;

try ( final ${pt.vectorIterator} vi = values.iterator() ) {
while ( vi.hasNext() ) {
final ${pt.primitive} c = vi.${pt.iteratorNext}();

if (!isNull(c)) {
sum += c;
} else {
nullCount++;
}
}
}

if (nullCount == values.size()) {
return NULL_LONG;
}

return sum;
}
</#if>
Expand Down
15 changes: 10 additions & 5 deletions engine/function/src/templates/TestNumeric.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,36 +567,41 @@ public class TestNumeric extends BaseArrayTestCase {

public void test${pt.boxed}Sum1() {
assertTrue(Math.abs(15 - sum(new ${pt.vectorDirect}(new ${pt.primitive}[]{4, 5, 6}))) == 0.0);
assertTrue(Math.abs(0 - sum(new ${pt.vectorDirect}())) == 0.0);
assertTrue(Math.abs(0 - sum(new ${pt.vectorDirect}(${pt.null}))) == 0.0);
assertTrue(Math.abs(20 - sum(new ${pt.vectorDirect}(new ${pt.primitive}[]{5, ${pt.null}, 15}))) == 0.0);
<#if pt.valueType.isFloat >
assertEquals(NULL_DOUBLE, sum((${pt.vector}) null));
assertEquals(NULL_DOUBLE, sum(new ${pt.vectorDirect}(new ${pt.primitive}[]{})));
assertEquals(NULL_DOUBLE, sum(new ${pt.vectorDirect}(new ${pt.primitive}[]{${pt.null}, ${pt.null}})));
assertEquals(Double.POSITIVE_INFINITY, sum(new ${pt.vectorDirect}(new ${pt.primitive}[]{4, Float.POSITIVE_INFINITY, 6})));
assertEquals(Double.POSITIVE_INFINITY, sum(new ${pt.vectorDirect}(new ${pt.primitive}[]{4, Float.POSITIVE_INFINITY, Float.POSITIVE_INFINITY})));
assertEquals(Double.NEGATIVE_INFINITY, sum(new ${pt.vectorDirect}(new ${pt.primitive}[]{4, Float.NEGATIVE_INFINITY, 6})));
assertEquals(Double.NEGATIVE_INFINITY, sum(new ${pt.vectorDirect}(new ${pt.primitive}[]{4, Float.NEGATIVE_INFINITY, Float.NEGATIVE_INFINITY})));
assertEquals(Double.NaN, sum(new ${pt.vectorDirect}(new ${pt.primitive}[]{4, Float.POSITIVE_INFINITY, Float.NEGATIVE_INFINITY})));
assertEquals(Double.NaN, sum(new ${pt.vectorDirect}(new ${pt.primitive}[]{4, Float.NaN, 6})));
<#else>
assertEquals(NULL_LONG, sum((${pt.vector}) null));
assertEquals(NULL_LONG, sum(new ${pt.vectorDirect}(new ${pt.primitive}[]{})));
assertEquals(NULL_LONG, sum(new ${pt.vectorDirect}(new ${pt.primitive}[]{${pt.null}, ${pt.null}})));
</#if>

}

public void test${pt.boxed}Sum2() {
assertTrue(Math.abs(15 - sum(new ${pt.primitive}[]{4, 5, 6})) == 0.0);
assertTrue(Math.abs(0 - sum(new ${pt.primitive}[]{})) == 0.0);
assertTrue(Math.abs(0 - sum(new ${pt.primitive}[]{${pt.null}})) == 0.0);
assertTrue(Math.abs(20 - sum(new ${pt.primitive}[]{5, ${pt.null}, 15})) == 0.0);
<#if pt.valueType.isFloat >
assertEquals(NULL_DOUBLE, sum((${pt.primitive}[]) null));
assertEquals(NULL_DOUBLE, sum(new ${pt.primitive}[]{}));
assertEquals(NULL_DOUBLE, sum(new ${pt.primitive}[]{${pt.null}, ${pt.null}}));
assertEquals(Double.POSITIVE_INFINITY, sum(new ${pt.primitive}[]{4, Float.POSITIVE_INFINITY, 6}));
assertEquals(Double.POSITIVE_INFINITY, sum(new ${pt.primitive}[]{4, Float.POSITIVE_INFINITY, Float.POSITIVE_INFINITY}));
assertEquals(Double.NEGATIVE_INFINITY, sum(new ${pt.primitive}[]{4, Float.NEGATIVE_INFINITY, 6}));
assertEquals(Double.NEGATIVE_INFINITY, sum(new ${pt.primitive}[]{4, Float.NEGATIVE_INFINITY, Float.NEGATIVE_INFINITY}));
assertEquals(Double.NaN, sum(new ${pt.primitive}[]{4, Float.POSITIVE_INFINITY, Float.NEGATIVE_INFINITY}));
assertEquals(Double.NaN, sum(new ${pt.primitive}[]{4, Float.NaN, 6}));
<#else>
assertEquals(NULL_LONG, sum((${pt.primitive}[]) null));
assertEquals(NULL_LONG, sum(new ${pt.primitive}[]{}));
assertEquals(NULL_LONG, sum(new ${pt.primitive}[]{${pt.null}, ${pt.null}}));
</#if>
}

Expand Down
Loading