From 80312cdb6055c01e01ea285dd72e15a2614b2389 Mon Sep 17 00:00:00 2001
From: Xinyi Zou <zouxinyi02@gmail.com>
Date: Fri, 10 May 2024 14:40:07 +0800
Subject: [PATCH 1/2] 1

---
 build.sh                       | 6 ++----
 thirdparty/build-thirdparty.sh | 9 +++++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/build.sh b/build.sh
index 73bf8da620099d..f1041558af3240 100755
--- a/build.sh
+++ b/build.sh
@@ -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"
 
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index 20c9bb281bd1f9..7677977d741666 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -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
@@ -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

From c9416a71db26f00fda0ca1afeb00c2ee958f80e6 Mon Sep 17 00:00:00 2001
From: Xinyi Zou <zouxinyi02@gmail.com>
Date: Sat, 11 May 2024 13:17:43 +0800
Subject: [PATCH 2/2] 2

---
 build.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index f1041558af3240..b67824ec56fce9 100755
--- a/build.sh
+++ b/build.sh
@@ -356,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