Skip to content

Commit

Permalink
[deps](be) update libhdfs3 and jemalloc (apache#16894)
Browse files Browse the repository at this point in the history
- Modified: libhdfs3 2.3.7 -> 2.3.8
- Modified: jemalloc 5.2.1 -> 5.3.0  (apache#14871)
  • Loading branch information
morningman authored Feb 19, 2023
1 parent 73f7979 commit cd3dbc3
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 18 deletions.
4 changes: 2 additions & 2 deletions dist/LICENSE-dist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1530,7 +1530,7 @@ The Apache Software License, Version 2.0
* aws sdk: 1.9.211
* benchmark: 1.5.6
* simdjson: 3.0.1
* libhdfs3: 2.3.7
* libhdfs3: 2.3.8
* opentelemetry-proto: 0.18.0
* opentelemetry-cpp: 1.4.0
* clucenc: 2.4.4
Expand Down Expand Up @@ -1571,7 +1571,7 @@ Other dependencies:
* brotli: 1.0.9 -- license/LICENSE-brotli.txt
* bitshuffle: 0.5.1 -- license/LICENSE-bigshuffle.txt
* fmt: 7.1.3 -- license/LICENSE-fmt.txt
* jemalloc: 5.2.1 -- license/LICENSE-jemolloc.txt
* jemalloc: 5.3.0 -- license/LICENSE-jemolloc.txt
* lzma@master -- license/LICENSE-lzma.txt
* libdivide: 5.0 -- license/LICENSE-libdivide.txt
* pdqsort: 0.0.0+git20180419 -- license/LICENSE-pdqsort.txt
Expand Down
4 changes: 4 additions & 0 deletions thirdparty/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

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}`

## v20230218
- Modified: libhdfs3 2.3.7 -> 2.3.8
- Modified: jemalloc 5.2.1 -> 5.3.0

## v20230130
- Modified: libhdfs3 2.3.6 -> 2.3.7

Expand Down
6 changes: 3 additions & 3 deletions thirdparty/build-thirdparty.sh
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,7 @@ build_arrow() {
export ARROW_LZ4_URL="${TP_SOURCE_DIR}/${LZ4_NAME}"
export ARROW_FLATBUFFERS_URL="${TP_SOURCE_DIR}/${FLATBUFFERS_NAME}"
export ARROW_ZSTD_URL="${TP_SOURCE_DIR}/${ZSTD_NAME}"
export ARROW_JEMALLOC_URL="${TP_SOURCE_DIR}/${JEMALLOC_NAME}"
export ARROW_JEMALLOC_URL="${TP_SOURCE_DIR}/${JEMALLOC_ARROW_NAME}"
export ARROW_Thrift_URL="${TP_SOURCE_DIR}/${THRIFT_NAME}"
export ARROW_SNAPPY_URL="${TP_SOURCE_DIR}/${SNAPPY_NAME}"
export ARROW_ZLIB_URL="${TP_SOURCE_DIR}/${ZLIB_NAME}"
Expand Down Expand Up @@ -1404,8 +1404,8 @@ build_hdfs3() {

# jemalloc
build_jemalloc() {
check_if_source_exist "${JEMALLOC_SOURCE}"
cd "${TP_SOURCE_DIR}/${JEMALLOC_SOURCE}"
check_if_source_exist "${JEMALLOC_DORIS_SOURCE}"
cd "${TP_SOURCE_DIR}/${JEMALLOC_DORIS_SOURCE}"

mkdir -p "${BUILD_DIR}"
cd "${BUILD_DIR}"
Expand Down
6 changes: 3 additions & 3 deletions thirdparty/download-thirdparty.sh
Original file line number Diff line number Diff line change
Expand Up @@ -345,15 +345,15 @@ fi
echo "Finished patching ${LIBRDKAFKA_SOURCE}"

# patch jemalloc, disable JEMALLOC_MANGLE for overloading the memory API.
if [[ "${JEMALLOC_SOURCE}" = "jemalloc-5.2.1" ]]; then
cd "${TP_SOURCE_DIR}/${JEMALLOC_SOURCE}"
if [[ "${JEMALLOC_DORIS_SOURCE}" = "jemalloc-5.3.0" ]]; then
cd "${TP_SOURCE_DIR}/${JEMALLOC_DORIS_SOURCE}"
if [[ ! -f "${PATCHED_MARK}" ]]; then
patch -p0 <"${TP_PATCH_DIR}/jemalloc_hook.patch"
touch "${PATCHED_MARK}"
fi
cd -
fi
echo "Finished patching ${JEMALLOC_SOURCE}"
echo "Finished patching ${JEMALLOC_DORIS_SOURCE}"

# patch hyperscan
# https://github.com/intel/hyperscan/issues/292
Expand Down
27 changes: 17 additions & 10 deletions thirdparty/vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -292,11 +292,17 @@ ORC_NAME=orc-1.7.2.tar.gz
ORC_SOURCE=orc-1.7.2
ORC_MD5SUM="6cab37935eacdec7d078d327746a8578"

# jemalloc
JEMALLOC_DOWNLOAD="https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2"
JEMALLOC_NAME="jemalloc-5.2.1.tar.bz2"
JEMALLOC_SOURCE="jemalloc-5.2.1"
JEMALLOC_MD5SUM="3d41fbf006e6ebffd489bdb304d009ae"
# jemalloc for arrow
JEMALLOC_ARROW_DOWNLOAD="https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2"
JEMALLOC_ARROW_NAME="jemalloc-5.2.1.tar.bz2"
JEMALLOC_ARROW_SOURCE="jemalloc-5.2.1"
JEMALLOC_ARROW_MD5SUM="3d41fbf006e6ebffd489bdb304d009ae"

# jemalloc for doris
JEMALLOC_DORIS_DOWNLOAD="https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2"
JEMALLOC_DORIS_NAME="jemalloc-5.3.0.tar.bz2"
JEMALLOC_DORIS_SOURCE="jemalloc-5.3.0"
JEMALLOC_DORIS_MD5SUM="09a8328574dab22a7df848eae6dbbf53"

# cctz
CCTZ_DOWNLOAD="https://github.com/google/cctz/archive/v2.3.tar.gz"
Expand Down Expand Up @@ -368,10 +374,10 @@ KRB5_SOURCE="krb5-1.19"
KRB5_MD5SUM="aaf18447a5a014aa3b7e81814923f4c9"

# hdfs3
HDFS3_DOWNLOAD="https://github.com/apache/doris-thirdparty/archive/refs/tags/libhdfs3-v2.3.7.tar.gz"
HDFS3_NAME="doris-thirdparty-libhdfs3-v2.3.7.tar.gz"
HDFS3_SOURCE="doris-thirdparty-libhdfs3-v2.3.7"
HDFS3_MD5SUM="4c6b272970858214bccd0fc670071fc7"
HDFS3_DOWNLOAD="https://github.com/apache/doris-thirdparty/archive/refs/tags/libhdfs3-v2.3.8.tar.gz"
HDFS3_NAME="doris-thirdparty-libhdfs3-v2.3.8.tar.gz"
HDFS3_SOURCE="doris-thirdparty-libhdfs3-v2.3.8"
HDFS3_MD5SUM="3a9890bb43d0caee183ea7a49df2e4f3"

#libdivide
LIBDIVIDE_DOWNLOAD="https://github.com/ridiculousfish/libdivide/archive/5.0.tar.gz"
Expand Down Expand Up @@ -492,7 +498,8 @@ export TP_ARCHIVES=(
'FMT'
'PARALLEL_HASHMAP'
'ORC'
'JEMALLOC'
'JEMALLOC_ARROW'
'JEMALLOC_DORIS'
'CCTZ'
'DATATABLES'
'BOOTSTRAP_TABLE_JS'
Expand Down

0 comments on commit cd3dbc3

Please sign in to comment.