This is an automated email from the ASF dual-hosted git repository.
zykkk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new d2cd0c30c7 [improvement](jdbc catalog) optimize the JDBC Catalog
connection error message (#23868)
d2cd0c30c7 is described below
commit d2cd0c30c770a8cd1bd2395680b260e9dfca355e
Author: zy-kkk <[email protected]>
AuthorDate: Mon Sep 11 10:26:54 2023 +0800
[improvement](jdbc catalog) optimize the JDBC Catalog connection error
message (#23868)
---
.../java/org/apache/doris/datasource/jdbc/client/JdbcClient.java | 5 +++--
fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java | 5 +++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClient.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClient.java
index 90070bdba7..8ffc5df3ca 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClient.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClient.java
@@ -162,8 +162,9 @@ public abstract class JdbcClient {
try {
conn = dataSource.getConnection();
} catch (Exception e) {
- throw new JdbcClientException("Can not connect to jdbc due to
error: %s, catalog name: %s", e.getMessage(),
- this.catalog, e);
+ String errorMessage = String.format("Can not connect to jdbc due
to error: %s, Catalog name: %s", e,
+ this.getCatalog());
+ throw new JdbcClientException(errorMessage, e);
}
return conn;
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
index a4d1e1880a..280729b01b 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
@@ -104,6 +104,7 @@ import
org.apache.doris.common.util.ProfileManager.ProfileType;
import org.apache.doris.common.util.SqlParserUtils;
import org.apache.doris.common.util.TimeUtils;
import org.apache.doris.common.util.Util;
+import org.apache.doris.datasource.jdbc.client.JdbcClientException;
import org.apache.doris.load.EtlJobType;
import org.apache.doris.load.LoadJobRowResult;
import org.apache.doris.load.loadv2.LoadManager;
@@ -778,6 +779,10 @@ public class StmtExecutor {
LOG.warn("execute Exception. {}", context.getQueryIdentifier(), e);
context.getState().setError(e.getMysqlErrorCode(), e.getMessage());
context.getState().setErrType(QueryState.ErrType.ANALYSIS_ERR);
+ } catch (JdbcClientException e) {
+ LOG.warn("execute Exception. {}", context.getQueryIdentifier(), e);
+ context.getState().setError(ErrorCode.ERR_UNKNOWN_ERROR,
+ e.getMessage());
} catch (Exception e) {
LOG.warn("execute Exception. {}", context.getQueryIdentifier(), e);
context.getState().setError(ErrorCode.ERR_UNKNOWN_ERROR,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
