Skip to content

Commit f20b48a

Browse files
committed
fix
1 parent 4f31734 commit f20b48a

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

fe/fe-core/src/main/java/org/apache/doris/analysis/ResourcePattern.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public ResourcePattern(String resourceName, ResourceTypeEnum type) {
7171
resourceName = "%";
7272
}
7373
this.resourceName = Strings.isNullOrEmpty(resourceName) ? "%" : resourceName;
74-
resourceType = type == null ? ResourceTypeEnum.GENERAL : type;
74+
resourceType = type;
7575
}
7676

7777
public void setResourceType(ResourceTypeEnum type) {

fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/Role.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,6 @@ public Role(String roleName, TablePattern tablePattern, PrivBitSet privs,
152152
public Role(String roleName, ResourcePattern resourcePattern, PrivBitSet privs) throws DdlException {
153153
this.roleName = roleName;
154154
// grant has trans privs
155-
// 2.x -> 3.0 compatibility logic
156-
if (resourcePattern.getResourceType() == null) {
157-
// 2.x not have cloud auth, so just transfer to ResourceTypeEnum.GENERAL
158-
resourcePattern.setResourceType(ResourceTypeEnum.GENERAL);
159-
}
160155
switch (resourcePattern.getResourceType()) {
161156
case GENERAL:
162157
this.resourcePatternToPrivs.put(resourcePattern, privs);
@@ -836,11 +831,6 @@ private void revokeCols(Map<ColPrivilegeKey, Set<String>> colPrivileges) {
836831
public void revokePrivs(ResourcePattern resourcePattern, PrivBitSet privs, boolean errOnNonExist)
837832
throws DdlException {
838833
PrivBitSet existingPriv;
839-
// 2.x -> 3.0 compatibility logic
840-
if (resourcePattern.getResourceType() == null) {
841-
// 2.x not have cloud auth, so just transfer to ResourceTypeEnum.GENERAL
842-
resourcePattern.setResourceType(ResourceTypeEnum.GENERAL);
843-
}
844834
switch (resourcePattern.getResourceType()) {
845835
case GENERAL:
846836
existingPriv = resourcePatternToPrivs.get(resourcePattern);

0 commit comments

Comments
 (0)