Skip to content

Add support for Apache Arrow C++ 13.0.0 or later #194

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
merged 1 commit into from
Jan 1, 2025
Merged

Add support for Apache Arrow C++ 13.0.0 or later #194

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
19 changes: 17 additions & 2 deletions src/afs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4083,7 +4083,7 @@ class FlightSQLServer : public arrow::flight::sql::FlightSqlServerBase {
ARROW_ASSIGN_OR_RAISE(auto ticket,
arrow::flight::sql::CreateStatementQueryTicket(query));
std::vector<arrow::flight::FlightEndpoint> endpoints{
arrow::flight::FlightEndpoint{arrow::flight::Ticket{std::move(ticket)}, {}}};
create_endpoint(std::move(ticket))};
ARROW_ASSIGN_OR_RAISE(
auto result,
arrow::flight::FlightInfo::Make(*schema, descriptor, endpoints, -1, -1));
Expand Down Expand Up @@ -4140,7 +4140,7 @@ class FlightSQLServer : public arrow::flight::sql::FlightSqlServerBase {
ARROW_ASSIGN_OR_RAISE(auto ticket,
arrow::flight::sql::CreateStatementQueryTicket(handle));
std::vector<arrow::flight::FlightEndpoint> endpoints{
arrow::flight::FlightEndpoint{arrow::flight::Ticket{std::move(ticket)}, {}}};
create_endpoint(std::move(ticket))};
ARROW_ASSIGN_OR_RAISE(
auto result,
arrow::flight::FlightInfo::Make(*schema, descriptor, endpoints, -1, -1));
Expand Down Expand Up @@ -4169,6 +4169,21 @@ class FlightSQLServer : public arrow::flight::sql::FlightSqlServerBase {
}

private:
arrow::flight::FlightEndpoint create_endpoint(std::string ticket)
{
#if ARROW_VERSION_MAJOR >= 14
return arrow::flight::FlightEndpoint{
arrow::flight::Ticket{std::move(ticket)}, {}, std::nullopt, ""};
#elif ARROW_VERSION_MAJOR >= 13
return arrow::flight::FlightEndpoint{
arrow::flight::Ticket{std::move(ticket)}, {}, std::nullopt};
#else
return arrow::flight::FlightEndpoint
{
arrow::flight::Ticket{std::move(ticket), {}};
#endif
}

arrow::Result<uint64_t> session_id(const arrow::flight::ServerCallContext& context)
{
auto middleware = reinterpret_cast<HeaderAuthServerMiddleware*>(
Expand Down
Loading