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
55 changes: 19 additions & 36 deletions src/protocol/KafkaMessage.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1413,7 +1413,7 @@ int KafkaMessage::parse_record_batch(void **buf, size_t *size,
return -1;
}

if ((int)crc32c(0, (const void *)*buf, hdr.length - 9) != hdr.crc)
if ((int)crc32c(*buf, hdr.length - 9) != hdr.crc)
{
errno = EBADMSG;
return -1;
Expand Down Expand Up @@ -1553,7 +1553,7 @@ int KafkaMessage::parse_records(void **buf, size_t *size, bool check_crcs,
return 0;
}
else if (ret < 0)
break;
return ret;
}

*size -= msg_set_size;
Expand All @@ -1563,14 +1563,6 @@ int KafkaMessage::parse_records(void **buf, size_t *size, bool check_crcs,

KafkaMessage::KafkaMessage()
{
static struct Crc32cInitializer
{
Crc32cInitializer()
{
crc32c_global_init();
}
} initializer;

this->parser = new kafka_parser_t;
kafka_parser_init(this->parser);
this->stream = new EncodeStream;
Expand Down Expand Up @@ -2081,6 +2073,7 @@ int KafkaRequest::encode_produce(struct iovec vectors[], int max)
int topic_cnt = 0;
this->toppar_list.rewind();
KafkaToppar *toppar;
KafkaBlock *block;

while ((toppar = this->toppar_list.get_next()) != NULL)
{
Expand Down Expand Up @@ -2210,11 +2203,7 @@ int KafkaRequest::encode_produce(struct iovec vectors[], int max)
append_i32(record_header, batch_length);
append_i32(record_header, 0);
append_i8(record_header, 2); //magic

uint32_t crc_32 = 0;
size_t crc32_offset = record_header.size();

append_i32(record_header, crc_32);
append_i32(record_header, 0);
append_i16(record_header, this->config.get_compress_type());
append_i32(record_header, batch_cnt - 1);
append_i64(record_header, first_timestamp);
Expand All @@ -2224,27 +2213,26 @@ int KafkaRequest::encode_produce(struct iovec vectors[], int max)
append_i32(record_header, -1);
append_i32(record_header, batch_cnt);

KafkaBlock *header_block = new KafkaBlock;

if (!header_block->set_block((void *)record_header.c_str(),
record_header.size()))
block = new KafkaBlock;
if (!block->set_block((void *)record_header.c_str(), record_header.size()))
{
delete header_block;
delete block;
return -1;
}

char *crc_ptr = (char *)header_block->get_block() + crc32_offset;
size_t crc32_offset = 8 + 4 + 4 + 1;
char *crc_ptr = (char *)block->get_block() + crc32_offset;
uint32_t crc_32 = crc32c_start();

this->serialized.insert_list(header_block);
this->serialized.insert_list(block);

crc_32 = crc32c(crc_32, (const void *)(crc_ptr + 4),
header_block->get_len() - crc32_offset - 4);
crc_32 = crc32c_continue(crc_ptr + 4, block->get_len() - crc32_offset - 4, crc_32);

this->serialized.block_insert_rewind();
KafkaBlock *block;
while ((block = this->serialized.get_block_insert_next()) != NULL)
crc_32 = crc32c(crc_32, block->get_block(), block->get_len());
crc_32 = crc32c_continue(block->get_block(), block->get_len(), crc_32);

crc_32 = crc32c_finish(crc_32);
*(uint32_t *)crc_ptr = htonl(crc_32);
*(uint32_t *)recordset_size_ptr = htonl(batch_length + 4 + 8);
}
Expand Down Expand Up @@ -2290,23 +2278,19 @@ int KafkaRequest::encode_produce(struct iovec vectors[], int max)
wrap_header.size() - crc32_offset - 4);

this->serialized.block_insert_rewind();
KafkaBlock *block;

while ((block = this->serialized.get_block_insert_next()) != NULL)
crc_32 = crc32(crc_32, (Bytef *)block->get_block(), block->get_len());

*(uint32_t *)crc_ptr = htonl(crc_32);

KafkaBlock *wrap_block = new KafkaBlock;

if (!wrap_block->set_block((void *)wrap_header.c_str(),
wrap_header.size()))
block = new KafkaBlock;
if (!block->set_block((void *)wrap_header.c_str(), wrap_header.size()))
{
delete wrap_block;
delete block;
return -1;
}

this->serialized.insert_list(wrap_block);
this->serialized.insert_list(block);
*(uint32_t *)recordset_size_ptr = htonl(message_size + 8 + 4);
}
else
Expand All @@ -2323,8 +2307,7 @@ int KafkaRequest::encode_produce(struct iovec vectors[], int max)
vectors[0].iov_base = (void *)this->msgbuf.c_str();
vectors[0].iov_len = this->msgbuf.size();

KafkaBlock *block = this->serialized.get_block_first();

block = this->serialized.get_block_first();
while (block)
{
this->stream->append_nocopy((const char *)block->get_block(),
Expand Down
Loading