Skip to content

[multistage] Fix count to return 0 when intermediate result is null #18471

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

Open
dang-stripe wants to merge 8 commits into
base: master
Choose a base branch
from
Open

[multistage] Fix count to return 0 when intermediate result is null #18471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
620ccb7
Fix CountAggregationFunction.extractFinalResult returning null instea…
dang-stripe May 12, 2026
176ce09
Add TODO for MSE broker-side short-circuit when all segments are pruned
dang-stripe May 12, 2026
1d1d7be
Pre-initialize MSE merge result holder with identity values for prune…
dang-stripe May 12, 2026
cfba92c
Add null guards to Covariance, IdSet, and AnyValue extractFinalResult
dang-stripe May 12, 2026
9513da5
Revert "Pre-initialize MSE merge result holder with identity values f…
dang-stripe May 12, 2026
9371346
revert to only the count agg change
dang-stripe May 20, 2026
2158f68
add test
dang-stripe May 20, 2026
b59d560
empty commit to trigger CI
dang-stripe May 20, 2026
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
5 changes: 3 additions & 2 deletions .../main/java/org/apache/pinot/core/query/aggregation/function/CountAggregationFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
import javax.annotation.Nullable;
import org.apache.pinot.common.request.context.ExpressionContext;
import org.apache.pinot.common.utils.DataSchema.ColumnDataType;
import org.apache.pinot.core.common.BlockValSet;
Expand Down Expand Up @@ -204,8 +205,8 @@ public ColumnDataType getFinalResultColumnType() {
}

@Override
public Long extractFinalResult(Long intermediateResult) {
return intermediateResult;
public Long extractFinalResult(@Nullable Long intermediateResult) {
return intermediateResult != null ? intermediateResult : 0L;
}

@Override
Expand Down
12 changes: 12 additions & 0 deletions ...t/java/org/apache/pinot/core/query/aggregation/function/CountAggregationFunctionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,16 @@

package org.apache.pinot.core.query.aggregation.function;

import java.util.List;
import org.apache.pinot.common.request.context.ExpressionContext;
import org.apache.pinot.queries.FluentQueryTest;
import org.apache.pinot.spi.data.FieldSpec;
import org.apache.pinot.spi.data.Schema;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;

import static org.testng.Assert.assertEquals;


public class CountAggregationFunctionTest extends AbstractAggregationFunctionTest {

Expand Down Expand Up @@ -234,6 +238,14 @@ public void countGroupByMV() {
);
}

@Test
public void testExtractFinalResultReturnsZeroForNull() {
CountAggregationFunction function =
new CountAggregationFunction(List.of(ExpressionContext.forIdentifier("col")), false);
assertEquals(function.extractFinalResult(null), Long.valueOf(0L));
assertEquals(function.extractFinalResult(5L), Long.valueOf(5L));
}

@DataProvider(name = "nullHandlingEnabled")
public Object[][] nullHandlingEnabled() {
return new Object[][]{
Expand Down
Loading