throw error instead of logging warning for getDiscoveredProjects

Author: keshavdandeva

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

@@ -1324,7 +1324,7 @@ public boolean isEnableProjectDiscovery() {
     return this.enableProjectDiscovery;
   }
 
-  public synchronized List<String> getDiscoveredProjects() {
+  public synchronized List<String> getDiscoveredProjects() throws SQLException {
     if (this.discoveredProjectsCache != null) {
       return this.discoveredProjectsCache;
     }
@@ -1339,16 +1339,10 @@ public synchronized List<String> getDiscoveredProjects() {
       }
       this.discoveredProjectsCache = ImmutableList.copyOf(projects);
     } catch (BigQueryException e) {
-      LOG.warning(e, "Failed to list all accessible projects due to BigQuery error.");
-      int statusCode = e.getCode();
-      // Only cache empty list for non-transient auth/permission errors (400, 401, 403)
-      if (statusCode == 400 || statusCode == 401 || statusCode == 403) {
-        this.discoveredProjectsCache = ImmutableList.of();
-      }
-      return ImmutableList.of();
+      throw new BigQueryJdbcException(
+          "Failed to list all accessible projects due to BigQuery error.", e);
     } catch (Exception e) {
-      LOG.warning(e, "Failed to list all accessible projects, falling back to connection default.");
-      return ImmutableList.of();
+      throw new BigQueryJdbcException("Failed to list all accessible projects.", e);
     }
     return this.discoveredProjectsCache;
   }

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

@@ -1996,14 +1996,14 @@ Comparator<FieldValueList> defineGetTablesComparator(FieldList resultSchemaField
   }
 
   @Override
