[incubator-doris] branch master updated: [BUG] Fix cast result expr bug (#3279)

[mo...@apache.org]

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

morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git


The following commit(s) were added to refs/heads/master by this push:
     new 037bc53  [BUG] Fix cast result expr bug (#3279)
037bc53 is described below

commit 037bc53b54eba4c29b24f5b8938ee775219859b8
Author: HangyuanLiu <46...@qq.com>
AuthorDate: Thu Apr 9 22:02:05 2020 +0800

    [BUG] Fix cast result expr bug (#3279)
    
    When the result type is a date type, the result expr type should not be cast.
    Because in the FE function, the specific type of the date type is determined by the actual
    type of the return value, not by the function return value type.
    
    For example, the function `str_to_date` may return DATE or DATETIME, depends on the
    format pattern.
    
    DATE:
    ```
    mysql> select str_to_date('11/09/2011', '%m/%d/%Y');
    +---------------------------------------+
    | str_to_date('11/09/2011', '%m/%d/%Y') |
    +---------------------------------------+
    | 2011-11-09                            |
    +---------------------------------------+
    ```
    
    DATETIME:
    ```
    mysql> select str_to_date('2014-12-21 12:34:56', '%Y-%m-%d %H:%i:%s');
    +---------------------------------------------------------+
    | str_to_date('2014-12-21 12:34:56', '%Y-%m-%d %H:%i:%s') |
    +---------------------------------------------------------+
    | 2014-12-21 12:34:56                                     |
    +---------------------------------------------------------+
---
 .../java/org/apache/doris/analysis/StatementBase.java    |  6 ++++++
 .../java/org/apache/doris/planner/QueryPlanTest.java     | 16 +++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/fe/src/main/java/org/apache/doris/analysis/StatementBase.java b/fe/src/main/java/org/apache/doris/analysis/StatementBase.java
index f858e7b..7410028 100644
--- a/fe/src/main/java/org/apache/doris/analysis/StatementBase.java
+++ b/fe/src/main/java/org/apache/doris/analysis/StatementBase.java
@@ -124,6 +124,12 @@ public abstract class StatementBase implements ParseNode {
         Preconditions.checkNotNull(resultExprs);
         Preconditions.checkState(resultExprs.size() == types.size());
         for (int i = 0; i < types.size(); ++i) {
+            //The specific type of the date type is determined by the 
+            //actual type of the return value, not by the function return value type in FE Function
+            //such as the result of str_to_date may be either DATE or DATETIME
+            if (resultExprs.get(i).getType().isDateType() && types.get(i).isDateType()) {
+                continue;                               
+            }
             if (!resultExprs.get(i).getType().equals(types.get(i))) {
                 resultExprs.set(i, resultExprs.get(i).castTo(types.get(i)));
             }
diff --git a/fe/src/test/java/org/apache/doris/planner/QueryPlanTest.java b/fe/src/test/java/org/apache/doris/planner/QueryPlanTest.java
index 170c96e..316d9ce 100644
--- a/fe/src/test/java/org/apache/doris/planner/QueryPlanTest.java
+++ b/fe/src/test/java/org/apache/doris/planner/QueryPlanTest.java
@@ -17,10 +17,11 @@
 
 package org.apache.doris.planner;
 
-
 import org.apache.doris.analysis.CreateDbStmt;
 import org.apache.doris.analysis.CreateTableStmt;
 import org.apache.doris.analysis.DropDbStmt;
+import org.apache.doris.analysis.Expr;
+import org.apache.doris.analysis.SelectStmt;
 import org.apache.doris.analysis.ShowCreateDbStmt;
 import org.apache.doris.analysis.StatementBase;
 import org.apache.doris.catalog.Catalog;
@@ -445,4 +446,17 @@ public class QueryPlanTest {
         Assert.assertEquals(showCreateDbStmt.toSql(), showCreateSchemaStmt.toSql());
     }
 
+    @Test
+    public void testDateTypeCastSyntax() throws Exception {
+        String castSql = "select * from test.baseall where k11 < cast('2020-03-26' as date)";
+        SelectStmt selectStmt =
+                (SelectStmt) UtFrameUtils.parseAndAnalyzeStmt(castSql, connectContext);
+        Expr rightExpr = selectStmt.getWhereClause().getChildren().get(1);
+        Assert.assertTrue(rightExpr.getType().equals(Type.DATETIME));
+
+        String castSql2 = "select str_to_date('11/09/2011', '%m/%d/%Y');";
+        String explainString = UtFrameUtils.getSQLPlanOrErrorMsg(connectContext, "explain " + castSql2);
+        Assert.assertTrue(explainString.contains("2011-11-09"));
+        Assert.assertFalse(explainString.contains("2011-11-09 00:00:00"));
+    }
 }


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