[upgrade](thirdparty) upgrade librdkafka from 1.8.2 to 1.9.2(#28210) (#…

…29160)

thirdparty/download-thirdparty.sh

@@ -334,10 +334,10 @@ fi
 echo "Finished patching ${ARROW_SOURCE}"
 
 # patch librdkafka to avoid crash
-if [[ "${LIBRDKAFKA_SOURCE}" == "librdkafka-1.8.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-1.8.2.patch"
+        patch -p0 <"${TP_PATCH_DIR}/librdkafka-1.9.2.patch"
         touch "${PATCHED_MARK}"
     fi
     cd -

thirdparty/patches/librdkafka-1.8.2.patch → thirdparty/patches/librdkafka-1.9.2.patch

@@ -1,20 +1,17 @@
---- src/rdkafka_broker.c	2021-10-12 04:15:44.000000000 +0800
-+++ src/rdkafka_broker.c	2022-03-10 10:31:45.141882467 +0800
-@@ -5464,7 +5464,9 @@
-  */
- void rd_kafka_broker_destroy_final (rd_kafka_broker_t *rkb) {
+--- lds-gen.py
++++ lds-gen.py
+@@ -58,7 +58,7 @@ if __name__ == '__main__':
 
--        rd_assert(thrd_is_current(rkb->rkb_thread));
-+        // To avoid the error describe in https://github.com/edenhill/librdkafka/issues/3608
-+        // comment this line to fix it temporarily.
-+        // rd_assert(thrd_is_current(rkb->rkb_thread));
-         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));
-
---- mklove/modules/configure.base	2022-11-21 03:47:14.072094876 +0800
-+++ mklove/modules/configure.base	2022-11-21 03:47:01.360075164 +0800
-@@ -1716,7 +1716,7 @@
+     # Special symbols not covered by above matches or not exposed in
+     # the public header files.
+-    funcs.append('rd_ut_coverage_check')
++    # funcs.append('rd_ut_coverage_check')
+
+     print('# Automatically generated by lds-gen.py - DO NOT EDIT')
+     print('{\n global:')
+--- mklove/modules/configure.base
++++ mklove/modules/configure.base
+@@ -1741,7 +1741,7 @@ function mkl_pkg_config_check {
      mkl_check_begin "$cname" "$2" "no-cache" "$1 (by pkg-config)" && return $?
 
      local cflags=
@@ -23,7 +20,7 @@
      mkl_dbg "pkg-config check $libname for CFLAGS ($2): $cmd"
 
      cflags=$($cmd 2>&1)
-@@ -1738,11 +1738,11 @@
+@@ -1764,11 +1764,11 @@ $cflags"
      fi
 
      local libs=
@@ -37,3 +34,16 @@
          # Clear define name ($2): caller may have additional checks
          mkl_check_failed "$cname" "" "$3" "pkg-config --libs failed"
          return 1
+--- src/rdkafka_broker.c
++++ src/rdkafka_broker.c
+@@ -5461,7 +5461,9 @@ static int rd_kafka_broker_thread_main(void *arg) {
+  */
+ void rd_kafka_broker_destroy_final(rd_kafka_broker_t *rkb) {
+
+-        rd_assert(thrd_is_current(rkb->rkb_thread));
++        // To avoid the error describe in https://github.com/edenhill/librdkafka/issues/3608
++        // comment this line to fix it temporarily.
++        // rd_assert(thrd_is_current(rkb->rkb_thread));
+         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));

thirdparty/vars.sh

@@ -214,11 +214,11 @@ CYRUS_SASL_NAME=cyrus-sasl-2.1.27.tar.gz
 CYRUS_SASL_SOURCE=cyrus-sasl-2.1.27
 CYRUS_SASL_MD5SUM="a33820c66e0622222c5aefafa1581083"
 
-# librdkafka-1.8.2
-LIBRDKAFKA_DOWNLOAD="https://github.com/edenhill/librdkafka/archive/refs/tags/v1.8.2.tar.gz"
-LIBRDKAFKA_NAME=librdkafka-1.8.2.tar.gz
-LIBRDKAFKA_SOURCE=librdkafka-1.8.2
-LIBRDKAFKA_MD5SUM="0abec0888d10c9553cdcbcbf9172d558"
+# 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.2/zstd-1.5.2.tar.gz"