This is an automated email from the ASF dual-hosted git repository.
zhangstar333 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 0510d548c65 [FeMeta](function) write function nullable mode info
(#25535)
0510d548c65 is described below
commit 0510d548c65dc29c2cf1395d54bdb4b2e7b20751
Author: zhangstar333 <[email protected]>
AuthorDate: Fri Oct 20 11:37:11 2023 +0800
[FeMeta](function) write function nullable mode info (#25535)
notice: this PR have change the fe meta version.
the nullable mode of udf-function is important,
if not write to info, it's will be loss after restart.
---
.../src/main/java/org/apache/doris/common/FeMetaVersion.java | 4 +++-
fe/fe-core/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 e33ef112e2e..650a831640b 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 4664b996467..6638eb6e367 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.Expr;
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 @@ public class Function implements Writable {
}
IOUtils.writeOptionString(output, libUrl);
IOUtils.writeOptionString(output, checksum);
+ output.writeUTF(nullableMode.toString());
}
@Override
@@ -698,6 +700,9 @@ public class Function implements Writable {
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 {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
