Skip to content

Commit 3151d94

Browse files
authored
[fix](Nereids): fix Ceiling. (#16164)
1 parent 8ca3aa8 commit 3151d94

File tree

5 files changed

+19
-79
lines changed

5 files changed

+19
-79
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
import org.apache.doris.nereids.trees.expressions.functions.scalar.Cardinality;
7979
import org.apache.doris.nereids.trees.expressions.functions.scalar.Cbrt;
8080
import org.apache.doris.nereids.trees.expressions.functions.scalar.Ceil;
81-
import org.apache.doris.nereids.trees.expressions.functions.scalar.Ceiling;
8281
import org.apache.doris.nereids.trees.expressions.functions.scalar.CharacterLength;
8382
import org.apache.doris.nereids.trees.expressions.functions.scalar.Coalesce;
8483
import org.apache.doris.nereids.trees.expressions.functions.scalar.Concat;
@@ -400,8 +399,7 @@ public class BuiltinScalarFunctions implements FunctionHelper {
400399
scalar(BitmapXorCount.class, "bitmap_xor_count"),
401400
scalar(Cardinality.class, "cardinality"),
402401
scalar(Cbrt.class, "cbrt"),
403-
scalar(Ceil.class, "ceil"),
404-
scalar(Ceiling.class, "ceiling"),
402+
scalar(Ceil.class, "ceil", "ceiling"),
405403
scalar(CharacterLength.class, "char_length", "character_length"),
406404
scalar(Coalesce.class, "coalesce"),
407405
scalar(Concat.class, "concat"),

fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Ceiling.java

Lines changed: 0 additions & 69 deletions
This file was deleted.

fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/visitor/ScalarFunctionVisitor.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
import org.apache.doris.nereids.trees.expressions.functions.scalar.Cardinality;
7979
import org.apache.doris.nereids.trees.expressions.functions.scalar.Cbrt;
8080
import org.apache.doris.nereids.trees.expressions.functions.scalar.Ceil;
81-
import org.apache.doris.nereids.trees.expressions.functions.scalar.Ceiling;
8281
import org.apache.doris.nereids.trees.expressions.functions.scalar.CharacterLength;
8382
import org.apache.doris.nereids.trees.expressions.functions.scalar.Coalesce;
8483
import org.apache.doris.nereids.trees.expressions.functions.scalar.Concat;
@@ -576,10 +575,6 @@ default R visitCeil(Ceil ceil, C context) {
576575
return visitScalarFunction(ceil, context);
577576
}
578577

579-
default R visitCeiling(Ceiling ceiling, C context) {
580-
return visitScalarFunction(ceiling, context);
581-
}
582-
583578
default R visitCharacterLength(CharacterLength characterLength, C context) {
584579
return visitScalarFunction(characterLength, context);
585580
}

regression-test/data/nereids_function_p0/scalar_function/A-F.out

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,23 @@
424424
77646.0
425425
534635.0
426426

427+
-- !sql --
428+
\N
429+
-35245.0
430+
-5325.0
431+
64.0
432+
88.0
433+
524.0
434+
535.0
435+
4236.0
436+
5437.0
437+
7346.0
438+
7347.0
439+
7569.0
440+
23524.0
441+
77646.0
442+
534635.0
443+
427444
-- !sql --
428445
4
429446
5

regression-test/suites/nereids_function_p0/scalar_function/A-F.groovy

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@ suite("nereids_scalar_fn_1") {
8181
// function bitmap_xor_count(bitmap, bitmap) is unsupported for the test suite.
8282
qt_sql "select cbrt(kdbl) from fn_test order by kdbl"
8383
qt_sql "select ceil(kdbl) from fn_test order by kdbl"
84-
// core
85-
// qt_sql "select ceiling(kdbl) from fn_test order by kdbl"
84+
qt_sql "select ceiling(kdbl) from fn_test order by kdbl"
8685
qt_sql "select character_length(kvchrs1) from fn_test order by kvchrs1"
8786
qt_sql "select character_length(kstr) from fn_test order by kstr"
8887
qt_sql "select coalesce(kbool) from fn_test order by kbool"

0 commit comments

Comments
 (0)