chore: minor refactors

Author: keshavdandeva

java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryDatabaseMetaData.java

@@ -1749,19 +1749,14 @@ private ResultSet getTablesImpl(
 
   @VisibleForTesting
   Thread runGetTablesTaskAsync(
-      String catalog,
-      String schemaPattern,
+      String effectiveCatalog,
+      String effectiveSchemaPattern,
       String tableNamePattern,
       String[] types,
       Schema resultSchema,
       BlockingQueue<BigQueryFieldValueListWrapper> queue)
       throws SQLException {
 
-    Tuple<String, String> effectiveIdentifiers =
-        determineEffectiveCatalogAndSchema(catalog, schemaPattern);
-    String effectiveCatalog = effectiveIdentifiers.x();
-    String effectiveSchemaPattern = effectiveIdentifiers.y();
-
     final Pattern schemaRegex = compileSqlLikePattern(effectiveSchemaPattern);
     final Pattern tableNameRegex = compileSqlLikePattern(tableNamePattern);
     final Set<String> requestedTypes =
@@ -2155,7 +2150,12 @@ private ResultSet getColumnsImpl(
 
     Thread fetcherThread =
         runGetColumnsTaskAsync(
-            catalog, schemaPattern, tableNamePattern, columnNamePattern, resultSchema, queue);
+            effectiveCatalog,
+            effectiveSchemaPattern,
+            tableNamePattern,
+            columnNamePattern,
+            resultSchema,
+            queue);
 
     BigQueryJsonResultSet resultSet =
         BigQueryJsonResultSet.of(resultSchema, -1, queue, null, new Thread[] {fetcherThread});
@@ -2166,19 +2166,14 @@ private ResultSet getColumnsImpl(
 
   @VisibleForTesting
   Thread runGetColumnsTaskAsync(
-      String catalog,
-      String schemaPattern,
+      String effectiveCatalog,
+      String effectiveSchemaPattern,
       String tableNamePattern,
       String columnNamePattern,
       Schema resultSchema,
       BlockingQueue<BigQueryFieldValueListWrapper> queue)
       throws SQLException {
 
-    Tuple<String, String> effectiveIdentifiers =
-        determineEffectiveCatalogAndSchema(catalog, schemaPattern);
-    String effectiveCatalog = effectiveIdentifiers.x();
-    String effectiveSchemaPattern = effectiveIdentifiers.y();
-
     Pattern schemaRegex = compileSqlLikePattern(effectiveSchemaPattern);
     Pattern tableNameRegex = compileSqlLikePattern(tableNamePattern);
     Pattern columnNameRegex = compileSqlLikePattern(columnNamePattern);

java-bigquery/google-cloud-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryDatabaseMetaDataTest.java

@@ -3299,14 +3299,7 @@ public void testGetTables_createsDetachedLinkedSpan() throws Exception {
       Assertions.assertNotNull(workerThread, "Worker thread should not be null");
       workerThread.join();
 
-      boolean found =
-          otelTesting.getSpans().stream()
-              .anyMatch(
-                  span ->
-                      span.getName().equals("BigQueryDatabaseMetaData.getTables.background")
-                          && span.getLinks().stream()
-                              .anyMatch(link -> link.getSpanContext().isValid()));
-      assertTrue(found);
+      assertSpanLinkedToParent("BigQueryDatabaseMetaData.getTables.background", parentSpan);
     } finally {
       parentSpan.end();
     }
@@ -3327,14 +3320,7 @@ public void testGetColumns_createsDetachedLinkedSpan() throws Exception {
       Assertions.assertNotNull(workerThread, "Worker thread should not be null");
       workerThread.join();
 
-      boolean found =
-          otelTesting.getSpans().stream()
-              .anyMatch(
-                  span ->
-                      span.getName().equals("BigQueryDatabaseMetaData.getColumns.background")
-                          && span.getLinks().stream()
-                              .anyMatch(link -> link.getSpanContext().isValid()));
-      assertTrue(found);
+      assertSpanLinkedToParent("BigQueryDatabaseMetaData.getColumns.background", parentSpan);
     } finally {
       parentSpan.end();
     }
@@ -3355,16 +3341,27 @@ public void testGetSchemas_createsDetachedLinkedSpan() throws Exception {
       Assertions.assertNotNull(workerThread, "Worker thread should not be null");
       workerThread.join();
 
-      boolean found =
-          otelTesting.getSpans().stream()
-              .anyMatch(
-                  span ->
-                      span.getName().equals("BigQueryDatabaseMetaData.getSchemas.background")
-                          && span.getLinks().stream()
-                              .anyMatch(link -> link.getSpanContext().isValid()));
-      assertTrue(found);
+      assertSpanLinkedToParent("BigQueryDatabaseMetaData.getSchemas.background", parentSpan);
     } finally {
       parentSpan.end();
     }
   }
+
+  private void assertSpanLinkedToParent(String spanName, Span parentSpan) {
+    boolean found =
+        otelTesting.getSpans().stream()
+            .anyMatch(
+                span ->
+                    span.getName().equals(spanName)
+                        && span.getLinks().stream()
+                            .anyMatch(
+                                link ->
+                                    link.getSpanContext()
+                                            .getTraceId()
+                                            .equals(parentSpan.getSpanContext().getTraceId())
+                                        && link.getSpanContext()
+                                            .getSpanId()
+                                            .equals(parentSpan.getSpanContext().getSpanId())));
+    assertTrue(found, "Span " + spanName + " not found or not linked to parent");
+  }
 }