Skip to content

Commit

Permalink
[fix](merge-cloud) Keep UserProperty compatible with the cloud mode (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
w41ter authored Mar 12, 2024
1 parent aa7571f commit f7776bb
Showing 1 changed file with 7 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
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;
Expand Down Expand Up @@ -624,6 +625,12 @@ public void readFields(DataInput in) throws IOException {
clusterToDppConfig.put(cluster, dppConfig);
}

if (Config.isCloudMode()) {
if (in.readBoolean()) {
defaultCloudCluster = Text.readString(in);
}
}

// whiteList
if (Env.getCurrentEnvJournalVersion() < FeMetaVersion.VERSION_116) {
whiteList.readFields(in);
Expand Down

0 comments on commit f7776bb

Please sign in to comment.