Improve active name clarity

birschick-bq · birschick-bq · commit bc0a98be519b · 2026-03-31T13:46:47.000-07:00
diff --git a/csharp/src/BigQueryConnection.cs b/csharp/src/BigQueryConnection.cs
@@ -53,6 +53,7 @@ public class BigQueryConnection : TracingConnection, ITokenProtectedResource
     {
         readonly Dictionary<string, string> properties;
         readonly HttpClient httpClient;
+        const string ClassName = nameof(BigQueryConnection);
         const string infoDriverName = "ADBC BigQuery Driver";
         const string infoVendorName = "BigQuery";
         // Note: this needs to be set before the constructor runs
@@ -268,7 +269,7 @@ internal BigQueryClient Open(string? projectId = null)
 
                 Client = client;
                 return client;
-            });
+            }, ClassName + ".", nameof(Open));
         }
 
         internal void SetCredential()
@@ -342,7 +343,7 @@ internal void SetCredential()
                 {
                     throw new ArgumentException($"{authenticationType} is not a valid authenticationType");
                 }
-            });
+            }, ClassName + ".", nameof(SetCredential));
         }
 
         public override void SetOption(string key, string value)
@@ -357,7 +358,7 @@ public override void SetOption(string key, string value)
                 {
                     UpdateClientToken();
                 }
-            });
+            }, ClassName + ".", nameof(SetOption));
         }
 
         /// <summary>
@@ -505,7 +506,7 @@ public override IArrowArrayStream GetInfo(IReadOnlyList<AdbcInfoCode> codes)
                 StandardSchemas.GetInfoSchema.Validate(dataArrays);
 
                 return new BigQueryInfoArrowStream(StandardSchemas.GetInfoSchema, dataArrays);
-            });
+            }, ClassName + ".", nameof(GetInfo));
         }
 
         public override IArrowArrayStream GetObjects(
@@ -529,7 +530,7 @@ public override IArrowArrayStream GetObjects(
                 {
                     throw new AdbcException(googleEx!.Message, AdbcStatusCode.Unauthorized, ex);
                 }
-            });
+            }, ClassName + ".", nameof(GetObjects));
         }
 
         /// <summary>
@@ -578,7 +579,7 @@ internal void UpdateClientToken()
                 {
                     throw new AdbcException(googleEx!.Message, AdbcStatusCode.Unauthorized, ex);
                 }
-            });
+            }, ClassName + ".", nameof(ExecuteQuery));
         }
 
         internal static bool IsUnauthorizedException(Exception ex, out GoogleApiException? googleEx)
@@ -648,7 +649,7 @@ private IArrowArray[] GetCatalogs(
                 StandardSchemas.GetObjectsSchema.Validate(dataArrays);
 
                 return dataArrays;
-            });
+            }, ClassName + ".", nameof(GetCatalogs));
         }
 
         private StructArray GetDbSchemas(
@@ -712,7 +713,7 @@ private StructArray GetDbSchemas(
                     length,
                     dataArrays,
                     nullBitmapBuffer.Build());
-            });
+            }, ClassName + ".", nameof(GetDbSchemas));
         }
 
         private StructArray GetTableSchemas(
@@ -806,7 +807,7 @@ private StructArray GetTableSchemas(
                     length,
                     dataArrays,
                     nullBitmapBuffer.Build());
-            });
+            }, ClassName + ".", nameof(GetTableSchemas));
         }
 
         private StructArray GetColumnSchema(
@@ -922,7 +923,7 @@ private StructArray GetColumnSchema(
                     length,
                     dataArrays,
                     nullBitmapBuffer.Build());
-            });
+            }, ClassName + ".", nameof(GetColumnSchema));
         }
 
         private StructArray GetConstraintSchema(
@@ -994,7 +995,7 @@ private StructArray GetConstraintSchema(
                     length,
                     dataArrays,
                     nullBitmapBuffer.Build());
-            });
+            }, ClassName + ".", nameof(GetConstraintSchema));
         }
 
         private StringArray GetConstraintColumnNames(
@@ -1022,7 +1023,7 @@ private StringArray GetConstraintColumnNames(
                 }
 
                 return constraintColumnNamesBuilder.Build();
-            });
+            }, ClassName + ".", nameof(GetConstraintColumnNames));
         }
 
         private StructArray GetConstraintsUsage(
@@ -1078,7 +1079,7 @@ private StructArray GetConstraintsUsage(
                     length,
                     dataArrays,
                     nullBitmapBuffer.Build());
-            });
+            }, ClassName + ".", nameof(GetConstraintsUsage));
         }
 
         private string PatternToRegEx(string? pattern)
