This is an automated email from the ASF dual-hosted git repository.
adarshsanjeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new ddd2299272f Add null check for VarianceAggregatorCollector
ddd2299272f is described below
commit ddd2299272fab5d6e1fcace796f42c9a5050e1be
Author: Adarsh Sanjeev <[email protected]>
AuthorDate: Mon Dec 4 22:26:44 2023 +0530
Add null check for VarianceAggregatorCollector
---
.../query/aggregation/variance/VarianceAggregatorCollector.java | 5 ++++-
.../aggregation/variance/VarianceAggregatorCollectorTest.java | 8 ++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git
a/extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/VarianceAggregatorCollector.java
b/extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/VarianceAggregatorCollector.java
index 6526a86aa86..365006734a0 100644
---
a/extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/VarianceAggregatorCollector.java
+++
b/extensions-core/stats/src/main/java/org/apache/druid/query/aggregation/variance/VarianceAggregatorCollector.java
@@ -91,8 +91,11 @@ public class VarianceAggregatorCollector
this.sum += other.sum;
}
- static Object combineValues(Object lhs, @Nullable Object rhs)
+ static Object combineValues(@Nullable Object lhs, @Nullable Object rhs)
{
+ if (lhs == null) {
+ return rhs;
+ }
((VarianceAggregatorCollector) lhs).fold((VarianceAggregatorCollector)
rhs);
return lhs;
}
diff --git
a/extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceAggregatorCollectorTest.java
b/extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceAggregatorCollectorTest.java
index d8261dd5b19..435e156edc3 100644
---
a/extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceAggregatorCollectorTest.java
+++
b/extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceAggregatorCollectorTest.java
@@ -173,6 +173,14 @@ public class VarianceAggregatorCollectorTest extends
InitializedNullHandlingTest
Assert.assertEquals(0, VarianceAggregatorCollector.COMPARATOR.compare(v1,
v2));
}
+ @Test
+ public void testNullCollectors()
+ {
+ VarianceAggregatorCollector collector =
+ (VarianceAggregatorCollector)
VarianceAggregatorCollector.combineValues(null, null);
+ Assert.assertNull(collector);
+ }
+
private static class FloatHandOver extends TestFloatColumnSelector
{
float v;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
