This is an automated email from the ASF dual-hosted git repository.
jakevin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 3151d94e9e [fix](Nereids): fix Ceiling. (#16164)
3151d94e9e is described below
commit 3151d94e9e6f63d95bbeeadaf2b94d7b80f0a0e6
Author: jakevin <[email protected]>
AuthorDate: Sat Jan 28 20:26:20 2023 +0800
[fix](Nereids): fix Ceiling. (#16164)
---
.../doris/catalog/BuiltinScalarFunctions.java | 4 +-
.../expressions/functions/scalar/Ceiling.java | 69 ----------------------
.../expressions/visitor/ScalarFunctionVisitor.java | 5 --
.../nereids_function_p0/scalar_function/A-F.out | 17 ++++++
.../nereids_function_p0/scalar_function/A-F.groovy | 3 +-
5 files changed, 19 insertions(+), 79 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/catalog/BuiltinScalarFunctions.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/BuiltinScalarFunctions.java
index caf6fa48d0..baee16adaa 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/catalog/BuiltinScalarFunctions.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/catalog/BuiltinScalarFunctions.java
@@ -78,7 +78,6 @@ import
org.apache.doris.nereids.trees.expressions.functions.scalar.BitmapXorCoun
import org.apache.doris.nereids.trees.expressions.functions.scalar.Cardinality;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Cbrt;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Ceil;
-import org.apache.doris.nereids.trees.expressions.functions.scalar.Ceiling;
import
org.apache.doris.nereids.trees.expressions.functions.scalar.CharacterLength;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Coalesce;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Concat;
@@ -400,8 +399,7 @@ public class BuiltinScalarFunctions implements
FunctionHelper {
scalar(BitmapXorCount.class, "bitmap_xor_count"),
scalar(Cardinality.class, "cardinality"),
scalar(Cbrt.class, "cbrt"),
- scalar(Ceil.class, "ceil"),
- scalar(Ceiling.class, "ceiling"),
+ scalar(Ceil.class, "ceil", "ceiling"),
scalar(CharacterLength.class, "char_length", "character_length"),
scalar(Coalesce.class, "coalesce"),
scalar(Concat.class, "concat"),
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Ceiling.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Ceiling.java
deleted file mode 100644
index 44838a837e..0000000000
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Ceiling.java
+++ /dev/null
@@ -1,69 +0,0 @@
-// 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.scalar;
-
-import org.apache.doris.catalog.FunctionSignature;
-import org.apache.doris.nereids.trees.expressions.Expression;
-import
org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature;
-import org.apache.doris.nereids.trees.expressions.functions.PropagateNullable;
-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 com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
-
-import java.util.List;
-
-/**
- * ScalarFunction 'ceiling'. This class is generated by GenerateFunction.
- */
-public class Ceiling extends ScalarFunction
- implements UnaryExpression, ExplicitlyCastableSignature,
PropagateNullable {
-
- public static final List<FunctionSignature> SIGNATURES = ImmutableList.of(
-
FunctionSignature.ret(BigIntType.INSTANCE).args(DoubleType.INSTANCE)
- );
-
- /**
- * constructor with 1 argument.
- */
- public Ceiling(Expression arg) {
- super("ceiling", arg);
- }
-
- /**
- * withChildren.
- */
- @Override
- public Ceiling withChildren(List<Expression> children) {
- Preconditions.checkArgument(children.size() == 1);
- return new Ceiling(children.get(0));
- }
-
- @Override
- public List<FunctionSignature> getSignatures() {
- return SIGNATURES;
- }
-
- @Override
- public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
- return visitor.visitCeiling(this, context);
- }
-}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/visitor/ScalarFunctionVisitor.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/visitor/ScalarFunctionVisitor.java
index cd2841dc87..e6cadbc3f4 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/visitor/ScalarFunctionVisitor.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/visitor/ScalarFunctionVisitor.java
@@ -78,7 +78,6 @@ import
org.apache.doris.nereids.trees.expressions.functions.scalar.BitmapXorCoun
import org.apache.doris.nereids.trees.expressions.functions.scalar.Cardinality;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Cbrt;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Ceil;
-import org.apache.doris.nereids.trees.expressions.functions.scalar.Ceiling;
import
org.apache.doris.nereids.trees.expressions.functions.scalar.CharacterLength;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Coalesce;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Concat;
@@ -576,10 +575,6 @@ public interface ScalarFunctionVisitor<R, C> {
return visitScalarFunction(ceil, context);
}
- default R visitCeiling(Ceiling ceiling, C context) {
- return visitScalarFunction(ceiling, context);
- }
-
default R visitCharacterLength(CharacterLength characterLength, C context)
{
return visitScalarFunction(characterLength, context);
}
diff --git a/regression-test/data/nereids_function_p0/scalar_function/A-F.out
b/regression-test/data/nereids_function_p0/scalar_function/A-F.out
index 043d7ebf3a..3e408b1e97 100644
--- a/regression-test/data/nereids_function_p0/scalar_function/A-F.out
+++ b/regression-test/data/nereids_function_p0/scalar_function/A-F.out
@@ -424,6 +424,23 @@
77646.0
534635.0
+-- !sql --
+\N
+-35245.0
+-5325.0
+64.0
+88.0
+524.0
+535.0
+4236.0
+5437.0
+7346.0
+7347.0
+7569.0
+23524.0
+77646.0
+534635.0
+
-- !sql --
4
5
diff --git
a/regression-test/suites/nereids_function_p0/scalar_function/A-F.groovy
b/regression-test/suites/nereids_function_p0/scalar_function/A-F.groovy
index c3b8d3011f..1d1d722a12 100644
--- a/regression-test/suites/nereids_function_p0/scalar_function/A-F.groovy
+++ b/regression-test/suites/nereids_function_p0/scalar_function/A-F.groovy
@@ -81,8 +81,7 @@ suite("nereids_scalar_fn_1") {
// function bitmap_xor_count(bitmap, bitmap) is unsupported for the test suite.
qt_sql "select cbrt(kdbl) from fn_test order by kdbl"
qt_sql "select ceil(kdbl) from fn_test order by kdbl"
- // core
- // qt_sql "select ceiling(kdbl) from fn_test order by kdbl"
+ qt_sql "select ceiling(kdbl) from fn_test order by kdbl"
qt_sql "select character_length(kvchrs1) from fn_test order by kvchrs1"
qt_sql "select character_length(kstr) from fn_test order by kstr"
qt_sql "select coalesce(kbool) from fn_test order by kbool"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
