[doris] branch branch-1.2-lts updated: [fix](planner)the common type of floating and decimal should be floating type (#20682)

[yi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

yiguolei pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-1.2-lts by this push:
     new 4700d4672a [fix](planner)the common type of floating and decimal should be floating type (#20682)
4700d4672a is described below

commit 4700d4672a6918904472d85c03ea6affdb5c7c9b
Author: starocean999 <40...@users.noreply.github.com>
AuthorDate: Mon Jun 12 11:32:44 2023 +0800

    [fix](planner)the common type of floating and decimal should be floating type (#20682)
---
 fe/fe-common/src/main/java/org/apache/doris/catalog/ScalarType.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fe/fe-common/src/main/java/org/apache/doris/catalog/ScalarType.java b/fe/fe-common/src/main/java/org/apache/doris/catalog/ScalarType.java
index 263751f5cd..d4b148baf8 100644
--- a/fe/fe-common/src/main/java/org/apache/doris/catalog/ScalarType.java
+++ b/fe/fe-common/src/main/java/org/apache/doris/catalog/ScalarType.java
@@ -1015,7 +1015,7 @@ public class ScalarType extends Type {
 
         if (t1.isDecimalV2() || t2.isDecimalV2()) {
             if (t1.isFloatingPointType() || t2.isFloatingPointType()) {
-                return MAX_DECIMALV2_TYPE;
+                return Type.DOUBLE;
             }
             return t1.isDecimalV2() ? t1 : t2;
         }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org