[Enhancement] Upgrade pulsar client to 3.3.0 (#30684)

Fixes #29540
This commit is contained in:
chen9t 2023-09-27 14:28:54 +08:00 committed by GitHub
parent 24c5088a5e
commit 88d4eaaf2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 13 deletions

View File

@ -593,7 +593,7 @@ build_librdkafka() {
build_pulsar() {
check_if_source_exist $PULSAR_SOURCE
cd $TP_SOURCE_DIR/$PULSAR_SOURCE/pulsar-client-cpp
cd $TP_SOURCE_DIR/$PULSAR_SOURCE
$CMAKE_CMD -DCMAKE_LIBRARY_PATH=$TP_INSTALL_DIR/lib -DCMAKE_INCLUDE_PATH=$TP_INSTALL_DIR/include \
-DPROTOC_PATH=$TP_INSTALL_DIR/bin/protoc -DBUILD_TESTS=OFF -DBUILD_PYTHON_WRAPPER=OFF -DBUILD_DYNAMIC_LIB=OFF .

View File

@ -374,7 +374,7 @@ echo "Finished patching $CROARINGBITMAP_SOURCE"
# patch pulsar
cd $TP_SOURCE_DIR/$PULSAR_SOURCE
if [ ! -f $PATCHED_MARK ] && [ $PULSAR_SOURCE = "pulsar-2.10.1" ]; then
if [ ! -f $PATCHED_MARK ] && [ $PULSAR_SOURCE = "pulsar-client-cpp-3.3.0" ]; then
patch -p1 < $TP_PATCH_DIR/pulsar.patch
touch $PATCHED_MARK
fi

View File

@ -1,13 +1,13 @@
diff --git a/pulsar-client-cpp/lib/CompressionCodecZstd.cc b/pulsar-client-cpp/lib/CompressionCodecZstd.cc
index 14c09925501dafc6cb8d7540fa5c5c169da7baea..74e533f70fe87152e9c647f4088d1261316a5a18 100644
--- a/pulsar-client-cpp/lib/CompressionCodecZstd.cc
+++ b/pulsar-client-cpp/lib/CompressionCodecZstd.cc
diff --git a/lib/CompressionCodecZstd.cc b/lib/CompressionCodecZstd.cc
index 14c0992..74e533f 100644
--- a/lib/CompressionCodecZstd.cc
+++ b/lib/CompressionCodecZstd.cc
@@ -19,7 +19,7 @@
#include "CompressionCodecZstd.h"
#if HAS_ZSTD
-#include <zstd.h>
+#include <zstd/zstd.h>
namespace pulsar {

8
thirdparty/vars.sh vendored
View File

@ -217,10 +217,10 @@ LIBRDKAFKA_SOURCE=librdkafka-2.0.2
LIBRDKAFKA_MD5SUM="c0120dc32acc129bfb4656fe17568da1"
# pulsar
PULSAR_DOWNLOAD="https://github.com/apache/pulsar/archive/refs/tags/v2.10.1.tar.gz"
PULSAR_NAME=pulsar-2.10.1.tar.gz
PULSAR_SOURCE=pulsar-2.10.1
PULSAR_MD5SUM="3c387e7a8be4545a39e00611ed051918"
PULSAR_DOWNLOAD="https://github.com/apache/pulsar-client-cpp/archive/refs/tags/v3.3.0.tar.gz"
PULSAR_NAME=pulsar-client-3.3.0.tar.gz
PULSAR_SOURCE=pulsar-client-cpp-3.3.0
PULSAR_MD5SUM="348b7e5ec39e50547668520d13a417a1"
# zstd
ZSTD_DOWNLOAD="https://github.com/facebook/zstd/archive/v1.5.0.tar.gz"