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 5137d3c3c Datasource client bug fix (#4500)
5137d3c3c is described below
commit 5137d3c3c0544d4f5237827194d45cfc82726abb
Author: zhangwejun <[email protected]>
AuthorDate: Tue May 2 22:43:01 2023 +0800
Datasource client bug fix (#4500)
* Fix datasource client query type conversion exception
---
.../linkis/datasource/client/request/MetadataGetColumnsAction.scala | 5 +++++
.../datasource/client/request/MetadataGetDatabasesAction.scala | 3 +++
.../linkis/datasource/client/request/MetadataGetTablesAction.scala | 4 ++++
.../client/response/GetConnectParamsByDataSourceIdResult.scala | 2 +-
.../datasource/client/response/GetInfoByDataSourceIdResult.scala | 2 +-
.../datasource/client/response/MetadataGetTablePropsResult.scala | 2 +-
6 files changed, 15 insertions(+), 3 deletions(-)
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala
index ae912d17f..4184e52e4 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala
+++
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala
@@ -120,6 +120,11 @@ object MetadataGetColumnsAction {
metadataGetColumnsAction.database = this.database
metadataGetColumnsAction.table = this.table
metadataGetColumnsAction.setParameter("system", system)
+ if (StringUtils.isNotBlank(dataSourceName)) {
+ metadataGetColumnsAction.setParameter("dataSourceName", dataSourceName)
+ metadataGetColumnsAction.setParameter("database", database)
+ metadataGetColumnsAction.setParameter("table", table)
+ }
metadataGetColumnsAction.setUser(user)
metadataGetColumnsAction
}
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala
index 53df5e331..f20cd57fc 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala
+++
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala
@@ -94,6 +94,9 @@ object MetadataGetDatabasesAction {
metadataGetDatabasesAction.dataSourceId = this.dataSourceId
metadataGetDatabasesAction.dataSourceName = this.dataSourceName
metadataGetDatabasesAction.setParameter("system", system)
+ if (StringUtils.isNotBlank(dataSourceName)) {
+ metadataGetDatabasesAction.setParameter("dataSourceName",
dataSourceName)
+ }
metadataGetDatabasesAction.setUser(user)
metadataGetDatabasesAction
}
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablesAction.scala
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablesAction.scala
index d2079bab4..adbe01478 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablesAction.scala
+++
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablesAction.scala
@@ -103,6 +103,10 @@ object MetadataGetTablesAction {
metadataGetTablesAction.dataSourceName = this.dataSourceName
metadataGetTablesAction.database = this.database
metadataGetTablesAction.setParameter("system", system)
+ if (StringUtils.isNotBlank(dataSourceName)) {
+ metadataGetTablesAction.setParameter("dataSourceName", dataSourceName)
+ metadataGetTablesAction.setParameter("database", database)
+ }
metadataGetTablesAction.setUser(user)
metadataGetTablesAction
}
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceIdResult.scala
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceIdResult.scala
index 37c346716..bcfe5211c 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceIdResult.scala
+++
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceIdResult.scala
@@ -22,7 +22,7 @@ import org.apache.linkis.httpclient.dws.response.DWSResult
import scala.beans.BeanProperty
-@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/(\\S+)/connect-params")
+@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/(\\d+)/connect-params")
class GetConnectParamsByDataSourceIdResult extends DWSResult {
@BeanProperty var connectParams: java.util.Map[String, Any] = _
}
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceIdResult.scala
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceIdResult.scala
index 4fcf865c0..be63623df 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceIdResult.scala
+++
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceIdResult.scala
@@ -24,7 +24,7 @@ import org.apache.linkis.httpclient.dws.response.DWSResult
import scala.beans.BeanProperty
-@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/info/(\\S+)")
+@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/info/(\\d+)")
class GetInfoByDataSourceIdResult extends DWSResult {
@BeanProperty var info: java.util.Map[String, Any] = _
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablePropsResult.scala
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablePropsResult.scala
index ac79a3638..d2ee1092c 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablePropsResult.scala
+++
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablePropsResult.scala
@@ -25,7 +25,7 @@ import java.util
import scala.beans.BeanProperty
@DWSHttpMessageResult(
-
"/api/rest_j/v\\d+/(metadataQuery|metadatamanager)/(getTableProp|props)(\\S+/db/\\S+/table/\\S+)?"
+
"/api/rest_j/v\\d+/(metadataQuery|metadatamanager)/(getTableProps|props)(\\S+/db/\\S+/table/\\S+)?"
)
class MetadataGetTablePropsResult extends DWSResult {
@BeanProperty var props: util.Map[String, String] = _
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
