Skip to content

Commit b451f80

Browse files
kennethjiakennethjia
authored
Merge pull request #6 from kenneth-jia/PickUpLibrdkafka150
Pick up librdkafka v1.5.0
2 parents 747b8ca + d1a88bc commit b451f80

File tree

9 files changed

+110
-68
lines changed

9 files changed

+110
-68
lines changed

‎.github/workflows/on_pull_request.yml‎

Lines changed: 48 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ name: pull_request
33
on: [push, pull_request]
44

55
env:
6-
CPU_CORE_NUM: 2
6+
CPU_CORE_NUM : 2
7+
LIBRDKAFKA_VERSION: 1.5.0
78

89
jobs:
910
build_gcc_debug:
@@ -33,16 +34,16 @@ jobs:
3334
mkdir -p googletest
3435
cd googletest
3536
env CC=gcc CXX=g++ cmake /usr/src/googletest/
36-
make -j$CPU_CORE_NUM && sudo make install
37+
make -j${CPU_CORE_NUM} && sudo make install
3738
cd ../
3839
# 4. Install boost lib
3940
sudo apt install -y libboost-all-dev
4041
# 5. Install librdkafka
41-
wget https://github.com/edenhill/librdkafka/archive/v1.4.2.tar.gz
42-
tar -xvzf v1.4.2.tar.gz
43-
cd librdkafka-1.4.2
42+
wget https://github.com/edenhill/librdkafka/archive/v${LIBRDKAFKA_VERSION}.tar.gz
43+
tar -xvzf v${LIBRDKAFKA_VERSION}.tar.gz
44+
cd librdkafka-${LIBRDKAFKA_VERSION}
4445
./configure
45-
make -j$CPU_CORE_NUM && sudo make install
46+
make -j${CPU_CORE_NUM} && sudo make install
4647
cd ../
4748
# 6. Install zookeeper
4849
wget https://mirrors.bfsu.edu.cn/apache/zookeeper/zookeeper-3.6.2/apache-zookeeper-3.6.2-bin.tar.gz
@@ -59,7 +60,7 @@ jobs:
5960
- name: Build
6061
run: |
6162
cd $BUILD_SUB_DIR
62-
make -j$CPU_CORE_NUM VERBOSE=1
63+
make -j${CPU_CORE_NUM} VERBOSE=1
6364
- name: Test
6465
run: |
6566
cd $BUILD_SUB_DIR
@@ -102,16 +103,16 @@ jobs:
102103
mkdir -p googletest
103104
cd googletest
104105
env CC=gcc CXX=g++ cmake /usr/src/googletest/
105-
make -j$CPU_CORE_NUM && sudo make install
106+
make -j${CPU_CORE_NUM} && sudo make install
106107
cd ../
107108
# 4. Install boost lib
108109
sudo apt install -y libboost-all-dev
109110
# 5. Install librdkafka
110-
wget https://github.com/edenhill/librdkafka/archive/v1.4.2.tar.gz
111-
tar -xvzf v1.4.2.tar.gz
112-
cd librdkafka-1.4.2
111+
wget https://github.com/edenhill/librdkafka/archive/v${LIBRDKAFKA_VERSION}.tar.gz
112+
tar -xvzf v${LIBRDKAFKA_VERSION}.tar.gz
113+
cd librdkafka-${LIBRDKAFKA_VERSION}
113114
./configure
114-
make -j$CPU_CORE_NUM && sudo make install
115+
make -j${CPU_CORE_NUM} && sudo make install
115116
cd ../
116117
# 6. Install zookeeper
117118
wget https://mirrors.bfsu.edu.cn/apache/zookeeper/zookeeper-3.6.2/apache-zookeeper-3.6.2-bin.tar.gz
@@ -128,7 +129,7 @@ jobs:
128129
- name: Build
129130
run: |
130131
cd $BUILD_SUB_DIR
131-
make -j$CPU_CORE_NUM VERBOSE=1
132+
make -j${CPU_CORE_NUM} VERBOSE=1
132133
- name: Test
133134
run: |
134135
cd $BUILD_SUB_DIR
@@ -176,9 +177,9 @@ jobs:
176177
# 4. Install boost lib
177178
sudo apt install -y libboost-all-dev
178179
# 5. Install librdkafka
179-
wget https://github.com/edenhill/librdkafka/archive/v1.4.2.tar.gz
180-
tar -xvzf v1.4.2.tar.gz
181-
cd librdkafka-1.4.2
180+
wget https://github.com/edenhill/librdkafka/archive/v${LIBRDKAFKA_VERSION}.tar.gz
181+
tar -xvzf v${LIBRDKAFKA_VERSION}.tar.gz
182+
cd librdkafka-${LIBRDKAFKA_VERSION}
182183
./configure
183184
make && sudo make install
184185
cd ../
@@ -197,7 +198,7 @@ jobs:
197198
- name: Build
198199
run: |
199200
cd $BUILD_SUB_DIR
200-
make -j$CPU_CORE_NUM VERBOSE=1
201+
make -j${CPU_CORE_NUM} VERBOSE=1
201202
- name: Test
202203
run: |
203204
cd $BUILD_SUB_DIR
@@ -240,16 +241,16 @@ jobs:
240241
mkdir -p googletest
241242
cd googletest
242243
env CC=gcc CXX=g++ cmake /usr/src/googletest/
243-
make -j$CPU_CORE_NUM && sudo make install
244+
make -j${CPU_CORE_NUM} && sudo make install
244245
cd ../
245246
# 4. Install boost lib
246247
sudo apt install -y libboost-all-dev
247248
# 5. Install librdkafka
248-
wget https://github.com/edenhill/librdkafka/archive/v1.4.2.tar.gz
249-
tar -xvzf v1.4.2.tar.gz
250-
cd librdkafka-1.4.2
249+
wget https://github.com/edenhill/librdkafka/archive/v${LIBRDKAFKA_VERSION}.tar.gz
250+
tar -xvzf v${LIBRDKAFKA_VERSION}.tar.gz
251+
cd librdkafka-${LIBRDKAFKA_VERSION}
251252
./configure
252-
make -j$CPU_CORE_NUM && sudo make install
253+
make -j${CPU_CORE_NUM} && sudo make install
253254
cd ../
254255
# 6. Install zookeeper
255256
wget https://mirrors.bfsu.edu.cn/apache/zookeeper/zookeeper-3.6.2/apache-zookeeper-3.6.2-bin.tar.gz
@@ -266,7 +267,7 @@ jobs:
266267
- name: Build
267268
run: |
268269
cd $BUILD_SUB_DIR
269-
make -j$CPU_CORE_NUM VERBOSE=1
270+
make -j${CPU_CORE_NUM} VERBOSE=1
270271
- name: Test
271272
run: |
272273
cd $BUILD_SUB_DIR
@@ -308,16 +309,16 @@ jobs:
308309
mkdir -p googletest
309310
cd googletest
310311
env CC=gcc CXX=g++ cmake /usr/src/googletest/
311-
make -j$CPU_CORE_NUM && sudo make install
312+
make -j${CPU_CORE_NUM} && sudo make install
312313
cd ../
313314
# 4. Install boost lib
314315
sudo apt install -y libboost-all-dev
315316
# 5. Install librdkafka
316-
wget https://github.com/edenhill/librdkafka/archive/v1.4.2.tar.gz
317-
tar -xvzf v1.4.2.tar.gz
318-
cd librdkafka-1.4.2
317+
wget https://github.com/edenhill/librdkafka/archive/v${LIBRDKAFKA_VERSION}.tar.gz
318+
tar -xvzf v${LIBRDKAFKA_VERSION}.tar.gz
319+
cd librdkafka-${LIBRDKAFKA_VERSION}
319320
./configure
320-
make -j$CPU_CORE_NUM && sudo make install
321+
make -j${CPU_CORE_NUM} && sudo make install
321322
cd ../
322323
# 6. Install zookeeper
323324
wget https://mirrors.bfsu.edu.cn/apache/zookeeper/zookeeper-3.6.2/apache-zookeeper-3.6.2-bin.tar.gz
@@ -334,7 +335,7 @@ jobs:
334335
- name: Build
335336
run: |
336337
cd $BUILD_SUB_DIR
337-
make -j$CPU_CORE_NUM VERBOSE=1
338+
make -j${CPU_CORE_NUM} VERBOSE=1
338339
- name: Test
339340
run: |
340341
cd $BUILD_SUB_DIR
@@ -376,16 +377,16 @@ jobs:
376377
mkdir -p googletest
377378
cd googletest
378379
env CC=gcc CXX=g++ cmake /usr/src/googletest/
379-
make -j$CPU_CORE_NUM && sudo make install
380+
make -j${CPU_CORE_NUM} && sudo make install
380381
cd ../
381382
# 4. Install boost lib
382383
sudo apt install -y libboost-all-dev
383384
# 5. Install librdkafka
384-
wget https://github.com/edenhill/librdkafka/archive/v1.4.2.tar.gz
385-
tar -xvzf v1.4.2.tar.gz
386-
cd librdkafka-1.4.2
385+
wget https://github.com/edenhill/librdkafka/archive/v${LIBRDKAFKA_VERSION}.tar.gz
386+
tar -xvzf v${LIBRDKAFKA_VERSION}.tar.gz
387+
cd librdkafka-${LIBRDKAFKA_VERSION}
387388
./configure
388-
make -j$CPU_CORE_NUM && sudo make install
389+
make -j${CPU_CORE_NUM} && sudo make install
389390
cd ../
390391
# 6. Install zookeeper
391392
wget https://mirrors.bfsu.edu.cn/apache/zookeeper/zookeeper-3.6.2/apache-zookeeper-3.6.2-bin.tar.gz
@@ -402,7 +403,7 @@ jobs:
402403
- name: Build
403404
run: |
404405
cd $BUILD_SUB_DIR
405-
make -j$CPU_CORE_NUM VERBOSE=1
406+
make -j${CPU_CORE_NUM} VERBOSE=1
406407
- name: Test
407408
run: |
408409
cd $BUILD_SUB_DIR
@@ -445,16 +446,16 @@ jobs:
445446
mkdir -p googletest
446447
cd googletest
447448
cmake /usr/src/googletest/
448-
make -j$CPU_CORE_NUM && sudo make install
449+
make -j${CPU_CORE_NUM} && sudo make install
449450
cd ../
450451
# 4. Install boost lib
451452
sudo apt install -y libboost-all-dev
452453
# 5. Install librdkafka
453-
wget https://github.com/edenhill/librdkafka/archive/v1.4.2.tar.gz
454-
tar -xvzf v1.4.2.tar.gz
455-
cd librdkafka-1.4.2
454+
wget https://github.com/edenhill/librdkafka/archive/v${LIBRDKAFKA_VERSION}.tar.gz
455+
tar -xvzf v${LIBRDKAFKA_VERSION}.tar.gz
456+
cd librdkafka-${LIBRDKAFKA_VERSION}
456457
./configure
457-
make -j$CPU_CORE_NUM && sudo make install
458+
make -j${CPU_CORE_NUM} && sudo make install
458459
cd ../
459460
# 6. Install zookeeper
460461
wget https://mirrors.bfsu.edu.cn/apache/zookeeper/zookeeper-3.6.2/apache-zookeeper-3.6.2-bin.tar.gz
@@ -471,7 +472,7 @@ jobs:
471472
- name: Build
472473
run: |
473474
cd $BUILD_SUB_DIR
474-
make -j$CPU_CORE_NUM VERBOSE=1
475+
make -j${CPU_CORE_NUM} VERBOSE=1
475476
- name: Test
476477
run: |
477478
cd $BUILD_SUB_DIR
@@ -516,16 +517,16 @@ jobs:
516517
mkdir -p googletest
517518
cd googletest
518519
env CC=clang CXX=clang++ cmake /usr/src/googletest/
519-
make -j$CPU_CORE_NUM && sudo make install
520+
make -j${CPU_CORE_NUM} && sudo make install
520521
cd ../
521522
# 4. Install boost lib
522523
sudo apt install -y libboost-all-dev
523524
# 5. Install librdkafka
524-
wget https://github.com/edenhill/librdkafka/archive/v1.4.2.tar.gz
525-
tar -xvzf v1.4.2.tar.gz
526-
cd librdkafka-1.4.2
525+
wget https://github.com/edenhill/librdkafka/archive/v${LIBRDKAFKA_VERSION}.tar.gz
526+
tar -xvzf v${LIBRDKAFKA_VERSION}.tar.gz
527+
cd librdkafka-${LIBRDKAFKA_VERSION}
527528
./configure
528-
make -j$CPU_CORE_NUM && sudo make install
529+
make -j${CPU_CORE_NUM} && sudo make install
529530
cd ../
530531
- name: Config
531532
run: |
@@ -534,7 +535,7 @@ jobs:
534535
- name: Build
535536
run: |
536537
cd $BUILD_SUB_DIR
537-
make -j$CPU_CORE_NUM VERBOSE=1
538+
make -j${CPU_CORE_NUM} VERBOSE=1
538539
539540
build_doc:
540541
name: Generate Documents

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The `Modern C++ based Kafka API` is a layer of C++ wrapper based on [librdkafka]
66

