Fasten listing tables in BigQuery connector

ebyhr · ebyhr · commit 212e1bb744bb · 2021-04-18T22:03:33.000+09:00
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryClient.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryClient.java
@@ -112,6 +112,11 @@ Optional<RemoteDatabaseObject> toRemoteDataset(String projectId, String datasetN
     }
 
     Optional<RemoteDatabaseObject> toRemoteTable(String projectId, String remoteDatasetName, String tableName)
+    {
+        return toRemoteTable(projectId, remoteDatasetName, tableName, listTables(DatasetId.of(projectId, remoteDatasetName), TABLE, VIEW));
+    }
+
+    Optional<RemoteDatabaseObject> toRemoteTable(String projectId, String remoteDatasetName, String tableName, Iterable<Table> tables)
     {
         requireNonNull(projectId, "projectId is null");
         requireNonNull(remoteDatasetName, "remoteDatasetName is null");
@@ -129,7 +134,7 @@ Optional<RemoteDatabaseObject> toRemoteTable(String projectId, String remoteData
 
         // cache miss, reload the cache
         Map<TableId, Optional<RemoteDatabaseObject>> mapping = new HashMap<>();
-        for (Table table : listTables(DatasetId.of(projectId, remoteDatasetName), TABLE, VIEW)) {
+        for (Table table : tables) {
             mapping.merge(
                     tableIdToLowerCase(table.getTableId()),
                     Optional.of(RemoteDatabaseObject.of(table.getTableId().getTable())),
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryMetadata.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryMetadata.java
@@ -144,9 +144,10 @@ public List<SchemaTableName> listTables(ConnectorSession session, Optional<Strin
 
         ImmutableList.Builder<SchemaTableName> tableNames = ImmutableList.builder();
         for (String remoteSchemaName : remoteSchemaNames) {
-            for (Table table : bigQueryClient.listTables(DatasetId.of(projectId, remoteSchemaName), TABLE, VIEW)) {
+            Iterable<Table> tables = bigQueryClient.listTables(DatasetId.of(projectId, remoteSchemaName), TABLE, VIEW);
+            for (Table table : tables) {
                 // filter ambiguous tables
-                boolean isAmbiguous = bigQueryClient.toRemoteTable(projectId, remoteSchemaName, table.getTableId().getTable().toLowerCase(ENGLISH))
+                boolean isAmbiguous = bigQueryClient.toRemoteTable(projectId, remoteSchemaName, table.getTableId().getTable().toLowerCase(ENGLISH), tables)
                         .filter(RemoteDatabaseObject::isAmbiguous)
                         .isPresent();
                 if (!isAmbiguous) {
