Skip to content

GH-49435: [C++][FlightRPC] Check return value for new nodiscard declared functions on Protobuf #49436

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

Closed
raulcd wants to merge 5 commits into from
Closed

GH-49435: [C++][FlightRPC] Check return value for new nodiscard declared functions on Protobuf #49436

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6f473bf
GH-49435: [C++][FlightRPC] Check return value for new nodiscard decla…
raulcd Mar 3, 2026
1888aa7
Another nodiscard from protobuf
raulcd Mar 3, 2026
016150c
Specifically ignore return value for PackFrom
raulcd Mar 3, 2026
ec3b4c0
Update ticket.PackFrom handling of return value
raulcd Mar 5, 2026
5e5c410
Pin protobuf@33 due to grpc/grpc#41755 issue
raulcd Mar 5, 2026
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
4 changes: 3 additions & 1 deletion cpp/src/arrow/flight/sql/server.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,9 @@ arrow::Result<std::string> CreateStatementQueryTicket(
ticket_statement_query.set_statement_handle(statement_handle);

google::protobuf::Any ticket;
ticket.PackFrom(ticket_statement_query);
// PackFrom returns void for older protobuf versions and [[nodiscard]] bool
// for newer versions, so we explicitly ignore the return value.
(void)ticket.PackFrom(ticket_statement_query);
Comment thread
raulcd marked this conversation as resolved.
Outdated

std::string ticket_string;

Expand Down
5 changes: 4 additions & 1 deletion cpp/src/arrow/flight/transport/grpc/serialization_internal.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,10 @@ ::grpc::Status FlightDataDeserialize(ByteBuffer* buffer,
// Can't use ParseFromCodedStream as this reads the entire
// rest of the stream into the descriptor command field.
std::string buffer;
pb_stream.ReadString(&buffer, length);
if (!pb_stream.ReadString(&buffer, length)) {
return {::grpc::StatusCode::INTERNAL,
"Unable to read FlightDescriptor from protobuf"};
}
if (!pb_descriptor.ParseFromString(buffer)) {
return {::grpc::StatusCode::INTERNAL, "Unable to parse FlightDescriptor"};
}
Expand Down
Loading