This is an automated email from the ASF dual-hosted git repository.
panxiaolei 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 e470fee99dc [Chore](build) upgrade thirdparty ldb to 0.25 and fix
clucene build fail on gcc15 (#53519)
e470fee99dc is described below
commit e470fee99dc6910679ec28d3e2c0cf0ff41f7473
Author: Pxl <[email protected]>
AuthorDate: Wed Jul 23 09:37:27 2025 +0800
[Chore](build) upgrade thirdparty ldb to 0.25 and fix clucene build fail on
gcc15 (#53519)
upgrade thirdparty ldb to 0.25 and fix clucene build fail on gcc15
---
.github/workflows/build-thirdparty.yml | 6 +++---
be/CMakeLists.txt | 11 +++++------
build.sh | 2 +-
contrib/clucene | 2 +-
env.sh | 2 +-
thirdparty/CHANGELOG.md | 5 +++++
thirdparty/build-thirdparty.sh | 13 +++++++++----
thirdparty/download-thirdparty.sh | 17 +++++------------
thirdparty/patches/absl.patch | 20 --------------------
thirdparty/patches/grpc-absl-fix.patch | 21 +++++++++++++++++++++
thirdparty/patches/rocksdb-mac-compile-fix.patch | 17 +++++++++++++++++
thirdparty/vars.sh | 16 ++++++++--------
12 files changed, 76 insertions(+), 56 deletions(-)
diff --git a/.github/workflows/build-thirdparty.yml
b/.github/workflows/build-thirdparty.yml
index f08ff35e778..881a91a84b1 100644
--- a/.github/workflows/build-thirdparty.yml
+++ b/.github/workflows/build-thirdparty.yml
@@ -120,7 +120,7 @@ jobs:
sudo DEBIAN_FRONTEND=noninteractive apt install --yes
"${packages[@]}"
mkdir -p "${DEFAULT_DIR}"
- wget
https://github.com/amosbird/ldb_toolchain_gen/releases/download/v0.18/ldb_toolchain_gen.sh
\
+ wget
https://github.com/amosbird/ldb_toolchain_gen/releases/download/v0.25/ldb_toolchain_gen.sh
\
-q -O /tmp/ldb_toolchain_gen.sh
bash /tmp/ldb_toolchain_gen.sh "${DEFAULT_DIR}/ldb-toolchain"
@@ -173,7 +173,7 @@ jobs:
'openjdk@11'
'maven'
'node'
- 'llvm@16'
+ 'llvm@20'
)
# Install packages except cmake
@@ -231,7 +231,7 @@ jobs:
'openjdk@11'
'maven'
'node'
- 'llvm@16'
+ 'llvm@20'
)
# Install packages except cmake
diff --git a/be/CMakeLists.txt b/be/CMakeLists.txt
index bc1300b3b4f..af636966219 100644
--- a/be/CMakeLists.txt
+++ b/be/CMakeLists.txt
@@ -197,6 +197,9 @@ SET(SNAPPY_HOME "$ENV{DORIS_THIRDPARTY}/installed")
SET(LZ4_HOME "$ENV{DORIS_THIRDPARTY}/installed")
SET(LZ4_INCLUDE_DIR "$ENV{DORIS_THIRDPARTY}/installed/include/lz4")
SET(ZLIB_HOME "$ENV{DORIS_THIRDPARTY}/installed")
+SET(ZLIB_USE_STATIC_LIBS ON)
+SET(ZLIB_ROOT "$ENV{DORIS_THIRDPARTY}/installed")
+find_package(ZLIB)
SET(ZSTD_HOME "$ENV{DORIS_THIRDPARTY}/installed")
SET(ZSTD_INCLUDE_DIR "$ENV{DORIS_THIRDPARTY}/installed/include/zstd")
SET(CONTRIB_PATH "${PROJECT_SOURCE_DIR}/../contrib")
@@ -210,7 +213,6 @@ option(BUILD_SHARED_LIBRARIES "Build shared libraries" OFF)
option(BUILD_CONTRIBS_LIB "Build contribs lib" ON)
set(BOOST_ROOT "$ENV{DORIS_THIRDPARTY}/installed")
-set(ZLIB_ROOT "$ENV{DORIS_THIRDPARTY}/installed")
set(Roaring_ROOT "$ENV{DORIS_THIRDPARTY}/installed")
set(USE_STAT64 0)
@@ -567,11 +569,8 @@ endif()
if (absl_FOUND)
set(COMMON_THIRDPARTY
${COMMON_THIRDPARTY}
- absl::flags_internal
- absl::flags_reflection
- absl::random_internal_pool_urbg
- absl::random_internal_randen
- absl::random_internal_seed_material
+ absl::flags
+ absl::random_random
absl::spinlock_wait
absl::status
absl::statusor
diff --git a/build.sh b/build.sh
index 056e5e7da8c..7fe974caacf 100755
--- a/build.sh
+++ b/build.sh
@@ -464,7 +464,7 @@ if [[ -z "${DISABLE_JAVA_CHECK_STYLE}" ]]; then
DISABLE_JAVA_CHECK_STYLE='OFF'
fi
-if [[ -n "${DISABLE_BUILD_AZURE}" ]]; then
+if [[ -n "${DISABLE_BUILD_AZURE}" || "${TARGET_SYSTEM}" == 'Darwin' ]]; then
BUILD_AZURE='OFF'
fi
diff --git a/contrib/clucene b/contrib/clucene
index 75126ebce82..f608ed38463 160000
--- a/contrib/clucene
+++ b/contrib/clucene
@@ -1 +1 @@
-Subproject commit 75126ebce823d3c7a61396973330f132120a31ec
+Subproject commit f608ed38463c298e1d10310f8dcff74c0325b0f1
diff --git a/env.sh b/env.sh
index 0a5ae6365c7..213e25f0cd8 100755
--- a/env.sh
+++ b/env.sh
@@ -61,7 +61,7 @@ CELLARS=(
wget
pcre
maven
- llvm@16
+ llvm@20
m4
)
for cellar in "\${CELLARS[@]}"; do
diff --git a/thirdparty/CHANGELOG.md b/thirdparty/CHANGELOG.md
index 528c29a13d2..8f2a6d9beae 100644
--- a/thirdparty/CHANGELOG.md
+++ b/thirdparty/CHANGELOG.md
@@ -2,6 +2,11 @@
This file contains version of the third-party dependency libraries in the
build-env image. The docker build-env image is apache/doris, and the tag is
`build-env-${version}`
+## 20250720
+
+- Modified: zlib 1.2.11 -> 1.3.1
+- Modified: abseil 20230125.3. -> 20250512.1
+
## 20250715
- Modified: azure-core 1.10.3 -> 1.16.0
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index 6084026fd00..0ee36a87baa 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -988,6 +988,12 @@ build_grpc() {
cmake -DgRPC_INSTALL=ON \
-DgRPC_BUILD_TESTS=OFF \
+ -Dgrpc_csharp_plugin=OFF \
+ -Dgrpc_node_plugin=OFF \
+ -Dgrpc_objective_c_plugin=OFF \
+ -Dgrpc_php_plugin=OFF \
+ -Dgrpc_python_plugin=OFF \
+ -Dgrpc_ruby_plugin=OFF \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX="${TP_INSTALL_DIR}" \
-DgRPC_CARES_PROVIDER=package \
@@ -1358,7 +1364,7 @@ build_aws_sdk() {
-DCMAKE_PREFIX_PATH="${TP_INSTALL_DIR}" -DBUILD_SHARED_LIBS=OFF
-DENABLE_TESTING=OFF \
-DCURL_LIBRARY_RELEASE="${TP_INSTALL_DIR}/lib/libcurl.a"
-DZLIB_LIBRARY_RELEASE="${TP_INSTALL_DIR}/lib/libz.a" \
-DBUILD_ONLY="core;s3;s3-crt;transfer;identity-management;sts" \
- -DCMAKE_CXX_FLAGS="-Wno-nonnull ${warning_deprecated_literal_operator}
-Wno-deprecated-declarations ${warning_dangling_reference}" -DCPP_STANDARD=17
+ -DCMAKE_CXX_FLAGS="-Wno-nonnull -Wno-deprecated-literal-operator
${warning_deprecated_literal_operator} -Wno-deprecated-declarations
${warning_dangling_reference}" -DCPP_STANDARD=17
cd "${BUILD_DIR}"
@@ -1657,7 +1663,7 @@ build_binutils() {
cd "${BUILD_DIR}"
../configure --prefix="${TP_INSTALL_DIR}/binutils"
--includedir="${TP_INCLUDE_DIR}" --libdir="${TP_LIB_DIR}" \
- --enable-install-libiberty --without-msgpack
+ --enable-install-libiberty --without-msgpack -with-system-zlib
make -j "${PARALLEL}"
make install-bfd install-libiberty install-binutils
}
@@ -1808,7 +1814,7 @@ build_base64() {
# azure blob storage
build_azure() {
- if [[ "${BUILD_AZURE}" == "OFF" ]]; then
+ if [[ "${BUILD_AZURE}" == "OFF" || "$(uname -s)" == 'Darwin' ]]; then
echo "Skip build azure"
else
check_if_source_exist "${AZURE_SOURCE}"
@@ -2019,7 +2025,6 @@ if [[ "${#packages[@]}" -eq 0 ]]; then
ali_sdk
base64
azure
- dragonbox
brotli
icu
pugixml
diff --git a/thirdparty/download-thirdparty.sh
b/thirdparty/download-thirdparty.sh
index 54bcf2148d2..628a5671c2f 100755
--- a/thirdparty/download-thirdparty.sh
+++ b/thirdparty/download-thirdparty.sh
@@ -247,17 +247,6 @@ echo "===== Patching thirdparty archives..."
###################################################################################
PATCHED_MARK="patched_mark"
-# abseil patch
-if [[ " ${TP_ARCHIVES[*]} " =~ " ABSEIL " ]]; then
- cd "${TP_SOURCE_DIR}/${ABSEIL_SOURCE}"
- if [[ ! -f "${PATCHED_MARK}" ]]; then
- patch -p1 <"${TP_PATCH_DIR}/absl.patch"
- touch "${PATCHED_MARK}"
- fi
- cd -
- echo "Finished patching ${ABSEIL_SOURCE}"
-fi
-
# glog patch
if [[ " ${TP_ARCHIVES[*]} " =~ " GLOG " ]]; then
if [[ "${GLOG_SOURCE}" == "glog-0.4.0" ]]; then
@@ -354,6 +343,9 @@ if [[ " ${TP_ARCHIVES[*]} " =~ " ROCKSDB " ]]; then
cd "${TP_SOURCE_DIR}/${ROCKSDB_SOURCE}"
if [[ ! -f "${PATCHED_MARK}" ]]; then
patch -p1 <"${TP_PATCH_DIR}/rocksdb-5.14.2.patch"
+ if [[ "$(uname -s)" == "Darwin" ]]; then
+ patch -p1 <"${TP_PATCH_DIR}/rocksdb-mac-compile-fix.patch"
+ fi
touch "${PATCHED_MARK}"
fi
cd -
@@ -522,6 +514,7 @@ if [[ " ${TP_ARCHIVES[*]} " =~ " GRPC " ]]; then
cd "${TP_SOURCE_DIR}/${GRPC_SOURCE}"
if [[ ! -f "${PATCHED_MARK}" ]]; then
patch -p1 <"${TP_PATCH_DIR}/grpc-1.54.3.patch"
+ patch -p1 <"${TP_PATCH_DIR}/grpc-absl-fix.patch"
touch "${PATCHED_MARK}"
fi
cd -
@@ -627,7 +620,7 @@ if [[ " ${TP_ARCHIVES[*]} " =~ " AZURE " ]]; then
touch "${PATCHED_MARK}"
fi
cd -
- echo "Finished patching ${GRPC_SOURCE}"
+ echo "Finished patching ${AZURE_SOURCE}"
fi
# vim: ts=4 sw=4 ts=4 tw=100:
diff --git a/thirdparty/patches/absl.patch b/thirdparty/patches/absl.patch
deleted file mode 100644
index 4a16368a9b2..00000000000
--- a/thirdparty/patches/absl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/absl/container/internal/btree.h b/absl/container/internal/btree.h
-index d734676a..43216318 100644
---- a/absl/container/internal/btree.h
-+++ b/absl/container/internal/btree.h
-@@ -76,16 +76,6 @@ namespace absl {
- ABSL_NAMESPACE_BEGIN
- namespace container_internal {
-
--#ifdef ABSL_BTREE_ENABLE_GENERATIONS
--#error ABSL_BTREE_ENABLE_GENERATIONS cannot be directly set
--#elif defined(ABSL_HAVE_ADDRESS_SANITIZER) || \
-- defined(ABSL_HAVE_MEMORY_SANITIZER)
--// When compiled in sanitizer mode, we add generation integers to the nodes
and
--// iterators. When iterators are used, we validate that the container has not
--// been mutated since the iterator was constructed.
--#define ABSL_BTREE_ENABLE_GENERATIONS
--#endif
--
- template <typename Compare, typename T, typename U>
- using compare_result_t = absl::result_of_t<const Compare(const T &, const U
&)>;
diff --git a/thirdparty/patches/grpc-absl-fix.patch
b/thirdparty/patches/grpc-absl-fix.patch
new file mode 100644
index 00000000000..f56d3459029
--- /dev/null
+++ b/thirdparty/patches/grpc-absl-fix.patch
@@ -0,0 +1,21 @@
+--- ./src/core/lib/iomgr/tcp_posix_old.cc 2025-07-19 02:19:55
++++ ./src/core/lib/iomgr/tcp_posix.cc 2025-07-19 02:19:44
+@@ -22,6 +22,8 @@
+
+ #include "src/core/lib/iomgr/exec_ctx.h"
+ #include "src/core/lib/iomgr/port.h"
++
++#include "absl/strings/str_cat.h"
+
+ #ifdef GRPC_POSIX_SOCKET_TCP
+
+--- ./src/core/lib/iomgr/event_engine_shims/tcp_client_old.cc 2025-07-19
02:24:05
++++ ./src/core/lib/iomgr/event_engine_shims/tcp_client.cc 2025-07-19
02:16:24
+@@ -17,6 +17,7 @@
+
+ #include "absl/status/status.h"
+ #include "absl/strings/string_view.h"
++#include "absl/strings/str_cat.h"
+
+ #include <grpc/event_engine/event_engine.h>
+ #include <grpc/support/time.h>
diff --git a/thirdparty/patches/rocksdb-mac-compile-fix.patch
b/thirdparty/patches/rocksdb-mac-compile-fix.patch
new file mode 100644
index 00000000000..3b1044fcace
--- /dev/null
+++ b/thirdparty/patches/rocksdb-mac-compile-fix.patch
@@ -0,0 +1,17 @@
+--- ./util/autovector.h 2025-07-19 00:47:17
++++ ./util/autovector2.h 2025-07-19 00:47:10
+@@ -12,6 +12,7 @@
+ #include <vector>
+
+ namespace rocksdb {
++#define ROCKSDB_LITE 1
+
+ #ifdef ROCKSDB_LITE
+ template <class T, size_t kSize = 8>
+@@ -335,4 +336,6 @@
+ return *this;
+ }
+ #endif // ROCKSDB_LITE
++
++#undef ROCKSDB_LITE
+ } // namespace rocksdb
diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh
index bc11d26d6b1..28180079e7c 100644
--- a/thirdparty/vars.sh
+++ b/thirdparty/vars.sh
@@ -110,10 +110,10 @@ GPERFTOOLS_SOURCE=gperftools-2.10
GPERFTOOLS_MD5SUM="62bf6c76ba855ed580de5e139bd2a483"
# zlib
-ZLIB_DOWNLOAD="https://sourceforge.net/projects/libpng/files/zlib/1.2.11/zlib-1.2.11.tar.gz";
-ZLIB_NAME=zlib-1.2.11.tar.gz
-ZLIB_SOURCE=zlib-1.2.11
-ZLIB_MD5SUM="1c9f62f0778697a09d36121ead88e08e"
+ZLIB_DOWNLOAD="https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.gz";
+ZLIB_NAME=zlib-1.3.1.tar.gz
+ZLIB_SOURCE=zlib-1.3.1
+ZLIB_MD5SUM="9855b6d802d7fe5b7bd5b196a2271655"
# lz4
LZ4_DOWNLOAD="https://github.com/lz4/lz4/archive/v1.9.4.tar.gz";
@@ -261,10 +261,10 @@ ARROW_SOURCE="arrow-apache-arrow-17.0.0"
ARROW_MD5SUM="ba18bf83e2164abd34b9ac4cb164f0f0"
# Abseil
-ABSEIL_DOWNLOAD="https://github.com/abseil/abseil-cpp/archive/refs/tags/20230125.3.tar.gz";
-ABSEIL_NAME="abseil-cpp-20230125.3.tar.gz"
-ABSEIL_SOURCE=abseil-cpp-20230125.3
-ABSEIL_MD5SUM="9b6dae642c4bd92f007ab2c148bc0498"
+ABSEIL_DOWNLOAD="https://github.com/abseil/abseil-cpp/releases/download/20250512.1/abseil-cpp-20250512.1.tar.gz";
+ABSEIL_NAME="abseil-cpp-20250512.1.tar.gz"
+ABSEIL_SOURCE=abseil-cpp-20250512.1
+ABSEIL_MD5SUM="f225db90c7f3485f3bb65ab2aeae76fa"
# S2
S2_DOWNLOAD="https://github.com/google/s2geometry/archive/refs/tags/v0.10.0.tar.gz";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
