This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
new b5a7ef1c4 [ISSUE-3798]Optimize DsmQueryProtocol (#3803)
b5a7ef1c4 is described below
commit b5a7ef1c4915246a57bea38b31740b7cdcc167f3
Author: 成彬彬 <[email protected]>
AuthorDate: Tue Nov 15 14:07:50 2022 +0800
[ISSUE-3798]Optimize DsmQueryProtocol (#3803)
---
.../common/protocol/DsmQueryProtocol.scala | 7 ++---
.../core/receivers/DsmReceiver.scala | 31 ++++++++++++++++------
.../service/impl/MetadataQueryServiceImpl.java | 3 ++-
3 files changed, 29 insertions(+), 12 deletions(-)
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/scala/org/apache/linkis/datasourcemanager/common/protocol/DsmQueryProtocol.scala
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/scala/org/apache/linkis/datasourcemanager/common/protocol/DsmQueryProtocol.scala
index 510382d36..2370def30 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/scala/org/apache/linkis/datasourcemanager/common/protocol/DsmQueryProtocol.scala
+++
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/scala/org/apache/linkis/datasourcemanager/common/protocol/DsmQueryProtocol.scala
@@ -44,7 +44,8 @@ case class DsInfoQueryRequest(id: String, name: String,
system: String) extends
*/
case class DsInfoResponse(
status: Boolean,
- dsType: String,
- params: util.Map[String, Object],
- creator: String
+ dsType: String = "",
+ params: util.Map[String, Object] = new util.HashMap[String, Object](),
+ creator: String = "",
+ errorMsg: String = ""
) extends DsmQueryProtocol
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/scala/org/apache/linkis/datasourcemanager/core/receivers/DsmReceiver.scala
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/scala/org/apache/linkis/datasourcemanager/core/receivers/DsmReceiver.scala
index b14e83a2c..a1cc8406b 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/scala/org/apache/linkis/datasourcemanager/core/receivers/DsmReceiver.scala
+++
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/scala/org/apache/linkis/datasourcemanager/core/receivers/DsmReceiver.scala
@@ -30,6 +30,7 @@ import org.apache.linkis.rpc.message.annotation.Receiver
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.stereotype.Component
+import java.text.MessageFormat
import java.util
import org.slf4j.LoggerFactory
@@ -62,7 +63,13 @@ class DsmReceiver {
var publishedVersionId = dataSource.getPublishedVersionId
if (publishedVersionId == null) {
logger.warn("Datasource name:{} is not published.",
dataSource.getDataSourceName)
- return DsInfoResponse(status = false, "", new util.HashMap[String,
Object](), "")
+ return DsInfoResponse(
+ status = false,
+ errorMsg = MessageFormat.format(
+ "Datasource name:{0} is not published.",
+ dataSource.getDataSourceName
+ )
+ )
}
RestfulApiHelper.decryptPasswordKey(
@@ -71,13 +78,13 @@ class DsmReceiver {
)
DsInfoResponse(
status = true,
- dataSource.getDataSourceType.getName,
- dataSource.getConnectParams,
- dataSource.getCreateUser
+ dsType = dataSource.getDataSourceType.getName,
+ params = dataSource.getConnectParams,
+ creator = dataSource.getCreateUser
)
} else {
logger.warn("Can not get any dataSource")
- DsInfoResponse(status = true, "", new util.HashMap[String,
Object](), "")
+ DsInfoResponse(status = true, errorMsg = "Can not get any
dataSource")
}
} {
case e: Exception =>
@@ -85,16 +92,24 @@ class DsmReceiver {
s"Fail to get data source information, id:${dsInfoQueryRequest.id}
system:${dsInfoQueryRequest.system}",
e
)
- DsInfoResponse(status = false, "", new util.HashMap[String,
Object](), "")
+ DsInfoResponse(
+ status = false,
+ errorMsg =
+ s"Fail to get data source information,
id:${dsInfoQueryRequest.id} system:${dsInfoQueryRequest.system}"
+ )
case t: Throwable =>
logger.error(
s"Fail to get data source information, id:{dsInfoQueryRequest.id}
system:${dsInfoQueryRequest.system}",
t
)
- DsInfoResponse(status = false, "", new util.HashMap[String,
Object](), "")
+ DsInfoResponse(
+ status = false,
+ errorMsg =
+ s"Fail to get data source information,
id:{dsInfoQueryRequest.id} system:${dsInfoQueryRequest.system}"
+ )
}
} else {
- DsInfoResponse(status = true, "", new util.HashMap[String, Object](), "")
+ DsInfoResponse(status = true)
}
}
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/service/impl/MetadataQueryServiceImpl.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/service/impl/MetadataQueryServiceImpl.java
index c2508d239..f71fc71c3 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/service/impl/MetadataQueryServiceImpl.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/service/impl/MetadataQueryServiceImpl.java
@@ -398,7 +398,8 @@ public class MetadataQueryServiceImpl implements
MetadataQueryService {
true,
dataSource.getDataSourceType().getName(),
dataSource.getConnectParams(),
- dataSource.getCreateUser())
+ dataSource.getCreateUser(),
+ "")
: null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
