From aa0d6d6b04c01feecc7294076710a1217727c498 Mon Sep 17 00:00:00 2001 From: morningman Date: Fri, 6 Sep 2024 15:51:34 +0800 Subject: [PATCH] 2 --- .../org/apache/doris/datasource/ExternalCatalog.java | 10 ++++++++++ .../java/org/apache/doris/qe/ConnectProcessor.java | 6 ++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java index 0b6c4fe636fb73b..c445466564ce27b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java @@ -660,6 +660,16 @@ public Optional> getDbForReplay(long d } } + /** + * Build a database instance. + * If checkExists is true, it will check if the database exists in the remote system. + * + * @param dbName + * @param dbId + * @param logType + * @param checkExists + * @return + */ protected ExternalDatabase buildDbForInit(String dbName, long dbId, InitCatalogLog.Type logType, boolean checkExists) { if (checkExists) { diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java index 8f6faf41598cc43..aecc2218515c408 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java +++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java @@ -156,11 +156,13 @@ protected void handleInitDb(String fullDbName) { if (catalogName != null) { CatalogIf catalogIf = ctx.getEnv().getCatalogMgr().getCatalog(catalogName); if (catalogIf == null) { - ctx.getState().setError(ErrorCode.ERR_BAD_DB_ERROR, "No match catalog in doris: " + fullDbName); + ctx.getState().setError(ErrorCode.ERR_BAD_DB_ERROR, + ErrorCode.ERR_BAD_DB_ERROR.formatErrorMsg(catalogName + "." + dbName)); return; } if (catalogIf.getDbNullable(dbName) == null) { - ctx.getState().setError(ErrorCode.ERR_BAD_DB_ERROR, "No match database in doris: " + fullDbName); + ctx.getState().setError(ErrorCode.ERR_BAD_DB_ERROR, + ErrorCode.ERR_BAD_DB_ERROR.formatErrorMsg(catalogName + "." + dbName)); return; } }