Merge pull request #18671 from filimonov/librdkafka-v1.5.3

Update librdkafka to v1.6.0-RC2

librdkafka @ cf11d0aa

-Subproject commit f2f6616419d567c9198aef0d1133a2e9b4f02276
+Subproject commit cf11d0aa36d4738f2c9bf4377807661660f1be76

contrib/librdkafka-cmake/CMakeLists.txt

@@ -2,26 +2,25 @@ set(RDKAFKA_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/librdkafka/src)
 
 set(SRCS
   ${RDKAFKA_SOURCE_DIR}/crc32c.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_zstd.c
 #  ${RDKAFKA_SOURCE_DIR}/lz4.c
 #  ${RDKAFKA_SOURCE_DIR}/lz4frame.c
 #  ${RDKAFKA_SOURCE_DIR}/lz4hc.c
-  ${RDKAFKA_SOURCE_DIR}/rdxxhash.c
-#  ${RDKAFKA_SOURCE_DIR}/regexp.c
   ${RDKAFKA_SOURCE_DIR}/rdaddr.c
   ${RDKAFKA_SOURCE_DIR}/rdavl.c
   ${RDKAFKA_SOURCE_DIR}/rdbuf.c
   ${RDKAFKA_SOURCE_DIR}/rdcrc32.c
   ${RDKAFKA_SOURCE_DIR}/rddl.c
   ${RDKAFKA_SOURCE_DIR}/rdfnv1a.c
+  ${RDKAFKA_SOURCE_DIR}/rdgz.c
   ${RDKAFKA_SOURCE_DIR}/rdhdrhistogram.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_admin.c # looks optional
+  ${RDKAFKA_SOURCE_DIR}/rdkafka_assignment.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_assignor.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_aux.c # looks optional
   ${RDKAFKA_SOURCE_DIR}/rdkafka_background.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_broker.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_buf.c
+  ${RDKAFKA_SOURCE_DIR}/rdkafka.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_cert.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_cgrp.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_conf.c
@@ -29,7 +28,9 @@ set(SRCS
   ${RDKAFKA_SOURCE_DIR}/rdkafka_error.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_event.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_feature.c
+  ${RDKAFKA_SOURCE_DIR}/rdkafka_header.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_idempotence.c
+  ${RDKAFKA_SOURCE_DIR}/rdkafka_interceptor.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_lz4.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_metadata.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_metadata_cache.c
@@ -49,20 +50,22 @@ set(SRCS
   ${RDKAFKA_SOURCE_DIR}/rdkafka_request.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_roundrobin_assignor.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl.c
+#  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_cyrus.c # optionally included below
   ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_oauthbearer.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_plain.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_scram.c
 #  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_win32.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_ssl.c
+  ${RDKAFKA_SOURCE_DIR}/rdkafka_sticky_assignor.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_subscription.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_timer.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_topic.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_transport.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_interceptor.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_header.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_txnmgr.c
+  ${RDKAFKA_SOURCE_DIR}/rdkafka_zstd.c
   ${RDKAFKA_SOURCE_DIR}/rdlist.c
   ${RDKAFKA_SOURCE_DIR}/rdlog.c
+  ${RDKAFKA_SOURCE_DIR}/rdmap.c
   ${RDKAFKA_SOURCE_DIR}/rdmurmur2.c
   ${RDKAFKA_SOURCE_DIR}/rdports.c
   ${RDKAFKA_SOURCE_DIR}/rdrand.c
@@ -70,10 +73,11 @@ set(SRCS
   ${RDKAFKA_SOURCE_DIR}/rdstring.c
   ${RDKAFKA_SOURCE_DIR}/rdunittest.c
   ${RDKAFKA_SOURCE_DIR}/rdvarint.c
+  ${RDKAFKA_SOURCE_DIR}/rdxxhash.c
+  # ${RDKAFKA_SOURCE_DIR}/regexp.c
   ${RDKAFKA_SOURCE_DIR}/snappy.c
   ${RDKAFKA_SOURCE_DIR}/tinycthread.c
   ${RDKAFKA_SOURCE_DIR}/tinycthread_extra.c
-  ${RDKAFKA_SOURCE_DIR}/rdgz.c
 )
 
 if(${ENABLE_CYRUS_SASL})

contrib/librdkafka-cmake/config.h.in

@@ -44,9 +44,9 @@
 // atomic_64
 #define ATOMIC_OP(OP1,OP2,PTR,VAL) __atomic_ ## OP1 ## _ ## OP2(PTR, VAL, __ATOMIC_SEQ_CST)
 // parseversion
-#define RDKAFKA_VERSION_STR "0.11.4"
+#define RDKAFKA_VERSION_STR "1.6.0"
 // parseversion
-#define MKL_APP_VERSION "0.11.4"
+#define MKL_APP_VERSION "1.6.0"
 // libdl
 #define WITH_LIBDL 1
 // WITH_PLUGINS