Skip to content

fix(bq_driver): Prevent crash when listing datasets for invalid projects #1241

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
Anshu6250 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(bq_driver): Prevent crash when listing datasets for invalid projects #1241

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a91ddf0
fix(bq_driver): Prevent crash when listing datasets for invalid projects
Anshu6250 Sep 25, 2025
427017e
changes
Anshu6250 Nov 10, 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
40 changes: 30 additions & 10 deletions google/cloud/odbc/bq_driver/internal/odbc_sql_tables.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ StatusRecordOr<std::string> ConstructQuery(
}

std::vector<std::string> AppendAdditionalProjectsIfMissing(
ODBCBQClient& bq_client, SQLULEN metadata_id,
std::vector<std::string> base_projects,
std::string const& additional_projects) {
std::set<std::string> existing_ids(base_projects.begin(),
Expand All @@ -203,13 +204,31 @@ std::vector<std::string> AppendAdditionalProjectsIfMissing(
std::stringstream ss(additional_projects);
std::string project_id;
while (std::getline(ss, project_id, ',')) {
// Trim leading/trailing whitespace
project_id.erase(0, project_id.find_first_not_of(" \t"));
project_id.erase(project_id.find_last_not_of(" \t") + 1);
// Trim leading whitespace (spaces, tabs, newlines)
project_id.erase(0, project_id.find_first_not_of(" \t\n\r"));
Copy link
Copy Markdown
Collaborator

@shivamd-gpartner shivamd-gpartner Oct 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please document the code here

// Trim trailing whitespace (spaces, tabs, newlines)
project_id.erase(project_id.find_last_not_of(" \t\n\r") + 1);

if (project_id.empty() || existing_ids.count(project_id)) {
continue;
}
auto validation_status =
GetFilteredDatasetIds(bq_client, project_id, "%", metadata_id);

if (!project_id.empty() &&
existing_ids.find(project_id) == existing_ids.end()) {
if (validation_status.Ok()) {
base_projects.push_back(project_id);
existing_ids.insert(project_id);
} else {
auto const& status_record = validation_status.GetStatusRecord();

if (status_record.native_error_code == 404) {
LOG(INFO) << "Additional project '" << project_id
<< "' from DSN is not found or inaccessible. Skipping.";
} else {
LOG(ERROR) << "Validation of additional project '" << project_id
<< "' failed with code " << status_record.native_error_code
<< ": " << status_record.message;
}
}
}
return base_projects;
Expand Down Expand Up @@ -336,8 +355,8 @@ StatusRecordOr<ResultSet> GetResultSetForProjects(

std::vector<std::string> project_list = *project_ids_status;
if (!additional_projects.empty()) {
project_list = AppendAdditionalProjectsIfMissing(std::move(project_list),
additional_projects);
project_list = AppendAdditionalProjectsIfMissing(
bq_client, metadata_id, std::move(project_list), additional_projects);
}

return CreateResultSetForProjects(project_list);
Expand All @@ -357,8 +376,8 @@ StatusRecordOr<ResultSet> GetResultSetForDatasets(
std::vector<std::string> project_list = *project_ids_status;

if (!additional_projects.empty()) {
project_list = AppendAdditionalProjectsIfMissing(std::move(project_list),
additional_projects);
project_list = AppendAdditionalProjectsIfMissing(
bq_client, metadata_id, std::move(project_list), additional_projects);
}

std::vector<std::string> dataset_ids;
Expand Down Expand Up @@ -395,7 +414,8 @@ StatusRecordOr<ResultSet> GetResultSetForTables(
ConnectionHandle& conn_handle = *(stmt_handle.GetConnectionHandle());
// Append additional projects if any
project_list = AppendAdditionalProjectsIfMissing(
std::move(project_list), conn_handle.GetDsn().additional_projects);
bq_client, metadata_id, std::move(project_list),
conn_handle.GetDsn().additional_projects);

// 1. Prepare the list of tasks (Project + Dataset combinations)
struct TaskInput {
Expand Down