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 f7776bbbf3e [fix](merge-cloud) Keep UserProperty compatible with the
cloud mode (#32118)
f7776bbbf3e is described below
commit f7776bbbf3e18084ba4406436d04d715764096b7
Author: walter <[email protected]>
AuthorDate: Tue Mar 12 20:24:01 2024 +0800
[fix](merge-cloud) Keep UserProperty compatible with the cloud mode (#32118)
---
.../main/java/org/apache/doris/mysql/privilege/UserProperty.java | 7 +++++++
1 file changed, 7 insertions(+)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserProperty.java
b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserProperty.java
index dd56bcf235d..8b4b6d08285 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserProperty.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserProperty.java
@@ -21,6 +21,7 @@ import org.apache.doris.analysis.SetUserPropertyVar;
import org.apache.doris.catalog.Env;
import org.apache.doris.cluster.ClusterNamespace;
import org.apache.doris.common.AnalysisException;
+import org.apache.doris.common.Config;
import org.apache.doris.common.DdlException;
import org.apache.doris.common.FeMetaVersion;
import org.apache.doris.common.LoadException;
@@ -624,6 +625,12 @@ public class UserProperty implements Writable {
clusterToDppConfig.put(cluster, dppConfig);
}
+ if (Config.isCloudMode()) {
+ if (in.readBoolean()) {
+ defaultCloudCluster = Text.readString(in);
+ }
+ }
+
// whiteList
if (Env.getCurrentEnvJournalVersion() < FeMetaVersion.VERSION_116) {
whiteList.readFields(in);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
