Skip to content

Replaced sizeof(frame_header_type) with SIZE_OF_FRAME_LENGTH_AND_FLAGS [HZ-5297] #1386

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.

Sign up for GitHub

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

Merged
ihsandemir merged 2 commits into from
Dec 30, 2025
+12 −11
Merged

Replaced sizeof(frame_header_type) with SIZE_OF_FRAME_LENGTH_AND_FLAGS [HZ-5297] #1386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf740eb
Replaced `sizeof(frame_header_type)` with SIZE_OF_FRAME_LENGTH_AND_FL…
ihsandemir Dec 29, 2025
23d280c
format fix.
ihsandemir Dec 29, 2025
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
18 changes: 9 additions & 9 deletions hazelcast/include/hazelcast/client/protocol/ClientMessage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1179,7 +1179,7 @@ class HAZELCAST_API ClientMessage
bool isNull = (nullptr == value);
if (isNull) {
auto* h = reinterpret_cast<frame_header_type*>(
wr_ptr(sizeof(frame_header_type)));
wr_ptr(SIZE_OF_FRAME_LENGTH_AND_FLAGS));
*h = null_frame();
if (is_final) {
h->flags |= IS_FINAL_FLAG;
Expand All @@ -1196,9 +1196,9 @@ class HAZELCAST_API ClientMessage
inline void set(const std::string& value, bool is_final = false)
{
auto h = reinterpret_cast<frame_header_type*>(
wr_ptr(sizeof(frame_header_type)));
wr_ptr(SIZE_OF_FRAME_LENGTH_AND_FLAGS));
auto len = value.length();
h->frame_len = sizeof(frame_header_type) + len;
h->frame_len = SIZE_OF_FRAME_LENGTH_AND_FLAGS + len;
if (is_final) {
h->flags |= IS_FINAL_FLAG;
}
Expand Down Expand Up @@ -1286,15 +1286,15 @@ class HAZELCAST_API ClientMessage
{
if (value.data_size() == 0) {
auto* h = reinterpret_cast<frame_header_type*>(
wr_ptr(sizeof(frame_header_type)));
wr_ptr(SIZE_OF_FRAME_LENGTH_AND_FLAGS));
*h = null_frame();
if (is_final) {
h->flags |= IS_FINAL_FLAG;
}
return;
}
auto& bytes = value.to_byte_array();
auto frame_length = sizeof(frame_header_type) + bytes.size();
auto frame_length = SIZE_OF_FRAME_LENGTH_AND_FLAGS + bytes.size();
auto fp = wr_ptr(frame_length);
auto* header = reinterpret_cast<frame_header_type*>(fp);
header->frame_len = frame_length;
Expand Down Expand Up @@ -1345,15 +1345,15 @@ class HAZELCAST_API ClientMessage
void set(const std::vector<T>& values, bool is_final = false)
{
auto* h = reinterpret_cast<frame_header_type*>(
wr_ptr(sizeof(frame_header_type)));
wr_ptr(SIZE_OF_FRAME_LENGTH_AND_FLAGS));
*h = begin_frame();

for (auto& item : values) {
set(item);
}

h = reinterpret_cast<frame_header_type*>(
wr_ptr(sizeof(frame_header_type)));
wr_ptr(SIZE_OF_FRAME_LENGTH_AND_FLAGS));
*h = end_frame();
if (is_final) {
h->flags |= IS_FINAL_FLAG;
Expand Down Expand Up @@ -1569,14 +1569,14 @@ class HAZELCAST_API ClientMessage
void add_begin_frame()
{
auto* f = reinterpret_cast<frame_header_type*>(
wr_ptr(sizeof(frame_header_type)));
wr_ptr(SIZE_OF_FRAME_LENGTH_AND_FLAGS));
*f = begin_frame();
}

void add_end_frame(bool is_final)
{
auto ef = reinterpret_cast<frame_header_type*>(
wr_ptr(sizeof(frame_header_type)));
wr_ptr(SIZE_OF_FRAME_LENGTH_AND_FLAGS));
*ef = end_frame();
if (is_final) {
ef->flags |= IS_FINAL_FLAG;
Expand Down
5 changes: 3 additions & 2 deletions hazelcast/src/hazelcast/client/protocol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ ClientMessage::fast_forward_to_end_frame()
int number_expected_frames = 1;
while (number_expected_frames) {
auto* f = reinterpret_cast<frame_header_type*>(
rd_ptr(sizeof(frame_header_type)));
rd_ptr(SIZE_OF_FRAME_LENGTH_AND_FLAGS));

int16_t flags = f->flags;
if (is_flag_set(flags, END_DATA_STRUCTURE_FLAG)) {
Expand All @@ -400,7 +400,8 @@ ClientMessage::fast_forward_to_end_frame()
}

// skip current frame
rd_ptr(static_cast<int32_t>(f->frame_len) - sizeof(frame_header_type));
rd_ptr(static_cast<int32_t>(f->frame_len) -
SIZE_OF_FRAME_LENGTH_AND_FLAGS);
}
}

Expand Down
Loading