From 956e7c0ca0ba66903d85b6f88487afc3044e4ba5 Mon Sep 17 00:00:00 2001
From: Jitendra Kumar <14930630+jitendrakr88@users.noreply.github.com>
Date: Tue, 27 May 2025 13:39:06 +0530
Subject: [PATCH] [BugFix] Handling NPE in VarianceAggregationFunction merger

---
 .../function/VarianceAggregationFunction.java          | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/VarianceAggregationFunction.java b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/VarianceAggregationFunction.java
index 753c96219d62..ca398ba39977 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/VarianceAggregationFunction.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/query/aggregation/function/VarianceAggregationFunction.java
@@ -158,12 +158,10 @@ public VarianceTuple extractGroupByResult(GroupByResultHolder groupByResultHolde
 
   @Override
   public VarianceTuple merge(VarianceTuple intermediateResult1, VarianceTuple intermediateResult2) {
-    if (_nullHandlingEnabled) {
-      if (intermediateResult1 == null) {
-        return intermediateResult2;
-      } else if (intermediateResult2 == null) {
-        return intermediateResult1;
-      }
+    if (intermediateResult1 == null) {
+      return intermediateResult2;
+    } else if (intermediateResult2 == null) {
+      return intermediateResult1;
     }
     intermediateResult1.apply(intermediateResult2);
     return intermediateResult1;