Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BugFix] Fix an issue when the privilege is merged,casue root privilge dropped. (backport #46411) #46570

Closed
wants to merge 1 commit into from
Closed

[BugFix] Fix an issue when the privilege is merged,casue root privilge dropped. (backport #46411) #46570

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions fe/fe-core/src/main/java/com/starrocks/privilege/PrivilegeCollection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,13 @@ public void merge(PrivilegeCollection other) {
} else {
List<PrivilegeEntry> typeList = typeToPrivilegeEntryList.get(typeId);
for (PrivilegeEntry entry : otherList) {
<<<<<<< HEAD:fe/fe-core/src/main/java/com/starrocks/privilege/PrivilegeCollection.java
grantObjectToList(entry.actionSet, entry.object, entry.isGrant, typeList);
=======
//deep copy here
ActionSet actionSetClone = new ActionSet(entry.actionSet);
grantObjectToList(actionSetClone, entry.object, entry.withGrantOption, typeList);
>>>>>>> 2391dd9be8 ([BugFix] Fix an issue when the privilege is merged,casue root privilge dropped. (#46411)):fe/fe-core/src/main/java/com/starrocks/privilege/PrivilegeCollectionV2.java
} // for privilege entry in other.list
}
} // for typeId, privilegeEntryList in other
Expand Down
Loading