Skip to content

[fix](memory) Fix build.sh thirdparty path error for jemalloc #34643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xinyiZzz merged 2 commits into from
May 11, 2024
Merged

[fix](memory) Fix build.sh thirdparty path error for jemalloc #34643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80312cd
1
xinyiZzz May 10, 2024
c9416a7
2
xinyiZzz May 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,8 @@ set -eo pipefail
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"

export DORIS_HOME="${ROOT}"
export TP_DIR="${ROOT}/thirdparty"
export TP_INSTALL_DIR="${TP_DIR:-.}/installed"
export TP_INCLUDE_DIR="${TP_INSTALL_DIR}/include"
export TP_LIB_DIR="${TP_INSTALL_DIR}/lib"
export TP_INCLUDE_DIR="${DORIS_THIRDPARTY}/installed/include"
export TP_LIB_DIR="${DORIS_THIRDPARTY}/installed/lib"

. "${DORIS_HOME}/env.sh"

Expand Down Expand Up @@ -358,7 +356,9 @@ if [[ -z "${USE_MEM_TRACKER}" ]]; then
USE_MEM_TRACKER='OFF'
fi
fi
if [[ -z "${USE_JEMALLOC}" ]]; then
if [[ "${BUILD_TYPE,,}" == "asan" ]]; then
USE_JEMALLOC='OFF'
elif [[ -z "${USE_JEMALLOC}" ]]; then
USE_JEMALLOC='ON'
fi
if [[ ! -f "${TP_INCLUDE_DIR}/jemalloc/jemalloc_doris_with_prefix.h" ]]; then
Expand Down
9 changes: 7 additions & 2 deletions thirdparty/build-thirdparty.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,6 +875,11 @@ build_rocksdb_jemalloc_with_prefix() {
cp librocksdb.a "${TP_LIB_DIR}/librocksdb_jemalloc_with_prefix.a"
cp -r include/rocksdb "${TP_INCLUDE_DIR}/rocksdb_jemalloc_with_prefix"
strip_lib librocksdb_jemalloc_with_prefix.a
# for compatibility with previous doris version
rm -rf "${TP_LIB_DIR}/librocksdb.a"
rm -rf "${TP_INCLUDE_DIR}/rocksdb"
cp "${TP_LIB_DIR}/librocksdb_jemalloc_with_prefix.a" "${TP_LIB_DIR}/librocksdb.a"
cp -r "${TP_INCLUDE_DIR}/rocksdb_jemalloc_with_prefix" "${TP_INCLUDE_DIR}/rocksdb"
}

# cyrus_sasl
Expand Down Expand Up @@ -1866,10 +1871,10 @@ if [[ "${#packages[@]}" -eq 0 ]]; then
thrift
leveldb
brpc
jemalloc_doris_with_prefix
rocksdb_jemalloc_with_prefix
jemalloc_doris
rocksdb
jemalloc_doris_with_prefix
rocksdb_jemalloc_with_prefix
krb5 # before cyrus_sasl
cyrus_sasl
librdkafka
Expand Down