[branch-2.1][Bug] test suite test_table_options may cause NPE in FE #…

…39457 (#39509) (#40018) ## Proposed changes pick #39509 Co-authored-by: Vallish Pai <[email protected]>
apache · Aug 28, 2024 · 42f30d4 · 42f30d4
1 parent ddf72ce
commit 42f30d4
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/tablefunction/MetadataGenerator.java b/fe/fe-core/src/main/java/org/apache/doris/tablefunction/MetadataGenerator.java
@@ -1105,6 +1105,15 @@ private static TFetchSchemaTableDataResult tablePropertiesMetadataResult(TSchema
         CatalogIf catalog = Env.getCurrentEnv().getCatalogMgr().getCatalog(clg);
         List<TRow> dataBatch = Lists.newArrayList();
         DatabaseIf database = catalog.getDbNullable(dbId);
+        if (database == null) {
+            // BE gets the database id list from FE and then invokes this interface
+            // per database. there is a chance that in between database can be dropped.
+            // so need to handle database not exist case and return ok so that BE continue the
+            // loop with next database.
+            result.setDataBatch(dataBatch);
+            result.setStatus(new TStatus(TStatusCode.OK));
+            return result;
+        }
         List<TableIf> tables = database.getTables();
         if (catalog instanceof InternalCatalog) {
             tablePropertiesForInternalCatalog(currentUserIdentity, catalog, database, tables, dataBatch);