Skip to content

Commit 72a5fd1

Browse files
committed
fix pre commit check failures
1 parent b904001 commit 72a5fd1

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

csharp/src/Drivers/Apache/Spark/RetryHttpHandler.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,12 @@ protected override async Task<HttpResponseMessage> SendAsync(
142142

143143
// Create a custom exception with the SQL state code and last error message
144144
var exception = new AdbcException(
145-
lastErrorMessage ?? "Service temporarily unavailable and retry timeout exceeded",
145+
lastErrorMessage ?? "Service temporarily unavailable and retry timeout exceeded",
146146
AdbcStatusCode.IOError);
147-
147+
148148
// Add SQL state as part of the message since we can't set it directly
149149
throw new AdbcException(
150-
$"[SQLState: 08001] {exception.Message}",
150+
$"[SQLState: 08001] {exception.Message}",
151151
AdbcStatusCode.IOError);
152152
}
153153

csharp/src/Drivers/Apache/Spark/SparkHttpConnection.cs

+9-9
Original file line numberDiff line numberDiff line change
@@ -146,21 +146,21 @@ protected override void ValidateOptions()
146146
? connectTimeoutMsValue
147147
: throw new ArgumentOutOfRangeException(SparkParameters.ConnectTimeoutMilliseconds, connectTimeoutMs, $"must be a value of 0 (infinite) or between 1 .. {int.MaxValue}. default is 30000 milliseconds.");
148148
}
149-
149+
150150
// Parse retry configuration parameters
151151
Properties.TryGetValue(SparkParameters.TemporarilyUnavailableRetry, out string? tempUnavailableRetryStr);
152152
int tempUnavailableRetryValue = 1; // Default to enabled
153153
if (tempUnavailableRetryStr != null && !int.TryParse(tempUnavailableRetryStr, out tempUnavailableRetryValue))
154154
{
155-
throw new ArgumentOutOfRangeException(SparkParameters.TemporarilyUnavailableRetry, tempUnavailableRetryStr,
155+
throw new ArgumentOutOfRangeException(SparkParameters.TemporarilyUnavailableRetry, tempUnavailableRetryStr,
156156
$"must be a value of 0 (disabled) or 1 (enabled). Default is 1.");
157157
}
158158
TemporarilyUnavailableRetry = tempUnavailableRetryValue != 0;
159-
159+
160160
Properties.TryGetValue(SparkParameters.TemporarilyUnavailableRetryTimeout, out string? tempUnavailableRetryTimeoutStr);
161161
if (tempUnavailableRetryTimeoutStr != null)
162162
{
163-
if (!int.TryParse(tempUnavailableRetryTimeoutStr, NumberStyles.Integer, CultureInfo.InvariantCulture, out int tempUnavailableRetryTimeoutValue) ||
163+
if (!int.TryParse(tempUnavailableRetryTimeoutStr, NumberStyles.Integer, CultureInfo.InvariantCulture, out int tempUnavailableRetryTimeoutValue) ||
164164
tempUnavailableRetryTimeoutValue < 0)
165165
{
166166
throw new ArgumentOutOfRangeException(SparkParameters.TemporarilyUnavailableRetryTimeout, tempUnavailableRetryTimeoutStr,
@@ -172,7 +172,7 @@ protected override void ValidateOptions()
172172
{
173173
TemporarilyUnavailableRetryTimeout = 900; // Default to 15 minutes
174174
}
175-
175+
176176
TlsOptions = HiveServer2TlsImpl.GetHttpTlsOptions(Properties);
177177
}
178178

@@ -199,13 +199,13 @@ protected override TTransport CreateTransport()
199199
AuthenticationHeaderValue? authenticationHeaderValue = GetAuthenticationHeaderValue(authTypeValue, token, username, password, access_token);
200200

201201
HttpClientHandler httpClientHandler = HiveServer2TlsImpl.NewHttpClientHandler(TlsOptions);
202-
202+
203203
// Create a RetryHttpHandler that wraps the HttpClientHandler to handle 503 responses
204204
var retryHandler = new RetryHttpHandler(
205-
httpClientHandler,
206-
TemporarilyUnavailableRetry,
205+
httpClientHandler,
206+
TemporarilyUnavailableRetry,
207207
TemporarilyUnavailableRetryTimeout);
208-
208+
209209
HttpClient httpClient = new(retryHandler);
210210
httpClient.BaseAddress = baseAddress;
211211
httpClient.DefaultRequestHeaders.Authorization = authenticationHeaderValue;

csharp/test/Drivers/Apache/Spark/SparkConnectionTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ public InvalidConnectionParametersTestData()
317317
Add(new(new() { [SparkParameters.Type] = SparkServerTypeConstants.Http, [SparkParameters.HostName] = "valid.server.com", [AdbcOptions.Username] = "user", [AdbcOptions.Password] = "myPassword", [SparkParameters.ConnectTimeoutMilliseconds] = "non-numeric" }, typeof(ArgumentOutOfRangeException)));
318318
Add(new(new() { [SparkParameters.Type] = SparkServerTypeConstants.Http, [SparkParameters.HostName] = "valid.server.com", [AdbcOptions.Username] = "user", [AdbcOptions.Password] = "myPassword", [SparkParameters.ConnectTimeoutMilliseconds] = "" }, typeof(ArgumentOutOfRangeException)));
319319
Add(new(new() { [SparkParameters.Type] = SparkServerTypeConstants.Databricks, [SparkParameters.Token] = "abcdef", [SparkParameters.HostName] = "valid.server.com", [AdbcOptions.Uri] = "http://valid.hostname.com" }, typeof(ArgumentOutOfRangeException)));
320-
320+
321321
// Tests for the new retry configuration parameters
322322
Add(new(new() { [SparkParameters.Type] = SparkServerTypeConstants.Http, [SparkParameters.HostName] = "valid.server.com", [AdbcOptions.Username] = "user", [AdbcOptions.Password] = "myPassword", [SparkParameters.TemporarilyUnavailableRetry] = "invalid" }, typeof(ArgumentOutOfRangeException)));
323323
Add(new(new() { [SparkParameters.Type] = SparkServerTypeConstants.Http, [SparkParameters.HostName] = "valid.server.com", [AdbcOptions.Username] = "user", [AdbcOptions.Password] = "myPassword", [SparkParameters.TemporarilyUnavailableRetryTimeout] = "invalid" }, typeof(ArgumentOutOfRangeException)));

0 commit comments

Comments
 (0)