Skip to content

[native] Add TestAggregations to native-tests #24809

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

Merged
pramodsatya merged 4 commits into from
Jun 13, 2025
Merged

[native] Add TestAggregations to native-tests #24809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
714dda6
Remove overriden testcase testCountDistinct
pramodsatya Mar 26, 2025
a63be7d
Parameterize aggregation tests to support DWRF
pramodsatya Apr 25, 2025
636fbd3
Add QDigest, TDigest to supported native types
pramodsatya Jun 11, 2025
ba58f18
[native] Add TestAggregations to native-tests
pramodsatya Mar 26, 2025
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
11 changes: 5 additions & 6 deletions ...java/com/facebook/presto/sql/planner/optimizations/OptimizeMixedDistinctAggregations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
package com.facebook.presto.sql.planner.optimizations;

import com.facebook.presto.Session;
import com.facebook.presto.common.QualifiedObjectName;
import com.facebook.presto.metadata.Metadata;
import com.facebook.presto.spi.VariableAllocator;
import com.facebook.presto.spi.WarningCollector;
import com.facebook.presto.spi.function.FunctionHandle;
import com.facebook.presto.spi.function.StandardFunctionResolution;
import com.facebook.presto.spi.plan.AggregationNode;
import com.facebook.presto.spi.plan.AggregationNode.Aggregation;
Expand Down Expand Up @@ -51,7 +51,6 @@
import static com.facebook.presto.common.function.OperatorType.EQUAL;
import static com.facebook.presto.common.type.BigintType.BIGINT;
import static com.facebook.presto.common.type.BooleanType.BOOLEAN;
import static com.facebook.presto.metadata.BuiltInTypeAndFunctionNamespaceManager.JAVA_BUILTIN_NAMESPACE;
import static com.facebook.presto.spi.plan.AggregationNode.Step.SINGLE;
import static com.facebook.presto.spi.plan.AggregationNode.singleGroupingSet;
import static com.facebook.presto.spi.plan.ProjectNode.Locality.LOCAL;
Expand Down Expand Up @@ -214,10 +213,10 @@ public PlanNode visitAggregation(AggregationNode node, RewriteContext<Optional<A
Optional.empty(),
false,
Optional.empty());
QualifiedObjectName functionName = metadata.getFunctionAndTypeManager().getFunctionMetadata(entry.getValue().getFunctionHandle()).getName();
if (functionName.equals(QualifiedObjectName.valueOf(JAVA_BUILTIN_NAMESPACE, "count")) ||
functionName.equals(QualifiedObjectName.valueOf(JAVA_BUILTIN_NAMESPACE, "count_if")) ||
functionName.equals(QualifiedObjectName.valueOf(JAVA_BUILTIN_NAMESPACE, "approx_distinct"))) {
FunctionHandle functionHandle = entry.getValue().getFunctionHandle();
if (functionResolution.isCountFunction(functionHandle) ||
functionResolution.isCountIfFunction(functionHandle) ||
functionResolution.isApproximateCountDistinctFunction(functionHandle)) {
VariableReferenceExpression newVariable = variableAllocator.newVariable(entry.getValue().getCall().getSourceLocation(), "expr", entry.getKey().getType());
aggregations.put(newVariable, aggregation);
coalesceVariablesBuilder.put(newVariable, entry.getKey());
Expand Down
6 changes: 6 additions & 0 deletions presto-main-base/src/main/java/com/facebook/presto/sql/relational/FunctionResolution.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,12 @@ public boolean isCountFunction(FunctionHandle functionHandle)
return functionAndTypeResolver.getFunctionMetadata(functionHandle).getName().equals(functionAndTypeResolver.qualifyObjectName(QualifiedName.of("count")));
}

@Override
public boolean isCountIfFunction(FunctionHandle functionHandle)
{
return functionAndTypeResolver.getFunctionMetadata(functionHandle).getName().equals(functionAndTypeResolver.qualifyObjectName(QualifiedName.of("count_if")));
}

@Override
public FunctionHandle countFunction()
{
Expand Down
6 changes: 6 additions & 0 deletions ...xecution/src/test/java/com/facebook/presto/nativeworker/PrestoNativeQueryRunnerUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,12 @@ public HiveQueryRunnerBuilder setExtraProperties(Map<String, String> extraProper
return this;
}

public HiveQueryRunnerBuilder setExtraCoordinatorProperties(Map<String, String> extraCoordinatorProperties)
{
this.extraCoordinatorProperties.putAll(extraCoordinatorProperties);
return this;
}

public HiveQueryRunnerBuilder setHiveProperties(Map<String, String> hiveProperties)
{
this.hiveProperties.putAll(hiveProperties);
Expand Down
4 changes: 4 additions & 0 deletions ...decar-plugin/src/main/java/com/facebook/presto/sidecar/typemanager/NativeTypeManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,11 @@
import static com.facebook.presto.common.type.StandardTypes.IPPREFIX;
import static com.facebook.presto.common.type.StandardTypes.JSON;
import static com.facebook.presto.common.type.StandardTypes.MAP;
import static com.facebook.presto.common.type.StandardTypes.QDIGEST;
import static com.facebook.presto.common.type.StandardTypes.REAL;
import static com.facebook.presto.common.type.StandardTypes.ROW;
import static com.facebook.presto.common.type.StandardTypes.SMALLINT;
import static com.facebook.presto.common.type.StandardTypes.TDIGEST;
import static com.facebook.presto.common.type.StandardTypes.TIMESTAMP;
import static com.facebook.presto.common.type.StandardTypes.TIMESTAMP_WITH_TIME_ZONE;
import static com.facebook.presto.common.type.StandardTypes.TINYINT;
Expand Down Expand Up @@ -101,7 +103,9 @@ public class NativeTypeManager
ARRAY,
DECIMAL,
MAP,
QDIGEST,
ROW,
TDIGEST,
FunctionType.NAME);

private final TypeManager typeManager;
Expand Down
Loading
Loading