This is an automated email from the ASF dual-hosted git repository. kxiao pushed a commit to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/doris.git
commit 7985a03c98f46c172f8c6b6d4cd751cc9434e894 Author: Long Zhao <[email protected]> AuthorDate: Sat Oct 7 14:06:09 2023 +0800 [bug][auth]Show grant causes role errors in the memory. #24783 (#24841) --- .../apache/doris/mysql/privilege/CatalogPrivEntry.java | 6 ++++++ .../org/apache/doris/mysql/privilege/DbPrivEntry.java | 5 +++++ .../apache/doris/mysql/privilege/GlobalPrivEntry.java | 7 +++++++ .../org/apache/doris/mysql/privilege/PrivEntry.java | 3 +++ .../org/apache/doris/mysql/privilege/PrivTable.java | 18 +++++++++++++++++- .../doris/mysql/privilege/ResourcePrivEntry.java | 5 +++++ .../apache/doris/mysql/privilege/TablePrivEntry.java | 4 ++++ .../doris/mysql/privilege/WorkloadGroupPrivEntry.java | 5 +++++ 8 files changed, 52 insertions(+), 1 deletion(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/CatalogPrivEntry.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/CatalogPrivEntry.java index 97fde3ae5d0..a0ff74d0809 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/CatalogPrivEntry.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/CatalogPrivEntry.java @@ -22,6 +22,7 @@ import org.apache.doris.common.AnalysisException; import org.apache.doris.common.CaseSensibility; import org.apache.doris.common.FeMetaVersion; import org.apache.doris.common.PatternMatcher; +import org.apache.doris.common.PatternMatcherException; import org.apache.doris.common.PatternMatcherWrapper; import org.apache.doris.common.io.Text; import org.apache.doris.datasource.InternalCatalog; @@ -118,6 +119,11 @@ public class CatalogPrivEntry extends PrivEntry { return compareAssist(origCtl, otherEntry.origCtl); } + @Override + protected PrivEntry copy() throws AnalysisException, PatternMatcherException { + return CatalogPrivEntry.create(this.getOrigCtl(), this.getPrivSet().copy()); + } + @Override public boolean keyMatch(PrivEntry other) { if (!(other instanceof CatalogPrivEntry)) { diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/DbPrivEntry.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/DbPrivEntry.java index a08fb70cdd7..b7464ac5464 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/DbPrivEntry.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/DbPrivEntry.java @@ -22,6 +22,7 @@ import org.apache.doris.cluster.ClusterNamespace; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.CaseSensibility; import org.apache.doris.common.PatternMatcher; +import org.apache.doris.common.PatternMatcherException; import org.apache.doris.common.io.Text; import java.io.DataInput; @@ -126,4 +127,8 @@ public class DbPrivEntry extends CatalogPrivEntry { isAnyDb = origDb.equals(ANY_DB); } + @Override + protected PrivEntry copy() throws AnalysisException, PatternMatcherException { + return DbPrivEntry.create(this.getOrigCtl(), this.getOrigDb(), this.getPrivSet().copy()); + } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/GlobalPrivEntry.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/GlobalPrivEntry.java index 5281acb86a2..658f5c46dfe 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/GlobalPrivEntry.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/GlobalPrivEntry.java @@ -18,6 +18,8 @@ package org.apache.doris.mysql.privilege; import org.apache.doris.analysis.UserIdentity; +import org.apache.doris.common.AnalysisException; +import org.apache.doris.common.PatternMatcherException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -72,4 +74,9 @@ public class GlobalPrivEntry extends PrivEntry { password = new byte[passwordLen]; in.readFully(password); } + + @Override + protected PrivEntry copy() throws AnalysisException, PatternMatcherException { + return GlobalPrivEntry.create(this.getPrivSet().copy()); + } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PrivEntry.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PrivEntry.java index ea2ff6938d1..6ac321d1dec 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PrivEntry.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PrivEntry.java @@ -18,6 +18,7 @@ package org.apache.doris.mysql.privilege; import org.apache.doris.analysis.UserIdentity; +import org.apache.doris.common.AnalysisException; import org.apache.doris.common.CaseSensibility; import org.apache.doris.common.PatternMatcher; import org.apache.doris.common.PatternMatcherException; @@ -187,4 +188,6 @@ public abstract class PrivEntry implements Comparable<PrivEntry> { } return 0; } + + protected abstract PrivEntry copy() throws AnalysisException, PatternMatcherException; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PrivTable.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PrivTable.java index a2162a1d9e6..8da712b5c6d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PrivTable.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PrivTable.java @@ -17,9 +17,11 @@ package org.apache.doris.mysql.privilege; +import org.apache.doris.common.AnalysisException; import org.apache.doris.common.DdlException; import org.apache.doris.common.ErrorCode; import org.apache.doris.common.ErrorReport; +import org.apache.doris.common.PatternMatcherException; import org.apache.doris.common.io.Text; import com.google.common.collect.Lists; @@ -63,6 +65,20 @@ public abstract class PrivTable { */ public PrivEntry addEntry(PrivEntry newEntry, boolean errOnExist, boolean errOnNonExist) throws DdlException { + return addEntry(newEntry, errOnExist, errOnNonExist, false); + } + + public PrivEntry addEntry(PrivEntry entry, boolean errOnExist, boolean errOnNonExist, boolean isMerge) + throws DdlException { + PrivEntry newEntry = entry; + if (isMerge) { + try { + newEntry = entry.copy(); + } catch (AnalysisException | PatternMatcherException e) { + LOG.error("exception when copy PrivEntry", e); + } + } + PrivEntry existingEntry = getExistingEntry(newEntry); if (existingEntry == null) { if (errOnNonExist) { @@ -201,7 +217,7 @@ public abstract class PrivTable { public void merge(PrivTable privTable) { for (PrivEntry entry : privTable.entries) { try { - addEntry(entry, false, false); + addEntry(entry, false, false, true); } catch (DdlException e) { //will no exception LOG.debug(e.getMessage()); diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/ResourcePrivEntry.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/ResourcePrivEntry.java index c85e01867ef..a41f3803088 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/ResourcePrivEntry.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/ResourcePrivEntry.java @@ -77,6 +77,11 @@ public class ResourcePrivEntry extends PrivEntry { return origResource.compareTo(otherEntry.origResource); } + @Override + protected PrivEntry copy() throws AnalysisException, PatternMatcherException { + return ResourcePrivEntry.create(this.getOrigResource(), this.getPrivSet().copy()); + } + @Override public boolean keyMatch(PrivEntry other) { if (!(other instanceof ResourcePrivEntry)) { diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/TablePrivEntry.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/TablePrivEntry.java index ce1b5a2ca21..c89104cde1c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/TablePrivEntry.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/TablePrivEntry.java @@ -123,4 +123,8 @@ public class TablePrivEntry extends DbPrivEntry { isAnyTbl = origTbl.equals(ANY_TBL); } + @Override + protected PrivEntry copy() throws AnalysisException, PatternMatcherException { + return TablePrivEntry.create(this.getOrigCtl(), this.getOrigDb(), this.getOrigTbl(), this.getPrivSet().copy()); + } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/WorkloadGroupPrivEntry.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/WorkloadGroupPrivEntry.java index a9762b4b325..080d0e1f7c9 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/WorkloadGroupPrivEntry.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/WorkloadGroupPrivEntry.java @@ -69,6 +69,11 @@ public class WorkloadGroupPrivEntry extends PrivEntry { return origWorkloadGroupName.compareTo(otherEntry.origWorkloadGroupName); } + @Override + protected PrivEntry copy() throws AnalysisException, PatternMatcherException { + return WorkloadGroupPrivEntry.create(this.getOrigWorkloadGroupName(), this.getPrivSet().copy()); + } + @Override public boolean keyMatch(PrivEntry other) { if (!(other instanceof WorkloadGroupPrivEntry)) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
