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

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


The following commit(s) were added to refs/heads/branch-2.0 by this push:
     new 4068794dd51 [fix](nereids)Fix nereids fail to parse tablesample bug 
(#26982)
4068794dd51 is described below

commit 4068794dd51ad2a0f69e997cea63d88ec698a2d0
Author: Jibing-Li <64681310+jibing...@users.noreply.github.com>
AuthorDate: Thu Nov 16 12:24:10 2023 +0800

    [fix](nereids)Fix nereids fail to parse tablesample bug (#26982)
    
    backport #26981
---
 .../main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java  | 2 +-
 fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java         | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
 
b/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
index 248bb2e6e2c..19a2db2f0d5 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
@@ -2042,7 +2042,7 @@ public class LogicalPlanBuilder extends 
DorisParserBaseVisitor<Object> {
             return new TableSample(percent, true, seek);
         }
         SampleByRowsContext sampleByRowsContext = (SampleByRowsContext) 
sampleContext;
-        long rows = Long.parseLong(sampleByRowsContext.ROWS().getText());
+        long rows = 
Long.parseLong(sampleByRowsContext.INTEGER_VALUE().getText());
         return new TableSample(rows, false, seek);
     }
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java 
b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
index cad5da4aa6a..5ca0c3ae1a4 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
@@ -2503,8 +2503,7 @@ public class StmtExecutor {
                         planner = new NereidsPlanner(statementContext);
                         planner.plan(parsedStmt, 
context.getSessionVariable().toThrift());
                     } catch (Exception e) {
-                        LOG.warn("Arrow Flight SQL fall back to legacy 
planner, because: {}",
-                                e.getMessage(), e);
+                        LOG.warn("Fall back to legacy planner, because: {}", 
e.getMessage(), e);
                         parsedStmt = null;
                         planner = null;
                         context.getState().setNereids(false);


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

Reply via email to