Skip to content
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

Jump to bottom

feat(csharp/src/Drivers/BigQuery): add support for configurable query timeouts #2043

Merged
merged 3 commits into from
Jul 31, 2024
Merged

feat(csharp/src/Drivers/BigQuery): add support for configurable query timeouts #2043

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64c7619
add query timeout support
Jul 26, 2024
cd21560
PR feedback
Jul 30, 2024
ed53615
PR feedback
Jul 31, 2024
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
9 changes: 4 additions & 5 deletions csharp/src/Drivers/BigQuery/BigQueryConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -997,20 +997,19 @@ private IReadOnlyDictionary<string, string> ParseOptions()
{
Dictionary<string, string> options = new Dictionary<string, string>();

List<string> statementOptions = new List<string>()
{
string[] statementOptions = new string[] {
BigQueryParameters.AllowLargeResults,
BigQueryParameters.UseLegacySQL,
BigQueryParameters.LargeDecimalsAsString,
BigQueryParameters.LargeResultsDestinationTable,
BigQueryParameters.GetQueryResultsOptionsTimeoutMinutes
};

foreach (KeyValuePair<string, string> keyValuePair in this.properties)
foreach (string key in statementOptions)
{
if (statementOptions.Contains(keyValuePair.Key))
if (properties.TryGetValue(key, out string? value))
{
options[keyValuePair.Key] = keyValuePair.Value;
options[key] = value;
}
}

Expand Down
4 changes: 2 additions & 2 deletions csharp/src/Drivers/BigQuery/BigQueryStatement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ public override QueryResult ExecuteQuery()

GetQueryResultsOptions getQueryResultsOptions = new GetQueryResultsOptions();

if (this.Options != null && this.Options.ContainsKey(BigQueryParameters.GetQueryResultsOptionsTimeoutMinutes))
if (this.Options!.TryGetValue(BigQueryParameters.GetQueryResultsOptionsTimeoutMinutes, out string? timeoutMinutes))
davidhcoe marked this conversation as resolved.
Show resolved Hide resolved
{
if (int.TryParse(this.Options[BigQueryParameters.GetQueryResultsOptionsTimeoutMinutes], out int minutes))
if (int.TryParse(timeoutMinutes, out int minutes))
{
if (minutes >= 0)
{
Expand Down
2 changes: 1 addition & 1 deletion csharp/test/Drivers/BigQuery/BigQueryTestingUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ internal static Dictionary<string, string> GetBigQueryParameters(BigQueryTestCon
parameters.Add(BigQueryParameters.LargeResultsDestinationTable, testConfiguration.LargeResultsDestinationTable);
}

if(testConfiguration.TimeoutMinutes.HasValue)
if (testConfiguration.TimeoutMinutes.HasValue)
{
parameters.Add(BigQueryParameters.GetQueryResultsOptionsTimeoutMinutes, testConfiguration.TimeoutMinutes.Value.ToString());
}
Expand Down
Loading