This is an automated email from the ASF dual-hosted git repository.
morningman 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 ad86b931d4 [Thirdparty](clucene) update clucene to v2.4.6 to fix
bthread/pthread context bug (#16982)
ad86b931d4 is described below
commit ad86b931d4fbe812c7acf35d0a1ef3fff922db98
Author: airborne12 <[email protected]>
AuthorDate: Wed Feb 22 11:24:45 2023 +0800
[Thirdparty](clucene) update clucene to v2.4.6 to fix bthread/pthread
context bug (#16982)
1. change clucene version from 2.4.4->2.4.6
2. update build-thirdparty.sh clucene's build block, adding USE_BTHREAD
CMAKE flag, this flag is inherited from doris's USE_BTHREAD_SCANNER.
---
dist/LICENSE-dist.txt | 2 +-
thirdparty/CHANGELOG.md | 3 +++
thirdparty/build-thirdparty.sh | 9 +++++++++
thirdparty/vars.sh | 8 ++++----
4 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/dist/LICENSE-dist.txt b/dist/LICENSE-dist.txt
index 443cb9168e..d2b16151cf 100644
--- a/dist/LICENSE-dist.txt
+++ b/dist/LICENSE-dist.txt
@@ -1533,7 +1533,7 @@ The Apache Software License, Version 2.0
* libhdfs3: 2.3.8
* opentelemetry-proto: 0.18.0
* opentelemetry-cpp: 1.4.0
- * clucenc: 2.4.4
+ * clucene: 2.4.6
The MIT License -- licenses/LICENSE-MIT.txt
* datatables: 1.12.1
diff --git a/thirdparty/CHANGELOG.md b/thirdparty/CHANGELOG.md
index 78d3b58699..c16c0d6a6f 100644
--- a/thirdparty/CHANGELOG.md
+++ b/thirdparty/CHANGELOG.md
@@ -2,6 +2,9 @@
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}`
+## v20230221
+- Modified: clucene 2.4.4 -> 2.4.6
+
## v20230218
- Modified: libhdfs3 2.3.7 -> 2.3.8
- Modified: jemalloc 5.2.1 -> 5.3.0
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index 92143abc1d..5b775b8b56 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -1564,6 +1564,14 @@ build_clucene() {
else
USE_AVX2="${USE_AVX2:-0}"
fi
+ if [[ -z "${USE_BTHREAD_SCANNER}" ]]; then
+ USE_BTHREAD_SCANNER='OFF'
+ fi
+ if [[ ${USE_BTHREAD_SCANNER} == "ON" ]]; then
+ USE_BTHREAD=1
+ else
+ USE_BTHREAD=0
+ fi
check_if_source_exist "${CLUCENE_SOURCE}"
cd "${TP_SOURCE_DIR}/${CLUCENE_SOURCE}"
@@ -1581,6 +1589,7 @@ build_clucene() {
-DCMAKE_CXX_FLAGS="-fno-omit-frame-pointer ${warning_narrowing}" \
-DUSE_STAT64=0 \
-DUSE_AVX2="${USE_AVX2}" \
+ -DUSE_BTHREAD="${USE_BTHREAD}" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DBUILD_CONTRIBS_LIB=ON ..
${BUILD_SYSTEM} -j "${PARALLEL}"
diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh
index 84b2f7e2bc..b2a66b1d4a 100644
--- a/thirdparty/vars.sh
+++ b/thirdparty/vars.sh
@@ -55,10 +55,10 @@ export TP_JAR_DIR="${TP_INSTALL_DIR}/lib/jar"
#####################################################
#clucene
-CLUCENE_DOWNLOAD="https://github.com/apache/doris-thirdparty/archive/refs/tags/libclucene-v2.4.4.zip";
-CLUCENE_NAME="doris-thirdparty-libclucene-v2.4.4.zip"
-CLUCENE_SOURCE="doris-thirdparty-libclucene-v2.4.4"
-CLUCENE_MD5SUM="431b4c2dc5c75df5e114da72a2e9b74a"
+CLUCENE_DOWNLOAD="https://github.com/apache/doris-thirdparty/archive/refs/tags/libclucene-v2.4.6.zip";
+CLUCENE_NAME="doris-thirdparty-libclucene-v2.4.6.zip"
+CLUCENE_SOURCE="doris-thirdparty-libclucene-v2.4.6"
+CLUCENE_MD5SUM="3d2432c9dc4b23e4f4fb73605f0e577d"
# libevent
LIBEVENT_DOWNLOAD="https://github.com/libevent/libevent/archive/release-2.1.12-stable.tar.gz";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
