This is an automated email from the ASF dual-hosted git repository.
lijibing pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 8a575d0891b [improvement](statistics)User admin instead of root to run
stats sql. (#40867) (#40898)
8a575d0891b is described below
commit 8a575d0891b2060316a71a6eddbcf445a3210f54
Author: Jibing-Li <[email protected]>
AuthorDate: Wed Sep 18 13:36:50 2024 +0800
[improvement](statistics)User admin instead of root to run stats sql.
(#40867) (#40898)
backport: https://github.com/apache/doris/pull/40867
---
.../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 0794b356595..dc1dba5d981 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
@@ -202,8 +202,8 @@ public class StatisticsUtil {
sessionVariable.enableUniqueKeyPartialUpdate = 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();
return new AutoCloseConnectContext(connectContext);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
