This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 5969d6521f1 [branch-2.1](function) fix nereids fold constant wrong
result of abs (#37065) (#37108)
5969d6521f1 is described below
commit 5969d6521f1d0d6c321246142eaa7c3d2e7e0115
Author: zclllyybb <zhaochan...@selectdb.com>
AuthorDate: Wed Jul 3 11:58:06 2024 +0800
[branch-2.1](function) fix nereids fold constant wrong result of abs
(#37065) (#37108)
pick https://github.com/apache/doris/pull/37065
---
.../functions/executable/ExecutableFunctions.java | 8 +--
.../functions/ExecutableFunctionsTest.java | 64 ++++++++++++++++++++++
2 files changed, 68 insertions(+), 4 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/executable/ExecutableFunctions.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/executable/ExecutableFunctions.java
index aad56942f37..2e84542fd04 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/executable/ExecutableFunctions.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/executable/ExecutableFunctions.java
@@ -47,22 +47,22 @@ public class ExecutableFunctions {
*/
@ExecFunction(name = "abs", argTypes = {"TINYINT"}, returnType =
"SMALLINT")
public static Expression abs(TinyIntLiteral literal) {
- return new SmallIntLiteral((byte) Math.abs(literal.getValue()));
+ return new SmallIntLiteral((short) Math.abs(literal.getValue()));
}
@ExecFunction(name = "abs", argTypes = {"SMALLINT"}, returnType = "INT")
public static Expression abs(SmallIntLiteral literal) {
- return new IntegerLiteral((short) Math.abs(literal.getValue()));
+ return new IntegerLiteral(Math.abs(literal.getValue()));
}
@ExecFunction(name = "abs", argTypes = {"INT"}, returnType = "BIGINT")
public static Expression abs(IntegerLiteral literal) {
- return new BigIntLiteral(Math.abs(literal.getValue()));
+ return new BigIntLiteral(Math.abs((long) literal.getValue()));
}
@ExecFunction(name = "abs", argTypes = {"BIGINT"}, returnType = "LARGEINT")
public static Expression abs(BigIntLiteral literal) {
- return new LargeIntLiteral(new
BigInteger(Long.toString(Math.abs(literal.getValue()))));
+ return new
LargeIntLiteral(BigInteger.valueOf(literal.getValue()).abs());
}
@ExecFunction(name = "abs", argTypes = {"LARGEINT"}, returnType =
"LARGEINT")
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/expressions/functions/ExecutableFunctionsTest.java
b/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/expressions/functions/ExecutableFunctionsTest.java
new file mode 100644
index 00000000000..6c2e9f144be
--- /dev/null
+++
b/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/expressions/functions/ExecutableFunctionsTest.java
@@ -0,0 +1,64 @@
+// 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;
+
+import
org.apache.doris.nereids.trees.expressions.functions.executable.ExecutableFunctions;
+import org.apache.doris.nereids.trees.expressions.literal.BigIntLiteral;
+import org.apache.doris.nereids.trees.expressions.literal.IntegerLiteral;
+import org.apache.doris.nereids.trees.expressions.literal.LargeIntLiteral;
+import org.apache.doris.nereids.trees.expressions.literal.SmallIntLiteral;
+import org.apache.doris.nereids.trees.expressions.literal.TinyIntLiteral;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.math.BigInteger;
+
+public class ExecutableFunctionsTest {
+ @Test
+ void testAbsFunctions() {
+ TinyIntLiteral tinyInt1 = new TinyIntLiteral((byte) -128);
+ Assertions.assertEquals(new SmallIntLiteral((short) 128),
ExecutableFunctions.abs(tinyInt1));
+ TinyIntLiteral tinyInt2 = new TinyIntLiteral((byte) 127);
+ Assertions.assertEquals(new SmallIntLiteral((short) 127),
ExecutableFunctions.abs(tinyInt2));
+
+ SmallIntLiteral smallInt1 = new SmallIntLiteral((short) -32768);
+ Assertions.assertEquals(new IntegerLiteral(32768),
ExecutableFunctions.abs(smallInt1));
+ SmallIntLiteral smallInt2 = new SmallIntLiteral((short) 32767);
+ Assertions.assertEquals(new IntegerLiteral(32767),
ExecutableFunctions.abs(smallInt2));
+
+ IntegerLiteral int1 = new IntegerLiteral(-2147483648);
+ Assertions.assertEquals(new BigIntLiteral(2147483648L),
ExecutableFunctions.abs(int1));
+ IntegerLiteral int2 = new IntegerLiteral(2147483647);
+ Assertions.assertEquals(new BigIntLiteral(2147483647L),
ExecutableFunctions.abs(int2));
+
+ BigIntLiteral bigInt1 = new BigIntLiteral(-9223372036854775808L);
+ Assertions.assertEquals(new LargeIntLiteral(new
BigInteger("9223372036854775808")),
+ ExecutableFunctions.abs(bigInt1));
+ BigIntLiteral bigInt2 = new BigIntLiteral(9223372036854775807L);
+ Assertions.assertEquals(new LargeIntLiteral(new
BigInteger("9223372036854775807")),
+ ExecutableFunctions.abs(bigInt2));
+
+ LargeIntLiteral largeInt1 = new LargeIntLiteral(new
BigInteger("-170141183460469231731687303715884105728"));
+ Assertions.assertEquals(new LargeIntLiteral(new
BigInteger("170141183460469231731687303715884105728")),
+ ExecutableFunctions.abs(largeInt1));
+ LargeIntLiteral largeInt2 = new LargeIntLiteral(new
BigInteger("170141183460469231731687303715884105727"));
+ Assertions.assertEquals(new LargeIntLiteral(new
BigInteger("170141183460469231731687303715884105727")),
+ ExecutableFunctions.abs(largeInt2));
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
