Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update librdkafka to v2.5.3 in rdkafka-sys #700

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "rdkafka-sys/librdkafka"]
path = rdkafka-sys/librdkafka
url = https://github.com/edenhill/librdkafka
url = https://github.com/confluentinc/librdkafka
2 changes: 1 addition & 1 deletion rdkafka-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rdkafka-sys"
version = "4.7.0+2.3.0"
version = "4.8.0+2.5.3"
authors = ["Federico Giraud <giraud.federico@gmail.com>"]
build = "build.rs"
links = "rdkafka"
Expand Down
2 changes: 2 additions & 0 deletions rdkafka-sys/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

* Upgrade to librdkafka v2.5.3.

## v4.7.0+2.2.0 (2023-11-07)

* Upgrade to librdkafka v2.3.0.
Expand Down
2 changes: 1 addition & 1 deletion rdkafka-sys/librdkafka
Submodule librdkafka updated 156 files
88 changes: 0 additions & 88 deletions rdkafka-sys/simple_producer.rs

This file was deleted.

50 changes: 47 additions & 3 deletions rdkafka-sys/src/bindings.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/* automatically generated by rust-bindgen 0.66.1 */
/* automatically generated by rust-bindgen 0.69.4 */

use libc::{c_char, c_int, c_void, sockaddr, FILE};
use num_enum::TryFromPrimitive;

