[Bug] test suite test_table_options may cause NPE in FE #39457

apache · Aug 16, 2024 · 89540d1 · 89540d1
1 parent ed560bb
commit 89540d1
Showing 1 changed file with 10 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
@@ -1135,6 +1135,11 @@ private static TFetchSchemaTableDataResult tableOptionsMetadataResult(TSchemaTab
         String clg = params.getCatalog();
         CatalogIf catalog = Env.getCurrentEnv().getCatalogMgr().getCatalog(clg);
         DatabaseIf database = catalog.getDbNullable(dbId);
+        if (database == null) {
+            result.setDataBatch(dataBatch);
+            result.setStatus(new TStatus(TStatusCode.OK));
+            return result;
+        }
         List<TableIf> tables = database.getTables();
         if (catalog instanceof InternalCatalog) {
             tableOptionsForInternalCatalog(currentUserIdentity, catalog, database, tables, dataBatch);
@@ -1222,6 +1227,11 @@ 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) {
+            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);