This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new e8fea85237b [fix](auth) Fix ResourceTypeEnum Compatibility Upgrade
(#39288)
e8fea85237b is described below
commit e8fea85237b7ab9408a5fafd6ca6addf18d08147
Author: deardeng <[email protected]>
AuthorDate: Thu Aug 15 20:11:11 2024 +0800
[fix](auth) Fix ResourceTypeEnum Compatibility Upgrade (#39288)
```
RuntimeLogger 2024-08-12 22:47:37,850 ERROR (replayer|88)
[EditLog.loadJournal():1244] replay Operation Type 64, log id: 13752
java.lang.NullPointerException: Cannot invoke
"org.apache.doris.analysis.ResourceTypeEnum.ordinal()" because the return value
of "org.apache.doris.analysis.ResourcePattern.getResourceType()" is null
at org.apache.doris.mysql.privilege.Role.<init>(Role.java:155)
~[doris-fe.jar:1.2-SNAPSHOT]
at
org.apache.doris.mysql.privilege.Auth.grantInternal(Auth.java:706)
~[doris-fe.jar:1.2-SNAPSHOT]
at org.apache.doris.mysql.privilege.Auth.replayGrant(Auth.java:657)
~[doris-fe.jar:1.2-SNAPSHOT]
at org.apache.doris.persist.EditLog.loadJournal(EditLog.java:466)
~[doris-fe.jar:1.2-SNAPSHOT]
at org.apache.doris.catalog.Env.replayJournal(Env.java:2913)
~[doris-fe.jar:1.2-SNAPSHOT]
at org.apache.doris.catalog.Env$4.runOneCycle(Env.java:2675)
~[doris-fe.jar:1.2-SNAPSHOT]
at org.apache.doris.common.util.Daemon.run(Daemon.java:116)
~[doris-fe.jar:1.2-SNAPSHOT]
```
## Proposed changes
Issue Number: close #xxx
<!--Describe your changes.-->
---
.../src/main/java/org/apache/doris/analysis/ResourcePattern.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/ResourcePattern.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ResourcePattern.java
index ecfcb980613..2052c4e9eb8 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ResourcePattern.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ResourcePattern.java
@@ -134,5 +134,9 @@ public class ResourcePattern implements Writable,
GsonPostProcessable {
if ("*".equals(resourceName)) {
resourceName = "%";
}
+ // 2.x -> 3.0 compatibility logic
+ if (resourceType == null) {
+ resourceType = ResourceTypeEnum.GENERAL;
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
