Skip to content

GH-54916: [C++][IPC] Align metadata in Message::Open #54917

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

Open
Spikhalskiy wants to merge 1 commit into
base: main
Choose a base branch
from
Open

GH-54916: [C++][IPC] Align metadata in Message::Open #54917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions cpp/src/arrow/ipc/message.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ class Message::MessageImpl {
: metadata_(std::move(metadata)), message_(nullptr), body_(std::move(body)) {}

Status Open() {
RETURN_NOT_OK(MaybeAlignMetadata(&metadata_));
RETURN_NOT_OK(
internal::VerifyMessage(metadata_->data(), metadata_->size(), &message_));

Expand Down
26 changes: 26 additions & 0 deletions cpp/src/arrow/ipc/read_write_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

#include <algorithm>
#include <cstdint>
#include <cstring>
#include <limits>
#include <memory>
#include <numeric>
Expand Down Expand Up @@ -224,6 +225,31 @@ TEST(TestMessage, Verify) {
ASSERT_FALSE(message.Verify());
}

TEST(TestMessage, OpenUnalignedMetadata) {
auto custom_metadata = key_value_metadata({"foo"}, {"bar"});
ASSERT_OK_AND_ASSIGN(
auto serialized,
internal::WriteRecordBatchMessage(
/*length=*/0, /*body_length=*/0, custom_metadata,
/*nodes=*/{},
/*buffers=*/{}, /*variadic_counts=*/{}, IpcWriteOptions::Defaults()));

// Place the metadata at an odd address, as when it is sliced out of a larger
// buffer (e.g. a Flight data_header)
ASSERT_OK_AND_ASSIGN(std::shared_ptr<Buffer> storage,
AllocateBuffer(serialized->size() + 1));
std::memcpy(storage->mutable_data() + 1, serialized->data(), serialized->size());
auto unaligned = SliceBuffer(storage, 1, serialized->size());
ASSERT_NE(0, reinterpret_cast<uintptr_t>(unaligned->data()) % 8);

ASSERT_OK_AND_ASSIGN(auto message, Message::Open(unaligned, /*body=*/nullptr));
ASSERT_EQ(0, reinterpret_cast<uintptr_t>(message->metadata()->data()) % 8);
ASSERT_TRUE(message->metadata()->Equals(*serialized));
ASSERT_EQ(MessageType::RECORD_BATCH, message->type());
ASSERT_EQ(0, message->body_length());
ASSERT_TRUE(message->custom_metadata()->Equals(*custom_metadata));
}

INSTANTIATE_TEST_SUITE_P(TestMessage, TestMessage,
::testing::ValuesIn(kMetadataVersions));

Expand Down
Loading