(doris) branch master updated: [improvement](statistics)User admin instead of root to run stats sql. (#40867)

[lijibing]

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

lijibing 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 5c9ac9aaf62 [improvement](statistics)User admin instead of root to run 
stats sql. (#40867)
5c9ac9aaf62 is described below

commit 5c9ac9aaf62b33e8adbadce18c0c0c16679a044e
Author: Jibing-Li <64681310+jibing...@users.noreply.github.com>
AuthorDate: Wed Sep 18 10:42:35 2024 +0800

    [improvement](statistics)User admin instead of root to run stats sql. 
(#40867)
    
    User admin instead of root to run stats sql.
---
 .../main/java/org/apache/doris/common/util/InternalDatabaseUtil.java  | 3 ++-
 .../main/java/org/apache/doris/statistics/util/StatisticsUtil.java    | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/common/util/InternalDatabaseUtil.java
 
b/fe/fe-core/src/main/java/org/apache/doris/common/util/InternalDatabaseUtil.java
index f255b794cbd..4b915a9171f 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/common/util/InternalDatabaseUtil.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/common/util/InternalDatabaseUtil.java
@@ -30,7 +30,8 @@ public class InternalDatabaseUtil {
         if (!FeConstants.INTERNAL_DB_NAME.equals(dbName)) {
             return;
         }
-        if (ctx == null || ctx.getCurrentUserIdentity() == null || 
!ctx.getCurrentUserIdentity().isRootUser()) {
+        if (ctx == null || ctx.getCurrentUserIdentity() == null
+                || !ctx.getCurrentUserIdentity().isRootUser() && 
!ctx.getCurrentUserIdentity().isAdminUser()) {
             throw new AnalysisException("Not allowed to operate database: " + 
dbName);
         }
     }
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/statistics/util/StatisticsUtil.java 
b/fe/fe-core/src/main/java/org/apache/doris/statistics/util/StatisticsUtil.java
index 198f06b2fe2..15d8750d977 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/statistics/util/StatisticsUtil.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/statistics/util/StatisticsUtil.java
@@ -226,8 +226,8 @@ public class StatisticsUtil {
         sessionVariable.enableMaterializedViewRewrite = false;
         connectContext.setEnv(Env.getCurrentEnv());
         connectContext.setDatabase(FeConstants.INTERNAL_DB_NAME);
-        connectContext.setQualifiedUser(UserIdentity.ROOT.getQualifiedUser());
-        connectContext.setCurrentUserIdentity(UserIdentity.ROOT);
+        connectContext.setQualifiedUser(UserIdentity.ADMIN.getQualifiedUser());
+        connectContext.setCurrentUserIdentity(UserIdentity.ADMIN);
         connectContext.setStartTime();
         if (Config.isCloudMode()) {
             AutoCloseConnectContext ctx = new 
AutoCloseConnectContext(connectContext);


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