[doris] branch master updated: [fix](MTMV) Show MTMV statement on table raises exceptions (#15882)

[adonisling]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 40fa5b4019 [fix](MTMV) Show MTMV statement on table raises exceptions 
(#15882)
40fa5b4019 is described below

commit 40fa5b4019b470a7a356096cda35756a0646e9ae
Author: huangzhaowei <carlmartin...@gmail.com>
AuthorDate: Wed Jan 18 10:25:33 2023 +0800

    [fix](MTMV) Show MTMV statement on table raises exceptions (#15882)
---
 .../src/main/java/org/apache/doris/analysis/ShowMTMVJobStmt.java  | 2 +-
 .../src/main/java/org/apache/doris/analysis/ShowMTMVTaskStmt.java | 2 +-
 .../src/test/java/org/apache/doris/mtmv/ShowMTMVJobStmtTest.java  | 8 ++++++++
 .../src/test/java/org/apache/doris/mtmv/ShowMTMVTaskStmtTest.java | 8 ++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowMTMVJobStmt.java 
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowMTMVJobStmt.java
index ef7ed80d1a..d0e934c62c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowMTMVJobStmt.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowMTMVJobStmt.java
@@ -87,7 +87,7 @@ public class ShowMTMVJobStmt extends ShowStmt {
     @Override
     public void analyze(Analyzer analyzer) throws UserException {
         super.analyze(analyzer);
-        if (dbName != null && mvName != null && 
!dbName.equals(mvName.getDb())) {
+        if (dbName != null && mvName != null && mvName.getDb() != null && 
!dbName.equals(mvName.getDb())) {
             throw new UserException("Database name should be same when they 
both been set.");
         }
         if (!Strings.isNullOrEmpty(dbName)) {
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowMTMVTaskStmt.java 
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowMTMVTaskStmt.java
index 353174fb4d..12532dc2b3 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowMTMVTaskStmt.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowMTMVTaskStmt.java
@@ -86,7 +86,7 @@ public class ShowMTMVTaskStmt extends ShowStmt {
     @Override
     public void analyze(Analyzer analyzer) throws UserException {
         super.analyze(analyzer);
-        if (dbName != null && mvName != null && 
!dbName.equals(mvName.getDb())) {
+        if (dbName != null && mvName != null && mvName.getDb() != null && 
!dbName.equals(mvName.getDb())) {
             throw new UserException("Database name should be same when they 
both been set.");
         }
         if (!Strings.isNullOrEmpty(dbName)) {
diff --git 
a/fe/fe-core/src/test/java/org/apache/doris/mtmv/ShowMTMVJobStmtTest.java 
b/fe/fe-core/src/test/java/org/apache/doris/mtmv/ShowMTMVJobStmtTest.java
index 1e4ec76e2a..50af285f24 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/mtmv/ShowMTMVJobStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/mtmv/ShowMTMVJobStmtTest.java
@@ -68,6 +68,14 @@ public class ShowMTMVJobStmtTest {
         Assert.assertNotNull(stmt.getDbName());
         Assert.assertNotNull(stmt.getMVName());
         Assert.assertEquals("SHOW MTMV JOB ON `db2`.`mv1`", stmt.toSql());
+
+        tableName = new TableName(null, null, "mv1");
+        stmt = new ShowMTMVJobStmt("db1", tableName);
+        stmt.analyze(analyzer);
+        Assert.assertNull(stmt.getJobName());
+        Assert.assertNotNull(stmt.getDbName());
+        Assert.assertNotNull(stmt.getMVName());
+        Assert.assertEquals("SHOW MTMV JOB FROM db1 ON `mv1`", stmt.toSql());
     }
 
     @Test(expected = UserException.class)
diff --git 
a/fe/fe-core/src/test/java/org/apache/doris/mtmv/ShowMTMVTaskStmtTest.java 
b/fe/fe-core/src/test/java/org/apache/doris/mtmv/ShowMTMVTaskStmtTest.java
index 0dfb659c09..0d4e93e237 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/mtmv/ShowMTMVTaskStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/mtmv/ShowMTMVTaskStmtTest.java
@@ -68,6 +68,14 @@ public class ShowMTMVTaskStmtTest {
         Assert.assertNotNull(stmt.getDbName());
         Assert.assertNotNull(stmt.getMVName());
         Assert.assertEquals("SHOW MTMV TASK ON `db2`.`mv1`", stmt.toSql());
+
+        tableName = new TableName(null, null, "mv1");
+        stmt = new ShowMTMVTaskStmt("db1", tableName);
+        stmt.analyze(analyzer);
+        Assert.assertNull(stmt.getTaskId());
+        Assert.assertNotNull(stmt.getDbName());
+        Assert.assertNotNull(stmt.getMVName());
+        Assert.assertEquals("SHOW MTMV TASK FROM db1 ON `mv1`", stmt.toSql());
     }
 
     @Test(expected = UserException.class)


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