pub const RD_KAFKA_VERSION: i32 = 33751295;
pub const RD_KAFKA_VERSION: i32 = 33882367;
pub const RD_KAFKA_DEBUG_CONTEXTS : & [u8 ; 138] = b"all,generic,broker,topic,metadata,feature,queue,msg,protocol,cgrp,security,fetch,interceptor,plugin,consumer,admin,eos,mock,assignor,conf\0" ;
pub const RD_KAFKA_DESTROY_F_NO_CONSUMER_CLOSE: i32 = 8;
pub const RD_KAFKA_OFFSET_BEGINNING: i32 = -2;
Expand Down Expand Up @@ -214,6 +214,7 @@ pub enum rd_kafka_resp_err_t {
RD_KAFKA_RESP_ERR__NOOP = -141,
RD_KAFKA_RESP_ERR__AUTO_OFFSET_RESET = -140,
RD_KAFKA_RESP_ERR__LOG_TRUNCATION = -139,
RD_KAFKA_RESP_ERR__INVALID_DIFFERENT_RECORD = -138,
RD_KAFKA_RESP_ERR__END = -100,
RD_KAFKA_RESP_ERR_UNKNOWN = -1,
RD_KAFKA_RESP_ERR_NO_ERROR = 0,
Expand Down Expand Up @@ -314,7 +315,14 @@ pub enum rd_kafka_resp_err_t {
RD_KAFKA_RESP_ERR_INVALID_UPDATE_VERSION = 95,
RD_KAFKA_RESP_ERR_FEATURE_UPDATE_FAILED = 96,
RD_KAFKA_RESP_ERR_PRINCIPAL_DESERIALIZATION_FAILURE = 97,
RD_KAFKA_RESP_ERR_END_ALL = 98,
RD_KAFKA_RESP_ERR_UNKNOWN_TOPIC_ID = 100,
RD_KAFKA_RESP_ERR_FENCED_MEMBER_EPOCH = 110,
RD_KAFKA_RESP_ERR_UNRELEASED_INSTANCE_ID = 111,
RD_KAFKA_RESP_ERR_UNSUPPORTED_ASSIGNOR = 112,
RD_KAFKA_RESP_ERR_STALE_MEMBER_EPOCH = 113,
RD_KAFKA_RESP_ERR_UNKNOWN_SUBSCRIPTION_ID = 117,
RD_KAFKA_RESP_ERR_TELEMETRY_TOO_LARGE = 118,
RD_KAFKA_RESP_ERR_END_ALL = 119,
}
#[repr(C)]
#[derive(Debug, Copy, Clone)]
Expand Down Expand Up @@ -604,6 +612,9 @@ extern "C" {
extern "C" {
pub fn rd_kafka_message_errstr(rkmessage: *const rd_kafka_message_t) -> *const c_char;
}
extern "C" {
pub fn rd_kafka_message_produce_errstr(rkmessage: *const rd_kafka_message_t) -> *const c_char;
}
extern "C" {
pub fn rd_kafka_message_timestamp(
rkmessage: *const rd_kafka_message_t,
Expand Down Expand Up @@ -1500,6 +1511,11 @@ extern "C" {
group_instance_id: *const c_char,
) -> *mut rd_kafka_consumer_group_metadata_t;
}
extern "C" {
pub fn rd_kafka_consumer_group_metadata_member_id(
group_metadata: *const rd_kafka_consumer_group_metadata_t,
) -> *const c_char;
}
extern "C" {
pub fn rd_kafka_consumer_group_metadata_destroy(arg1: *mut rd_kafka_consumer_group_metadata_t);
}
Expand Down Expand Up @@ -3604,6 +3620,15 @@ extern "C" {
hi: i64,
) -> rd_kafka_resp_err_t;
}
extern "C" {
pub fn rd_kafka_mock_partition_push_leader_response(
mcluster: *mut rd_kafka_mock_cluster_t,
topic: *const c_char,
partition: c_int,
leader_id: i32,
leader_epoch: i32,
) -> rd_kafka_resp_err_t;
}
extern "C" {
pub fn rd_kafka_mock_broker_set_down(
mcluster: *mut rd_kafka_mock_cluster_t,
Expand Down Expand Up @@ -3661,6 +3686,12 @@ pub type rd_kafka_mock_request_t = rd_kafka_mock_request_s;
extern "C" {
pub fn rd_kafka_mock_request_destroy(mreq: *mut rd_kafka_mock_request_t);
}
extern "C" {
pub fn rd_kafka_mock_request_destroy_array(
mreqs: *mut *mut rd_kafka_mock_request_t,
mreq_cnt: usize,
);
}
extern "C" {
pub fn rd_kafka_mock_request_id(mreq: *mut rd_kafka_mock_request_t) -> i32;
}
Expand All @@ -3679,3 +3710,16 @@ extern "C" {
extern "C" {
pub fn rd_kafka_mock_clear_requests(mcluster: *mut rd_kafka_mock_cluster_t);
}
extern "C" {
pub fn rd_kafka_mock_telemetry_set_requested_metrics(
mcluster: *mut rd_kafka_mock_cluster_t,
metrics: *mut *mut c_char,
metrics_cnt: usize,
) -> rd_kafka_resp_err_t;
}
extern "C" {
pub fn rd_kafka_mock_telemetry_set_push_interval(
mcluster: *mut rd_kafka_mock_cluster_t,
push_interval_ms: i64,
) -> rd_kafka_resp_err_t;
}
8 changes: 8 additions & 0 deletions rdkafka-sys/src/helpers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -174,5 +174,13 @@ pub fn rd_kafka_resp_err_t_to_rdkafka_error(err: RDKafkaRespErr) -> RDKafkaError
RD_KAFKA_RESP_ERR_PRINCIPAL_DESERIALIZATION_FAILURE => PrincipalDeserializationFailure,
RD_KAFKA_RESP_ERR_END_ALL => EndAll,
RD_KAFKA_RESP_ERR__LOG_TRUNCATION => LogTruncation,
RD_KAFKA_RESP_ERR__INVALID_DIFFERENT_RECORD => InvalidDifferentRecord,
RD_KAFKA_RESP_ERR_UNKNOWN_TOPIC_ID => UnknownTopicId,
RD_KAFKA_RESP_ERR_FENCED_MEMBER_EPOCH => FencedMemberEpoch,
RD_KAFKA_RESP_ERR_UNRELEASED_INSTANCE_ID => UnreleasedInstanceId,
RD_KAFKA_RESP_ERR_UNSUPPORTED_ASSIGNOR => UnsupportedAssignor,
RD_KAFKA_RESP_ERR_STALE_MEMBER_EPOCH => StaleMemberEpoch,
RD_KAFKA_RESP_ERR_UNKNOWN_SUBSCRIPTION_ID => UnknownSubscriptionId,
RD_KAFKA_RESP_ERR_TELEMETRY_TOO_LARGE => TelemetryTooLarge,
}
}
20 changes: 20 additions & 0 deletions rdkafka-sys/src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,9 @@ pub enum RDKafkaErrorCode {
AutoOffsetReset = -140,
/// Partition log truncation detected
LogTruncation = -139,
/// A different record in the batch was invalid and this message failed
/// persisting.
InvalidDifferentRecord = -138,
#[doc(hidden)]
End = -100,
/// Unknown broker error.
Expand Down Expand Up @@ -456,6 +459,23 @@ pub enum RDKafkaErrorCode {
FeatureUpdateFailed = 96,
/// Request principal deserialization failed during forwarding.
PrincipalDeserializationFailure = 97,
/// Unknown topic ID.
UnknownTopicId = 100,
/// The member epoch is fenced by the group coordinator.
FencedMemberEpoch = 110,
/// The instance ID is still used by another member in the consumer group.
UnreleasedInstanceId = 111,
/// The assignor or its version range is not supported by the consumer
/// group.
UnsupportedAssignor = 112,
/// The member epoch is stale.
StaleMemberEpoch = 113,
/// Client sent a push telemetry request with an invalid or outdated
/// subscription ID.
UnknownSubscriptionId = 117,
/// Client sent a push telemetry request larger than the maximum size
/// the broker will accept.
TelemetryTooLarge = 118,
#[doc(hidden)]
EndAll,
}
Expand Down