Skip to content

[feature](agg) add aggregate function sum0 #32541

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
morrySnow merged 7 commits into from
Mar 28, 2024
Merged

[feature](agg) add aggregate function sum0 #32541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
471958c
add aggregate function sum0
xiedeyantu Mar 20, 2024
62ec71e
Update fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expres…
xiedeyantu Mar 22, 2024
5eda420
add
xiedeyantu Mar 22, 2024
a2800b3
add multi_distinct_sum0
xiedeyantu Mar 22, 2024
6c9a119
fix style
xiedeyantu Mar 23, 2024
d6cf2fd
add test
xiedeyantu Mar 26, 2024
8757f52
add .out file
xiedeyantu Mar 27, 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
2 changes: 2 additions & 0 deletions be/src/vec/aggregate_functions/aggregate_function_simple_factory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ void register_aggregate_function_combinator_distinct(AggregateFunctionSimpleFact
void register_aggregate_function_combinator_foreach(AggregateFunctionSimpleFactory& factory);

void register_aggregate_function_sum(AggregateFunctionSimpleFactory& factory);
void register_aggregate_function_sum0(AggregateFunctionSimpleFactory& factory);
void register_aggregate_function_minmax(AggregateFunctionSimpleFactory& factory);
void register_aggregate_function_min_by(AggregateFunctionSimpleFactory& factory);
void register_aggregate_function_max_by(AggregateFunctionSimpleFactory& factory);
Expand Down Expand Up @@ -70,6 +71,7 @@ AggregateFunctionSimpleFactory& AggregateFunctionSimpleFactory::instance() {
static AggregateFunctionSimpleFactory instance;
std::call_once(oc, [&]() {
register_aggregate_function_sum(instance);
register_aggregate_function_sum0(instance);
register_aggregate_function_minmax(instance);
register_aggregate_function_min_by(instance);
register_aggregate_function_max_by(instance);
Expand Down
4 changes: 4 additions & 0 deletions be/src/vec/aggregate_functions/aggregate_function_sum.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,8 @@ void register_aggregate_function_sum(AggregateFunctionSimpleFactory& factory) {
"sum_decimal256", creator_with_type::creator<AggregateFunctionSumSimpleDecimal256>);
}

void register_aggregate_function_sum0(AggregateFunctionSimpleFactory& factory) {
factory.register_function_both("sum0", creator_with_type::creator<AggregateFunctionSumSimple>);
}

} // namespace doris::vectorized
4 changes: 4 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/catalog/BuiltinAggregateFunctions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import org.apache.doris.nereids.trees.expressions.functions.agg.MultiDistinctCount;
import org.apache.doris.nereids.trees.expressions.functions.agg.MultiDistinctGroupConcat;
import org.apache.doris.nereids.trees.expressions.functions.agg.MultiDistinctSum;
import org.apache.doris.nereids.trees.expressions.functions.agg.MultiDistinctSum0;
import org.apache.doris.nereids.trees.expressions.functions.agg.Ndv;
import org.apache.doris.nereids.trees.expressions.functions.agg.OrthogonalBitmapIntersect;
import org.apache.doris.nereids.trees.expressions.functions.agg.OrthogonalBitmapIntersectCount;
Expand All @@ -64,6 +65,7 @@
import org.apache.doris.nereids.trees.expressions.functions.agg.Stddev;
import org.apache.doris.nereids.trees.expressions.functions.agg.StddevSamp;
import org.apache.doris.nereids.trees.expressions.functions.agg.Sum;
import org.apache.doris.nereids.trees.expressions.functions.agg.Sum0;
import org.apache.doris.nereids.trees.expressions.functions.agg.TopN;
import org.apache.doris.nereids.trees.expressions.functions.agg.TopNArray;
import org.apache.doris.nereids.trees.expressions.functions.agg.TopNWeighted;
Expand Down Expand Up @@ -118,6 +120,7 @@ public class BuiltinAggregateFunctions implements FunctionHelper {
agg(MultiDistinctCount.class, "multi_distinct_count"),
agg(MultiDistinctGroupConcat.class, "multi_distinct_group_concat"),
agg(MultiDistinctSum.class, "multi_distinct_sum"),
agg(MultiDistinctSum0.class, "multi_distinct_sum0"),
agg(Ndv.class, "approx_count_distinct", "ndv"),
agg(OrthogonalBitmapIntersect.class, "orthogonal_bitmap_intersect"),
agg(OrthogonalBitmapIntersectCount.class, "orthogonal_bitmap_intersect_count"),
Expand All @@ -132,6 +135,7 @@ public class BuiltinAggregateFunctions implements FunctionHelper {
agg(Stddev.class, "stddev_pop", "stddev"),
agg(StddevSamp.class, "stddev_samp"),
agg(Sum.class, "sum"),
agg(Sum0.class, "sum0"),
agg(TopN.class, "topn"),
agg(TopNArray.class, "topn_array"),
agg(TopNWeighted.class, "topn_weighted"),
Expand Down
109 changes: 85 additions & 24 deletions fe/fe-core/src/main/java/org/apache/doris/catalog/FunctionSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;

public class FunctionSet<T> {
Expand Down Expand Up @@ -924,6 +925,17 @@ private void initAggregateBuiltins() {
// sum in multi distinct
if (t.equals(Type.BIGINT) || t.equals(Type.LARGEINT) || t.equals(Type.DOUBLE)) {
addBuiltin(AggregateFunction.createBuiltin("multi_distinct_sum", Lists.newArrayList(t),
t,
t,
"",
"",
"",
"",
null,
null,
"",
false, true, false, true));
addBuiltin(AggregateFunction.createBuiltin("multi_distinct_sum0", Lists.newArrayList(t),
t,
t,
"",
Expand All @@ -937,6 +949,17 @@ private void initAggregateBuiltins() {
} else if (t.equals(Type.MAX_DECIMALV2_TYPE)) {
// vectorized
addBuiltin(AggregateFunction.createBuiltin("multi_distinct_sum", Lists.newArrayList(t),
MULTI_DISTINCT_SUM_RETURN_TYPE.get(t),
Type.MAX_DECIMALV2_TYPE,
"",
"",
"",
"",
null,
null,
"",
false, true, false, true));
addBuiltin(AggregateFunction.createBuiltin("multi_distinct_sum0", Lists.newArrayList(t),
MULTI_DISTINCT_SUM_RETURN_TYPE.get(t),
Type.MAX_DECIMALV2_TYPE,
"",
Expand All @@ -950,6 +973,17 @@ private void initAggregateBuiltins() {
} else if (t.equals(Type.DECIMAL32)) {
// vectorized
addBuiltin(AggregateFunction.createBuiltin("multi_distinct_sum", Lists.newArrayList(t),
MULTI_DISTINCT_SUM_RETURN_TYPE.get(t),
Type.DECIMAL32,
"",
"",
"",
"",
null,
null,
"",
false, true, false, true));
addBuiltin(AggregateFunction.createBuiltin("multi_distinct_sum0", Lists.newArrayList(t),
MULTI_DISTINCT_SUM_RETURN_TYPE.get(t),
Type.DECIMAL32,
"",
Expand All @@ -962,6 +996,17 @@ private void initAggregateBuiltins() {
false, true, true, true));
} else if (t.equals(Type.DECIMAL64)) {
addBuiltin(AggregateFunction.createBuiltin("multi_distinct_sum", Lists.newArrayList(t),
MULTI_DISTINCT_SUM_RETURN_TYPE.get(t),
Type.DECIMAL64,
"",
"",
"",
"",
null,
null,
"",
false, true, false, true));
addBuiltin(AggregateFunction.createBuiltin("multi_distinct_sum0", Lists.newArrayList(t),
MULTI_DISTINCT_SUM_RETURN_TYPE.get(t),
Type.DECIMAL64,
"",
Expand All @@ -974,6 +1019,17 @@ private void initAggregateBuiltins() {
false, true, true, true));
} else if (t.equals(Type.DECIMAL128)) {
addBuiltin(AggregateFunction.createBuiltin("multi_distinct_sum", Lists.newArrayList(t),
MULTI_DISTINCT_SUM_RETURN_TYPE.get(t),
Type.DECIMAL128,
"",
"",
"",
"",
null,
null,
"",
false, true, false, true));
addBuiltin(AggregateFunction.createBuiltin("multi_distinct_sum0", Lists.newArrayList(t),
MULTI_DISTINCT_SUM_RETURN_TYPE.get(t),
Type.DECIMAL128,
"",
Expand Down Expand Up @@ -1174,86 +1230,91 @@ private void initAggregateBuiltins() {
}

// Sum
String []sumNames = {"sum", "sum_distinct"};
for (String name : sumNames) {
addBuiltin(AggregateFunction.createBuiltin(name,
// functionName(String) -> returnsNonNullOnEmpty(Boolean)
Map<String, Boolean> sumNames = ImmutableMap.of(
"sum", false,
"sum_distinct", false,
"sum0", true
);
for (Entry<String, Boolean> nameWithReturn : sumNames.entrySet()) {
addBuiltin(AggregateFunction.createBuiltin(nameWithReturn.getKey(),
Lists.<Type>newArrayList(Type.BOOLEAN), Type.BIGINT, Type.BIGINT, "",
"",
"",
null, null,
"",
null, false, true, false, true));
null, false, true, nameWithReturn.getValue(), true));

addBuiltin(AggregateFunction.createBuiltin(name,
addBuiltin(AggregateFunction.createBuiltin(nameWithReturn.getKey(),
Lists.<Type>newArrayList(Type.TINYINT), Type.BIGINT, Type.BIGINT, "",
"",
"",
null, null,
"",
null, false, true, false, true));
addBuiltin(AggregateFunction.createBuiltin(name,
null, false, true, nameWithReturn.getValue(), true));
addBuiltin(AggregateFunction.createBuiltin(nameWithReturn.getKey(),
Lists.<Type>newArrayList(Type.SMALLINT), Type.BIGINT, Type.BIGINT, "",
"",
"",
null, null,
"",
null, false, true, false, true));
addBuiltin(AggregateFunction.createBuiltin(name,
null, false, true, nameWithReturn.getValue(), true));
addBuiltin(AggregateFunction.createBuiltin(nameWithReturn.getKey(),
Lists.<Type>newArrayList(Type.INT), Type.BIGINT, Type.BIGINT, "",
"",
"",
null, null,
"",
null, false, true, false, true));
addBuiltin(AggregateFunction.createBuiltin(name,
null, false, true, nameWithReturn.getValue(), true));
addBuiltin(AggregateFunction.createBuiltin(nameWithReturn.getKey(),
Lists.<Type>newArrayList(Type.BIGINT), Type.BIGINT, Type.BIGINT, "",
"",
"",
null, null,
"",
null, false, true, false, true));
addBuiltin(AggregateFunction.createBuiltin(name,
null, false, true, nameWithReturn.getValue(), true));
addBuiltin(AggregateFunction.createBuiltin(nameWithReturn.getKey(),
Lists.<Type>newArrayList(Type.DOUBLE), Type.DOUBLE, Type.DOUBLE, "",
"",
"",
null, null,
"",
null, false, true, false, true));
addBuiltin(AggregateFunction.createBuiltin(name,
null, false, true, nameWithReturn.getValue(), true));
addBuiltin(AggregateFunction.createBuiltin(nameWithReturn.getKey(),
Lists.<Type>newArrayList(Type.MAX_DECIMALV2_TYPE), Type.MAX_DECIMALV2_TYPE, Type.MAX_DECIMALV2_TYPE, "",
"",
"",
null, null,
"",
null, false, true, false, true));
addBuiltin(AggregateFunction.createBuiltin(name,
null, false, true, nameWithReturn.getValue(), true));
addBuiltin(AggregateFunction.createBuiltin(nameWithReturn.getKey(),
Lists.<Type>newArrayList(Type.DECIMAL32), ScalarType.DECIMAL128, Type.DECIMAL128, "",
"",
"",
null, null,
"",
null, false, true, false, true));
addBuiltin(AggregateFunction.createBuiltin(name,
null, false, true, nameWithReturn.getValue(), true));
addBuiltin(AggregateFunction.createBuiltin(nameWithReturn.getKey(),
Lists.<Type>newArrayList(Type.DECIMAL64), Type.DECIMAL128, Type.DECIMAL128, "",
"",
"",
null, null,
"",
null, false, true, false, true));
addBuiltin(AggregateFunction.createBuiltin(name,
null, false, true, nameWithReturn.getValue(), true));
addBuiltin(AggregateFunction.createBuiltin(nameWithReturn.getKey(),
Lists.<Type>newArrayList(Type.DECIMAL128), Type.DECIMAL128, Type.DECIMAL128, "",
"",
"",
null, null,
"",
null, false, true, false, true));
addBuiltin(AggregateFunction.createBuiltin(name,
null, false, true, nameWithReturn.getValue(), true));
addBuiltin(AggregateFunction.createBuiltin(nameWithReturn.getKey(),
Lists.<Type>newArrayList(Type.LARGEINT), Type.LARGEINT, Type.LARGEINT, "",
"",
"",
null, null,
"",
null, false, true, false, true));
null, false, true, nameWithReturn.getValue(), true));
}

Type[] types = {Type.SMALLINT, Type.TINYINT, Type.INT, Type.BIGINT, Type.FLOAT, Type.DOUBLE, Type.CHAR,
Expand Down
82 changes: 82 additions & 0 deletions ...main/java/org/apache/doris/nereids/trees/expressions/functions/agg/MultiDistinctSum0.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

package org.apache.doris.nereids.trees.expressions.functions.agg;

import org.apache.doris.catalog.FunctionSignature;
import org.apache.doris.nereids.exceptions.AnalysisException;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.expressions.functions.AlwaysNotNullable;
import org.apache.doris.nereids.trees.expressions.functions.ComputePrecisionForSum;
import org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature;
import org.apache.doris.nereids.trees.expressions.shape.UnaryExpression;
import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
import org.apache.doris.nereids.types.BigIntType;
import org.apache.doris.nereids.types.DoubleType;
import org.apache.doris.nereids.types.LargeIntType;

import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;

import java.util.List;

/** MultiDistinctSum0 */
public class MultiDistinctSum0 extends AggregateFunction implements UnaryExpression,
ExplicitlyCastableSignature, ComputePrecisionForSum, MultiDistinction, AlwaysNotNullable {

public static final List<FunctionSignature> SIGNATURES = ImmutableList.of(
FunctionSignature.ret(BigIntType.INSTANCE).varArgs(BigIntType.INSTANCE),
FunctionSignature.ret(BigIntType.INSTANCE).varArgs(DoubleType.INSTANCE),
FunctionSignature.ret(BigIntType.INSTANCE).varArgs(LargeIntType.INSTANCE)
);

public MultiDistinctSum0(Expression arg0) {
super("multi_distinct_sum0", true, arg0);
}

public MultiDistinctSum0(boolean distinct, Expression arg0) {
super("multi_distinct_sum0", true, arg0);
}

@Override
public void checkLegalityBeforeTypeCoercion() {
if (child().getDataType().isDateLikeType()) {
throw new AnalysisException("Sum0 in multi distinct functions do not support Date/Datetime type");
}
}

@Override
public List<FunctionSignature> getSignatures() {
return new Sum0(getArgument(0)).getSignatures();
}

@Override
public FunctionSignature searchSignature(List<FunctionSignature> signatures) {
return new Sum0(getArgument(0)).searchSignature(signatures);
}

@Override
public MultiDistinctSum0 withDistinctAndChildren(boolean distinct, List<Expression> children) {
Preconditions.checkArgument(children.size() == 1);
return new MultiDistinctSum0(distinct, children.get(0));
}

@Override
public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
return visitor.visitMultiDistinctSum0(this, context);
}
}
Loading