Skip to content

Fix segfault issue from empty metadata #81

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
alinaliBQ merged 3 commits into from
Aug 6, 2025
Merged

Fix segfault issue from empty metadata #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de1db39
Fix segfault issue from empty metadata
alinaliBQ Aug 1, 2025
2966e21
chore: trigger CI
alinaliBQ Aug 5, 2025
782ac88
Address comments from James
alinaliBQ Aug 5, 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
11 changes: 9 additions & 2 deletions cpp/src/arrow/flight/sql/column_metadata.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,15 @@ const char* ColumnMetadata::kIsSearchable = "ARROW:FLIGHT:SQL:IS_SEARCHABLE";
const char* ColumnMetadata::kRemarks = "ARROW:FLIGHT:SQL:REMARKS";

ColumnMetadata::ColumnMetadata(
std::shared_ptr<const arrow::KeyValueMetadata> metadata_map)
: metadata_map_(std::move(metadata_map)) {}
std::shared_ptr<const arrow::KeyValueMetadata> metadata_map) {
if (metadata_map) {
metadata_map_ = std::move(metadata_map);
} else {
std::shared_ptr<const arrow::KeyValueMetadata> empty_metadata_map(
new arrow::KeyValueMetadata);
metadata_map_ = std::move(empty_metadata_map);
}
}

arrow::Result<std::string> ColumnMetadata::GetCatalogName() const {
return metadata_map_->Get(kCatalogName);
Expand Down
8 changes: 1 addition & 7 deletions cpp/src/arrow/flight/sql/odbc/flight_sql/flight_sql_result_set_metadata.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,9 @@ constexpr int32_t DefaultDecimalPrecision = 38;
constexpr int32_t DefaultLengthForVariableLengthColumns = 1024;

namespace {
std::shared_ptr<const arrow::KeyValueMetadata> empty_metadata_map(
new arrow::KeyValueMetadata);

inline arrow::flight::sql::ColumnMetadata GetMetadata(
const std::shared_ptr<Field>& field) {
const auto& metadata_map = field->metadata();

arrow::flight::sql::ColumnMetadata metadata(metadata_map ? metadata_map
: empty_metadata_map);
arrow::flight::sql::ColumnMetadata metadata(field->metadata());
return metadata;
}

Expand Down
4 changes: 2 additions & 2 deletions cpp/src/arrow/flight/sql/odbc/flight_sql/flight_sql_statement_get_columns.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ Result<std::shared_ptr<RecordBatch>> Transform_inner(
? data_type_v3
: ConvertSqlDataTypeFromV3ToV2(data_type_v3);

// TODO: Use `metadata.GetTypeName()` when ARROW-16064 is merged.
const auto& type_name_result = field->metadata()->Get("ARROW:FLIGHT:SQL:TYPE_NAME");
const auto& type_name_result = metadata.GetTypeName();

data.type_name = type_name_result.ok() ? type_name_result.ValueOrDie()
: GetTypeNameFromSqlDataType(data_type_v3);

Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/flight/sql/odbc/odbc_api.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,14 +962,14 @@ SQLRETURN SQLFetch(SQLHSTMT stmt) {

using ODBC::ODBCDescriptor;
using ODBC::ODBCStatement;

return ODBCStatement::ExecuteWithDiagnostics(stmt, SQL_ERROR, [=]() {
ODBCStatement* statement = reinterpret_cast<ODBCStatement*>(stmt);

// The SQL_ATTR_ROW_ARRAY_SIZE statement attribute specifies the number of rows in the
// rowset.
ODBCDescriptor* ard = statement->GetARD();
size_t rows = static_cast<size_t>(ard->GetArraySize());

if (statement->Fetch(rows)) {
return SQL_SUCCESS;
} else {
Expand Down
Loading