Skip to content

Commit 42317b3

Browse files
committed
[Bug-Fix] Add function addBuiltinBothScalaAndVectorized to replace addBuiltin to fix (apache#31)
the bug of expr analyze exception
1 parent 04f336f commit 42317b3

6 files changed

Lines changed: 52 additions & 18 deletions

File tree

‎fe/fe-core/src/main/java/org/apache/doris/analysis/ArithmeticExpr.java‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,26 +95,30 @@ public boolean isBinary() {
9595

9696
public static void initBuiltins(FunctionSet functionSet) {
9797
for (Type t : Type.getNumericTypes()) {
98-
functionSet.addBuiltin(ScalarFunction.createBuiltinOperator(
98+
functionSet.addBuiltinBothScalaAndVectorized(ScalarFunction.createBuiltinOperator(
9999
Operator.MULTIPLY.getName(), Lists.newArrayList(t, t), t));
100-
functionSet.addBuiltin(ScalarFunction.createBuiltinOperator(
100+
functionSet.addBuiltinBothScalaAndVectorized(ScalarFunction.createBuiltinOperator(
101101
Operator.ADD.getName(), Lists.newArrayList(t, t), t));
102-
functionSet.addBuiltin(ScalarFunction.createBuiltinOperator(
102+
functionSet.addBuiltinBothScalaAndVectorized(ScalarFunction.createBuiltinOperator(
103103
Operator.SUBTRACT.getName(), Lists.newArrayList(t, t), t));
104104
}
105-
functionSet.addBuiltin(ScalarFunction.createBuiltinOperator(
105+
functionSet.addBuiltinBothScalaAndVectorized(ScalarFunction.createBuiltinOperator(
106106
Operator.DIVIDE.getName(),
107107
Lists.<Type>newArrayList(Type.DOUBLE, Type.DOUBLE),
108108
Type.DOUBLE));
109-
functionSet.addBuiltin(ScalarFunction.createBuiltinOperator(
109+
functionSet.addBuiltinBothScalaAndVectorized(ScalarFunction.createBuiltinOperator(
110+
Operator.DIVIDE.getName(),
111+
Lists.<Type>newArrayList(Type.DECIMAL, Type.DECIMAL),
112+
Type.DECIMAL));
113+
functionSet.addBuiltinBothScalaAndVectorized(ScalarFunction.createBuiltinOperator(
110114
Operator.DIVIDE.getName(),
111115
Lists.<Type>newArrayList(Type.DECIMALV2, Type.DECIMALV2),
112116
Type.DECIMALV2));
113117

114118
// MOD(), FACTORIAL(), BITAND(), BITOR(), BITXOR(), and BITNOT() are registered as
115119
// builtins, see palo_functions.py
116120
for (Type t : Type.getIntegerTypes()) {
117-
functionSet.addBuiltin(ScalarFunction.createBuiltinOperator(
121+
functionSet.addBuiltinBothScalaAndVectorized(ScalarFunction.createBuiltinOperator(
118122
Operator.INT_DIVIDE.getName(), Lists.newArrayList(t, t), t));
119123
}
120124
}

‎fe/fe-core/src/main/java/org/apache/doris/analysis/BinaryPredicate.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -170,19 +170,19 @@ protected BinaryPredicate(BinaryPredicate other) {
170170
public static void initBuiltins(FunctionSet functionSet) {
171171
for (Type t: Type.getSupportedTypes()) {
172172
if (t.isNull()) continue; // NULL is handled through type promotion.
173-
functionSet.addBuiltin(ScalarFunction.createBuiltinOperator(
173+
functionSet.addBuiltinBothScalaAndVectorized(ScalarFunction.createBuiltinOperator(
174174
Operator.EQ.getName(), Lists.newArrayList(t, t), Type.BOOLEAN));
175-
functionSet.addBuiltin(ScalarFunction.createBuiltinOperator(
175+
functionSet.addBuiltinBothScalaAndVectorized(ScalarFunction.createBuiltinOperator(
176176
Operator.NE.getName(), Lists.newArrayList(t, t), Type.BOOLEAN));
177-
functionSet.addBuiltin(ScalarFunction.createBuiltinOperator(
177+
functionSet.addBuiltinBothScalaAndVectorized(ScalarFunction.createBuiltinOperator(
178178
Operator.LE.getName(), Lists.newArrayList(t, t), Type.BOOLEAN));
179-
functionSet.addBuiltin(ScalarFunction.createBuiltinOperator(
179+
functionSet.addBuiltinBothScalaAndVectorized(ScalarFunction.createBuiltinOperator(
180180
Operator.GE.getName(), Lists.newArrayList(t, t), Type.BOOLEAN));
181-
functionSet.addBuiltin(ScalarFunction.createBuiltinOperator(
181+
functionSet.addBuiltinBothScalaAndVectorized(ScalarFunction.createBuiltinOperator(
182182
Operator.LT.getName(), Lists.newArrayList(t, t), Type.BOOLEAN));
183-
functionSet.addBuiltin(ScalarFunction.createBuiltinOperator(
183+
functionSet.addBuiltinBothScalaAndVectorized(ScalarFunction.createBuiltinOperator(
184184
Operator.GT.getName(), Lists.newArrayList(t, t), Type.BOOLEAN));
185-
functionSet.addBuiltin(ScalarFunction.createBuiltinOperator(
185+
functionSet.addBuiltinBothScalaAndVectorized(ScalarFunction.createBuiltinOperator(
186186
Operator.EQ_FOR_NULL.getName(), Lists.newArrayList(t, t), Type.BOOLEAN));
187187
}
188188
}

‎fe/fe-core/src/main/java/org/apache/doris/analysis/CastExpr.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public static void initBuiltins(FunctionSet functionSet) {
120120
}
121121
String beSymbol = "doris::" + beClass + "::cast_to_"
122122
+ typeName;
123-
functionSet.addBuiltin(ScalarFunction.createBuiltin(getFnName(toType),
123+
functionSet.addBuiltinBothScalaAndVectorized(ScalarFunction.createBuiltin(getFnName(toType),
124124
Lists.newArrayList(fromType), false, toType, beSymbol, null, null, true));
125125
}
126126
}

‎fe/fe-core/src/main/java/org/apache/doris/analysis/CompoundPredicate.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ public class CompoundPredicate extends Predicate {
4242
private final Operator op;
4343

4444
public static void initBuiltins(FunctionSet functionSet) {
45-
functionSet.addBuiltin(ScalarFunction.createBuiltinOperator(
45+
functionSet.addBuiltinBothScalaAndVectorized(ScalarFunction.createBuiltinOperator(
4646
Operator.AND.toString(), Lists.newArrayList(Type.BOOLEAN, Type.BOOLEAN), Type.BOOLEAN));
47-
functionSet.addBuiltin(ScalarFunction.createBuiltinOperator(
47+
functionSet.addBuiltinBothScalaAndVectorized(ScalarFunction.createBuiltinOperator(
4848
Operator.OR.toString(), Lists.newArrayList(Type.BOOLEAN, Type.BOOLEAN), Type.BOOLEAN));
49-
functionSet.addBuiltin(ScalarFunction.createBuiltinOperator(
49+
functionSet.addBuiltinBothScalaAndVectorized(ScalarFunction.createBuiltinOperator(
5050
Operator.NOT.toString(), Lists.newArrayList(Type.BOOLEAN), Type.BOOLEAN));
5151
}
5252

‎fe/fe-core/src/main/java/org/apache/doris/catalog/Function.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ public List<Comparable> getInfo(boolean isVerbose) {
724724
return row;
725725
}
726726

727-
public boolean isVectorized() {
727+
boolean isVectorized() {
728728
return vectorized;
729729
}
730730
}

‎fe/fe-core/src/main/java/org/apache/doris/catalog/FunctionSet.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
package org.apache.doris.catalog;
1919

20+
import com.google.common.base.Preconditions;
2021
import org.apache.doris.analysis.ArithmeticExpr;
2122
import org.apache.doris.analysis.BinaryPredicate;
2223
import org.apache.doris.analysis.CastExpr;
@@ -76,6 +77,7 @@ public void init() {
7677
BinaryPredicate.initBuiltins(this);
7778
CompoundPredicate.initBuiltins(this);
7879
CastExpr.initBuiltins(this);
80+
7981
IsNullPredicate.initBuiltins(this);
8082
ScalarBuiltins.initBuiltins(this);
8183
LikePredicate.initBuiltins(this);
@@ -1010,6 +1012,34 @@ public void addBuiltin(Function fn) {
10101012
addFunction(fn, true);
10111013
}
10121014

1015+
/**
1016+
* Adds a function both in FunctionSet and VecFunctionSet to this database.
1017+
* The function must not already exist and need to be not vectorized
1018+
*/
1019+
public void addBuiltinBothScalaAndVectorized(Function fn) {
1020+
if (getFunction(fn, Function.CompareMode.IS_INDISTINGUISHABLE) != null) {
1021+
return;
1022+
}
1023+
Preconditions.checkState(!fn.isVectorized());
1024+
1025+
// add scala function
1026+
List<Function> fns = functions.get(fn.functionName());
1027+
if (fns == null) {
1028+
fns = Lists.newArrayList();
1029+
functions.put(fn.functionName(), fns);
1030+
}
1031+
fns.add(fn);
1032+
1033+
// add vectorized function
1034+
List<Function> vecFns = vectorizedFunctions.get(fn.functionName());
1035+
if (vecFns == null) {
1036+
vecFns = Lists.newArrayList();
1037+
vectorizedFunctions.put(fn.functionName(), vecFns);
1038+
}
1039+
vecFns.add(new Function(fn.getFunctionName(), fn.getArgs(), fn.getReturnType(), fn.hasVarArgs(), true));
1040+
}
1041+
1042+
10131043
public static final String COUNT = "count";
10141044
// Populate all the aggregate builtins in the catalog.
10151045
// null symbols indicate the function does not need that step of the evaluation.

0 commit comments

Comments
 (0)