@@ -1196,7 +1197,7 @@ public override Schema GetTableSchema(string? catalog, string? dbSchema, string
                 }
 
                 return new Schema(fields, null);
-            });
+            }, ClassName + ".", nameof(GetTableSchema));
         }
 
         private Field DescToField(BigQueryRow row)
diff --git a/csharp/src/BigQueryStatement.cs b/csharp/src/BigQueryStatement.cs
@@ -50,6 +50,7 @@ namespace AdbcDrivers.BigQuery
     /// </summary>
     class BigQueryStatement : TracingStatement, ITokenProtectedResource, IDisposable
     {
+        private const string ClassName = nameof(BigQueryStatement);
         readonly BigQueryConnection bigQueryConnection;
         readonly CancellationRegistry cancellationRegistry;
 
@@ -146,7 +147,7 @@ private async Task<QueryResult> ExecuteQueryInternalAsync()
                             // if the authentication token was reset, then we need a new job with the latest token
                             context.Job = await Client.GetJobAsync(jobReference, cancellationToken: context.CancellationToken).ConfigureAwait(false);
                             return await context.Job.GetQueryResultsAsync(getQueryResultsOptions, cancellationToken: context.CancellationToken).ConfigureAwait(false);
-                        }, "BigQueryStatement.ExecuteQueryInternalAsync.GetQueryResultsAsync");
+                        }, ClassName + "." + nameof(ExecuteQueryInternalAsync) + "." + nameof(BigQueryJob.GetQueryResultsAsync));
                     }).ConfigureAwait(false);
                 };
 
@@ -243,7 +244,7 @@ private async Task<QueryResult> ExecuteQueryInternalAsync()
                         {
                             // Cancelling this step may leave the server with unread streams.
                             return await GetArrowReaders(clientMgr, table, results.TableReference.ProjectId, maxStreamCount, activity, context.CancellationToken).ConfigureAwait(false);
-                        }, "BigQueryStatement.ExecuteQueryInternalAsync.GetArrowReaders");
+                        }, ClassName + "." + nameof(ExecuteQueryInternalAsync) + "." + nameof(GetArrowReaders));
                     }).ConfigureAwait(false);
                 };
                 IEnumerable<IArrowReader> readers = await ExecuteWithRetriesAsync(getArrowReadersFunc, activity, cancellationContext.CancellationToken).ConfigureAwait(false);
@@ -252,7 +253,7 @@ private async Task<QueryResult> ExecuteQueryInternalAsync()
                 IArrowArrayStream stream = new MultiArrowReader(this, TranslateSchema(results.Schema), readers, new CancellationContext(cancellationRegistry));
                 activity?.AddTag(SemanticConventions.Db.Response.ReturnedRows, totalRows);
                 return new QueryResult(totalRows, stream);
-            });
+            }, ClassName + "." + nameof(ExecuteQueryInternalAsync));
         }
 
         private Task<QueryResult> ExecuteMetadataCommandQuery(Activity? activity)
@@ -713,7 +714,7 @@ public override void Cancel()
             this.TraceActivity(_ =>
             {
                 this.cancellationRegistry.CancelAll();
-            });
+            }, ClassName + ".", nameof(Cancel));
         }
 
         public override void Dispose()
@@ -763,7 +764,7 @@ private async Task<UpdateResult> ExecuteUpdateInternalAsync()
 
                 activity?.AddTag(SemanticConventions.Db.Response.ReturnedRows, updatedRows);
                 return new UpdateResult(updatedRows);
