database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

revoke colum privs the second time failed

Browse Source
This commit is contained in:
cambyzhu
2024-05-15 19:39:52 +08:00
committed by yiguolei
parent fa35e54350
commit ec4414f383
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -637,19 +637,22 @@ public class Role implements Writable, GsonPostProcessable {
public void revokePrivs(TablePattern tblPattern, PrivBitSet privs, Map<ColPrivilegeKey, Set<String>> colPrivileges,
boolean errOnNonExist)
throws DdlException {
PrivBitSet existingPriv = tblPatternToPrivs.get(tblPattern);
if (existingPriv == null) {
if (errOnNonExist) {
throw new DdlException(tblPattern + " does not exist in role " + roleName);
if (!colPrivileges.isEmpty()) {
revokeCols(colPrivileges);
} else {
PrivBitSet existingPriv = tblPatternToPrivs.get(tblPattern);
if (existingPriv == null) {
if (errOnNonExist) {
throw new DdlException(tblPattern + " does not exist in role " + roleName);
}
return;
}
return;
existingPriv.remove(privs);
if (existingPriv.isEmpty()) {
tblPatternToPrivs.remove(tblPattern);
}
revokePrivs(tblPattern, privs);
}
existingPriv.remove(privs);
if (existingPriv.isEmpty()) {
tblPatternToPrivs.remove(tblPattern);
}
revokePrivs(tblPattern, privs);
revokeCols(colPrivileges);
}
private void revokeCols(Map<ColPrivilegeKey, Set<String>> colPrivileges) {
@ -661,6 +664,12 @@ public class Role implements Writable, GsonPostProcessable {
colPrivMap.get(entry.getKey()).removeAll(entry.getValue());
if (CollectionUtils.isEmpty(colPrivMap.get(entry.getKey()))) {
colPrivMap.remove(entry.getKey());
TablePattern tblPattern = new TablePattern(entry.getKey().getCtl(), entry.getKey().getDb(),
entry.getKey().getTbl());
PrivBitSet existingPriv = tblPatternToPrivs.get(tblPattern);
if (existingPriv != null && existingPriv.isEmpty()) {
tblPatternToPrivs.remove(tblPattern);
}
}
}
}