redirect outer fetcher tasks to cached executor to prevent pool-induced deadlock

Author: keshavdandeva

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

@@ -912,7 +912,7 @@ public ResultSet getProcedures(
           }
         };
 
-    Future<?> fetcherFuture = connection.getMetadataExecutor().submit(procedureFetcher);
+    Future<?> fetcherFuture = connection.getExecutorService().submit(procedureFetcher);
     BigQueryJsonResultSet resultSet =
         BigQueryJsonResultSet.of(resultSchema, -1, queue, null, new Future<?>[] {fetcherFuture});
 
@@ -1127,7 +1127,7 @@ public ResultSet getProcedureColumns(
           }
         };
 
-    Future<?> fetcherFuture = connection.getMetadataExecutor().submit(procedureColumnFetcher);
+    Future<?> fetcherFuture = connection.getExecutorService().submit(procedureColumnFetcher);
     BigQueryJsonResultSet resultSet =
         BigQueryJsonResultSet.of(resultSchema, -1, queue, null, new Future<?>[] {fetcherFuture});
 
@@ -1759,7 +1759,7 @@ public ResultSet getTables(
           }
         };
 
-    Future<?> fetcherFuture = connection.getMetadataExecutor().submit(tableFetcher);
+    Future<?> fetcherFuture = connection.getExecutorService().submit(tableFetcher);
     BigQueryJsonResultSet resultSet =
         BigQueryJsonResultSet.of(resultSchema, -1, queue, null, new Future<?>[] {fetcherFuture});
 
@@ -2084,7 +2084,7 @@ public ResultSet getColumns(
           }
         };
 
-    Future<?> fetcherFuture = connection.getMetadataExecutor().submit(columnFetcher);
+    Future<?> fetcherFuture = connection.getExecutorService().submit(columnFetcher);
     BigQueryJsonResultSet resultSet =
         BigQueryJsonResultSet.of(resultSchema, -1, queue, null, new Future<?>[] {fetcherFuture});
 
@@ -3600,7 +3600,7 @@ public ResultSet getSchemas(String catalog, String schemaPattern) throws SQLExce
           }
         };
 
-    Future<?> fetcherFuture = connection.getMetadataExecutor().submit(schemaFetcher);
+    Future<?> fetcherFuture = connection.getExecutorService().submit(schemaFetcher);
     BigQueryJsonResultSet resultSet =
         BigQueryJsonResultSet.of(resultSchema, -1, queue, null, new Future<?>[] {fetcherFuture});
 
@@ -3879,7 +3879,7 @@ public ResultSet getFunctions(String catalog, String schemaPattern, String funct
           }
         };
 
-    Future<?> fetcherFuture = connection.getMetadataExecutor().submit(functionFetcher);
+    Future<?> fetcherFuture = connection.getExecutorService().submit(functionFetcher);
     BigQueryJsonResultSet resultSet =
         BigQueryJsonResultSet.of(resultSchema, -1, queue, null, new Future<?>[] {fetcherFuture});
 
@@ -4085,7 +4085,7 @@ public ResultSet getFunctionColumns(
           }
         };
 
-    Future<?> fetcherFuture = connection.getMetadataExecutor().submit(functionColumnFetcher);
+    Future<?> fetcherFuture = connection.getExecutorService().submit(functionColumnFetcher);
     BigQueryJsonResultSet resultSet =
         BigQueryJsonResultSet.of(resultSchema, -1, queue, null, new Future<?>[] {fetcherFuture});
 

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

@@ -73,6 +73,7 @@ public void setUp() throws SQLException {
     when(bigQueryConnection.getBigQuery()).thenReturn(bigqueryClient);
     when(bigQueryConnection.createStatement()).thenReturn(mockStatement);
     when(bigQueryConnection.getMetadataExecutor()).thenReturn(metadataExecutor);
+    when(bigQueryConnection.getExecutorService()).thenReturn(metadataExecutor);
 
     dbMetadata = new BigQueryDatabaseMetaData(bigQueryConnection);
   }