This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.4.0
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.4.0 by this push:
new 46c2bb24f Fixed the linkis-metadata-query-service-jdbc bug (#4508)
46c2bb24f is described below
commit 46c2bb24f3ac7c1fb657b3d1ee03fb5639fd8720
Author: ChengJie1053 <[email protected]>
AuthorDate: Fri May 5 21:01:58 2023 +0800
Fixed the linkis-metadata-query-service-jdbc bug (#4508)
* Fixed the linkis-metadata-query-service-jdbc bug
* Fixed the linkis-metadata-query-service-jdbc bug
* Formatting code
---
.../linkis/metadata/query/service/ClickhouseMetaService.java | 8 ++++++--
.../org/apache/linkis/metadata/query/service/Db2MetaService.java | 8 ++++++--
.../org/apache/linkis/metadata/query/service/DmMetaService.java | 8 ++++++--
.../apache/linkis/metadata/query/service/DorisMetaService.java | 8 ++++++--
.../linkis/metadata/query/service/GreenplumMetaService.java | 7 +++++--
.../apache/linkis/metadata/query/service/KingbaseMetaService.java | 8 ++++++--
.../apache/linkis/metadata/query/service/OracleMetaService.java | 8 ++++++--
.../linkis/metadata/query/service/PostgresqlMetaService.java | 7 +++++--
.../linkis/metadata/query/service/SqlserverMetaService.java | 8 ++++++--
.../linkis/metadata/query/service/StarrocksMetaService.java | 8 ++++++--
.../org/apache/linkis/metadata/query/service/TidbMetaService.java | 8 ++++++--
11 files changed, 64 insertions(+), 22 deletions(-)
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/ClickhouseMetaService.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/ClickhouseMetaService.java
index ec099b11d..06fbe9657 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/ClickhouseMetaService.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/ClickhouseMetaService.java
@@ -24,6 +24,8 @@ import
org.apache.linkis.metadata.query.common.service.MetadataConnection;
import org.apache.linkis.metadata.query.service.clickhouse.SqlConnection;
import org.apache.linkis.metadata.query.service.conf.SqlParamsMapper;
+import org.apache.commons.lang3.StringUtils;
+
import org.springframework.stereotype.Component;
import java.sql.SQLException;
@@ -53,8 +55,10 @@ public class ClickhouseMetaService extends
AbstractDbMetaService<SqlConnection>
Object sqlParamObj =
params.get(SqlParamsMapper.PARAM_SQL_EXTRA_PARAMS.getValue());
if (null != sqlParamObj) {
if (!(sqlParamObj instanceof Map)) {
- extraParams =
- Json.fromJson(String.valueOf(sqlParamObj), Map.class,
String.class, Object.class);
+ String paramStr = String.valueOf(sqlParamObj);
+ if (StringUtils.isNotBlank(paramStr)) {
+ extraParams = Json.fromJson(paramStr, Map.class, String.class,
Object.class);
+ }
} else {
extraParams = (Map<String, Object>) sqlParamObj;
}
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/Db2MetaService.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/Db2MetaService.java
index 8746b1621..3a405dcbf 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/Db2MetaService.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/Db2MetaService.java
@@ -24,6 +24,8 @@ import
org.apache.linkis.metadata.query.common.service.MetadataConnection;
import org.apache.linkis.metadata.query.service.conf.SqlParamsMapper;
import org.apache.linkis.metadata.query.service.db2.SqlConnection;
+import org.apache.commons.lang3.StringUtils;
+
import org.springframework.stereotype.Component;
import java.sql.SQLException;
@@ -54,8 +56,10 @@ public class Db2MetaService extends
AbstractDbMetaService<SqlConnection> {
Object sqlParamObj =
params.get(SqlParamsMapper.PARAM_SQL_EXTRA_PARAMS.getValue());
if (null != sqlParamObj) {
if (!(sqlParamObj instanceof Map)) {
- extraParams =
- Json.fromJson(String.valueOf(sqlParamObj), Map.class,
String.class, Object.class);
+ String paramStr = String.valueOf(sqlParamObj);
+ if (StringUtils.isNotBlank(paramStr)) {
+ extraParams = Json.fromJson(paramStr, Map.class, String.class,
Object.class);
+ }
} else {
extraParams = (Map<String, Object>) sqlParamObj;
}
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/DmMetaService.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/DmMetaService.java
index 7b3164c7b..b825cd1a3 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/DmMetaService.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/DmMetaService.java
@@ -24,6 +24,8 @@ import
org.apache.linkis.metadata.query.common.service.MetadataConnection;
import org.apache.linkis.metadata.query.service.conf.SqlParamsMapper;
import org.apache.linkis.metadata.query.service.dm.SqlConnection;
+import org.apache.commons.lang3.StringUtils;
+
import java.sql.SQLException;
import java.util.HashMap;
import java.util.List;
@@ -51,8 +53,10 @@ public class DmMetaService extends
AbstractDbMetaService<SqlConnection> {
Object sqlParamObj =
params.get(SqlParamsMapper.PARAM_SQL_EXTRA_PARAMS.getValue());
if (null != sqlParamObj) {
if (!(sqlParamObj instanceof Map)) {
- extraParams =
- Json.fromJson(String.valueOf(sqlParamObj), Map.class,
String.class, Object.class);
+ String paramStr = String.valueOf(sqlParamObj);
+ if (StringUtils.isNotBlank(paramStr)) {
+ extraParams = Json.fromJson(paramStr, Map.class, String.class,
Object.class);
+ }
} else {
extraParams = (Map<String, Object>) sqlParamObj;
}
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/DorisMetaService.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/DorisMetaService.java
index 747ccab3f..40b28ae5a 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/DorisMetaService.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/DorisMetaService.java
@@ -24,6 +24,8 @@ import
org.apache.linkis.metadata.query.common.service.MetadataConnection;
import org.apache.linkis.metadata.query.service.conf.SqlParamsMapper;
import org.apache.linkis.metadata.query.service.mysql.SqlConnection;
+import org.apache.commons.lang3.StringUtils;
+
import org.springframework.stereotype.Component;
import java.sql.SQLException;
@@ -53,8 +55,10 @@ public class DorisMetaService extends
AbstractDbMetaService<SqlConnection> {
Object sqlParamObj =
params.get(SqlParamsMapper.PARAM_SQL_EXTRA_PARAMS.getValue());
if (null != sqlParamObj) {
if (!(sqlParamObj instanceof Map)) {
- extraParams =
- Json.fromJson(String.valueOf(sqlParamObj), Map.class,
String.class, Object.class);
+ String paramStr = String.valueOf(sqlParamObj);
+ if (StringUtils.isNotBlank(paramStr)) {
+ extraParams = Json.fromJson(paramStr, Map.class, String.class,
Object.class);
+ }
} else {
extraParams = (Map<String, Object>) sqlParamObj;
}
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/GreenplumMetaService.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/GreenplumMetaService.java
index dfca10f42..c5e4ebd53 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/GreenplumMetaService.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/GreenplumMetaService.java
@@ -24,6 +24,7 @@ import
org.apache.linkis.metadata.query.common.service.MetadataConnection;
import org.apache.linkis.metadata.query.service.conf.SqlParamsMapper;
import org.apache.linkis.metadata.query.service.greenplum.SqlConnection;
+import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import java.sql.SQLException;
@@ -58,8 +59,10 @@ public class GreenplumMetaService extends
AbstractDbMetaService<SqlConnection> {
Object sqlParamObj =
params.get(SqlParamsMapper.PARAM_SQL_EXTRA_PARAMS.getValue());
if (null != sqlParamObj) {
if (!(sqlParamObj instanceof Map)) {
- extraParams =
- Json.fromJson(String.valueOf(sqlParamObj), Map.class,
String.class, Object.class);
+ String paramStr = String.valueOf(sqlParamObj);
+ if (StringUtils.isNotBlank(paramStr)) {
+ extraParams = Json.fromJson(paramStr, Map.class, String.class,
Object.class);
+ }
} else {
extraParams = (Map<String, Object>) sqlParamObj;
}
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/KingbaseMetaService.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/KingbaseMetaService.java
index 93f34b8eb..15dde4787 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/KingbaseMetaService.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/KingbaseMetaService.java
@@ -24,6 +24,8 @@ import
org.apache.linkis.metadata.query.common.service.MetadataConnection;
import org.apache.linkis.metadata.query.service.conf.SqlParamsMapper;
import org.apache.linkis.metadata.query.service.kingbase.SqlConnection;
+import org.apache.commons.lang3.StringUtils;
+
import java.sql.SQLException;
import java.util.HashMap;
import java.util.List;
@@ -52,8 +54,10 @@ public class KingbaseMetaService extends
AbstractDbMetaService<SqlConnection> {
Object sqlParamObj =
params.get(SqlParamsMapper.PARAM_SQL_EXTRA_PARAMS.getValue());
if (null != sqlParamObj) {
if (!(sqlParamObj instanceof Map)) {
- extraParams =
- Json.fromJson(String.valueOf(sqlParamObj), Map.class,
String.class, Object.class);
+ String paramStr = String.valueOf(sqlParamObj);
+ if (StringUtils.isNotBlank(paramStr)) {
+ extraParams = Json.fromJson(paramStr, Map.class, String.class,
Object.class);
+ }
} else {
extraParams = (Map<String, Object>) sqlParamObj;
}
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/OracleMetaService.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/OracleMetaService.java
index 7896a0696..dbdf22243 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/OracleMetaService.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/OracleMetaService.java
@@ -24,6 +24,8 @@ import
org.apache.linkis.metadata.query.common.service.MetadataConnection;
import org.apache.linkis.metadata.query.service.conf.SqlParamsMapper;
import org.apache.linkis.metadata.query.service.oracle.SqlConnection;
+import org.apache.commons.lang3.StringUtils;
+
import java.sql.SQLException;
import java.util.HashMap;
import java.util.List;
@@ -59,8 +61,10 @@ public class OracleMetaService extends
AbstractDbMetaService<SqlConnection> {
Object sqlParamObj =
params.get(SqlParamsMapper.PARAM_SQL_EXTRA_PARAMS.getValue());
if (null != sqlParamObj) {
if (!(sqlParamObj instanceof Map)) {
- extraParams =
- Json.fromJson(String.valueOf(sqlParamObj), Map.class,
String.class, Object.class);
+ String paramStr = String.valueOf(sqlParamObj);
+ if (StringUtils.isNotBlank(paramStr)) {
+ extraParams = Json.fromJson(paramStr, Map.class, String.class,
Object.class);
+ }
} else {
extraParams = (Map<String, Object>) sqlParamObj;
}
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/PostgresqlMetaService.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/PostgresqlMetaService.java
index e79e54822..13145eeef 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/PostgresqlMetaService.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/PostgresqlMetaService.java
@@ -24,6 +24,7 @@ import
org.apache.linkis.metadata.query.common.service.MetadataConnection;
import org.apache.linkis.metadata.query.service.conf.SqlParamsMapper;
import org.apache.linkis.metadata.query.service.postgres.SqlConnection;
+import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import java.sql.SQLException;
@@ -59,8 +60,10 @@ public class PostgresqlMetaService extends
AbstractDbMetaService<SqlConnection>
Object sqlParamObj =
params.get(SqlParamsMapper.PARAM_SQL_EXTRA_PARAMS.getValue());
if (null != sqlParamObj) {
if (!(sqlParamObj instanceof Map)) {
- extraParams =
- Json.fromJson(String.valueOf(sqlParamObj), Map.class,
String.class, Object.class);
+ String paramStr = String.valueOf(sqlParamObj);
+ if (StringUtils.isNotBlank(paramStr)) {
+ extraParams = Json.fromJson(paramStr, Map.class, String.class,
Object.class);
+ }
} else {
extraParams = (Map<String, Object>) sqlParamObj;
}
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/SqlserverMetaService.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/SqlserverMetaService.java
index 592fc006c..9a2001cda 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/SqlserverMetaService.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/SqlserverMetaService.java
@@ -24,6 +24,8 @@ import
org.apache.linkis.metadata.query.common.service.MetadataConnection;
import org.apache.linkis.metadata.query.service.conf.SqlParamsMapper;
import org.apache.linkis.metadata.query.service.sqlserver.SqlConnection;
+import org.apache.commons.lang3.StringUtils;
+
import java.sql.SQLException;
import java.util.HashMap;
import java.util.List;
@@ -48,8 +50,10 @@ public class SqlserverMetaService extends
AbstractDbMetaService<SqlConnection> {
Object sqlParamObj =
params.get(SqlParamsMapper.PARAM_SQL_EXTRA_PARAMS.getValue());
if (null != sqlParamObj) {
if (!(sqlParamObj instanceof Map)) {
- extraParams =
- Json.fromJson(String.valueOf(sqlParamObj), Map.class,
String.class, Object.class);
+ String paramStr = String.valueOf(sqlParamObj);
+ if (StringUtils.isNotBlank(paramStr)) {
+ extraParams = Json.fromJson(paramStr, Map.class, String.class,
Object.class);
+ }
} else {
extraParams = (Map<String, Object>) sqlParamObj;
}
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/StarrocksMetaService.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/StarrocksMetaService.java
index 6d4a146d7..d58c3d4c2 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/StarrocksMetaService.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/StarrocksMetaService.java
@@ -24,6 +24,8 @@ import
org.apache.linkis.metadata.query.common.service.MetadataConnection;
import org.apache.linkis.metadata.query.service.conf.SqlParamsMapper;
import org.apache.linkis.metadata.query.service.mysql.SqlConnection;
+import org.apache.commons.lang3.StringUtils;
+
import org.springframework.stereotype.Component;
import java.sql.SQLException;
@@ -53,8 +55,10 @@ public class StarrocksMetaService extends
AbstractDbMetaService<SqlConnection> {
Object sqlParamObj =
params.get(SqlParamsMapper.PARAM_SQL_EXTRA_PARAMS.getValue());
if (null != sqlParamObj) {
if (!(sqlParamObj instanceof Map)) {
- extraParams =
- Json.fromJson(String.valueOf(sqlParamObj), Map.class,
String.class, Object.class);
+ String paramStr = String.valueOf(sqlParamObj);
+ if (StringUtils.isNotBlank(paramStr)) {
+ extraParams = Json.fromJson(paramStr, Map.class, String.class,
Object.class);
+ }
} else {
extraParams = (Map<String, Object>) sqlParamObj;
}
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/TidbMetaService.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/TidbMetaService.java
index 3692cd632..2843bebbc 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/TidbMetaService.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/TidbMetaService.java
@@ -24,6 +24,8 @@ import
org.apache.linkis.metadata.query.common.service.MetadataConnection;
import org.apache.linkis.metadata.query.service.conf.SqlParamsMapper;
import org.apache.linkis.metadata.query.service.mysql.SqlConnection;
+import org.apache.commons.lang3.StringUtils;
+
import org.springframework.stereotype.Component;
import java.sql.SQLException;
@@ -53,8 +55,10 @@ public class TidbMetaService extends
AbstractDbMetaService<SqlConnection> {
Object sqlParamObj =
params.get(SqlParamsMapper.PARAM_SQL_EXTRA_PARAMS.getValue());
if (null != sqlParamObj) {
if (!(sqlParamObj instanceof Map)) {
- extraParams =
- Json.fromJson(String.valueOf(sqlParamObj), Map.class,
String.class, Object.class);
+ String paramStr = String.valueOf(sqlParamObj);
+ if (StringUtils.isNotBlank(paramStr)) {
+ extraParams = Json.fromJson(paramStr, Map.class, String.class,
Object.class);
+ }
} else {
extraParams = (Map<String, Object>) sqlParamObj;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