77
Here is the [doxygen documentation for developers](doxygen/annotated.html).
88

9-
- At present, the `Modern C++ based Kafka API` is compatible with `librdkafka` v1.4.2.
9+
- At present, the `Modern C++ based Kafka API` is compatible with `librdkafka` v1.5.0.
1010

1111
## Why it's here
1212

‎include/kafka/KafkaConsumer.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,9 @@ class KafkaConsumer: public KafkaClient
177177
/**
178178
* Get the offsets for the given partitions by time-point.
179179
* Throws KafkaException with errors:
180-
* - RD_KAFKA_RESP_ERR__TIMED_OUT: Not all offsets could be fetched in time.
181-
* - RD_KAFKA_RESP_ERR__UNKNOWN_PARTITION: All partitions are unknown.
182-
* - RD_KAFKA_RESP_ERR__LEADER_NOT_AVAILABLE: Unable to query leaders from the given partitions.
180+
* - RD_KAFKA_RESP_ERR__TIMED_OUT: Not all offsets could be fetched in time.
181+
* - RD_KAFKA_RESP_ERR__UNKNOWN_PARTITION: All partitions are unknown.
182+
* - RD_KAFKA_RESP_ERR_LEADER_NOT_AVAILABLE: Unable to query leaders from the given partitions.
183183
*/
184184
std::map<TopicPartition, Offset> offsetsForTime(const TopicPartitions& tps,
185185
std::chrono::time_point<std::chrono::system_clock> timepoint,

‎include/kafka/ProducerConfig.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,12 @@ class ProducerConfig: public Properties
6464
*/
6565
static const constexpr char* BATCH_NUM_MESSAGES = "batch.num.messages";
6666

67+
/**
68+
* Maximum size (in bytes) of all messages batched in one MessageSet (including protocol framing overhead).
69+
* Default value: 1000000
70+
*/
71+
static const constexpr char* BATCH_SIZE = "batch.size";
72+
6773
/**
6874
* Maximum Kafka protocol request message size.
6975
* Note: Should be coordinated with the bokers's configuration. Otherwise, any larger message would be rejected!

0 commit comments

Comments
 (0)