-  public ResultSet getSchemas() {
+  public ResultSet getSchemas() throws SQLException {
     LOG.info("getSchemas() called");
 
     return getSchemas(null, null);
   }
 
   @Override
-  public ResultSet getCatalogs() {
+  public ResultSet getCatalogs() throws SQLException {
     LOG.info("getCatalogs() called");
 
     final List<String> accessibleCatalogs = getAccessibleCatalogNames();
@@ -3618,7 +3618,7 @@ public RowIdLifetime getRowIdLifetime() {
   }
 
   @Override
-  public ResultSet getSchemas(String catalog, String schemaPattern) {
+  public ResultSet getSchemas(String catalog, String schemaPattern) throws SQLException {
     if ((catalog != null && catalog.isEmpty())
         || (schemaPattern != null && schemaPattern.isEmpty())) {
       LOG.warning("Returning empty ResultSet as catalog or schemaPattern is an empty string.");
@@ -3641,20 +3641,20 @@ public ResultSet getSchemas(String catalog, String schemaPattern) {
           final FieldList localResultSchemaFields = resultSchemaFields;
           List<String> projectsToScanList = new ArrayList<>();
 
-          if (catalogParam != null) {
-            projectsToScanList.add(catalogParam);
-          } else {
-            projectsToScanList.addAll(getAccessibleCatalogNames());
-          }
+          try {
+            if (catalogParam != null) {
+              projectsToScanList.add(catalogParam);
+            } else {
+              projectsToScanList.addAll(getAccessibleCatalogNames());
+            }
 
-          if (projectsToScanList.isEmpty()) {
-            LOG.info(
-                "No valid projects to scan (primary, specified, or additional). Returning empty"
-                    + " resultset.");
-            return;
-          }
+            if (projectsToScanList.isEmpty()) {
+              LOG.info(
+                  "No valid projects to scan (primary, specified, or additional). Returning empty"
+                      + " resultset.");
+              return;
+            }
 
-          try {
             for (String currentProjectToScan : projectsToScanList) {
               if (Thread.currentThread().isInterrupted()) {
                 LOG.warning(
@@ -3707,6 +3707,13 @@ public ResultSet getSchemas(String catalog, String schemaPattern) {
 
           } catch (Throwable t) {
             LOG.severe("Unexpected error in schema fetcher runnable: " + t.getMessage());
+            Exception ex = (t instanceof Exception) ? (Exception) t : new Exception(t);
+            try {
+              queue.put(BigQueryFieldValueListWrapper.ofError(ex));
+            } catch (InterruptedException ie) {
+              LOG.warning("Failed to put exception to queue due to interruption.");
+              Thread.currentThread().interrupt();
+            }
           } finally {
             signalEndOfData(queue, localResultSchemaFields);
             LOG.info("Schema fetcher thread finished.");
@@ -5178,7 +5185,7 @@ private String getCurrentCatalogName() {
     return this.connection.getCatalog();
   }
 
-  private List<String> getAccessibleCatalogNames() {
+  private List<String> getAccessibleCatalogNames() throws SQLException {
     Set<String> accessibleCatalogs = new HashSet<>();
     String primaryCatalog = getCurrentCatalogName();
     if (primaryCatalog != null && !primaryCatalog.isEmpty()) {

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

@@ -556,42 +556,54 @@ public void testGetDiscoveredProjects_Success() throws Exception {
   }
 
   @Test
-  public void testGetDiscoveredProjects_NonTransientError() throws Exception {
+  public void testGetDiscoveredProjects_BigQueryExceptionThrown() throws Exception {
     try (BigQueryConnection connection = new BigQueryConnection(BASE_URL)) {
       BigQuery mockBigQuery = mock(BigQuery.class);
       connection.bigQuery = mockBigQuery;
 
-      // 403 Forbidden (Non-transient error)
       BigQueryException exception = new BigQueryException(403, "Access Denied");
       when(mockBigQuery.listProjects(any(BigQuery.ProjectListOption.class))).thenThrow(exception);
 
-      List<String> discovered = connection.getDiscoveredProjects();
-      assertTrue(discovered.isEmpty());
-
-      // Verify that it caches the empty list for 403, so it does not retry.
-      List<String> discoveredCached = connection.getDiscoveredProjects();
-      assertTrue(discoveredCached.isEmpty());
-      verify(mockBigQuery, times(1)).listProjects(any(BigQuery.ProjectListOption.class));
+      // Verify that it throws BigQueryJdbcException
+      BigQueryJdbcException ex =
+          assertThrows(
+              BigQueryJdbcException.class,
+              () -> {
+                connection.getDiscoveredProjects();
+              });
+      assertTrue(
+          ex.getMessage()
+              .contains("Failed to list all accessible projects due to BigQuery error."));
+      assertEquals(exception, ex.getCause());
+
+      // Subsequent call should retry since no cache is set
+      assertThrows(
+          BigQueryJdbcException.class,
+          () -> {
+            connection.getDiscoveredProjects();
+          });
+      verify(mockBigQuery, times(2)).listProjects(any(BigQuery.ProjectListOption.class));
     }
   }
 
   @Test
-  public void testGetDiscoveredProjects_TransientError() throws Exception {
+  public void testGetDiscoveredProjects_OtherExceptionThrown() throws Exception {
     try (BigQueryConnection connection = new BigQueryConnection(BASE_URL)) {
       BigQuery mockBigQuery = mock(BigQuery.class);
       connection.bigQuery = mockBigQuery;
 
-      // 500 Internal Error (Transient error, should not cache empty list)
-      BigQueryException exception = new BigQueryException(500, "Internal Server Error");
+      RuntimeException exception = new RuntimeException("Generic Network Failure");
       when(mockBigQuery.listProjects(any(BigQuery.ProjectListOption.class))).thenThrow(exception);
 
-      List<String> discovered = connection.getDiscoveredProjects();
-      assertTrue(discovered.isEmpty());
-
-      // Since it's a transient error, it should NOT cache the empty list and should try again.
-      List<String> discoveredCached = connection.getDiscoveredProjects();
-      assertTrue(discoveredCached.isEmpty());
-      verify(mockBigQuery, times(2)).listProjects(any(BigQuery.ProjectListOption.class));
+      // Verify that it throws BigQueryJdbcException
+      BigQueryJdbcException ex =
+          assertThrows(
+              BigQueryJdbcException.class,
+              () -> {
+                connection.getDiscoveredProjects();
+              });
+      assertTrue(ex.getMessage().contains("Failed to list all accessible projects."));
+      assertEquals(exception, ex.getCause());
     }
   }
 }

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

@@ -2955,7 +2955,7 @@ public void testPrepareGetCatalogsRows() {
   }
 
   @Test
-  public void testGetSchemas_NoArgs_DelegatesCorrectly() {
+  public void testGetSchemas_NoArgs_DelegatesCorrectly() throws SQLException {
     BigQueryDatabaseMetaData spiedDbMetadata = spy(dbMetadata);
     ResultSet mockResultSet = mock(ResultSet.class);
     doReturn(mockResultSet).when(spiedDbMetadata).getSchemas(null, null);