This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 8f0ebde9df [Fix](multi-catalog) Fix zlib init error by using doris's
zlib shared library and jni.log does not output. #23260 (#23993)
8f0ebde9df is described below
commit 8f0ebde9df5fcbf94616aad8fd7813cc181deb87
Author: Qi Chen <[email protected]>
AuthorDate: Wed Sep 6 20:37:18 2023 +0800
[Fix](multi-catalog) Fix zlib init error by using doris's zlib shared
library and jni.log does not output. #23260 (#23993)
---
bin/run-fs-benchmark.sh | 2 +-
bin/start_be.sh | 2 +-
build.sh | 4 ++++
thirdparty/build-thirdparty.sh | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/bin/run-fs-benchmark.sh b/bin/run-fs-benchmark.sh
index a0823d0563..8eb0781106 100755
--- a/bin/run-fs-benchmark.sh
+++ b/bin/run-fs-benchmark.sh
@@ -72,7 +72,7 @@ if [[ -d "${DORIS_HOME}/lib/hadoop_hdfs/" ]]; then
fi
if [[ -n "${HADOOP_CONF_DIR}" ]]; then
- export DORIS_CLASSPATH="${HADOOP_CONF_DIR}:${DORIS_CLASSPATH}"
+ export DORIS_CLASSPATH="${DORIS_CLASSPATH}:${HADOOP_CONF_DIR}"
fi
# the CLASSPATH and LIBHDFS_OPTS is used for hadoop libhdfs
diff --git a/bin/start_be.sh b/bin/start_be.sh
index 514da5e02a..9841e57cda 100755
--- a/bin/start_be.sh
+++ b/bin/start_be.sh
@@ -120,7 +120,7 @@ if [[ -d "${DORIS_HOME}/custom_lib" ]]; then
fi
if [[ -n "${HADOOP_CONF_DIR}" ]]; then
- export DORIS_CLASSPATH="${HADOOP_CONF_DIR}:${DORIS_CLASSPATH}"
+ export DORIS_CLASSPATH="${DORIS_CLASSPATH}:${HADOOP_CONF_DIR}"
fi
# the CLASSPATH and LIBHDFS_OPTS is used for hadoop libhdfs
diff --git a/build.sh b/build.sh
index d2600224bb..d76717b383 100755
--- a/build.sh
+++ b/build.sh
@@ -632,6 +632,10 @@ if [[ "${OUTPUT_BE_BINARY}" -eq 1 ]]; then
cp -r -p "${DORIS_THIRDPARTY}/installed/lib/hadoop_hdfs/"
"${DORIS_OUTPUT}/be/lib/"
fi
+ if [[ -f "${DORIS_THIRDPARTY}/installed/lib/libz.so" ]]; then
+ cp -r -p "${DORIS_THIRDPARTY}/installed/lib/libz.so"*
"${DORIS_OUTPUT}/be/lib/"
+ fi
+
if [[ "${BUILD_BE_JAVA_EXTENSIONS_FALSE_IN_CONF}" -eq 1 ]]; then
echo -e "\033[33;1mWARNNING: \033[37;1mDisable Java UDF support in
be.conf due to the BE was built without Java UDF.\033[0m"
cat >>"${DORIS_OUTPUT}/be/conf/be.conf" <<EOF
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index ab62802cd0..895db73f32 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -581,7 +581,7 @@ build_zlib() {
CFLAGS="-O3 -fPIC" \
CPPFLAGS="-I${TP_INCLUDE_DIR}" \
LDFLAGS="-L${TP_LIB_DIR}" \
- ./configure --prefix="${TP_INSTALL_DIR}" --static
+ ./configure --prefix="${TP_INSTALL_DIR}"
make -j "${PARALLEL}"
make install
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