-            });
+            }, ClassName + ".", nameof(ExecuteUpdateInternalAsync));
         }
 
         private Schema TranslateSchema(TableSchema schema)
@@ -1173,6 +1174,7 @@ public void Dispose()
 
         private class MultiArrowReader : TracingReader
         {
+            private const string ClassName = BigQueryStatement.ClassName + ".MultiArrowReader";
             private static readonly string s_assemblyName = BigQueryUtils.GetAssemblyName(typeof(BigQueryStatement));
             private static readonly string s_assemblyVersion = BigQueryUtils.GetAssemblyVersion(typeof(BigQueryStatement));
 
@@ -1229,7 +1231,7 @@ public MultiArrowReader(BigQueryStatement statement, Schema schema, IEnumerable<
 
                         this.reader = null;
                     }
-                });
+                }, ClassName + ".", nameof(ReadNextRecordBatchAsync));
             }
 
             protected override void Dispose(bool disposing)

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ public class BigQueryConnection : TracingConnection, ITokenProtectedResource`
`53`	`53`	`{`
`54`	`54`	`readonly Dictionary<string, string> properties;`
`55`	`55`	`readonly HttpClient httpClient;`
	`56`	`+ const string ClassName = nameof(BigQueryConnection);`
`56`	`57`	`const string infoDriverName = "ADBC BigQuery Driver";`
`57`	`58`	`const string infoVendorName = "BigQuery";`
`58`	`59`	`// Note: this needs to be set before the constructor runs`
`@@ -268,7 +269,7 @@ internal BigQueryClient Open(string? projectId = null)`
`268`	`269`
`269`	`270`	`Client = client;`
`270`	`271`	`return client;`
`271`		`- });`
	`272`	`+ }, ClassName + ".", nameof(Open));`
`272`	`273`	`}`
`273`	`274`
`274`	`275`	`internal void SetCredential()`
`@@ -342,7 +343,7 @@ internal void SetCredential()`
`342`	`343`	`{`
`343`	`344`	`throw new ArgumentException($"{authenticationType} is not a valid authenticationType");`
`344`	`345`	`}`
`345`		`- });`
	`346`	`+ }, ClassName + ".", nameof(SetCredential));`
`346`	`347`	`}`
`347`	`348`
`348`	`349`	`public override void SetOption(string key, string value)`
`@@ -357,7 +358,7 @@ public override void SetOption(string key, string value)`
`357`	`358`	`{`
`358`	`359`	`UpdateClientToken();`
`359`	`360`	`}`
`360`		`- });`
	`361`	`+ }, ClassName + ".", nameof(SetOption));`
`361`	`362`	`}`
`362`	`363`
`363`	`364`	`/// <summary>`
`@@ -505,7 +506,7 @@ public override IArrowArrayStream GetInfo(IReadOnlyList<AdbcInfoCode> codes)`
`505`	`506`	`StandardSchemas.GetInfoSchema.Validate(dataArrays);`
`506`	`507`
`507`	`508`	`return new BigQueryInfoArrowStream(StandardSchemas.GetInfoSchema, dataArrays);`
`508`		`- });`
	`509`	`+ }, ClassName + ".", nameof(GetInfo));`
`509`	`510`	`}`
`510`	`511`
`511`	`512`	`public override IArrowArrayStream GetObjects(`
`@@ -529,7 +530,7 @@ public override IArrowArrayStream GetObjects(`
`529`	`530`	`{`
`530`	`531`	`throw new AdbcException(googleEx!.Message, AdbcStatusCode.Unauthorized, ex);`
`531`	`532`	`}`
`532`		`- });`
	`533`	`+ }, ClassName + ".", nameof(GetObjects));`
`533`	`534`	`}`
`534`	`535`
`535`	`536`	`/// <summary>`
`@@ -578,7 +579,7 @@ internal void UpdateClientToken()`
`578`	`579`	`{`
`579`	`580`	`throw new AdbcException(googleEx!.Message, AdbcStatusCode.Unauthorized, ex);`
`580`	`581`	`}`
`581`		`- });`
	`582`	`+ }, ClassName + ".", nameof(ExecuteQuery));`
`582`	`583`	`}`
`583`	`584`
`584`	`585`	`internal static bool IsUnauthorizedException(Exception ex, out GoogleApiException? googleEx)`
`@@ -648,7 +649,7 @@ private IArrowArray[] GetCatalogs(`
`648`	`649`	`StandardSchemas.GetObjectsSchema.Validate(dataArrays);`
`649`	`650`
`650`	`651`	`return dataArrays;`
`651`		`- });`
	`652`	`+ }, ClassName + ".", nameof(GetCatalogs));`
`652`	`653`	`}`
`653`	`654`
`654`	`655`	`private StructArray GetDbSchemas(`
`@@ -712,7 +713,7 @@ private StructArray GetDbSchemas(`
`712`	`713`	`length,`
`713`	`714`	`dataArrays,`
`714`	`715`	`nullBitmapBuffer.Build());`
`715`		`- });`
	`716`	`+ }, ClassName + ".", nameof(GetDbSchemas));`
`716`	`717`	`}`
`717`	`718`
`718`	`719`	`private StructArray GetTableSchemas(`
`@@ -806,7 +807,7 @@ private StructArray GetTableSchemas(`
`806`	`807`	`length,`
`807`	`808`	`dataArrays,`
`808`	`809`	`nullBitmapBuffer.Build());`
`809`		`- });`
	`810`	`+ }, ClassName + ".", nameof(GetTableSchemas));`
`810`	`811`	`}`
`811`	`812`
`812`	`813`	`private StructArray GetColumnSchema(`
`@@ -922,7 +923,7 @@ private StructArray GetColumnSchema(`
`922`	`923`	`length,`
`923`	`924`	`dataArrays,`
`924`	`925`	`nullBitmapBuffer.Build());`
`925`		`- });`
	`926`	`+ }, ClassName + ".", nameof(GetColumnSchema));`
`926`	`927`	`}`
`927`	`928`
`928`	`929`	`private StructArray GetConstraintSchema(`
`@@ -994,7 +995,7 @@ private StructArray GetConstraintSchema(`
`994`	`995`	`length,`
`995`	`996`	`dataArrays,`
`996`	`997`	`nullBitmapBuffer.Build());`
`997`		`- });`
	`998`	`+ }, ClassName + ".", nameof(GetConstraintSchema));`
`998`	`999`	`}`
`999`	`1000`
`1000`	`1001`	`private StringArray GetConstraintColumnNames(`
`@@ -1022,7 +1023,7 @@ private StringArray GetConstraintColumnNames(`
`1022`	`1023`	`}`
`1023`	`1024`
`1024`	`1025`	`return constraintColumnNamesBuilder.Build();`
`1025`		`- });`
	`1026`	`+ }, ClassName + ".", nameof(GetConstraintColumnNames));`
`1026`	`1027`	`}`
`1027`	`1028`
`1028`	`1029`	`private StructArray GetConstraintsUsage(`
`@@ -1078,7 +1079,7 @@ private StructArray GetConstraintsUsage(`
`1078`	`1079`	`length,`
`1079`	`1080`	`dataArrays,`
`1080`	`1081`	`nullBitmapBuffer.Build());`
`1081`		`- });`
	`1082`	`+ }, ClassName + ".", nameof(GetConstraintsUsage));`
`1082`	`1083`	`}`
`1083`	`1084`
`1084`	`1085`	`private string PatternToRegEx(string? pattern)`
`@@ -1196,7 +1197,7 @@ public override Schema GetTableSchema(string? catalog, string? dbSchema, string`
`1196`	`1197`	`}`
`1197`	`1198`
`1198`	`1199`	`return new Schema(fields, null);`
`1199`		`- });`
	`1200`	`+ }, ClassName + ".", nameof(GetTableSchema));`
`1200`	`1201`	`}`
`1201`	`1202`
`1202`	`1203`	`private Field DescToField(BigQueryRow row)`