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 ca6cb04d162 [fix](routine_load) change librdkafka version from 2.0.2
to 1.9.2 to avoid memory leak (#28528)
ca6cb04d162 is described below
commit ca6cb04d1623dbca70b2dc718ac7b54b62c30372
Author: HHoflittlefish777 <[email protected]>
AuthorDate: Mon Dec 18 18:35:04 2023 +0800
[fix](routine_load) change librdkafka version from 2.0.2 to 1.9.2 to avoid
memory leak (#28528)
---
thirdparty/download-thirdparty.sh | 4 ++--
.../patches/{librdkafka-2.0.2.patch => librdkafka-1.9.2.patch} | 3 +--
thirdparty/vars.sh | 10 +++++-----
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/thirdparty/download-thirdparty.sh
b/thirdparty/download-thirdparty.sh
index 4702defb81d..9845f2d9a49 100755
--- a/thirdparty/download-thirdparty.sh
+++ b/thirdparty/download-thirdparty.sh
@@ -327,10 +327,10 @@ fi
echo "Finished patching ${ARROW_SOURCE}"
# patch librdkafka to avoid crash
-if [[ "${LIBRDKAFKA_SOURCE}" == "librdkafka-2.0.2" ]]; then
+if [[ "${LIBRDKAFKA_SOURCE}" == "librdkafka-1.9.2" ]]; then
cd "${TP_SOURCE_DIR}/${LIBRDKAFKA_SOURCE}"
if [[ ! -f "${PATCHED_MARK}" ]]; then
- patch -p0 <"${TP_PATCH_DIR}/librdkafka-2.0.2.patch"
+ patch -p0 <"${TP_PATCH_DIR}/librdkafka-1.9.2.patch"
touch "${PATCHED_MARK}"
fi
cd -
diff --git a/thirdparty/patches/librdkafka-2.0.2.patch
b/thirdparty/patches/librdkafka-1.9.2.patch
similarity index 96%
rename from thirdparty/patches/librdkafka-2.0.2.patch
rename to thirdparty/patches/librdkafka-1.9.2.patch
index 87fb7a0da6a..38064e751dc 100644
--- a/thirdparty/patches/librdkafka-2.0.2.patch
+++ b/thirdparty/patches/librdkafka-1.9.2.patch
@@ -36,7 +36,7 @@
return 1
--- src/rdkafka_broker.c
+++ src/rdkafka_broker.c
-@@ -4613,7 +4613,9 @@ static int rd_kafka_broker_thread_main(void *arg) {
+@@ -5461,7 +5461,9 @@ static int rd_kafka_broker_thread_main(void *arg) {
*/
void rd_kafka_broker_destroy_final(rd_kafka_broker_t *rkb) {
@@ -47,4 +47,3 @@
rd_assert(TAILQ_EMPTY(&rkb->rkb_monitors));
rd_assert(TAILQ_EMPTY(&rkb->rkb_outbufs.rkbq_bufs));
rd_assert(TAILQ_EMPTY(&rkb->rkb_waitresps.rkbq_bufs));
-
diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh
index 84f22508e3e..5581204d914 100644
--- a/thirdparty/vars.sh
+++ b/thirdparty/vars.sh
@@ -215,11 +215,11 @@ CYRUS_SASL_NAME=cyrus-sasl-2.1.27.tar.gz
CYRUS_SASL_SOURCE=cyrus-sasl-2.1.27
CYRUS_SASL_MD5SUM="a33820c66e0622222c5aefafa1581083"
-# librdkafka-2.0.2
-LIBRDKAFKA_DOWNLOAD="https://github.com/confluentinc/librdkafka/archive/refs/tags/v2.0.2.tar.gz";
-LIBRDKAFKA_NAME=librdkafka-2.0.2.tar.gz
-LIBRDKAFKA_SOURCE=librdkafka-2.0.2
-LIBRDKAFKA_MD5SUM="c0120dc32acc129bfb4656fe17568da1"
+# librdkafka-1.9.2
+LIBRDKAFKA_DOWNLOAD="https://github.com/edenhill/librdkafka/archive/v1.9.2.tar.gz";
+LIBRDKAFKA_NAME=librdkafka-1.9.2.tar.gz
+LIBRDKAFKA_SOURCE=librdkafka-1.9.2
+LIBRDKAFKA_MD5SUM="fe9624e905abbf8324b0f6be520d9c24"
# zstd
ZSTD_DOWNLOAD="https://github.com/facebook/zstd/releases/download/v1.5.5/zstd-1.5.5.tar.gz";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
