This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 2ef077e4b80 [bugfix](tvf)catch exception for fetching SchemaTableData
for 2.0 (#35109)
2ef077e4b80 is described below
commit 2ef077e4b80d960cabcf3d67c35deb5e7441d669
Author: wuwenchi <wuwenchi...@hotmail.com>
AuthorDate: Thu May 23 00:03:25 2024 +0800
[bugfix](tvf)catch exception for fetching SchemaTableData for 2.0 (#35109)
bp: #34856
---
.../planner/external/iceberg/IcebergMetadataCache.java | 3 +++
.../org/apache/doris/service/FrontendServiceImpl.java | 17 +++++++++++------
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/planner/external/iceberg/IcebergMetadataCache.java
b/fe/fe-core/src/main/java/org/apache/doris/planner/external/iceberg/IcebergMetadataCache.java
index 93847190144..4658ba8b8a4 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/planner/external/iceberg/IcebergMetadataCache.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/planner/external/iceberg/IcebergMetadataCache.java
@@ -65,6 +65,9 @@ public class IcebergMetadataCache {
public List<Snapshot> getSnapshotList(TIcebergMetadataParams params)
throws UserException {
CatalogIf catalog =
Env.getCurrentEnv().getCatalogMgr().getCatalog(params.getCatalog());
+ if (catalog == null) {
+ throw new UserException("The specified catalog does not exist:" +
params.getCatalog());
+ }
IcebergMetadataCacheKey key =
IcebergMetadataCacheKey.of(catalog.getId(),
params.getDatabase(), params.getTable());
List<Snapshot> ifPresent = snapshotListCache.getIfPresent(key);
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
index 9128220d9b0..36fdec157ac 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
@@ -2234,13 +2234,18 @@ public class FrontendServiceImpl implements
FrontendService.Iface {
@Override
public TFetchSchemaTableDataResult
fetchSchemaTableData(TFetchSchemaTableDataRequest request) throws TException {
- switch (request.getSchemaTableName()) {
- case METADATA_TABLE:
- return MetadataGenerator.getMetadataTable(request);
- default:
- break;
+ try {
+ switch (request.getSchemaTableName()) {
+ case METADATA_TABLE:
+ return MetadataGenerator.getMetadataTable(request);
+ default:
+ break;
+ }
+ return MetadataGenerator.errorResult("Fetch schema table name is
not set");
+ } catch (Exception e) {
+ LOG.warn("Failed to fetchSchemaTableData", e);
+ return MetadataGenerator.errorResult(e.getMessage());
}
- return MetadataGenerator.errorResult("Fetch schema table name is not
set");
}
private TNetworkAddress getClientAddr() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
