[fix](load priv) modify error msg of checking table priv (apache#7817)

amorynan · Feb 6, 2022 · 2ffd7fc · 2ffd7fc
1 parent 9eb1d1d
commit 2ffd7fc
Show file tree

Hide file tree

Showing 26 changed files with 32 additions and 32 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterColumnStatsStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterColumnStatsStmt.java
@@ -69,7 +69,7 @@ public void analyze(Analyzer analyzer) throws UserException {
             ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "ALTER COLUMN STATS",
                     ConnectContext.get().getQualifiedUser(),
                     ConnectContext.get().getRemoteIP(),
-                    tableName.getTbl());
+                    tableName.getDb() + ": " + tableName.getTbl());
         }
     }
 

diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterTableStatsStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterTableStatsStmt.java
@@ -63,7 +63,7 @@ public void analyze(Analyzer analyzer) throws UserException {
             ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "ALTER TABLE STATS",
                     ConnectContext.get().getQualifiedUser(),
                     ConnectContext.get().getRemoteIP(),
-                    tableName.getTbl());
+                    tableName.getDb() + ": " + tableName.getTbl());
         }
     }
 

diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterTableStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterTableStmt.java
@@ -69,7 +69,7 @@ public void analyze(Analyzer analyzer) throws UserException {
             ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "ALTER TABLE",
                     ConnectContext.get().getQualifiedUser(),
                     ConnectContext.get().getRemoteIP(),
-                    tbl.getTbl());
+                    tbl.getDb() + ": " + tbl.getTbl());
         }
         if (ops == null || ops.isEmpty()) {
             ErrorReport.reportAnalysisException(ErrorCode.ERR_NO_ALTER_OPERATION);

diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterViewStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterViewStmt.java
@@ -59,7 +59,7 @@ public void analyze(Analyzer analyzer) throws UserException {
             ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "ALTER VIEW",
                     ConnectContext.get().getQualifiedUser(),
                     ConnectContext.get().getRemoteIP(),
-                    tableName.getTbl());
+                    tableName.getDb() + ": " + tableName.getTbl());
         }
 
         if (cols != null) {

diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/CancelAlterTableStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/CancelAlterTableStmt.java
@@ -77,7 +77,7 @@ public void analyze(Analyzer analyzer) throws AnalysisException {
             ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "CANCEL ALTER TABLE",
                                                 ConnectContext.get().getQualifiedUser(),
                                                 ConnectContext.get().getRemoteIP(),
-                                                dbTableName.getTbl());
+                                                dbTableName.getDb() + ": " + dbTableName.getTbl());
         }
     }
 

diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ChannelDescription.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ChannelDescription.java
@@ -106,7 +106,7 @@ private void checkAuth(String fullDbName) throws AnalysisException {
                 PrivPredicate.LOAD)) {
             ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "LOAD",
                     ConnectContext.get().getQualifiedUser(),
-                    ConnectContext.get().getRemoteIP(), targetTable);
+                    ConnectContext.get().getRemoteIP(), fullDbName + ": " + targetTable);
         }
     }
 

diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/DataDescription.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/DataDescription.java
@@ -789,7 +789,7 @@ private void checkLoadPriv(String fullDbName) throws AnalysisException {
                 PrivPredicate.LOAD)) {
             ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "LOAD",
                     ConnectContext.get().getQualifiedUser(),
-                    ConnectContext.get().getRemoteIP(), tableName);
+                    ConnectContext.get().getRemoteIP(), fullDbName + ": " + tableName);
         }
 
         // check hive table auth
@@ -798,7 +798,7 @@ private void checkLoadPriv(String fullDbName) throws AnalysisException {
                     PrivPredicate.SELECT)) {
                 ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "SELECT",
                         ConnectContext.get().getQualifiedUser(),
-                        ConnectContext.get().getRemoteIP(), srcTableName);
+                        ConnectContext.get().getRemoteIP(), fullDbName + ": " + srcTableName);
             }
         }
     }

diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/DeleteStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/DeleteStmt.java
@@ -92,7 +92,7 @@ public void analyze(Analyzer analyzer) throws UserException {
                                                                 PrivPredicate.LOAD)) {
             ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "LOAD",
                                                 ConnectContext.get().getQualifiedUser(),
-                                                ConnectContext.get().getRemoteIP(), tbl.getTbl());
+                                                ConnectContext.get().getRemoteIP(), tbl.getDb() + ": " + tbl.getTbl());
         }
     }
 

diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/DescribeStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/DescribeStmt.java
@@ -106,7 +106,7 @@ public void analyze(Analyzer analyzer) throws AnalysisException, UserException {
             ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "DESCRIBE",
                                                 ConnectContext.get().getQualifiedUser(),
                                                 ConnectContext.get().getRemoteIP(),
-                                                dbTableName.getTbl());
+                                                dbTableName.getDb() + ": " + dbTableName.getTbl());
         }
 
         Database db = Catalog.getCurrentCatalog().getDbOrAnalysisException(dbTableName.getDb());

diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ExportStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ExportStmt.java
@@ -161,7 +161,7 @@ public void analyze(Analyzer analyzer) throws UserException {
             ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "EXPORT",
                                                 ConnectContext.get().getQualifiedUser(),
                                                 ConnectContext.get().getRemoteIP(),
-                    tblName.getTbl());
+                                                tblName.getDb() + ": " + tblName.getTbl());
         }
 
         // check table && partitions whether exist

diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/InsertStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/InsertStmt.java
@@ -203,7 +203,7 @@ public void getTables(Analyzer analyzer, Map<Long, Table> tableMap, Set<String>
                                                                 PrivPredicate.LOAD)) {
             ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "LOAD",
                                                 ConnectContext.get().getQualifiedUser(),
-                                                ConnectContext.get().getRemoteIP(), tblName.getTbl());
+                                                ConnectContext.get().getRemoteIP(), dbName + ": " + tableName);
         }
 
         tableMap.put(table.getId(), table);
@@ -271,7 +271,7 @@ public void analyze(Analyzer analyzer) throws UserException {
                                                                 tblName.getTbl(), PrivPredicate.LOAD)) {
             ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "LOAD",
                                                 ConnectContext.get().getQualifiedUser(),
-                                                ConnectContext.get().getRemoteIP(), tblName.getTbl());
+                                                ConnectContext.get().getRemoteIP(), tblName.getDb() + ": " + tblName.getTbl());
         }
 
         // check partition

diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/LockTablesStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/LockTablesStmt.java
@@ -71,7 +71,7 @@ public void analyze(Analyzer analyzer) throws UserException {
                 ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "SELECT",
                         ConnectContext.get().getQualifiedUser(),
                         ConnectContext.get().getRemoteIP(),
-                        tableName);
+                        dbName + ": " + tableName);
             }
         }
     }

diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/RecoverPartitionStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/RecoverPartitionStmt.java
@@ -63,7 +63,7 @@ public void analyze(Analyzer analyzer) throws AnalysisException, UserException {
             ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "RECOVERY",
                                                 ConnectContext.get().getQualifiedUser(),
                                                 ConnectContext.get().getRemoteIP(),
-                                                dbTblName.getTbl());
+                                                dbTblName.getDb() + ": " + dbTblName.getTbl());
         }
     }
 

diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/RecoverTableStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/RecoverTableStmt.java
@@ -58,7 +58,7 @@ public void analyze(Analyzer analyzer) throws AnalysisException, UserException {
             ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "RECOVERY",
                                                 ConnectContext.get().getQualifiedUser(),
                                                 ConnectContext.get().getRemoteIP(),
-                                                dbTblName.getTbl());
+                                                dbTblName.getDb() + ": " + dbTblName.getTbl());
         }
     }
 

diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java
@@ -322,7 +322,7 @@ public void getTables(Analyzer analyzer, Map<Long, Table> tableMap, Set<String>
                     ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "SELECT",
                             ConnectContext.get().getQualifiedUser(),
                             ConnectContext.get().getRemoteIP(),
-                            tblRef.getName().getTbl());
+                            dbName + ": " + tableName);
                 }
                 tableMap.put(table.getId(), table);
             }

diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowCreateTableStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowCreateTableStmt.java
@@ -83,7 +83,7 @@ public void analyze(Analyzer analyzer) throws AnalysisException {
             ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "SHOW CREATE TABLE",
                                                 ConnectContext.get().getQualifiedUser(),
                                                 ConnectContext.get().getRemoteIP(),
-                                                tbl.getTbl());
+                                                tbl.getDb() + ": " + tbl.getTbl());
         }
     }
 

diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowDataStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowDataStmt.java
@@ -225,7 +225,7 @@ public int compare(Table t1, Table t2) {
                 ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "SHOW DATA",
                         ConnectContext.get().getQualifiedUser(),
                         ConnectContext.get().getRemoteIP(),
-                        tableName);
+                        dbName + ": " + tableName);
             }
 
             OlapTable olapTable = db.getTableOrMetaException(tableName, TableType.OLAP);

diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowIndexStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowIndexStmt.java
@@ -72,7 +72,7 @@ public void analyze(Analyzer analyzer) throws AnalysisException, UserException {
         if (!Catalog.getCurrentCatalog().getAuth().checkTblPriv(ConnectContext.get(), tableName.getDb(), tableName.getTbl(),
                 PrivPredicate.SHOW)) {
             ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, analyzer.getQualifiedUser(),
-                    tableName.toString());
+                    tableName.getDb() + ": " + tableName.toString());
         }
     }
 

diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowPartitionsStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowPartitionsStmt.java
@@ -107,7 +107,7 @@ public void analyze(Analyzer analyzer) throws UserException {
             ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "SHOW PARTITIONS",
                                                 ConnectContext.get().getQualifiedUser(),
                                                 ConnectContext.get().getRemoteIP(),
-                                                tableName);
+                                                dbName + ": " + tableName);
         }
         Database db = Catalog.getCurrentCatalog().getDbOrAnalysisException(dbName);
         Table table = db.getTableOrMetaException(tableName, Table.TableType.OLAP);

diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowViewStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowViewStmt.java
@@ -92,7 +92,7 @@ public void analyze(Analyzer analyzer) throws AnalysisException, UserException {
             ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "SHOW VIEW",
                     ConnectContext.get().getQualifiedUser(),
                     ConnectContext.get().getRemoteIP(),
-                    getTbl());
+                    dbName + ": " + getTbl());
         }
 
         Database database = Catalog.getCurrentCatalog().getDbOrAnalysisException(dbName);

diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/Load.java b/fe/fe-core/src/main/java/org/apache/doris/load/Load.java
@@ -1710,7 +1710,7 @@ public boolean cancelLoadJob(CancelLoadStmt stmt, boolean isAccurateMatch) throw
                         PrivPredicate.LOAD)) {
                     ErrorReport.reportDdlException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "CANCEL LOAD",
                             ConnectContext.get().getQualifiedUser(),
-                            ConnectContext.get().getRemoteIP(), tblName);
+                            ConnectContext.get().getRemoteIP(), dbName + ": " + tblName);
                 }
             }
         }
@@ -1774,7 +1774,7 @@ public boolean cancelLoadJob(CancelLoadStmt stmt) throws DdlException {
                         PrivPredicate.LOAD)) {
                     ErrorReport.reportDdlException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "CANCEL LOAD",
                             ConnectContext.get().getQualifiedUser(),
-                            ConnectContext.get().getRemoteIP(), tblName);
+                            ConnectContext.get().getRemoteIP(), dbName + ": " + tblName);
                 }
             }
         }

diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadJob.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadJob.java
@@ -601,7 +601,7 @@ private void checkAuthWithoutAuthInfo(String command) throws DdlException {
                         ErrorReport.reportDdlException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR,
                                 command,
                                 ConnectContext.get().getQualifiedUser(),
-                                ConnectContext.get().getRemoteIP(), tblName);
+                                ConnectContext.get().getRemoteIP(), db.getFullName() + ": " + tblName);
                     }
                 }
             }

diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadManager.java b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadManager.java
@@ -130,7 +130,7 @@ public void createRoutineLoadJob(CreateRoutineLoadStmt createRoutineLoadStmt)
                                                 ConnectContext.get().getQualifiedUser(),
                                                 ConnectContext.get().getRemoteIP(),
                                                 createRoutineLoadStmt.getDBName(),
-                                                createRoutineLoadStmt.getTableName());
+                                                createRoutineLoadStmt.getDBName() + ": " + createRoutineLoadStmt.getTableName());
         }
 
         RoutineLoadJob routineLoadJob = null;
@@ -226,7 +226,7 @@ public RoutineLoadJob checkPrivAndGetJob(String dbName, String jobName)
             ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "LOAD",
                                                 ConnectContext.get().getQualifiedUser(),
                                                 ConnectContext.get().getRemoteIP(),
-                                                tableName);
+                                                dbFullName + ": " + tableName);
         }
         return routineLoadJob;
     }

diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ShowExecutor.java b/fe/fe-core/src/main/java/org/apache/doris/qe/ShowExecutor.java
@@ -1133,7 +1133,7 @@ private void handleShowLoadWarnings() throws AnalysisException {
                                                         "SHOW LOAD WARNING",
                                                         ConnectContext.get().getQualifiedUser(),
                                                         ConnectContext.get().getRemoteIP(),
-                                                        tblName);
+                                                        db.getFullName() + ": " + tblName);
                 }
             }
         }
@@ -1290,7 +1290,7 @@ private void handleShowRoutineLoadTask() throws AnalysisException {
             ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "LOAD",
                                                 ConnectContext.get().getQualifiedUser(),
                                                 ConnectContext.get().getRemoteIP(),
-                                                tableName);
+                                                dbFullName + ": " + tableName);
         }
 
         // get routine load task info

diff --git a/fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsManager.java b/fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsManager.java
@@ -71,7 +71,7 @@ public List<List<String>> showTableStatsList(String dbName, String tableName)
                 ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "SHOW CREATE TABLE",
                         ConnectContext.get().getQualifiedUser(),
                         ConnectContext.get().getRemoteIP(),
-                        tableName);
+                        dbName + ": " + tableName);
             }
             // get stats
             result.add(showTableStats(table));
@@ -100,7 +100,7 @@ public List<List<String>> showColumnStatsList(TableName tableName) throws Analys
             ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "SHOW CREATE TABLE",
                     ConnectContext.get().getQualifiedUser(),
                     ConnectContext.get().getRemoteIP(),
-                    tableName.getTbl());
+                    tableName.getDb() + ": " + tableName.getTbl());
         }
         // get stats
         List<List<String>> result = Lists.newArrayList();

diff --git a/fe/fe-core/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java b/fe/fe-core/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
@@ -1240,7 +1240,7 @@ public List<List<String>> getSingleTranInfo(long dbId, long txnId) throws Analys
                                     "SHOW TRANSACTION",
                                     ConnectContext.get().getQualifiedUser(),
                                     ConnectContext.get().getRemoteIP(),
-                                    tbl.getName());
+                                    db.getFullName() + ": " + tbl.getName());
                         }
                     }
                 }