This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 004ea93f2b7 branch-2.1:[chore](thridparty)Upgrade hadoop_libs (#60561)
004ea93f2b7 is described below
commit 004ea93f2b7443087ec7105bb7f3a0c6e710a172
Author: Calvin Kirs <[email protected]>
AuthorDate: Sat Feb 7 18:38:28 2026 +0800
branch-2.1:[chore](thridparty)Upgrade hadoop_libs (#60561)
### What problem does this PR solve?
Issue Number: close #xxx
Related PR: #xxx
Problem Summary:
### Release note
None
### Check List (For Author)
- Test <!-- At least one of them must be included. -->
- [ ] Regression test
- [ ] Unit Test
- [ ] Manual test (add detailed scripts or steps below)
- [ ] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
- [ ] Previous test can cover this change.
- [ ] No code files have been changed.
- [ ] Other reason <!-- Add your reason? -->
- Behavior changed:
- [ ] No.
- [ ] Yes. <!-- Explain the behavior change -->
- Does this need documentation?
- [ ] No.
- [ ] Yes. <!-- Add document PR link here. eg:
https://github.com/apache/doris-website/pull/1214 -->
### Check List (For Reviewer who merge this PR)
- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR
should merge into -->
---
thirdparty/build-thirdparty.sh | 18 ++++++++++++++++++
thirdparty/vars.sh | 9 ++++++++-
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index abdad19a97c..afa4135ea73 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -1695,6 +1695,23 @@ build_hadoop_libs() {
find ./hadoop-dist/target/hadoop-3.3.6/lib/native/ -type l -exec cp -P {}
"${TP_INSTALL_DIR}/lib/hadoop_hdfs/native/" \;
}
+build_hadoop_libs_3_4() {
+ check_if_source_exist "${HADOOP_LIBS_3_4_SOURCE}"
+ cd "${TP_SOURCE_DIR}/${HADOOP_LIBS_3_4_SOURCE}"
+ echo "THIRDPARTY_INSTALLED=${TP_INSTALL_DIR}" >env.sh
+ ./build.sh
+
+ rm -rf "${TP_INSTALL_DIR}/include/hadoop_hdfs_3_4/"
+ rm -rf "${TP_INSTALL_DIR}/lib/hadoop_hdfs_3_4/"
+ mkdir -p "${TP_INSTALL_DIR}/include/hadoop_hdfs_3_4/"
+ mkdir -p "${TP_INSTALL_DIR}/lib/hadoop_hdfs_3_4/"
+ cp -r ./hadoop-dist/target/hadoop-libhdfs-3.4.2/*
"${TP_INSTALL_DIR}/lib/hadoop_hdfs_3_4/"
+ cp -r ./hadoop-dist/target/hadoop-libhdfs-3.4.2/include/hdfs.h
"${TP_INSTALL_DIR}/include/hadoop_hdfs_3_4/"
+ rm -rf "${TP_INSTALL_DIR}/lib/hadoop_hdfs_3_4/native/*.a"
+ find ./hadoop-dist/target/hadoop-3.4.2/lib/native/ -type f ! -name '*.a'
-exec cp {} "${TP_INSTALL_DIR}/lib/hadoop_hdfs_3_4/native/" \;
+ find ./hadoop-dist/target/hadoop-3.4.2/lib/native/ -type l -exec cp -P {}
"${TP_INSTALL_DIR}/lib/hadoop_hdfs_3_4/native/" \;
+}
+
# AvxToNeon
build_avx2neon() {
check_if_source_exist "${AVX2NEON_SOURCE}"
@@ -1895,6 +1912,7 @@ if [[ "${#packages[@]}" -eq 0 ]]; then
read -r -a packages <<<"binutils gettext ${packages[*]}"
elif [[ "$(uname -s)" == 'Linux' ]]; then
read -r -a packages <<<"${packages[*]} hadoop_libs"
+ read -r -a packages <<<"${packages[*]} hadoop_libs_3_4"
fi
fi
diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh
index 7bc66c4677f..52bbfccdd58 100644
--- a/thirdparty/vars.sh
+++ b/thirdparty/vars.sh
@@ -468,6 +468,12 @@ HADOOP_LIBS_NAME="hadoop-3.3.6.5-for-doris.tar.gz"
HADOOP_LIBS_SOURCE="doris-thirdparty-hadoop-3.3.6.5-for-doris"
HADOOP_LIBS_MD5SUM="c13f90ceb5ef9460b7d736c49d9b79fd"
+HADOOP_LIBS_3_4_DOWNLOAD="https://github.com/apache/doris-thirdparty/archive/refs/tags/hadoop-3.4.2.1-for-doris.tar.gz";
+HADOOP_LIBS_3_4_NAME="hadoop-3.4.2.1-for-doris.tar.gz"
+HADOOP_LIBS_3_4_SOURCE="doris-thirdparty-hadoop-3.4.2.1-for-doris"
+HADOOP_LIBS_3_4_MD5SUM="4ca35773ecfae856962885413f6bbeac"
+
+
# AvxToNeon
AVX2NEON_DOWNLOAD="https://github.com/kunpengcompute/AvxToNeon/archive/refs/tags/v1.0.0.tar.gz";
AVX2NEON_NAME=v1.0.0.tar.gz
@@ -493,7 +499,7 @@ JSONCPP_SOURCE="jsoncpp-1.9.5"
JSONCPP_MD5SUM="d6c8c609f2162eff373db62b90a051c7"
# libuuid
-LIBUUID_DOWNLOAD="https://nchc.dl.sourceforge.net/project/libuuid/libuuid-1.0.3.tar.gz";
+LIBUUID_DOWNLOAD="https://distfiles.macports.org/libuuid/libuuid-1.0.3.tar.gz";
LIBUUID_NAME="libuuid-1.0.3.tar.gz"
LIBUUID_SOURCE="libuuid-1.0.3"
LIBUUID_MD5SUM="d44d866d06286c08ba0846aba1086d68"
@@ -590,6 +596,7 @@ export TP_ARCHIVES=(
'CONCURRENTQUEUE'
'FAST_FLOAT'
'HADOOP_LIBS'
+ 'HADOOP_LIBS_3_4'
'AVX2NEON'
'LIBDEFLATE'
'STREAMVBYTE'
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
