diff --git a/fe/fe-core/src/main/java/com/starrocks/clone/DynamicPartitionScheduler.java b/fe/fe-core/src/main/java/com/starrocks/clone/DynamicPartitionScheduler.java index b00785c53629d..8efa6cd11de51 100644 --- a/fe/fe-core/src/main/java/com/starrocks/clone/DynamicPartitionScheduler.java +++ b/fe/fe-core/src/main/java/com/starrocks/clone/DynamicPartitionScheduler.java @@ -155,7 +155,7 @@ private ArrayList getAddPartitionClause(Database db, OlapTab // AnalysisException: keys.size is always equal to column.size, cannot reach this exception // IllegalArgumentException: lb is greater than ub LOG.warn("Error in gen addPartitionKeyRange. Error={}, db: {}, table: {}", e.getMessage(), - db.getFullName(), olapTable.getName()); + db.getOriginName(), olapTable.getName()); continue; } for (Range partitionKeyRange : rangePartitionInfo.getIdToRange(false).values()) { @@ -239,7 +239,7 @@ private ArrayList getDropPartitionClause(Database db, OlapT // AnalysisException: keys.size is always equal to column.size, cannot reach this exception // IllegalArgumentException: lb is greater than ub LOG.warn("Error in gen reservePartitionKeyRange. Error={}, db: {}, table: {}", e.getMessage(), - db.getFullName(), olapTable.getName()); + db.getOriginName(), olapTable.getName()); return dropPartitionClauses; } RangePartitionInfo info = (RangePartitionInfo) (olapTable.getPartitionInfo()); diff --git a/fe/fe-core/src/main/java/com/starrocks/mysql/privilege/Auth.java b/fe/fe-core/src/main/java/com/starrocks/mysql/privilege/Auth.java index 0d6adca6982e6..8e3dd4e4c3e87 100644 --- a/fe/fe-core/src/main/java/com/starrocks/mysql/privilege/Auth.java +++ b/fe/fe-core/src/main/java/com/starrocks/mysql/privilege/Auth.java @@ -1586,42 +1586,6 @@ public List> getUserProperties(String qualifiedUser) { } } - public void dropUserOfCluster(String clusterName, boolean isReplay) { - writeLock(); - try { - Set allUserIdents = getAllUserIdents(true); - for (UserIdentity userIdent : allUserIdents) { - if (userIdent.getQualifiedUser().startsWith(clusterName)) { - dropUserInternal(userIdent, isReplay); - } - } - } finally { - writeUnlock(); - } - } - - // user can enter a cluster, if it has any privs of database or table in this cluster. - public boolean checkCanEnterCluster(ConnectContext ctx, String clusterName) { - readLock(); - try { - if (checkGlobalPriv(ctx, PrivPredicate.ALL)) { - return true; - } - - if (dbPrivTable.hasClusterPriv(ctx, clusterName)) { - return true; - } - - if (tablePrivTable.hasClusterPriv(ctx, clusterName)) { - return true; - } - - return false; - } finally { - readUnlock(); - } - } - private void initUser() { try { UserIdentity rootUser = new UserIdentity(ROOT_USER, "%"); diff --git a/fe/fe-core/src/main/java/com/starrocks/mysql/privilege/DbPrivTable.java b/fe/fe-core/src/main/java/com/starrocks/mysql/privilege/DbPrivTable.java index 33db9c63c46b9..4e149a7195704 100644 --- a/fe/fe-core/src/main/java/com/starrocks/mysql/privilege/DbPrivTable.java +++ b/fe/fe-core/src/main/java/com/starrocks/mysql/privilege/DbPrivTable.java @@ -23,7 +23,6 @@ import com.starrocks.analysis.UserIdentity; import com.starrocks.common.io.Text; -import com.starrocks.qe.ConnectContext; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -82,17 +81,6 @@ public boolean hasPriv(UserIdentity currentUser, PrivPredicate wanted) { return false; } - public boolean hasClusterPriv(ConnectContext ctx, String clusterName) { - Iterator iter = this.getFullReadOnlyIterator(); - while (iter.hasNext()) { - DbPrivEntry dbPrivEntry = (DbPrivEntry) iter.next(); - if (dbPrivEntry.getOrigDb().startsWith(clusterName)) { - return true; - } - } - return false; - } - @Override public void write(DataOutput out) throws IOException { if (!isClassNameWrote) { diff --git a/fe/fe-core/src/main/java/com/starrocks/transaction/GlobalTransactionMgr.java b/fe/fe-core/src/main/java/com/starrocks/transaction/GlobalTransactionMgr.java index 10c30b8048cd6..f864cd40394b3 100644 --- a/fe/fe-core/src/main/java/com/starrocks/transaction/GlobalTransactionMgr.java +++ b/fe/fe-core/src/main/java/com/starrocks/transaction/GlobalTransactionMgr.java @@ -509,7 +509,7 @@ public List> getDbInfo() { if (db == null) { continue; } - info.add(db.getFullName()); + info.add(db.getOriginName()); infos.add(info); } return infos;