Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -65,5 +67,3 @@ jobs:
freebsd-version
gmake
gmake tutorial
cd tutorial
./parallel_wget http://github.com/
2 changes: 1 addition & 1 deletion BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ cc_library(
srcs = [
'src/factory/KafkaTaskImpl.cc',
'src/protocol/KafkaMessage.cc',
'src/protocol/KafkaResult.cc',
],
copts = ['-fno-rtti'],
deps = [
Expand All @@ -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 = [
Expand Down
1 change: 1 addition & 0 deletions src/protocol/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()
2 changes: 0 additions & 2 deletions src/protocol/KafkaMessage.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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<KafkaBuffer *>(env);
snappy_buffer->append((const char *)block->get_block(), block->get_len());

break;

case Kafka_Lz4:
Expand Down
5 changes: 5 additions & 0 deletions src/protocol/KafkaResult.cc
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ KafkaResult::KafkaResult()
this->resp_num = 0;
}

KafkaResult::~KafkaResult()
{
delete []this->resp_vec;
}

KafkaResult& KafkaResult::operator= (KafkaResult&& move)
{
if (this != &move)
Expand Down
5 changes: 1 addition & 4 deletions src/protocol/KafkaResult.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,7 @@ class KafkaResult
public:
KafkaResult();

virtual ~KafkaResult()
{
delete []this->resp_vec;
}
virtual ~KafkaResult();

KafkaResult& operator= (KafkaResult&& move);

Expand Down
6 changes: 3 additions & 3 deletions src/protocol/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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
Expand Down