This is an automated email from the ASF dual-hosted git repository.
panxiaolei pushed a commit to branch selectdb-doris-2.1-glzq
in repository https://gitbox.apache.org/repos/asf/doris.git
commit 5733c9d84dd8140603fbee727408596bc3fc73f7
Author: xxiao2018 <78575849+xxiao2...@users.noreply.github.com>
AuthorDate: Fri May 5 11:57:05 2023 +0800
[selectdb] add build release scripts (#2)
ci: align build-for-release-selectdb.sh script (#10)
[release](build script) fix build release bug when build multiple version
on same machine #32104
change jdk path to open jdk (#108)
[script] remote audit loader from build-for-release-selectdb.sh
modify build-for-release-selectdb.sh
cp apache_hdfs_broker and audit_loader to extensions dir
---
bin/start_be.sh | 9 +
bin/start_fe.sh | 11 ++
build-for-release-selectdb.sh | 181 +++++++++++++++++++++
conf/be.conf | 3 +
conf/fe.conf | 3 +
.../java/org/apache/doris/qe/GlobalVariable.java | 4 +-
fs_brokers/apache_hdfs_broker/bin/start_broker.sh | 9 +
gensrc/script/gen_build_version.sh | 4 +-
8 files changed, 220 insertions(+), 4 deletions(-)
diff --git a/bin/start_be.sh b/bin/start_be.sh
index 8fcc152d624..1fbfddf2e8f 100755
--- a/bin/start_be.sh
+++ b/bin/start_be.sh
@@ -63,6 +63,15 @@ DORIS_HOME="$(
pwd
)"
export DORIS_HOME
+if [[ -z "${JAVA_HOME}" ]]; then
+ java_home="$(
+ cd "${curdir}/../.."
+ pwd
+ )"
+ export JAVA_HOME=$java_home/java8
+ export PATH=$JAVA_HOME/bin:$PATH
+ echo "${JAVA_HOME}"
+fi
if [[ "$(uname -s)" != 'Darwin' ]]; then
MAX_MAP_COUNT="$(cat /proc/sys/vm/max_map_count)"
diff --git a/bin/start_fe.sh b/bin/start_fe.sh
index 0e5033c094c..aed3d25c965 100755
--- a/bin/start_fe.sh
+++ b/bin/start_fe.sh
@@ -89,6 +89,17 @@ DORIS_HOME="$(
)"
export DORIS_HOME
+if [[ -z "${JAVA_HOME}" ]]; then
+ java_home="$(
+ cd "${curdir}/../.."
+ pwd
+ )"
+ export JAVA_HOME=$java_home/java8
+ export PATH=$JAVA_HOME/bin:$PATH
+ echo "${JAVA_HOME}"
+fi
+
+
# export env variables from fe.conf
#
# JAVA_OPTS
diff --git a/build-for-release-selectdb.sh b/build-for-release-selectdb.sh
new file mode 100755
index 00000000000..2d13b05655b
--- /dev/null
+++ b/build-for-release-selectdb.sh
@@ -0,0 +1,181 @@
+#!/usr/bin/env bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+##############################################################
+# This script is used to build for SelectDB Enterprise Core
+##############################################################
+
+set -eo pipefail
+
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
+
+export DORIS_HOME="${ROOT}"
+
+# Check args
+usage() {
+ echo "
+Usage: $0 --version version <options>
+ Optional options:
+ [no option] build with avx2
+ --noavx2 build without avx2
+ --tar pack the output
+
+ Eg.
+ $0 --version 1.2.0 build with avx2
+ $0 --noavx2 --version 1.2.0 build without avx2
+ $0 --version 1.2.0 --tar build with avx2 and pack the output
+ "
+ exit 1
+}
+
+if ! OPTS="$(getopt \
+ -n "$0" \
+ -o '' \
+ -l 'noavx2' \
+ -l 'tar' \
+ -l 'version:' \
+ -l 'help' \
+ -- "$@")"; then
+ usage
+fi
+
+eval set -- "${OPTS}"
+
+_USE_AVX2=1
+TAR=0
+VERSION=
+if [[ "$#" == 1 ]]; then
+ _USE_AVX2=1
+else
+ while true; do
+ case "$1" in
+ --noavx2)
+ _USE_AVX2=0
+ shift
+ ;;
+ --tar)
+ TAR=1
+ shift
+ ;;
+ --version)
+ VERSION="$2"
+ shift 2
+ ;;
+ --help)
+ HELP=1
+ shift
+ ;;
+ --)
+ shift
+ break
+ ;;
+ *)
+ echo "Internal error"
+ exit 1
+ ;;
+ esac
+ done
+fi
+
+if [[ "${HELP}" -eq 1 ]]; then
+ usage
+ exit
+fi
+
+if [[ -z ${VERSION} ]]; then
+ echo "Must specify version"
+ usage
+ exit 1
+fi
+
+echo "Get params:
+ VERSION -- ${VERSION}
+ USE_AVX2 -- ${_USE_AVX2}
+ TAR -- ${TAR}
+"
+
+ARCH="$(uname -m)"
+if [[ "${ARCH}" == "aarch64" ]]; then
+ ARCH="arm64"
+elif [[ "${ARCH}" == "x86_64" ]]; then
+ ARCH="x64"
+else
+ echo "Unknown arch: ${ARCH}"
+ exit 1
+fi
+
+ORI_OUTPUT="${ROOT}/output"
+
+FE="fe"
+BE="be"
+BROKER="apache_hdfs_broker"
+
+PACKAGE_NAME="selectdb-doris-${VERSION}-bin-${ARCH}"
+if [[ "${_USE_AVX2}" == "0" && "${ARCH}" == "x64" ]]; then
+ PACKAGE_NAME="${PACKAGE_NAME}-noavx2"
+fi
+OUTPUT="${ORI_OUTPUT}/${PACKAGE_NAME}"
+
+rm -rf "${OUTPUT}" && mkdir -p "${OUTPUT}" "${OUTPUT}/extensions"
+echo "Package Path: ${OUTPUT}"
+
+# download and setup java
+JAVA8_DOWNLOAD_LINK=
+JAVA8_DIR_NAME=
+if [[ "${ARCH}" == "x64" ]]; then
+
JAVA8_DOWNLOAD_LINK="https://selectdb-doris-1308700295.cos.ap-beijing.myqcloud.com/release/jdbc_driver/openjdk-8u352-b08-linux-x64.tar.gz";
+ JAVA8_DIR_NAME="openjdk-8u352-b08-linux-x64"
+elif [[ "${ARCH}" == "arm64" ]]; then
+
JAVA8_DOWNLOAD_LINK="https://selectdb-doris-1308700295.cos.ap-beijing.myqcloud.com/release/jdbc_driver/bisheng-jdk-8u352-linux-aarch64.tar.gz";
+ JAVA8_DIR_NAME="bisheng-jdk1.8.0_352"
+else
+ echo "Unknown arch: ${ARCH}"
+ exit 1
+fi
+
+OUTPUT_JAVA8="${OUTPUT}/java8"
+curl -# "${JAVA8_DOWNLOAD_LINK}" | tar xz -C "${OUTPUT}/" && mv
"${OUTPUT}/${JAVA8_DIR_NAME}/" "${OUTPUT_JAVA8}"
+export JAVA_HOME="${OUTPUT_JAVA8}"
+export PATH="${JAVA_HOME}/bin:${PATH}"
+
+# build core
+#sh build.sh --clean &&
+USE_AVX2="${_USE_AVX2}" sh build.sh && USE_AVX2="${_USE_AVX2}" sh build.sh
--be --meta-tool
+
+echo "Begin to install"
+cp -r "${ORI_OUTPUT}/fe" "${OUTPUT}/fe"
+cp -r "${ORI_OUTPUT}/be" "${OUTPUT}/be"
+cp -r "${ORI_OUTPUT}/apache_hdfs_broker"
"${OUTPUT}/extensions/apache_hdfs_broker"
+
+JDBC_DRIVERS_DIR="${OUTPUT}/jdbc_drivers/"
+mkdir -p "${JDBC_DRIVERS_DIR}"
+wget
https://selectdb-doris-1308700295.cos.ap-beijing.myqcloud.com/release/jdbc_driver/clickhouse-jdbc-0.3.2-patch11-all.jar
-P "${JDBC_DRIVERS_DIR}/"
+wget
https://selectdb-doris-1308700295.cos.ap-beijing.myqcloud.com/release/jdbc_driver/mssql-jdbc-11.2.0.jre8.jar
-P "${JDBC_DRIVERS_DIR}/"
+wget
https://selectdb-doris-1308700295.cos.ap-beijing.myqcloud.com/release/jdbc_driver/mysql-connector-java-8.0.25.jar
-P "${JDBC_DRIVERS_DIR}/"
+wget
https://selectdb-doris-1308700295.cos.ap-beijing.myqcloud.com/release/jdbc_driver/ojdbc6.jar
-P "${JDBC_DRIVERS_DIR}/"
+wget
https://selectdb-doris-1308700295.cos.ap-beijing.myqcloud.com/release/jdbc_driver/postgresql-42.5.0.jar
-P "${JDBC_DRIVERS_DIR}/"
+
+if [[ "${TAR}" -eq 1 ]]; then
+ echo "Begin to compress"
+ cd "${ORI_OUTPUT}"
+ tar -cf - "${PACKAGE_NAME}" | xz -T0 -z - >"${PACKAGE_NAME}".tar.xz
+ cd -
+fi
+
+echo "Output dir: ${OUTPUT}"
+exit 0
diff --git a/conf/be.conf b/conf/be.conf
index cd66596501f..4e6c298093c 100644
--- a/conf/be.conf
+++ b/conf/be.conf
@@ -51,6 +51,9 @@ ssl_certificate_path = "$DORIS_HOME/conf/cert.pem"
ssl_private_key_path = "$DORIS_HOME/conf/key.pem"
+# jdbc driver path configuration
+jdbc_drivers_dir=${DORIS_HOME}/../jdbc_drivers/
+
# Choose one if there are more than one ip except loopback address.
# Note that there should at most one ip match this list.
# If no ip match this rule, will choose one randomly.
diff --git a/conf/fe.conf b/conf/fe.conf
index 845dce87cdb..57c7a2ea140 100644
--- a/conf/fe.conf
+++ b/conf/fe.conf
@@ -58,6 +58,9 @@ query_port = 9030
edit_log_port = 9010
arrow_flight_sql_port = -1
+# jdbc driver path configuration
+jdbc_drivers_dir=${DORIS_HOME}/../jdbc_drivers/
+
# Choose one if there are more than one ip except loopback address.
# Note that there should at most one ip match this list.
# If no ip match this rule, will choose one randomly.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/GlobalVariable.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/GlobalVariable.java
index abe5d452a8f..54363804217 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/GlobalVariable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/GlobalVariable.java
@@ -67,8 +67,8 @@ public final class GlobalVariable {
@VariableMgr.VarAttr(name = VERSION_COMMENT, flag = VariableMgr.READ_ONLY)
- public static String versionComment = "Doris version "
- + Version.DORIS_BUILD_VERSION + "-" +
Version.DORIS_BUILD_SHORT_HASH;
+ public static String versionComment =
+ Version.DORIS_BUILD_VERSION + "-" + Version.DORIS_BUILD_SHORT_HASH;
@VariableMgr.VarAttr(name = VERSION, flag = VariableMgr.READ_ONLY)
public static String version = MysqlHandshakePacket.SERVER_VERSION;
diff --git a/fs_brokers/apache_hdfs_broker/bin/start_broker.sh
b/fs_brokers/apache_hdfs_broker/bin/start_broker.sh
index b6511332a61..8061b013fcf 100755
--- a/fs_brokers/apache_hdfs_broker/bin/start_broker.sh
+++ b/fs_brokers/apache_hdfs_broker/bin/start_broker.sh
@@ -56,6 +56,15 @@ BROKER_HOME="$(
pwd
)"
export BROKER_HOME
+if [[ -z "${JAVA_HOME}" ]]; then
+ java_home="$(
+ cd "${curdir}/../.."
+ pwd
+ )"
+ export JAVA_HOME=$java_home/java8
+ export PATH=$JAVA_HOME/bin:$PATH
+ echo "${JAVA_HOME}"
+fi
PID_DIR="$(
cd "${curdir}"
diff --git a/gensrc/script/gen_build_version.sh
b/gensrc/script/gen_build_version.sh
index 4ab0b13f003..af3445fbfb4 100755
--- a/gensrc/script/gen_build_version.sh
+++ b/gensrc/script/gen_build_version.sh
@@ -27,7 +27,7 @@
set -eo pipefail
-build_version_prefix="doris"
+build_version_prefix="selectdb-doris"
build_version_major=2
build_version_minor=1
build_version_patch=5
@@ -65,7 +65,7 @@ if [[ -d '.git' ]]; then
short_revision="$(git log -1 --pretty=format:"%h")"
url="git://${hostname}"
else
- revision="Unknown"
+ revision="tag"
short_revision="${revision}"
url="file://${hostname}"
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
