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

caiconghui 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 33a31de12a [fix](ut) fix some fe ut fail case (#18752)
33a31de12a is described below

commit 33a31de12a7c7144e0ceea64113da63da9ceffa8
Author: GoGoWen <82132356+gogo...@users.noreply.github.com>
AuthorDate: Mon Apr 17 22:01:48 2023 +0800

    [fix](ut) fix some fe ut fail case (#18752)
---
 .../src/test/java/org/apache/doris/analysis/ShowDataStmtTest.java   | 2 +-
 .../src/test/java/org/apache/doris/planner/OlapScanNodeTest.java    | 2 +-
 .../src/test/java/org/apache/doris/planner/QueryPlanTest.java       | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowDataStmtTest.java 
b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowDataStmtTest.java
index c77fc7923c..6787562463 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowDataStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowDataStmtTest.java
@@ -127,7 +127,7 @@ public class ShowDataStmtTest {
                 minTimes = 0;
                 result = true;
 
-                auth.checkTblPriv((ConnectContext) any, anyString, anyString, 
(PrivPredicate) any);
+                auth.checkTblPriv((ConnectContext) any, anyString, anyString, 
anyString, (PrivPredicate) any);
                 minTimes = 0;
                 result = true;
             }
diff --git 
a/fe/fe-core/src/test/java/org/apache/doris/planner/OlapScanNodeTest.java 
b/fe/fe-core/src/test/java/org/apache/doris/planner/OlapScanNodeTest.java
index 22e6cd74f2..7d23a3522d 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/planner/OlapScanNodeTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/planner/OlapScanNodeTest.java
@@ -168,6 +168,6 @@ public class OlapScanNodeTest {
     public void testTableNameWithAlias() {
         GlobalVariable.lowerCaseTableNames = 1;
         SlotRef slot = new SlotRef(new TableName("DB.TBL"), 
Column.DELETE_SIGN);
-        Assert.assertTrue(slot.getTableName().toString().equals("DB.tbl"));
+        
Assert.assertTrue(slot.getOriginTableName().toString().equals("DB.tbl"));
     }
 }
diff --git 
a/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java 
b/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java
index 169a9fdfe3..d536e66a9f 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java
@@ -1653,15 +1653,15 @@ public class QueryPlanTest extends TestWithFeService {
 
         sql = "SELECT a.k1, b.k2 FROM (SELECT k1 from baseall) a LEFT OUTER 
JOIN (select k1, 999 as k2 from baseall) b ON (a.k1=b.k1)";
         explainString = getSQLPlanOrErrorMsg("EXPLAIN " + sql);
-        Assert.assertTrue(explainString.contains("<slot 5>\n" + "    <slot 
7>"));
+        Assert.assertTrue(explainString.contains("<slot 7>\n" + "    <slot 
9>"));
 
         sql = "SELECT a.k1, b.k2 FROM (SELECT 1 as k1 from baseall) a RIGHT 
OUTER JOIN (select k1, 999 as k2 from baseall) b ON (a.k1=b.k1)";
         explainString = getSQLPlanOrErrorMsg("EXPLAIN " + sql);
-        Assert.assertTrue(explainString.contains("<slot 5>\n" + "    <slot 
7>"));
+        Assert.assertTrue(explainString.contains("<slot 8>\n" + "    <slot 
10>"));
 
         sql = "SELECT a.k1, b.k2 FROM (SELECT 1 as k1 from baseall) a FULL 
JOIN (select k1, 999 as k2 from baseall) b ON (a.k1=b.k1)";
         explainString = getSQLPlanOrErrorMsg("EXPLAIN " + sql);
-        Assert.assertTrue(explainString.contains("<slot 5>\n" + "    <slot 
7>"));
+        Assert.assertTrue(explainString.contains("<slot 8>\n" + "    <slot 
10>"));
     }
 
     @Test


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

Reply via email to