This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 40a10416511 [fix](jdbc catalog) fix jdbc table checksum and query jdbc
tvf (#34780)
40a10416511 is described below
commit 40a104165117c8538debdb8962c13ede6139265c
Author: zy-kkk <[email protected]>
AuthorDate: Mon May 13 18:08:18 2024 +0800
[fix](jdbc catalog) fix jdbc table checksum and query jdbc tvf (#34780)
---
.../apache/doris/datasource/jdbc/JdbcExternalCatalog.java | 1 +
.../apache/doris/tablefunction/QueryTableValueFunction.java | 12 ++++++------
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/JdbcExternalCatalog.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/JdbcExternalCatalog.java
index 1a8cde4d03b..e9b17497cf8 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/JdbcExternalCatalog.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/JdbcExternalCatalog.java
@@ -309,6 +309,7 @@ public class JdbcExternalCatalog extends ExternalCatalog {
jdbcTable.setJdbcPasswd(this.getJdbcPasswd());
jdbcTable.setDriverClass(this.getDriverClass());
jdbcTable.setDriverUrl(this.getDriverUrl());
+ jdbcTable.setCheckSum(this.getCheckSum());
jdbcTable.setResourceName(this.getResource());
jdbcTable.setConnectionPoolMinSize(this.getConnectionPoolMinSize());
jdbcTable.setConnectionPoolMaxSize(this.getConnectionPoolMaxSize());
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/tablefunction/QueryTableValueFunction.java
b/fe/fe-core/src/main/java/org/apache/doris/tablefunction/QueryTableValueFunction.java
index 3865d0b25c6..cb0f5100229 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/tablefunction/QueryTableValueFunction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/tablefunction/QueryTableValueFunction.java
@@ -44,12 +44,6 @@ public abstract class QueryTableValueFunction extends
TableValuedFunctionIf {
protected final String query;
public QueryTableValueFunction(Map<String, String> params) throws
AnalysisException {
- if (params.size() != 2) {
- throw new AnalysisException("Query TableValueFunction must have 2
arguments: 'catalog' and 'query'");
- }
- if (!params.containsKey(CATALOG) || !params.containsKey(QUERY)) {
- throw new AnalysisException("Query TableValueFunction must have 2
arguments: 'catalog' and 'query'");
- }
String catalogName = params.get(CATALOG);
this.query = params.get(QUERY);
this.catalogIf =
Env.getCurrentEnv().getCatalogMgr().getCatalog(catalogName);
@@ -57,6 +51,12 @@ public abstract class QueryTableValueFunction extends
TableValuedFunctionIf {
public static QueryTableValueFunction
createQueryTableValueFunction(Map<String, String> params)
throws AnalysisException {
+ if (params.size() != 2) {
+ throw new AnalysisException("Query TableValueFunction must have 2
arguments: 'catalog' and 'query'");
+ }
+ if (!params.containsKey(CATALOG) || !params.containsKey(QUERY)) {
+ throw new AnalysisException("Query TableValueFunction must have 2
arguments: 'catalog' and 'query'");
+ }
String catalogName = params.get(CATALOG);
// check priv
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
