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 index 10a8e1cc5ad9a4b..a8dff185d47cdb5 100644 --- 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 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 dataBatch = Lists.newArrayList(); DatabaseIf database = catalog.getDbNullable(dbId); + if (database == null) { + result.setDataBatch(dataBatch); + result.setStatus(new TStatus(TStatusCode.OK)); + return result; + } List tables = database.getTables(); if (catalog instanceof InternalCatalog) { tablePropertiesForInternalCatalog(currentUserIdentity, catalog, database, tables, dataBatch);