From a9121bb95bd279e238dac048bccc11b7ae1c7b4b Mon Sep 17 00:00:00 2001 From: Xie Han <63350856@qq.com> Date: Fri, 18 Jul 2025 15:52:09 +0800 Subject: [PATCH 1/2] Add KAFKA to CI. --- .github/workflows/ci.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1af927f470..ed149da6ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,15 +16,16 @@ jobs: - name: setup run: | sudo apt-get update - sudo apt-get install cmake g++ libgtest-dev make libssl-dev - sudo apt-get install redis valgrind + sudo apt-get install -y cmake g++ libgtest-dev make libssl-dev + sudo apt-get install -y redis valgrind + sudo apt-get install -y libsnappy-dev libzstd-dev liblz4-dev - uses: actions/checkout@v2 - name: make - run: make + run: make KAFKA=y - name: make check - run: make check + run: make check KAFKA=y - name: make tutorial - run: make tutorial + run: make tutorial KAFKA=y fedora-cmake: name: fedora @@ -37,15 +38,16 @@ jobs: - run: cat /etc/os-release - name: install dependencies run: | - dnf -y update - dnf -y install cmake gcc-c++ gtest-devel make - dnf -y install openssl-devel redis valgrind + sudo dnf -y update + sudo dnf install -y cmake gcc-c++ gtest-devel make + sudo dnf install -y openssl-devel redis valgrind + sudo dnf install -y snappy-devel libzstd-devel lz4-devel zlib-devel - name: make - run: make + run: make KAFKA=y - name: make check - run: make check + run: make check KAFKA=y - name: make tutorial - run: make tutorial + run: make tutorial KAFKA=y freebsd-cmake: name: freebsd @@ -65,5 +67,3 @@ jobs: freebsd-version gmake gmake tutorial - cd tutorial - ./parallel_wget http://github.com/ From 6552b86c8c77a4ad9922ee59ebfbba298885e684 Mon Sep 17 00:00:00 2001 From: Xie Han <63350856@qq.com> Date: Fri, 18 Jul 2025 19:55:32 +0800 Subject: [PATCH 2/2] Fix kafka compiling problem. --- BUILD | 2 +- src/protocol/CMakeLists.txt | 1 + src/protocol/KafkaMessage.cc | 2 -- src/protocol/KafkaResult.cc | 5 +++++ src/protocol/KafkaResult.h | 5 +---- src/protocol/xmake.lua | 6 +++--- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/BUILD b/BUILD index abb17d06cb..cb791ed906 100644 --- a/BUILD +++ b/BUILD @@ -212,6 +212,7 @@ cc_library( srcs = [ 'src/factory/KafkaTaskImpl.cc', 'src/protocol/KafkaMessage.cc', + 'src/protocol/KafkaResult.cc', ], copts = ['-fno-rtti'], deps = [ @@ -237,7 +238,6 @@ cc_library( srcs = [ 'src/client/WFKafkaClient.cc', 'src/protocol/KafkaDataTypes.cc', - 'src/protocol/KafkaResult.cc', 'src/protocol/kafka_parser.c', ], deps = [ diff --git a/src/protocol/CMakeLists.txt b/src/protocol/CMakeLists.txt index 6e53a11f87..9c77764890 100644 --- a/src/protocol/CMakeLists.txt +++ b/src/protocol/CMakeLists.txt @@ -44,4 +44,5 @@ if (KAFKA STREQUAL "y") ) add_library("protocol_kafka" OBJECT ${SRC}) set_property(SOURCE KafkaMessage.cc APPEND PROPERTY COMPILE_OPTIONS "-fno-rtti") + set_property(SOURCE KafkaResult.cc APPEND PROPERTY COMPILE_OPTIONS "-fno-rtti") endif () diff --git a/src/protocol/KafkaMessage.cc b/src/protocol/KafkaMessage.cc index 05c184eff4..9d2f1b75c9 100644 --- a/src/protocol/KafkaMessage.cc +++ b/src/protocol/KafkaMessage.cc @@ -377,13 +377,11 @@ static int compress_buf(KafkaBlock *block, int compress_type, void *env) } *block = std::move(nblock); - break; case Kafka_Snappy: snappy_buffer = static_cast(env); snappy_buffer->append((const char *)block->get_block(), block->get_len()); - break; case Kafka_Lz4: diff --git a/src/protocol/KafkaResult.cc b/src/protocol/KafkaResult.cc index 36a266aff9..f573ab5b39 100644 --- a/src/protocol/KafkaResult.cc +++ b/src/protocol/KafkaResult.cc @@ -33,6 +33,11 @@ KafkaResult::KafkaResult() this->resp_num = 0; } +KafkaResult::~KafkaResult() +{ + delete []this->resp_vec; +} + KafkaResult& KafkaResult::operator= (KafkaResult&& move) { if (this != &move) diff --git a/src/protocol/KafkaResult.h b/src/protocol/KafkaResult.h index 4eac839611..d2d1631875 100644 --- a/src/protocol/KafkaResult.h +++ b/src/protocol/KafkaResult.h @@ -45,10 +45,7 @@ class KafkaResult public: KafkaResult(); - virtual ~KafkaResult() - { - delete []this->resp_vec; - } + virtual ~KafkaResult(); KafkaResult& operator= (KafkaResult&& move); diff --git a/src/protocol/xmake.lua b/src/protocol/xmake.lua index 422659bab7..e2809936b7 100644 --- a/src/protocol/xmake.lua +++ b/src/protocol/xmake.lua @@ -38,7 +38,8 @@ target("protocol") target("kafka_message") if has_config("kafka") then - add_files("KafkaMessage.cc") + add_files("KafkaMessage.cc", + "KafkaResult.cc") set_kind("object") add_cxxflags("-fno-rtti") add_packages("lz4", "zstd", "zlib", "snappy") @@ -50,8 +51,7 @@ target("kafka_protocol") if has_config("kafka") then set_kind("object") add_files("kafka_parser.c", - "KafkaDataTypes.cc", - "KafkaResult.cc") + "KafkaDataTypes.cc") add_deps("kafka_message", "protocol") add_packages("zlib", "snappy", "zstd", "lz4") else