From c068465984e5b5f92f937a060679a6a0d814ef1d Mon Sep 17 00:00:00 2001 From: zhangstar333 <2561612514@qq.com> Date: Tue, 17 Oct 2023 17:12:51 +0800 Subject: [PATCH] [FeMeta](function) write function nullable mode info --- .../src/main/java/org/apache/doris/common/FeMetaVersion.java | 4 +++- .../src/main/java/org/apache/doris/catalog/Function.java | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/FeMetaVersion.java b/fe/fe-common/src/main/java/org/apache/doris/common/FeMetaVersion.java index e33ef112e2e02b..650a831640bfb1 100644 --- a/fe/fe-common/src/main/java/org/apache/doris/common/FeMetaVersion.java +++ b/fe/fe-common/src/main/java/org/apache/doris/common/FeMetaVersion.java @@ -70,9 +70,11 @@ public final class FeMetaVersion { public static final int VERSION_124 = 124; // For write/read auto create partition expr public static final int VERSION_125 = 125; + // For write/read function nullable mode info + public static final int VERSION_126 = 126; // note: when increment meta version, should assign the latest version to VERSION_CURRENT - public static final int VERSION_CURRENT = VERSION_125; + public static final int VERSION_CURRENT = VERSION_126; // all logs meta version should >= the minimum version, so that we could remove many if clause, for example // if (FE_METAVERSION < VERSION_94) ... diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Function.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Function.java index 4664b996467746..6638eb6e367956 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Function.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Function.java @@ -21,6 +21,7 @@ import org.apache.doris.analysis.FunctionCallExpr; import org.apache.doris.analysis.FunctionName; import org.apache.doris.common.AnalysisException; +import org.apache.doris.common.FeMetaVersion; import org.apache.doris.common.UserException; import org.apache.doris.common.io.IOUtils; import org.apache.doris.common.io.Text; @@ -664,6 +665,7 @@ protected void writeFields(DataOutput output) throws IOException { } IOUtils.writeOptionString(output, libUrl); IOUtils.writeOptionString(output, checksum); + output.writeUTF(nullableMode.toString()); } @Override @@ -698,6 +700,9 @@ public void readFields(DataInput input) throws IOException { if (hasChecksum) { checksum = Text.readString(input); } + if (Env.getCurrentEnvJournalVersion() >= FeMetaVersion.VERSION_126) { + nullableMode = NullableMode.valueOf(input.readUTF()); + } } public static Function read(DataInput input) throws IOException {