[Refactor] Remove used code (#8880)

StarRocks · Jul 18, 2022 · 150dcad · 150dcad
1 parent 517f50f
commit 150dcad
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 51 deletions.
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
@@ -155,7 +155,7 @@ private ArrayList<AddPartitionClause> 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<PartitionKey> partitionKeyRange : rangePartitionInfo.getIdToRange(false).values()) {
@@ -239,7 +239,7 @@ private ArrayList<DropPartitionClause> 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
@@ -1586,42 +1586,6 @@ public List<List<String>> getUserProperties(String qualifiedUser) {
         }
     }
 
-    public void dropUserOfCluster(String clusterName, boolean isReplay) {
-        writeLock();
-        try {
-            Set<UserIdentity> 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
@@ -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<PrivEntry> 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
@@ -509,7 +509,7 @@ public List<List<Comparable>> getDbInfo() {
             if (db == null) {
                 continue;
             }
-            info.add(db.getFullName());
+            info.add(db.getOriginName());
             infos.add(info);
         }
         return infos;