Skip to content

Commit c3a9b1d

Browse files
committed
update version
1 parent 30235e9 commit c3a9b1d

File tree

3 files changed

+763
-39
lines changed

3 files changed

+763
-39
lines changed

gensrc/script/gen_build_version.sh

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ if [[ -z "${DORIS_HOME}" ]]; then
6060
fi
6161

6262
if [[ -z "${DORIS_TEST_BINARY_DIR}" ]]; then
63-
if [[ -e "${DORIS_HOME}/fe/fe-core/target/generated-sources/build/org/apache/doris/common/Version.java" && -e "${DORIS_HOME}/gensrc/build/gen_cpp/version.h" && -e "${DORIS_HOME}/gensrc/build/gen_cpp/cloud_version.h" ]]; then
63+
if [[ -e "${DORIS_HOME}/fe/fe-common/target/generated-sources/build/org/apache/doris/common/Version.java" && -e "${DORIS_HOME}/gensrc/build/gen_cpp/version.h" && -e "${DORIS_HOME}/gensrc/build/gen_cpp/cloud_version.h" ]]; then
6464
exit
6565
fi
6666
fi
@@ -101,7 +101,7 @@ java_version_str="$("${java_cmd}" -fullversion 2>&1 | sed -e 's/"/\\"/g')"
101101
echo "get java cmd: ${java_cmd}"
102102
echo "get java version: ${java_version_str}"
103103

104-
VERSION_PACKAGE="${DORIS_HOME}/fe/fe-core/target/generated-sources/build/org/apache/doris/common"
104+
VERSION_PACKAGE="${DORIS_HOME}/fe/fe-common/target/generated-sources/build/org/apache/doris/common"
105105
mkdir -p "${VERSION_PACKAGE}"
106106
cat >"${VERSION_PACKAGE}/Version.java" <<EOF
107107
// Licensed to the Apache Software Foundation (ASF) under one
@@ -129,20 +129,23 @@ package org.apache.doris.common;
129129
130130
public class Version {
131131
132-
public static final String DORIS_BUILD_VERSION_PREFIX = "${build_version_prefix}";
132+
// Use String.valueOf() to prevent javac compile-time constant inlining.
133+
// Without this, changing Version.class alone (e.g. via fast-compile-fe.sh)
134+
// has no effect because the old values are baked into every referencing class.
135+
public static final String DORIS_BUILD_VERSION_PREFIX = String.valueOf("${build_version_prefix}");
133136
public static final int DORIS_BUILD_VERSION_MAJOR = ${build_version_major};
134137
public static final int DORIS_BUILD_VERSION_MINOR = ${build_version_minor};
135138
public static final int DORIS_BUILD_VERSION_PATCH = ${build_version_patch};
136139
public static final int DORIS_BUILD_VERSION_HOTFIX = ${build_version_hotfix};
137-
public static final String DORIS_BUILD_VERSION_RC_VERSION = "${build_version_rc_version}";
138-
public static final String DORIS_FEATURE_LIST = "${doris_feature_list}";
139-
140-
public static final String DORIS_BUILD_VERSION = "${build_version}";
141-
public static final String DORIS_BUILD_HASH = "${build_hash}";
142-
public static final String DORIS_BUILD_SHORT_HASH = "${build_short_hash}";
143-
public static final String DORIS_BUILD_TIME = "${build_time}";
144-
public static final String DORIS_BUILD_INFO = "${build_info}";
145-
public static final String DORIS_JAVA_COMPILE_VERSION = "${java_version_str}";
140+
public static final String DORIS_BUILD_VERSION_RC_VERSION = String.valueOf("${build_version_rc_version}");
141+
public static final String DORIS_FEATURE_LIST = String.valueOf("${doris_feature_list}");
142+
143+
public static final String DORIS_BUILD_VERSION = String.valueOf("${build_version}");
144+
public static final String DORIS_BUILD_HASH = String.valueOf("${build_hash}");
145+
public static final String DORIS_BUILD_SHORT_HASH = String.valueOf("${build_short_hash}");
146+
public static final String DORIS_BUILD_TIME = String.valueOf("${build_time}");
147+
public static final String DORIS_BUILD_INFO = String.valueOf("${build_info}");
148+
public static final String DORIS_JAVA_COMPILE_VERSION = String.valueOf("${java_version_str}");
146149
public static final int DORIS_FE_META_VERSION = ${build_fe_meta_version};
147150
148151
public static void main(String[] args) {

0 commit comments

Comments
 (0)