You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/03/10 01:44:47 UTC
[incubator-linkis] branch dev-1.1.0-datasource updated (9c58649 -> d445db0)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a change to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git.
from 9c58649 fix the value is displayed as the object address when the JDBC engine queries complex type fields. (#1646)
new c53ea79 fix：mdm.service.lib.dir and add some log
new 3874899 optimize datasource client unnecessary parameters
new b565cc1 adjust uniform dataSourceId parameter name
new c10cf07 optimize datasource client unnecessary parameters
new c9e2731 add some log for datasource
new 41f193f fix:TestEngine with ID 'junit-jupiter' failed to discover tests
new 9451eab fix:wrong class of Date
new 884141c adjust uniform dataSourceId parameter name
new 321db8c remove some protected_branches
new d445db0 format of ddl and dml
The 10 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.asf.yaml | 18 -----
db/linkis_ddl.sql | 46 ++++-------
db/linkis_dml.sql | 38 ++++-----
.../datasource/client/AbstractRemoteClient.scala | 2 +-
.../client/request/DeleteDataSourceAction.scala | 14 ++--
.../GetConnectParamsByDataSourceIdAction.scala | 9 ++-
.../GetConnectParamsByDataSourceNameAction.scala | 2 +-
.../request/GetDataSourceVersionsAction.scala | 14 ++--
.../request/GetKeyTypeDatasourceAction.scala | 2 +-
.../client/request/QueryDataSourceAction.scala | 36 +++++----
.../client/request/QueryDataSourceEnvAction.scala | 21 +++--
.../client/response/CreateDataSourceResult.scala | 2 +-
.../client/response/DeleteDataSourceResult.scala | 2 +-
.../client/response/ExpireDataSourceResult.scala | 2 +-
.../response/GetAllDataSourceTypesResult.scala | 4 +-
.../GetConnectParamsByDataSourceIdResult.scala | 2 +-
.../GetConnectParamsByDataSourceNameResult.scala | 2 +-
.../response/GetKeyTypeDatasourceResult.scala | 6 +-
.../client/response/QueryDataSourceEnvResult.scala | 4 +-
.../client/response/QueryDataSourceResult.scala | 4 +-
.../client/response/UpdateDataSourceResult.scala | 2 +-
.../core/dao/mapper/DataSourceTypeEnvMapper.xml | 4 +-
.../core/restful/DataSourceAdminRestfulApi.java | 24 +++---
.../core/restful/DataSourceCoreRestfulApi.java | 74 +++++++++---------
.../core/receivers/DsmReceiver.scala | 9 ++-
.../restful/DataSourceAdminRestfulApiTest.java | 6 +-
.../core/restful/DataSourceCoreRestfulApiTest.java | 10 +--
.../server/loader/MetaClassLoaderManager.java | 17 ++--
.../server/restful/MetadataCoreRestful.java | 26 +++----
.../service/impl/MetadataAppServiceImpl.java | 3 +-
.../server/receiver/BaseMetaReceiver.scala | 2 +-
.../jobhistory/restful/api/QueryRestfulApi.java | 2 +-
pom.xml | 16 ++--
.../apps/linkis/module/datasource/dataSourceApi.js | 2 +-
.../module/datasource/datasourceForm/index.vue | 4 +-
web/src/apps/linkis/module/datasource/index.vue | 90 +++++++++++-----------
36 files changed, 254 insertions(+), 267 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 05/10: add some log for datasource
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit c9e2731167317ccea164fc00fba9462a34acd84d
Author: casionone <ca...@gmail.com>
AuthorDate: Wed Mar 9 17:10:35 2022 +0800
add some log for datasource
---
.../linkis/datasourcemanager/core/receivers/DsmReceiver.scala | 9 +++++++--
.../metadatamanager/server/loader/MetaClassLoaderManager.java | 11 +++++------
.../metadatamanager/server/restful/MetadataCoreRestful.java | 2 +-
.../server/service/impl/MetadataAppServiceImpl.java | 3 +--
4 files changed, 14 insertions(+), 11 deletions(-)
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 12ddebb..4cf3de9 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
@@ -46,8 +46,10 @@ class DsmReceiver extends Receiver with Logging{
Utils.tryCatch {
var dataSource: DataSource = null
if (Option(name).isDefined) {
+ info("Try to get dataSource by dataSourceName:" + name)
dataSource = dataSourceInfoService.getDataSourceInfoForConnect(name)
} else if (id.toLong > 0) {
+ info("Try to get dataSource by dataSourceId:" + id)
dataSource = dataSourceInfoService.getDataSourceInfoForConnect(id.toLong)
}
if (null != dataSource) {
@@ -55,7 +57,10 @@ class DsmReceiver extends Receiver with Logging{
dataSource.getConnectParams)
DsInfoResponse(status = true, dataSource.getDataSourceType.getName,
dataSource.getConnectParams, dataSource.getCreateUser)
- } else DsInfoResponse(status = true, "", new util.HashMap[String, Object](), "")
+ } else {
+ warn("Can not get any dataSource")
+ DsInfoResponse(status = true, "", new util.HashMap[String, Object](), "")
+ }
}{
case e: Exception => logger.error(s"Fail to get data source information, id:$id system:$system", e)
DsInfoResponse(status = false, "", new util.HashMap[String, Object](), "")
@@ -83,7 +88,7 @@ class DsmReceiver extends Receiver with Logging{
dataSource.getConnectParams)
DsInfoResponse(status = true, dataSource.getDataSourceType.getName,
dataSource.getConnectParams, dataSource.getCreateUser)
- }else DsInfoResponse(status = true, "", new util.HashMap[String, Object](), "")
+ } else DsInfoResponse(status = true, "", new util.HashMap[String, Object](), "")
}{
case e: Exception => logger.error(s"Fail to get data source information, id:$id system:$system", e)
DsInfoResponse(status = false, "", new util.HashMap[String, Object](), "")
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/loader/MetaClassLoaderManager.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/loader/MetaClassLoaderManager.java
index 57b88d0..ff80814 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/loader/MetaClassLoaderManager.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/loader/MetaClassLoaderManager.java
@@ -52,7 +52,8 @@ public class MetaClassLoaderManager {
public static CommonVars<String> LIB_DIR =
CommonVars.apply(
"wds.linkis.server.mdm.service.lib.dir",
- Configuration.getLinkisHome()+"/lib/linkis-public-enhancements/linkis-ps-metadatamanager/service");
+ Configuration.getLinkisHome()
+ + "/lib/linkis-public-enhancements/linkis-ps-metadatamanager/service");
public static CommonVars<Integer> INSTANCE_EXPIRE_TIME =
CommonVars.apply("wds.linkis.server.mdm.service.instance.expire-in-seconds", 60);
@@ -86,15 +87,13 @@ public class MetaClassLoaderManager {
return instance;
}
String lib = LIB_DIR.getValue();
- String stdLib =
- lib.endsWith("/")
- ? lib.replaceAll(".$", "")
- : lib;
+ String stdLib = lib.endsWith("/") ? lib.replaceAll(".$", "") : lib;
String componentLib = stdLib + "/" + dsType;
LOG.info(
"Start to load/reload meta instance of data source type: ["
+ dsType
- + "] from library dir:"+componentLib );
+ + "] from library dir:"
+ + componentLib);
ClassLoader parentClassLoader =
MetaClassLoaderManager.class.getClassLoader();
ClassLoader metaClassLoader =
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/restful/MetadataCoreRestful.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/restful/MetadataCoreRestful.java
index e669ab3..ebcb9cb 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/restful/MetadataCoreRestful.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/restful/MetadataCoreRestful.java
@@ -280,8 +280,8 @@ public class MetadataCoreRestful {
if (e instanceof ErrorException) {
uiMessage += " possible reason[可能原因]: (" + e.getMessage() + ")";
}
- LOG.error(uiMessage, e);
}
+ LOG.error(uiMessage, e);
return Message.error(uiMessage);
}
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/service/impl/MetadataAppServiceImpl.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/service/impl/MetadataAppServiceImpl.java
index 7cd5b8a..8c78d98 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/service/impl/MetadataAppServiceImpl.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/service/impl/MetadataAppServiceImpl.java
@@ -246,8 +246,7 @@ public class MetadataAppServiceImpl implements MetadataAppService {
}
} catch (Exception e) {
if (e instanceof MetaRuntimeException) {
- throw new MetaMethodInvokeException(
- method, methodArgs, -1, e.getMessage(), e.getCause());
+ throw new MetaMethodInvokeException(method, methodArgs, -1, e.getMessage(), e);
}
// TODO ERROR CODE
throw new MetaMethodInvokeException(
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 03/10: adjust uniform dataSourceId parameter name
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit b565cc142c290c7dd1f04853821e13f4ead283e7
Author: casionone <ca...@gmail.com>
AuthorDate: Tue Mar 8 20:26:41 2022 +0800
adjust uniform dataSourceId parameter name
---
.../datasource/client/request/DeleteDataSourceAction.scala | 14 +++++++-------
.../client/request/GetDataSourceVersionsAction.scala | 14 +++++++-------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DeleteDataSourceAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DeleteDataSourceAction.scala
index e373742..102f1af 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DeleteDataSourceAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DeleteDataSourceAction.scala
@@ -25,37 +25,37 @@ import org.apache.linkis.httpclient.request.DeleteAction
class DeleteDataSourceAction extends DeleteAction with DataSourceAction {
private var user: String = _
- private var resourceId: String = _
+ private var dataSourceId: Long = _
override def setUser(user: String): Unit = this.user = user
override def getUser: String = this.user
- override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "info", resourceId)
+ override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "info", dataSourceId.toString)
}
object DeleteDataSourceAction{
def builder(): Builder = new Builder
class Builder private[DeleteDataSourceAction]() {
private var user: String = _
- private var resourceId: String = _
+ private var dataSourceId: Long = _
def setUser(user: String): Builder = {
this.user = user
this
}
- def setResourceId(resourceId: String): Builder = {
- this.resourceId = resourceId
+ def setDataSourceId(dataSourceId: Long): Builder = {
+ this.dataSourceId = dataSourceId
this
}
def builder(): DeleteDataSourceAction = {
if (user == null) throw new DataSourceClientBuilderException("user is needed!")
- if(resourceId == null) throw new DataSourceClientBuilderException("resourceId is needed!")
+ if(dataSourceId == null) throw new DataSourceClientBuilderException("dataSourceId is needed!")
val action = new DeleteDataSourceAction
action.user = user
- action.resourceId = resourceId
+ action.dataSourceId = dataSourceId
action
}
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetDataSourceVersionsAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetDataSourceVersionsAction.scala
index e07c5fa..be426fe 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetDataSourceVersionsAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetDataSourceVersionsAction.scala
@@ -23,38 +23,38 @@ import org.apache.linkis.httpclient.request.GetAction
class GetDataSourceVersionsAction extends GetAction with DataSourceAction {
private var user: String = _
- private var resourceId: String = _
+ private var dataSourceId: Long = _
override def setUser(user: String): Unit = this.user = user
override def getUser: String = this.user
- override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, resourceId, "versions")
+ override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, dataSourceId.toString, "versions")
}
object GetDataSourceVersionsAction {
def builder(): Builder = new Builder
class Builder private[GetDataSourceVersionsAction]() {
private var user: String = _
- private var resourceId: String = _
+ private var dataSourceId: Long = _
def setUser(user: String): Builder = {
this.user = user
this
}
- def setResourceId(resourceId: String): Builder = {
- this.resourceId = resourceId
+ def setDataSourceId(dataSourceId: Long): Builder = {
+ this.dataSourceId = dataSourceId
this
}
def build(): GetDataSourceVersionsAction = {
- if (resourceId == null) throw new DataSourceClientBuilderException("resourceId is needed!")
+ if (dataSourceId == null) throw new DataSourceClientBuilderException("dataSourceId is needed!")
if(user == null) throw new DataSourceClientBuilderException("user is needed!")
val action = new GetDataSourceVersionsAction
action.user = user
- action.resourceId = resourceId
+ action.dataSourceId = dataSourceId
action
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 07/10: fix:wrong class of Date
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 9451eab60a232baa7e40295ba1769bb8fda1b48e
Author: casionone <ca...@gmail.com>
AuthorDate: Wed Mar 9 18:32:42 2022 +0800
fix:wrong class of Date
---
.../java/org/apache/linkis/jobhistory/restful/api/QueryRestfulApi.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/restful/api/QueryRestfulApi.java b/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/restful/api/QueryRestfulApi.java
index 8e8f6d9..ca2692d 100644
--- a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/restful/api/QueryRestfulApi.java
+++ b/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/restful/api/QueryRestfulApi.java
@@ -42,9 +42,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
-import java.sql.Date;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
@RestController
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 04/10: optimize datasource client unnecessary parameters
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit c10cf078198fd9a58d584732f37bf23950430332
Author: casionone <ca...@gmail.com>
AuthorDate: Wed Mar 9 17:09:27 2022 +0800
optimize datasource client unnecessary parameters
---
.../GetConnectParamsByDataSourceIdAction.scala | 7 +++--
.../client/request/QueryDataSourceAction.scala | 36 +++++++++++++---------
.../client/request/QueryDataSourceEnvAction.scala | 21 ++++++++-----
.../core/restful/DataSourceCoreRestfulApi.java | 4 +--
4 files changed, 41 insertions(+), 27 deletions(-)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala
index 0c78ec6..9c0daf7 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala
@@ -60,12 +60,15 @@ object GetConnectParamsByDataSourceIdAction {
def build(): GetConnectParamsByDataSourceIdAction = {
if (dataSourceId == null) throw new DataSourceClientBuilderException("dataSourceId is needed!")
- if(system == null) throw new DataSourceClientBuilderException("system is needed!")
if(user == null) throw new DataSourceClientBuilderException("user is needed!")
val getConnectParamsByDataSourceIdAction = new GetConnectParamsByDataSourceIdAction
getConnectParamsByDataSourceIdAction.dataSourceId = this.dataSourceId
- getConnectParamsByDataSourceIdAction.setParameter("system", system)
+
+ if(system != null){
+ getConnectParamsByDataSourceIdAction.setParameter("system", system)
+ }
+
getConnectParamsByDataSourceIdAction.setUser(user)
getConnectParamsByDataSourceIdAction
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceAction.scala
index af780f5..81c8133 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceAction.scala
@@ -22,7 +22,7 @@ import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderExce
import org.apache.linkis.httpclient.request.GetAction
-class QueryDataSourceAction extends GetAction with DataSourceAction{
+class QueryDataSourceAction extends GetAction with DataSourceAction {
override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "info")
private var user: String = _
@@ -80,24 +80,30 @@ object QueryDataSourceAction {
}
def build(): QueryDataSourceAction = {
- if (system == null) throw new DataSourceClientBuilderException("system is needed!")
- if(name == null) throw new DataSourceClientBuilderException("name is needed!")
- if(typeId == null) throw new DataSourceClientBuilderException("typeId is needed!")
- if(identifies == null) throw new DataSourceClientBuilderException("identifies is needed!")
- if(currentPage == null) throw new DataSourceClientBuilderException("currentPage is needed!")
- if(pageSize == null) throw new DataSourceClientBuilderException("pageSize is needed!")
- if(user == null) throw new DataSourceClientBuilderException("user is needed!")
+ if (user == null) throw new DataSourceClientBuilderException("user is needed!")
val queryDataSourceAction = new QueryDataSourceAction
- queryDataSourceAction.setParameter("system", system)
- queryDataSourceAction.setParameter("name", name)
- queryDataSourceAction.setParameter("typeId", typeId)
- queryDataSourceAction.setParameter("identifies", identifies)
- queryDataSourceAction.setParameter("currentPage", currentPage)
- queryDataSourceAction.setParameter("pageSize", pageSize)
+ if (system != null) {
+ queryDataSourceAction.setParameter("system", system)
+ }
+ if (name != null) {
+ queryDataSourceAction.setParameter("name", name)
+ }
+ if (typeId != null) {
+ queryDataSourceAction.setParameter("typeId", typeId)
+ }
+ if (identifies != null) {
+ queryDataSourceAction.setParameter("identifies", identifies)
+ }
+ if (currentPage != null) {
+ queryDataSourceAction.setParameter("currentPage", currentPage)
+ }
+ if (pageSize != null) {
+ queryDataSourceAction.setParameter("pageSize", pageSize)
+ }
queryDataSourceAction.setUser(user)
-
queryDataSourceAction
}
}
+
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceEnvAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceEnvAction.scala
index 97a3504..daa0ccd 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceEnvAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceEnvAction.scala
@@ -69,18 +69,23 @@ object QueryDataSourceEnvAction {
}
def build(): QueryDataSourceEnvAction = {
- if (name == null) throw new DataSourceClientBuilderException("name is needed!")
- if(typeId == null) throw new DataSourceClientBuilderException("typeId is needed!")
- if(currentPage == null) throw new DataSourceClientBuilderException("currentPage is needed!")
- if(pageSize == null) throw new DataSourceClientBuilderException("pageSize is needed!")
if(user == null) throw new DataSourceClientBuilderException("user is needed!")
val queryDataSourceEnvAction = new QueryDataSourceEnvAction
- queryDataSourceEnvAction.setParameter("name", name)
- queryDataSourceEnvAction.setParameter("typeId", typeId)
- queryDataSourceEnvAction.setParameter("currentPage", currentPage)
- queryDataSourceEnvAction.setParameter("pageSize", pageSize)
+
+ if (name != null) {
+ queryDataSourceEnvAction.setParameter("name", name)
+ }
+ if (typeId != null) {
+ queryDataSourceEnvAction.setParameter("typeId", typeId)
+ }
+ if (currentPage != null) {
+ queryDataSourceEnvAction.setParameter("currentPage", currentPage)
+ }
+ if (pageSize != null) {
+ queryDataSourceEnvAction.setParameter("pageSize", pageSize)
+ }
queryDataSourceEnvAction.setUser(user)
queryDataSourceEnvAction
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java
index 205b09f..1d9789e 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java
@@ -541,8 +541,8 @@ public class DataSourceCoreRestfulApi {
@RequestParam(value = "name", required = false) String dataSourceName,
@RequestParam(value = "typeId", required = false) Long dataSourceTypeId,
@RequestParam(value = "identifies", required = false) String identifies,
- @RequestParam("currentPage") Integer currentPage,
- @RequestParam("pageSize") Integer pageSize,
+ @RequestParam(value = "currentPage", required = false) Integer currentPage,
+ @RequestParam(value = "pageSize", required = false) Integer pageSize,
HttpServletRequest req) {
return RestfulApiHelper.doAndResponse(
() -> {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 02/10: optimize datasource client unnecessary parameters
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 38748995e586107f9762ac066a4e7510b0ba5bab
Author: casionone <ca...@gmail.com>
AuthorDate: Wed Mar 9 17:53:50 2022 +0800
optimize datasource client unnecessary parameters
---
.../datasource/client/AbstractRemoteClient.scala | 2 +-
.../request/GetKeyTypeDatasourceAction.scala | 2 +-
.../client/response/CreateDataSourceResult.scala | 2 +-
.../client/response/DeleteDataSourceResult.scala | 2 +-
.../client/response/ExpireDataSourceResult.scala | 2 +-
.../response/GetAllDataSourceTypesResult.scala | 4 +-
.../response/GetKeyTypeDatasourceResult.scala | 6 +-
.../client/response/QueryDataSourceEnvResult.scala | 4 +-
.../client/response/QueryDataSourceResult.scala | 4 +-
.../client/response/UpdateDataSourceResult.scala | 2 +-
.../core/dao/mapper/DataSourceTypeEnvMapper.xml | 4 +-
.../core/restful/DataSourceAdminRestfulApi.java | 24 +++---
.../core/restful/DataSourceCoreRestfulApi.java | 70 ++++++++---------
.../server/restful/MetadataCoreRestful.java | 24 +++---
.../apps/linkis/module/datasource/dataSourceApi.js | 2 +-
.../module/datasource/datasourceForm/index.vue | 4 +-
web/src/apps/linkis/module/datasource/index.vue | 90 +++++++++++-----------
17 files changed, 124 insertions(+), 124 deletions(-)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/AbstractRemoteClient.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/AbstractRemoteClient.scala
index 3ace47b..6fa4bf4 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/AbstractRemoteClient.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/AbstractRemoteClient.scala
@@ -22,7 +22,7 @@ import org.apache.linkis.httpclient.request.Action
import org.apache.linkis.httpclient.response.Result
abstract class AbstractRemoteClient extends RemoteClient {
- protected val dwsHttpClient:DWSHttpClient
+ protected val dwsHttpClient: DWSHttpClient
override def execute(action: Action): Result = action match {
case action: Action => dwsHttpClient.execute(action)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetKeyTypeDatasourceAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetKeyTypeDatasourceAction.scala
index fcb27e6..4fac948 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetKeyTypeDatasourceAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetKeyTypeDatasourceAction.scala
@@ -25,7 +25,7 @@ import org.apache.linkis.httpclient.request.GetAction
class GetKeyTypeDatasourceAction extends GetAction with DataSourceAction{
private var dataSourceTypeId: Long = _
- override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "key_define", "type", dataSourceTypeId.toString)
+ override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "key-define", "type", dataSourceTypeId.toString)
private var user: String = _
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/CreateDataSourceResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/CreateDataSourceResult.scala
index 5388f68..acb3b2b 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/CreateDataSourceResult.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/CreateDataSourceResult.scala
@@ -24,5 +24,5 @@ import scala.beans.BeanProperty
@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/info/json")
class CreateDataSourceResult extends DWSResult{
- @BeanProperty var insert_id: Long = _
+ @BeanProperty var insertId: Long = _
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/DeleteDataSourceResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/DeleteDataSourceResult.scala
index f8d1f72..0a353db 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/DeleteDataSourceResult.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/DeleteDataSourceResult.scala
@@ -24,5 +24,5 @@ import scala.beans.BeanProperty
@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/info/(\\S+)")
class DeleteDataSourceResult extends DWSResult{
- @BeanProperty var remove_id: Long = _
+ @BeanProperty var removeId: Long = _
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/ExpireDataSourceResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/ExpireDataSourceResult.scala
index ef7dbe7..e1d46c9 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/ExpireDataSourceResult.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/ExpireDataSourceResult.scala
@@ -24,5 +24,5 @@ import scala.beans.BeanProperty
@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/info/(\\S+)/expire")
class ExpireDataSourceResult extends DWSResult{
- @BeanProperty var expire_id: Long = _
+ @BeanProperty var expireId: Long = _
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetAllDataSourceTypesResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetAllDataSourceTypesResult.scala
index 7c39539..b61ebed 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetAllDataSourceTypesResult.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetAllDataSourceTypesResult.scala
@@ -27,12 +27,12 @@ import scala.beans.BeanProperty
@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/type/all")
class GetAllDataSourceTypesResult extends DWSResult {
- @BeanProperty var type_list: java.util.List[java.util.Map[String, Any]] = _
+ @BeanProperty var typeList: java.util.List[java.util.Map[String, Any]] = _
def getAllDataSourceType: util.List[DataSourceType] = {
import scala.collection.JavaConverters._
- type_list.asScala.map(x => {
+ typeList.asScala.map(x => {
val str = DWSHttpClient.jacksonJson.writeValueAsString(x)
DWSHttpClient.jacksonJson.readValue(str, classOf[DataSourceType])
}).asJava
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetKeyTypeDatasourceResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetKeyTypeDatasourceResult.scala
index 434a62e..4667cd3 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetKeyTypeDatasourceResult.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetKeyTypeDatasourceResult.scala
@@ -26,13 +26,13 @@ import org.apache.linkis.httpclient.dws.annotation.DWSHttpMessageResult
import scala.beans.BeanProperty
-@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/key_define/type/(\\S+)")
+@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/key-define/type/(\\S+)")
class GetKeyTypeDatasourceResult extends DWSResult{
- @BeanProperty var key_define: util.List[java.util.Map[String, Any]] = _
+ @BeanProperty var keyDefine: util.List[java.util.Map[String, Any]] = _
def getDataSourceParamKeyDefinitions: util.List[DataSourceParamKeyDefinition] = {
import scala.collection.JavaConverters._
- key_define.asScala.map(x => {
+ keyDefine.asScala.map(x => {
val str = DWSHttpClient.jacksonJson.writeValueAsString(x)
DWSHttpClient.jacksonJson.readValue(str, classOf[DataSourceParamKeyDefinition])
}).asJava
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceEnvResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceEnvResult.scala
index 2caa157..e1b5cd0 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceEnvResult.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceEnvResult.scala
@@ -27,12 +27,12 @@ import scala.beans.BeanProperty
@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/env")
class QueryDataSourceEnvResult extends DWSResult{
- @BeanProperty var query_list: java.util.List[java.util.Map[String, Any]] = _
+ @BeanProperty var queryList: java.util.List[java.util.Map[String, Any]] = _
def getDataSourceEnv: util.List[DataSourceEnv] = {
import scala.collection.JavaConverters._
- query_list.asScala.map(x => {
+ queryList.asScala.map(x => {
val str = DWSHttpClient.jacksonJson.writeValueAsString(x)
DWSHttpClient.jacksonJson.readValue(str, classOf[DataSourceEnv])
}).asJava
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceResult.scala
index 5ad1217..0ba356d 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceResult.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceResult.scala
@@ -27,12 +27,12 @@ import scala.beans.BeanProperty
@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/info")
class QueryDataSourceResult extends DWSResult{
- @BeanProperty var query_list: util.List[java.util.Map[String, Any]] = _
+ @BeanProperty var queryList: util.List[java.util.Map[String, Any]] = _
@BeanProperty var totalPage: Int = _
def getAllDataSource: util.List[DataSource] = {
import scala.collection.JavaConverters._
- query_list.asScala.map(x => {
+ queryList.asScala.map(x => {
val str = DWSHttpClient.jacksonJson.writeValueAsString(x)
DWSHttpClient.jacksonJson.readValue(str, classOf[DataSource])
}).asJava
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceResult.scala
index 7d3d04d..fd6ea8b 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceResult.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceResult.scala
@@ -24,5 +24,5 @@ import scala.beans.BeanProperty
@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/info/(\\S+)/json")
class UpdateDataSourceResult extends DWSResult{
- @BeanProperty var insert_id: Long = _
+ @BeanProperty var insertId: Long = _
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/dao/mapper/DataSourceTypeEnvMapper.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/dao/mapper/DataSourceTypeEnvMapper.xml
index a097153..dc0f1ae 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/dao/mapper/DataSourceTypeEnvMapper.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/dao/mapper/DataSourceTypeEnvMapper.xml
@@ -22,12 +22,12 @@
<insert id="insertRelation" useGeneratedKeys="true" keyProperty="id">
<![CDATA[INSERT INTO `linkis_ps_dm_datasource_type_env`
- (`data_source_type_id`, `env_id`) VALUES
+ (`data_source_type_id`, `envId`) VALUES
(#{dataSourceTypeId}, #{dataSourceEnvId});]]>
</insert>
<delete id="removeRelationsByEnvId">
<![CDATA[DELETE FROM `linkis_ps_dm_datasource_type_env` WHERE
- `env_id` = #{envId};]]>
+ `envId` = #{envId};]]>
</delete>
</mapper>
\ No newline at end of file
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceAdminRestfulApi.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceAdminRestfulApi.java
index ebb21ee..fb18514 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceAdminRestfulApi.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceAdminRestfulApi.java
@@ -82,24 +82,24 @@ public class DataSourceAdminRestfulApi {
}
dataSourceEnv.setCreateUser(userName);
insertDataSourceEnv(dataSourceEnv);
- return Message.ok().data("insert_id", dataSourceEnv.getId());
+ return Message.ok().data("insertId", dataSourceEnv.getId());
},
"Fail to insert data source environment[新增数据源环境失败]");
}
- @RequestMapping(value = "/env_list/all/type/{type_id}", method = RequestMethod.GET)
- public Message getAllEnvListByDataSourceType(@PathVariable("type_id") Long typeId) {
+ @RequestMapping(value = "/env-list/all/type/{typeId}", method = RequestMethod.GET)
+ public Message getAllEnvListByDataSourceType(@PathVariable("typeId") Long typeId) {
return RestfulApiHelper.doAndResponse(
() -> {
List<DataSourceEnv> envList =
dataSourceInfoService.listDataSourceEnvByType(typeId);
- return Message.ok().data("env_list", envList);
+ return Message.ok().data("envList", envList);
},
"Fail to get data source environment list[获取数据源环境清单失败]");
}
- @RequestMapping(value = "/env/{env_id}", method = RequestMethod.GET)
- public Message getEnvEntityById(@PathVariable("env_id") Long envId) {
+ @RequestMapping(value = "/env/{envId}", method = RequestMethod.GET)
+ public Message getEnvEntityById(@PathVariable("envId") Long envId) {
return RestfulApiHelper.doAndResponse(
() -> {
DataSourceEnv dataSourceEnv = dataSourceInfoService.getDataSourceEnv(envId);
@@ -108,8 +108,8 @@ public class DataSourceAdminRestfulApi {
"Fail to get data source environment[获取数据源环境信息失败]");
}
- @RequestMapping(value = "/env/{env_id}", method = RequestMethod.DELETE)
- public Message removeEnvEntity(@PathVariable("env_id") Long envId, HttpServletRequest request) {
+ @RequestMapping(value = "/env/{envId}", method = RequestMethod.DELETE)
+ public Message removeEnvEntity(@PathVariable("envId") Long envId, HttpServletRequest request) {
return RestfulApiHelper.doAndResponse(
() -> {
String userName = SecurityFilter.getLoginUsername(request);
@@ -123,15 +123,15 @@ public class DataSourceAdminRestfulApi {
+ envId
+ "]");
}
- return Message.ok().data("remove_id", removeId);
+ return Message.ok().data("removeId", removeId);
},
"Fail to remove data source environment[删除数据源环境信息失败]");
}
- @RequestMapping(value = "/env/{env_id}/json", method = RequestMethod.PUT)
+ @RequestMapping(value = "/env/{envId}/json", method = RequestMethod.PUT)
public Message updateJsonEnv(
@RequestBody DataSourceEnv dataSourceEnv,
- @PathVariable("env_id") Long envId,
+ @PathVariable("envId") Long envId,
HttpServletRequest request)
throws ErrorException {
return RestfulApiHelper.doAndResponse(
@@ -179,7 +179,7 @@ public class DataSourceAdminRestfulApi {
dataSourceEnvVo.setPageSize(null != pageSize ? pageSize : 10);
List<DataSourceEnv> queryList =
dataSourceInfoService.queryDataSourceEnvPage(dataSourceEnvVo);
- return Message.ok().data("query_list", queryList);
+ return Message.ok().data("queryList", queryList);
},
"Fail to query page of data source environment[查询数据源环境失败]");
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java
index bae84c6..205b09f 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java
@@ -83,18 +83,18 @@ public class DataSourceCoreRestfulApi {
() -> {
List<DataSourceType> dataSourceTypes =
dataSourceRelateService.getAllDataSourceTypes();
- return Message.ok().data("type_list", dataSourceTypes);
+ return Message.ok().data("typeList", dataSourceTypes);
},
"Fail to get all types of data source[获取数据源类型列表失败]");
}
- @RequestMapping(value = "/key_define/type/{type_id}", method = RequestMethod.GET)
- public Message getKeyDefinitionsByType(@PathVariable("type_id") Long dataSourceTypeId) {
+ @RequestMapping(value = "/key-define/type/{typeId}", method = RequestMethod.GET)
+ public Message getKeyDefinitionsByType(@PathVariable("typeId") Long dataSourceTypeId) {
return RestfulApiHelper.doAndResponse(
() -> {
List<DataSourceParamKeyDefinition> keyDefinitions =
dataSourceRelateService.getKeyDefinitionsByType(dataSourceTypeId);
- return Message.ok().data("key_define", keyDefinitions);
+ return Message.ok().data("keyDefine", keyDefinitions);
},
"Fail to get key definitions of data source type[查询数据源参数键值对失败]");
}
@@ -121,15 +121,15 @@ public class DataSourceCoreRestfulApi {
+ " 已经存在]");
}
insertDataSource(dataSource);
- return Message.ok().data("insert_id", dataSource.getId());
+ return Message.ok().data("insertId", dataSource.getId());
},
"Fail to insert data source[新增数据源失败]");
}
- @RequestMapping(value = "/info/{data_source_id}/json", method = RequestMethod.PUT)
+ @RequestMapping(value = "/info/{dataSourceId}/json", method = RequestMethod.PUT)
public Message updateDataSourceInJson(
@RequestBody DataSource dataSource,
- @PathVariable("data_source_id") Long dataSourceId,
+ @PathVariable("dataSourceId") Long dataSourceId,
HttpServletRequest req) {
return RestfulApiHelper.doAndResponse(
() -> {
@@ -175,9 +175,9 @@ public class DataSourceCoreRestfulApi {
* @param req
* @return
*/
- @RequestMapping(value = "/parameter/{datasource_id}/json", method = RequestMethod.POST)
+ @RequestMapping(value = "/parameter/{dataSourceId}/json", method = RequestMethod.POST)
public Message insertJsonParameter(
- @PathVariable("datasource_id") Long datasourceId,
+ @PathVariable("dataSourceId") Long dataSourceId,
@RequestBody Map<String, Object> params,
HttpServletRequest req) {
return RestfulApiHelper.doAndResponse(
@@ -187,7 +187,7 @@ public class DataSourceCoreRestfulApi {
String userName = SecurityFilter.getLoginUsername(req);
DataSource dataSource =
- dataSourceInfoService.getDataSourceInfoBrief(datasourceId);
+ dataSourceInfoService.getDataSourceInfoBrief(dataSourceId);
if (null == dataSource) {
throw new ErrorException(
ServiceErrorCode.DATASOURCE_NOTFOUND_ERROR.getValue(),
@@ -207,7 +207,7 @@ public class DataSourceCoreRestfulApi {
long versionId =
dataSourceInfoService.insertDataSourceParameter(
keyDefinitionList,
- datasourceId,
+ dataSourceId,
connectParams,
userName,
comment);
@@ -224,9 +224,9 @@ public class DataSourceCoreRestfulApi {
* @param request
* @return
*/
- @RequestMapping(value = "/info/{data_source_id}", method = RequestMethod.GET)
+ @RequestMapping(value = "/info/{dataSourceId}", method = RequestMethod.GET)
public Message getInfoByDataSourceId(
- @PathVariable("data_source_id") Long dataSourceId, HttpServletRequest request) {
+ @PathVariable("dataSourceId") Long dataSourceId, HttpServletRequest request) {
return RestfulApiHelper.doAndResponse(
() -> {
DataSource dataSource = dataSourceInfoService.getDataSourceInfo(dataSourceId);
@@ -247,9 +247,9 @@ public class DataSourceCoreRestfulApi {
"Fail to access data source[获取数据源信息失败]");
}
- @RequestMapping(value = "/info/name/{data_source_name}", method = RequestMethod.GET)
+ @RequestMapping(value = "/info/name/{dataSourceName}", method = RequestMethod.GET)
public Message getInfoByDataSourceName(
- @PathVariable("data_source_name") String dataSourceName, HttpServletRequest request)
+ @PathVariable("dataSourceName") String dataSourceName, HttpServletRequest request)
throws UnsupportedEncodingException {
return RestfulApiHelper.doAndResponse(
() -> {
@@ -281,9 +281,9 @@ public class DataSourceCoreRestfulApi {
* @param version
* @return
*/
- @RequestMapping(value = "/info/{data_source_id}/{version}", method = RequestMethod.GET)
+ @RequestMapping(value = "/info/{dataSourceId}/{version}", method = RequestMethod.GET)
public Message getInfoByDataSourceIdAndVersion(
- @PathVariable("data_source_id") Long dataSourceId,
+ @PathVariable("dataSourceId") Long dataSourceId,
@PathVariable("version") Long version,
HttpServletRequest request) {
return RestfulApiHelper.doAndResponse(
@@ -316,9 +316,9 @@ public class DataSourceCoreRestfulApi {
* @param request
* @return
*/
- @RequestMapping(value = "/{data_source_id}/versions", method = RequestMethod.GET)
+ @RequestMapping(value = "/{dataSourceId}/versions", method = RequestMethod.GET)
public Message getVersionList(
- @PathVariable("data_source_id") Long dataSourceId, HttpServletRequest request) {
+ @PathVariable("dataSourceId") Long dataSourceId, HttpServletRequest request) {
return RestfulApiHelper.doAndResponse(
() -> {
DataSource dataSource =
@@ -349,10 +349,10 @@ public class DataSourceCoreRestfulApi {
"Fail to access data source[获取数据源信息失败]");
}
- @RequestMapping(value = "/publish/{datasource_id}/{version_id}", method = RequestMethod.POST)
+ @RequestMapping(value = "/publish/{dataSourceId}/{versionId}", method = RequestMethod.POST)
public Message publishByDataSourceId(
- @PathVariable("datasource_id") Long dataSourceId,
- @PathVariable("version_id") Long versionId,
+ @PathVariable("dataSourceId") Long dataSourceId,
+ @PathVariable("versionId") Long versionId,
HttpServletRequest request) {
return RestfulApiHelper.doAndResponse(
() -> {
@@ -384,9 +384,9 @@ public class DataSourceCoreRestfulApi {
* @param dataSourceId
* @return
*/
- @RequestMapping(value = "/info/{data_source_id}", method = RequestMethod.DELETE)
+ @RequestMapping(value = "/info/{dataSourceId}", method = RequestMethod.DELETE)
public Message removeDataSource(
- @PathVariable("data_source_id") Long dataSourceId, HttpServletRequest request) {
+ @PathVariable("dataSourceId") Long dataSourceId, HttpServletRequest request) {
return RestfulApiHelper.doAndResponse(
() -> {
// Get brief info
@@ -406,14 +406,14 @@ public class DataSourceCoreRestfulApi {
return Message.error(
"Fail to remove data source[删除数据源信息失败], [id:" + dataSourceId + "]");
}
- return Message.ok().data("remove_id", removeId);
+ return Message.ok().data("removeId", removeId);
},
"Fail to remove data source[删除数据源信息失败]");
}
- @RequestMapping(value = "/info/{data_source_id}/expire", method = RequestMethod.PUT)
+ @RequestMapping(value = "/info/{dataSourceId}/expire", method = RequestMethod.PUT)
public Message expireDataSource(
- @PathVariable("data_source_id") Long dataSourceId, HttpServletRequest request) {
+ @PathVariable("dataSourceId") Long dataSourceId, HttpServletRequest request) {
return RestfulApiHelper.doAndResponse(
() -> {
// Get brief info
@@ -433,7 +433,7 @@ public class DataSourceCoreRestfulApi {
return Message.error(
"Fail to expire data source[数据源过期失败], [id:" + dataSourceId + "]");
}
- return Message.ok().data("expire_id", expireId);
+ return Message.ok().data("expireId", expireId);
},
"Fail to expire data source[数据源过期失败]");
}
@@ -445,9 +445,9 @@ public class DataSourceCoreRestfulApi {
* @param req
* @return
*/
- @RequestMapping(value = "/{data_source_id}/connect_params", method = RequestMethod.GET)
+ @RequestMapping(value = "/{dataSourceId}/connect_params", method = RequestMethod.GET)
public Message getConnectParams(
- @PathVariable("data_source_id") Long dataSourceId, HttpServletRequest req) {
+ @PathVariable("dataSourceId") Long dataSourceId, HttpServletRequest req) {
return RestfulApiHelper.doAndResponse(
() -> {
DataSource dataSource =
@@ -471,9 +471,9 @@ public class DataSourceCoreRestfulApi {
"Fail to connect data source[连接数据源失败]");
}
- @RequestMapping(value = "/name/{data_source_name}/connect_params", method = RequestMethod.GET)
+ @RequestMapping(value = "/name/{dataSourceName}/connect_params", method = RequestMethod.GET)
public Message getConnectParams(
- @PathVariable("data_source_name") String dataSourceName, HttpServletRequest req)
+ @PathVariable("dataSourceName") String dataSourceName, HttpServletRequest req)
throws UnsupportedEncodingException {
return RestfulApiHelper.doAndResponse(
() -> {
@@ -498,9 +498,9 @@ public class DataSourceCoreRestfulApi {
"Fail to connect data source[连接数据源失败]");
}
- @RequestMapping(value = "/{data_source_id}/{version}/op/connect", method = RequestMethod.PUT)
+ @RequestMapping(value = "/{dataSourceId}/{version}/op/connect", method = RequestMethod.PUT)
public Message connectDataSource(
- @PathVariable("data_source_id") Long dataSourceId,
+ @PathVariable("dataSourceId") Long dataSourceId,
@PathVariable("version") Long version,
HttpServletRequest req) {
return RestfulApiHelper.doAndResponse(
@@ -560,7 +560,7 @@ public class DataSourceCoreRestfulApi {
dataSourceInfoService.queryDataSourceInfoPage(dataSourceVo);
List<DataSource> queryList = pageInfo.getList();
return Message.ok()
- .data("query_list", queryList)
+ .data("queryList", queryList)
.data("totalPage", pageInfo.getTotal());
},
"Fail to query page of data source[查询数据源失败]");
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/restful/MetadataCoreRestful.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/restful/MetadataCoreRestful.java
index 7b863fc..e669ab3 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/restful/MetadataCoreRestful.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/restful/MetadataCoreRestful.java
@@ -49,9 +49,9 @@ public class MetadataCoreRestful {
@Autowired private MetadataAppService metadataAppService;
- @RequestMapping(value = "/dbs/{data_source_id}", method = RequestMethod.GET)
+ @RequestMapping(value = "/dbs/{dataSourceId}", method = RequestMethod.GET)
public Message getDatabases(
- @PathVariable("data_source_id") String dataSourceId,
+ @PathVariable("dataSourceId") String dataSourceId,
@RequestParam("system") String system,
HttpServletRequest request) {
try {
@@ -73,9 +73,9 @@ public class MetadataCoreRestful {
}
}
- @RequestMapping(value = "/tables/{data_source_id}/db/{database}", method = RequestMethod.GET)
+ @RequestMapping(value = "/tables/{dataSourceId}/db/{database}", method = RequestMethod.GET)
public Message getTables(
- @PathVariable("data_source_id") String dataSourceId,
+ @PathVariable("dataSourceId") String dataSourceId,
@PathVariable("database") String database,
@RequestParam("system") String system,
HttpServletRequest request) {
@@ -105,10 +105,10 @@ public class MetadataCoreRestful {
}
@RequestMapping(
- value = "/props/{data_source_id}/db/{database}/table/{table}",
+ value = "/props/{dataSourceId}/db/{database}/table/{table}",
method = RequestMethod.GET)
public Message getTableProps(
- @PathVariable("data_source_id") String dataSourceId,
+ @PathVariable("dataSourceId") String dataSourceId,
@PathVariable("database") String database,
@PathVariable("table") String table,
@RequestParam("system") String system,
@@ -142,10 +142,10 @@ public class MetadataCoreRestful {
}
@RequestMapping(
- value = "/props/{data_source_id}/db/{database}/table/{table}/partition/{partition}",
+ value = "/props/{dataSourceId}/db/{database}/table/{table}/partition/{partition}",
method = RequestMethod.GET)
public Message getPartitionProps(
- @PathVariable("data_source_id") String dataSourceId,
+ @PathVariable("dataSourceId") String dataSourceId,
@PathVariable("database") String database,
@PathVariable("table") String table,
@PathVariable("partition") String partition,
@@ -183,10 +183,10 @@ public class MetadataCoreRestful {
}
@RequestMapping(
- value = "/partitions/{data_source_id}/db/{database}/table/{table}",
+ value = "/partitions/{dataSourceId}/db/{database}/table/{table}",
method = RequestMethod.GET)
public Message getPartitions(
- @PathVariable("data_source_id") String dataSourceId,
+ @PathVariable("dataSourceId") String dataSourceId,
@PathVariable("database") String database,
@PathVariable("table") String table,
@RequestParam("system") String system,
@@ -220,10 +220,10 @@ public class MetadataCoreRestful {
}
@RequestMapping(
- value = "/columns/{data_source_id}/db/{database}/table/{table}",
+ value = "/columns/{dataSourceId}/db/{database}/table/{table}",
method = RequestMethod.GET)
public Message getColumns(
- @PathVariable("data_source_id") String dataSourceId,
+ @PathVariable("dataSourceId") String dataSourceId,
@PathVariable("database") String database,
@PathVariable("table") String table,
@RequestParam("system") String system,
diff --git a/web/src/apps/linkis/module/datasource/dataSourceApi.js b/web/src/apps/linkis/module/datasource/dataSourceApi.js
index a7a3ca3..7fadb3d 100644
--- a/web/src/apps/linkis/module/datasource/dataSourceApi.js
+++ b/web/src/apps/linkis/module/datasource/dataSourceApi.js
@@ -32,7 +32,7 @@ const getEnvList = ()=>{
}
const getKeyDefine = (id)=>{
- return api.fetch(`/data-source-manager/key_define/type/${id}`, {}, 'get')
+ return api.fetch(`/data-source-manager/key-define/type/${id}`, {}, 'get')
}
/**
diff --git a/web/src/apps/linkis/module/datasource/datasourceForm/index.vue b/web/src/apps/linkis/module/datasource/datasourceForm/index.vue
index cd19bbb..a0d88d3 100644
--- a/web/src/apps/linkis/module/datasource/datasourceForm/index.vue
+++ b/web/src/apps/linkis/module/datasource/datasourceForm/index.vue
@@ -67,7 +67,7 @@ const typesMap = {
} catch (error) {
api.fetch(data.dataSource, {}, 'get').then(result=>{
delete source.options;
- source.options = result.env_list.map(item=>{
+ source.options = result.envList.map(item=>{
return {label: item.envName, value: ''+item.id}
});
// console.log('self.rule',self.rule)
@@ -159,7 +159,7 @@ export default {
getKeyDefine(this.data.dataSourceTypeId).then((data)=>{
this.loading = false;
- this.transformData(data.key_define);
+ this.transformData(data.keyDefine);
})
},
watch: {
diff --git a/web/src/apps/linkis/module/datasource/index.vue b/web/src/apps/linkis/module/datasource/index.vue
index 839ff08..b602297 100644
--- a/web/src/apps/linkis/module/datasource/index.vue
+++ b/web/src/apps/linkis/module/datasource/index.vue
@@ -5,9 +5,9 @@
~ The ASF licenses this file to You under the Apache License, Version 2.0
~ (the "License"); you may not use this file except in compliance with
~ the License. You may obtain a copy of the License at
- ~
+ ~
~ http://www.apache.org/licenses/LICENSE-2.0
- ~
+ ~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,9 +37,9 @@
slot="action"
>
<ButtonGroup size="small" :key="row.versionId">
-
+
<Button v-if="row.status==0" size="small" type="text" @click="onPublish(row)"> {{$t('message.linkis.datasource.publish')}} </Button>
-
+
<Button size="small" type="text" @click="watch(row, index)">{{$t('message.linkis.datasource.watch')}}</Button>
<Button v-if="row.status==2" size="small" type="text" @click="onRollback(row)"> {{$t('message.linkis.datasource.rollback')}} </Button>
@@ -59,7 +59,7 @@
v-model="showDataSource"
:title="`${actionType}${$t('message.linkis.datasource.datasourceSrc')}`">
<Spin size="large" fix v-if="loadingForm"></Spin>
- <DataSourceType :data="type_list" v-show="currentStep===0" :onSelected="onSelect"/>
+ <DataSourceType :data="typeList" v-show="currentStep===0" :onSelected="onSelect"/>
<DatasourceForm :data="currentSourceData" ref="datasourceForm" v-if="showDataSource&¤tStep===1"/>
<div slot="footer">
@@ -84,7 +84,7 @@
<Col span="6" class="search-item">
<span class="lable">{{$t('message.linkis.datasource.sourceType')}}</span>
<Select v-model="dataSourceTypeId" class="input">
- <Option v-for="item in type_list" :value="item.id" :key="item.id">{{item.name}}</Option>
+ <Option v-for="item in typeList" :value="item.id" :key="item.id">{{item.name}}</Option>
<Option value="null">{{$t('message.linkis.statusType.all')}}</Option>
</Select>
</Col>
@@ -124,7 +124,7 @@
<Button :disabled="row.expire" size="small" type="primary" @click="modify(row, index)">{{$t('message.linkis.edit')}}</Button>
<Button :disabled="row.expire" size="small" type="primary" @click="overdue(row)"> {{$t('message.linkis.datasource.overdue')}} </Button>
-
+
<Button type="primary" @click="onConnectTest(row)"> {{$t('message.linkis.datasource.connectTest')}} </Button>
</ButtonGroup>
</template>
@@ -182,8 +182,8 @@ export default {
minWidth: 100,
render: (h, params)=>{
let result = {};
- if(this.type_list){
- result = this.type_list.find(item => params.row.dataSourceTypeId == item.id) || {};
+ if(this.typeList){
+ result = this.typeList.find(item => params.row.dataSourceTypeId == item.id) || {};
}
return h('span', result.name);
},
@@ -196,8 +196,8 @@ export default {
// minWidth: 100,
// render: (h, params)=>{
// let result = {};
- // if(this.env_list){
- // result = this.env_list.find(item => params.row.dataSourceEnvId == item.id) || {envName: '无'};
+ // if(this.envList){
+ // result = this.envList.find(item => params.row.dataSourceEnvId == item.id) || {envName: '无'};
// }
// return h('span', result.envName);
// },
@@ -211,8 +211,8 @@ export default {
align: 'center',
render: (h, params)=>{
let result = {};
- if(this.env_list){
-
+ if(this.envList){
+
result = this.tableStatusMap.find(item => params.row.expire == item.status) || {};
}
var color = 'green';
@@ -243,7 +243,7 @@ export default {
title: this.$t('message.linkis.datasource.desc'),
key: 'dataSourceDesc',
minWidth: 120,
-
+
tooltip: true,
align: 'center'
},
@@ -262,7 +262,7 @@ export default {
},
],
pageDatalist: [],
- type_list: [],
+ typeList: [],
versionStatusMap: [{status: 1, name: this.$t('message.linkis.datasource.published')}, {status: 0, name: this.$t('message.linkis.datasource.unpublish')}, {status: 2, name: this.$t('message.linkis.datasource.cannotPublish')} ],
tableStatusMap: [{status: false, name: this.$t('message.linkis.datasource.used')}, {status: true, name: this.$t('message.linkis.datasource.overdue')} ],
currentVersionList: [],
@@ -313,20 +313,20 @@ export default {
}
},
created(){
-
+
getDataSourceTypeList().then((data)=>{
- this.type_list = data.type_list;
+ this.typeList = data.typeList;
getEnvList().then((data)=>{
- this.env_list = data.query_list;
+ this.envList = data.queryList;
this.searchList();
})
})
-
-
+
+
},
methods: {
overdue(data){
@@ -341,21 +341,21 @@ export default {
}
const data = {
typeId: this.dataSourceTypeId,
- pageSize: this.page.pageSize,
+ pageSize: this.page.pageSize,
currentPage: this.page.pageNow,
name: this.searchName
};
-
+
if(data.typeId == 'null'){
delete data.typeId;
}
-
+
getDataSourceList(
{
...data
}).then(result=>{
this.tableLoading = false;
- this.pageDatalist = result.query_list;
+ this.pageDatalist = result.queryList;
this.page.totalSize = result.totalPage;
});
},
@@ -380,18 +380,18 @@ export default {
}else{
element.status = 0;
}
-
+
if(this.currentSourceData.publishedVersionId == element.versionId){
lastPulishIndex = index;
element.status = 1;
}
-
+
}
})
-
-
+
+
},
openVersionList(row){
this.currentSourceData = row;
@@ -433,7 +433,7 @@ export default {
}else if(this.currentStep>1){
this.currentStep = 1;
}
-
+
},
tranceFormData(data){
const formData = new FormData();
@@ -443,7 +443,7 @@ export default {
}else {
formData.append(key, data[key]);
}
-
+
});
return formData;
},
@@ -473,7 +473,7 @@ export default {
},
onSubmit(){
this.$refs.datasourceForm.fApi.submit((formData)=>{
-
+
const realFormData = {};
FORM_KEYS.forEach(key=>{
realFormData[key] = formData[key];
@@ -483,9 +483,9 @@ export default {
realFormData.createSystem = "Linkis";
realFormData.dataSourceTypeId = this.currentSourceData.dataSourceTypeId;
-
-
-
+
+
+
let postDataSource = createDataSource;
let commentMsg = this.$t('message.linkis.datasource.initVersion');
@@ -499,8 +499,8 @@ export default {
postDataSource(realFormData, this.currentSourceData.id).then(data=>{
this.loadingForm = false;
// if(连接信息有变化)
-
- const sourceId = data.id || data.insert_id || data.update_id;
+
+ const sourceId = data.id || data.insertId || data.updateId;
console.log()
if(!this.currentSourceData.id || !this.isEqual(this.preProcessData(this.$refs.datasourceForm.sourceConnectData), formData)){
@@ -523,7 +523,7 @@ export default {
this.searchList();
this.showDataSource = false;
}
-
+
}).catch(()=>{
this.loadingForm = false;
})
@@ -544,7 +544,7 @@ export default {
connect(data.info).then(()=>{
this.loadingVersionList = false;
this.$Message.success('Connect Success');
-
+
}).catch(()=>{
this.loadingVersionList = false;
})
@@ -557,14 +557,14 @@ export default {
connect(data.info).then(()=>{
this.tableLoading = false;
this.$Message.success('Connect Success');
-
+
}).catch(()=>{
this.tableLoading = false;
})
}).catch(()=>{
this.tableLoading = false;
})
-
+
},
onConnectFormTest(){
this.$refs.datasourceForm.fApi.submit(()=>{
@@ -586,7 +586,7 @@ export default {
}).catch(()=>{this.loadingForm = false;})
})
})
-
+
},
onPublish(data){
this.loadingVersionList = true;
@@ -599,15 +599,15 @@ export default {
},
onRollback(data){
this.showVersionList = false;
- const sourceId = data.id || data.datasourceId || data.update_id;
-
+ const sourceId = data.id || data.datasourceId || data.updateId;
+
saveConnectParams(sourceId, data.connectParams, this.$t('message.linkis.datasource.commentValue', {text: data.versionId})).then(()=>{
this.$Message.success('onRollback Success');
this.searchList();
});
}
-
+
}
}
</script>
-<style lang="scss" src="./index.scss" scoped></style>
\ No newline at end of file
+<style lang="scss" src="./index.scss" scoped></style>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 01/10: fix：mdm.service.lib.dir and add some log
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit c53ea798ef92adf5e5ce2b0dd4102afac941e4f9
Author: casionone <ca...@gmail.com>
AuthorDate: Mon Mar 7 20:47:07 2022 +0800
fix：mdm.service.lib.dir and add some log
---
.../server/loader/MetaClassLoaderManager.java | 18 +++++++++---------
.../server/receiver/BaseMetaReceiver.scala | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/loader/MetaClassLoaderManager.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/loader/MetaClassLoaderManager.java
index 62aaf28..57b88d0 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/loader/MetaClassLoaderManager.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/loader/MetaClassLoaderManager.java
@@ -18,6 +18,7 @@
package org.apache.linkis.metadatamanager.server.loader;
import org.apache.linkis.common.conf.CommonVars;
+import org.apache.linkis.common.conf.Configuration;
import org.apache.linkis.common.exception.ErrorException;
import org.apache.linkis.metadatamanager.common.exception.MetaRuntimeException;
import org.apache.linkis.metadatamanager.common.service.AbstractMetaService;
@@ -51,8 +52,7 @@ public class MetaClassLoaderManager {
public static CommonVars<String> LIB_DIR =
CommonVars.apply(
"wds.linkis.server.mdm.service.lib.dir",
- "/lib/linkis-pulicxxxx-/linkis-metdata-manager/service");
-
+ Configuration.getLinkisHome()+"/lib/linkis-public-enhancements/linkis-ps-metadatamanager/service");
public static CommonVars<Integer> INSTANCE_EXPIRE_TIME =
CommonVars.apply("wds.linkis.server.mdm.service.instance.expire-in-seconds", 60);
@@ -85,22 +85,22 @@ public class MetaClassLoaderManager {
&& !Objects.equals(finalServiceInstance1, instance)) {
return instance;
}
+ String lib = LIB_DIR.getValue();
+ String stdLib =
+ lib.endsWith("/")
+ ? lib.replaceAll(".$", "")
+ : lib;
+ String componentLib = stdLib + "/" + dsType;
LOG.info(
"Start to load/reload meta instance of data source type: ["
+ dsType
- + "]");
+ + "] from library dir:"+componentLib );
ClassLoader parentClassLoader =
MetaClassLoaderManager.class.getClassLoader();
ClassLoader metaClassLoader =
classLoaders.compute(
dsType,
(type, classLoader) -> {
- String lib = LIB_DIR.getValue();
- String stdLib =
- lib.endsWith("/")
- ? lib.replaceAll(".$", "")
- : lib;
- String componentLib = stdLib + "/" + dsType;
try {
return new URLClassLoader(
getJarsUrlsOfPath(componentLib)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/scala/org/apache/linkis/metadatamanager/server/receiver/BaseMetaReceiver.scala b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/scala/org/apache/linkis/metadatamanager/server/receiver/BaseMetaReceiver.scala
index 65ff091..584a192 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/scala/org/apache/linkis/metadatamanager/server/receiver/BaseMetaReceiver.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/scala/org/apache/linkis/metadatamanager/server/receiver/BaseMetaReceiver.scala
@@ -32,7 +32,7 @@ import scala.concurrent.duration.Duration
@Component
class BaseMetaReceiver extends Receiver with Logging{
@Autowired
- private var metadataAppService:MetadataAppService = _
+ private var metadataAppService: MetadataAppService = _
override def receive(message: Any, sender: Sender): Unit = {}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 08/10: adjust uniform dataSourceId parameter name
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 884141ccfab4c533726aae7c4c6f1f06bf64c83d
Author: casionone <ca...@gmail.com>
AuthorDate: Wed Mar 9 19:48:48 2022 +0800
adjust uniform dataSourceId parameter name
---
db/linkis_dml.sql | 2 +-
.../client/request/GetConnectParamsByDataSourceIdAction.scala | 2 +-
.../request/GetConnectParamsByDataSourceNameAction.scala | 2 +-
.../client/response/GetConnectParamsByDataSourceIdResult.scala | 2 +-
.../response/GetConnectParamsByDataSourceNameResult.scala | 2 +-
.../core/restful/DataSourceCoreRestfulApi.java | 4 ++--
.../core/restful/DataSourceAdminRestfulApiTest.java | 6 +++---
.../core/restful/DataSourceCoreRestfulApiTest.java | 10 +++++-----
8 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/db/linkis_dml.sql b/db/linkis_dml.sql
index a7d7232..fb62648 100644
--- a/db/linkis_dml.sql
+++ b/db/linkis_dml.sql
@@ -330,7 +330,7 @@ INSERT INTO `linkis_ps_dm_datasource_type_key` VALUES
(3,1,'params','连接参数',NULL,'TEXT',NULL,0,'输入JSON格式: {\"param\":\"value\"}',NULL,NULL,NULL,NULL,'2021-12-06 10:35:00','2021-12-06 10:35:00'),
(9,1,'username','用户名',NULL,'TEXT',NULL,1,'用户名','^[0-9A-Za-z_-]+$',NULL,NULL,NULL,'2021-04-12 01:54:39','2021-04-12 01:54:39'),
(10,1,'password','密码',NULL,'PASSWORD',NULL,1,'密码','',NULL,NULL,NULL,'2021-04-12 01:54:39','2021-04-12 01:54:39'),
-(11,4,'envId','集群环境',NULL,'SELECT',NULL,1,'集群环境',NULL,NULL,NULL,'/api/rest_j/v1/data-source-manager/env_list/all/type/4','2021-05-12 03:03:34','2021-05-12 03:03:34');
+(11,4,'envId','集群环境',NULL,'SELECT',NULL,1,'集群环境',NULL,NULL,NULL,'/api/rest_j/v1/data-source-manager/env-list/all/type/4','2021-05-12 03:03:34','2021-05-12 03:03:34');
INSERT INTO `linkis_ps_dm_datasource_env` VALUES
(1,'测试环境SIT','测试环境SIT',4,'{\"uris\":\"thrift://localhost:9083\", \"hadoopConf\":{\"hive.metastore.execute.setugi\":\"true\"}}','2021-10-26 14:57:29',NULL,'2021-10-26 14:57:29',NULL),
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala
index 9c0daf7..3725f91 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala
@@ -25,7 +25,7 @@ import org.apache.linkis.httpclient.request.GetAction
class GetConnectParamsByDataSourceIdAction extends GetAction with DataSourceAction {
private var dataSourceId: Long = _
- override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, dataSourceId.toString, "connect_params")
+ override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, dataSourceId.toString, "connect-params")
private var user: String = _
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceNameAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceNameAction.scala
index 19d6de0..cade0d5 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceNameAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceNameAction.scala
@@ -31,7 +31,7 @@ class GetConnectParamsByDataSourceNameAction extends GetAction with DataSourceAc
private var user: String = _
- override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "name", dataSourceName, "connect_params")
+ override def suffixURLs: Array[String] = Array(DATA_SOURCE_SERVICE_MODULE.getValue, "name", dataSourceName, "connect-params")
override def setUser(user: String): Unit = this.user = user
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 e42ec28..c8b39b7 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/(\\S+)/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/GetConnectParamsByDataSourceNameResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceNameResult.scala
index 0cd2ea2..d84828c 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceNameResult.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceNameResult.scala
@@ -21,7 +21,7 @@ import org.apache.linkis.httpclient.dws.response.DWSResult
import scala.beans.BeanProperty
-@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/name/(\\S+)/connect_params")
+@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/name/(\\S+)/connect-params")
class GetConnectParamsByDataSourceNameResult extends DWSResult{
@BeanProperty var connectParams: java.util.Map[String, Any] = _
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java
index 1d9789e..c708fdd 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java
@@ -445,7 +445,7 @@ public class DataSourceCoreRestfulApi {
* @param req
* @return
*/
- @RequestMapping(value = "/{dataSourceId}/connect_params", method = RequestMethod.GET)
+ @RequestMapping(value = "/{dataSourceId}/connect-params", method = RequestMethod.GET)
public Message getConnectParams(
@PathVariable("dataSourceId") Long dataSourceId, HttpServletRequest req) {
return RestfulApiHelper.doAndResponse(
@@ -471,7 +471,7 @@ public class DataSourceCoreRestfulApi {
"Fail to connect data source[连接数据源失败]");
}
- @RequestMapping(value = "/name/{dataSourceName}/connect_params", method = RequestMethod.GET)
+ @RequestMapping(value = "/name/{dataSourceName}/connect-params", method = RequestMethod.GET)
public Message getConnectParams(
@PathVariable("dataSourceName") String dataSourceName, HttpServletRequest req)
throws UnsupportedEncodingException {
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceAdminRestfulApiTest.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceAdminRestfulApiTest.java
index e9720c3..6a9dd6e 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceAdminRestfulApiTest.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceAdminRestfulApiTest.java
@@ -105,14 +105,14 @@ class DataSourceAdminRestfulApiTest {
Mockito.doNothing().when(dataSourceInfoService).saveDataSourceEnv(any());
assertTrue(
MessageStatus.SUCCESS() == mvcResult.getStatus()
- && "10".equals(mvcResult.getData().get("insert_id").toString()));
+ && "10".equals(mvcResult.getData().get("insertId").toString()));
}
@Test
void getAllEnvListByDataSourceType() throws Exception {
long dataSourceEnvTypeId = 10l;
String url =
- String.format("/data-source-manager/env_list/all/type/%s", dataSourceEnvTypeId);
+ String.format("/data-source-manager/env-list/all/type/%s", dataSourceEnvTypeId);
MvcUtils mvcUtils = new MvcUtils(mockMvc);
List<DataSourceEnv> envList = new ArrayList<>();
Mockito.when(dataSourceInfoService.listDataSourceEnvByType(dataSourceEnvTypeId))
@@ -154,7 +154,7 @@ class DataSourceAdminRestfulApiTest {
mvcResult = mvcUtils.getMessage(mvcUtils.buildMvcResultDelete(url));
assertTrue(
MessageStatus.SUCCESS() == mvcResult.getStatus()
- && "10".equals(mvcResult.getData().get("remove_id").toString()));
+ && "10".equals(mvcResult.getData().get("removeId").toString()));
}
@Test
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApiTest.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApiTest.java
index e863942..80d05c4 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApiTest.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApiTest.java
@@ -104,7 +104,7 @@ class DataSourceCoreRestfulApiTest {
Message res = mvcUtils.getMessage(mvcResult);
assertThat(dataSourceTypes)
.usingRecursiveComparison()
- .isEqualTo(res.getData().get("type_list"));
+ .isEqualTo(res.getData().get("typeList"));
}
@Test
@@ -116,11 +116,11 @@ class DataSourceCoreRestfulApiTest {
.thenReturn(keyDefinitions);
MvcResult mvcResult =
mvcUtils.buildMvcResultGet(
- String.format("/data-source-manager/key_define/type/%s", dataSourceTypeId));
+ String.format("/data-source-manager/key-define/type/%s", dataSourceTypeId));
Message res = mvcUtils.getMessage(mvcResult);
assertThat(keyDefinitions)
.usingRecursiveComparison()
- .isEqualTo(res.getData().get("key_define"));
+ .isEqualTo(res.getData().get("keyDefine"));
}
@Test
@@ -473,7 +473,7 @@ class DataSourceCoreRestfulApiTest {
void testGetConnectParamsById() throws Exception {
MvcUtils mvcUtils = new MvcUtils(mockMvc);
long dataSourceId = 1l;
- String url = String.format("/data-source-manager/%s/connect_params", dataSourceId);
+ String url = String.format("/data-source-manager/%s/connect-params", dataSourceId);
DataSource dataSource = new DataSource();
dataSource.setId(dataSourceId);
dataSource.setCreateUser("hadoop");
@@ -502,7 +502,7 @@ class DataSourceCoreRestfulApiTest {
void testGetConnectParamsByName() throws Exception {
MvcUtils mvcUtils = new MvcUtils(mockMvc);
String dataSourceName = "hive-test";
- String url = String.format("/data-source-manager/name/%s/connect_params", dataSourceName);
+ String url = String.format("/data-source-manager/name/%s/connect-params", dataSourceName);
DataSource dataSource = new DataSource();
dataSource.setDataSourceName(dataSourceName);
dataSource.setCreateUser("hadoop");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 10/10: format of ddl and dml
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit d445db0a406a24ec148b2c566484870bfbc9d95b
Author: casionone <ca...@gmail.com>
AuthorDate: Wed Mar 9 21:50:07 2022 +0800
format of ddl and dml
---
db/linkis_ddl.sql | 46 ++++++++++++++--------------------------------
db/linkis_dml.sql | 38 ++++++++++++++++++++------------------
2 files changed, 34 insertions(+), 50 deletions(-)
diff --git a/db/linkis_ddl.sql b/db/linkis_ddl.sql
index 393badf..7dfddd6 100644
--- a/db/linkis_ddl.sql
+++ b/db/linkis_ddl.sql
@@ -416,7 +416,7 @@ CREATE TABLE `linkis_ps_cs_context_listener` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-drop table if exists `linkis_ps_bml_resources`;
+DROP TABLE IF EXISTS `linkis_ps_bml_resources`;
CREATE TABLE if not exists `linkis_ps_bml_resources` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'Primary key',
`resource_id` varchar(50) NOT NULL COMMENT 'resource uuid',
@@ -437,7 +437,7 @@ CREATE TABLE if not exists `linkis_ps_bml_resources` (
) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4;
-drop table if exists `linkis_ps_bml_resources_version`;
+DROP TABLE IF EXISTS `linkis_ps_bml_resources_version`;
CREATE TABLE if not exists `linkis_ps_bml_resources_version` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'Primary key',
`resource_id` varchar(50) NOT NULL COMMENT 'Resource uuid',
@@ -459,7 +459,7 @@ CREATE TABLE if not exists `linkis_ps_bml_resources_version` (
-drop table if exists `linkis_ps_bml_resources_permission`;
+DROP TABLE IF EXISTS `linkis_ps_bml_resources_permission`;
CREATE TABLE if not exists `linkis_ps_bml_resources_permission` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'Primary key',
`resource_id` varchar(50) NOT NULL COMMENT 'Resource uuid',
@@ -473,7 +473,7 @@ CREATE TABLE if not exists `linkis_ps_bml_resources_permission` (
-drop table if exists `linkis_ps_resources_download_history`;
+DROP TABLE IF EXISTS `linkis_ps_resources_download_history`;
CREATE TABLE if not exists `linkis_ps_resources_download_history` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'primary key',
`start_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'start time',
@@ -490,7 +490,7 @@ CREATE TABLE if not exists `linkis_ps_resources_download_history` (
-- 创建资源任务表,包括上传,更新,下载
-drop table if exists `linkis_ps_bml_resources_task`;
+DROP TABLE IF EXISTS `linkis_ps_bml_resources_task`;
CREATE TABLE if not exists `linkis_ps_bml_resources_task` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`resource_id` varchar(50) DEFAULT NULL COMMENT 'resource uuid',
@@ -511,7 +511,7 @@ CREATE TABLE if not exists `linkis_ps_bml_resources_task` (
-drop table if exists linkis_ps_bml_project;
+DROP TABLE IF EXISTS `linkis_ps_bml_project`;
create table if not exists linkis_ps_bml_project(
`id` int(10) NOT NULL AUTO_INCREMENT,
`name` varchar(128) DEFAULT NULL,
@@ -527,7 +527,7 @@ PRIMARY KEY (`id`)
-drop table if exists linkis_ps_bml_project_user;
+DROP TABLE IF EXISTS `linkis_ps_bml_project_user`;
create table if not exists linkis_ps_bml_project_user(
`id` int(10) NOT NULL AUTO_INCREMENT,
`project_id` int(10) NOT NULL,
@@ -541,7 +541,7 @@ PRIMARY KEY (`id`)
)ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin ROW_FORMAT=COMPACT;
-drop table if exists linkis_ps_bml_project_resource;
+DROP TABLE IF EXISTS `linkis_ps_bml_project_resource`;
create table if not exists linkis_ps_bml_project_resource(
`id` int(10) NOT NULL AUTO_INCREMENT,
`project_id` int(10) NOT NULL,
@@ -609,7 +609,6 @@ CREATE TABLE `linkis_ps_error_code` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
DROP TABLE IF EXISTS `linkis_cg_manager_service_instance`;
-
CREATE TABLE `linkis_cg_manager_service_instance` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`instance` varchar(128) COLLATE utf8_bin DEFAULT NULL,
@@ -625,7 +624,6 @@ CREATE TABLE `linkis_cg_manager_service_instance` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
DROP TABLE IF EXISTS `linkis_cg_manager_linkis_resources`;
-
CREATE TABLE `linkis_cg_manager_linkis_resources` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`max_resource` varchar(255) COLLATE utf8_bin DEFAULT NULL,
@@ -644,7 +642,6 @@ CREATE TABLE `linkis_cg_manager_linkis_resources` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
DROP TABLE IF EXISTS `linkis_cg_manager_lock`;
-
CREATE TABLE `linkis_cg_manager_lock` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`lock_object` varchar(255) COLLATE utf8_bin DEFAULT NULL,
@@ -676,7 +673,6 @@ CREATE TABLE `linkis_cg_manager_engine_em` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
DROP TABLE IF EXISTS `linkis_cg_manager_label`;
-
CREATE TABLE `linkis_cg_manager_label` (
`id` int(20) NOT NULL AUTO_INCREMENT,
`label_key` varchar(32) COLLATE utf8_bin NOT NULL,
@@ -690,7 +686,6 @@ CREATE TABLE `linkis_cg_manager_label` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
DROP TABLE IF EXISTS `linkis_cg_manager_label_value_relation`;
-
CREATE TABLE `linkis_cg_manager_label_value_relation` (
`id` int(20) NOT NULL AUTO_INCREMENT,
`label_value_key` varchar(255) COLLATE utf8_bin NOT NULL,
@@ -736,7 +731,6 @@ CREATE TABLE `linkis_cg_manager_label_user` (
DROP TABLE IF EXISTS `linkis_cg_manager_metrics_history`;
-
CREATE TABLE `linkis_cg_manager_metrics_history` (
`id` int(20) NOT NULL AUTO_INCREMENT,
`instance_status` int(20) DEFAULT NULL,
@@ -752,7 +746,6 @@ CREATE TABLE `linkis_cg_manager_metrics_history` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
DROP TABLE IF EXISTS `linkis_cg_manager_service_instance_metrics`;
-
CREATE TABLE `linkis_cg_manager_service_instance_metrics` (
`instance` varchar(128) COLLATE utf8_bin NOT NULL,
`instance_status` int(11) DEFAULT NULL,
@@ -777,7 +770,7 @@ CREATE TABLE `linkis_cg_engine_conn_plugin_bml_resources` (
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'created time',
`last_update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'updated time',
PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
-- ----------------------------
-- Table structure for linkis_ps_dm_datasource
@@ -801,9 +794,7 @@ CREATE TABLE `linkis_ps_dm_datasource`
`expire` tinyint(1) DEFAULT 0,
`published_version_id` int(11) DEFAULT NULL,
PRIMARY KEY (`id`)
-) ENGINE = InnoDB
- CHARACTER SET = utf8
- COLLATE = utf8_bin;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
-- ----------------------------
-- Table structure for linkis_ps_dm_datasource_env
@@ -821,9 +812,7 @@ CREATE TABLE `linkis_ps_dm_datasource_env`
`modify_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
`modify_user` varchar(255) COLLATE utf8_bin NULL DEFAULT NULL,
PRIMARY KEY (`id`)
-) ENGINE = InnoDB
- CHARACTER SET = utf8
- COLLATE = utf8_bin;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
-- ----------------------------
@@ -840,9 +829,7 @@ CREATE TABLE `linkis_ps_dm_datasource_type`
`icon` varchar(255) COLLATE utf8_bin DEFAULT NULL,
`layers` int(3) NOT NULL,
PRIMARY KEY (`id`)
-) ENGINE = InnoDB
- CHARACTER SET = utf8
- COLLATE = utf8_bin;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
-- ----------------------------
-- Table structure for linkis_ps_dm_datasource_type_key
@@ -866,10 +853,7 @@ CREATE TABLE `linkis_ps_dm_datasource_type_key`
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`id`)
-) ENGINE = InnoDB
- CHARACTER SET = utf8
- COLLATE = utf8_bin;
-
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
-- ----------------------------
-- Table structure for linkis_ps_dm_datasource_version
-- ----------------------------
@@ -883,6 +867,4 @@ CREATE TABLE `linkis_ps_dm_datasource_version`
`create_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP,
`create_user` varchar(255) COLLATE utf8_bin NULL DEFAULT NULL,
PRIMARY KEY (`version_id`, `datasource_id`) USING BTREE
-) ENGINE = InnoDB
- CHARACTER SET = utf8
- COLLATE = utf8_bin;
\ No newline at end of file
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
\ No newline at end of file
diff --git a/db/linkis_dml.sql b/db/linkis_dml.sql
index fb62648..124e180 100644
--- a/db/linkis_dml.sql
+++ b/db/linkis_dml.sql
@@ -317,21 +317,23 @@ INSERT INTO linkis_ps_error_code (error_code,error_desc,error_regex,error_type)
INSERT INTO linkis_ps_error_code (error_code,error_desc,error_regex,error_type) VALUES ('95005','未配置代理用户，请在ITSM走WTSS用户变更单，为你的用户授权改代理用户','请联系系统管理员为您的用户添加该代理用户',0);
INSERT INTO linkis_ps_error_code (error_code,error_desc,error_regex,error_type) VALUES ('60079','所查库表无权限','Authorization failed:No privilege',0);
INSERT INTO linkis_ps_error_code (error_code,error_desc,error_regex,error_type) VALUES ('30002','启动引擎超时，您可以进行任务重试','wait for DefaultEngineConn',0);
-INSERT INTO `linkis_ps_dm_datasource_type` VALUES
-(1,'mysql','mysql数据库','mysql数据库','关系型数据库','',3),
-(2,'kafka','kafka','kafka','消息队列','',2),
-(3,'presto','presto SQL','presto','大数据存储','',3),
-(4,'hive','hive数据库','hive','大数据存储','',3),
-(6,'mongodb','default','default','DEFAULT',NULL,3);
-
-INSERT INTO `linkis_ps_dm_datasource_type_key` VALUES
-(1,1,'host','Host',NULL,'TEXT',NULL,1,'mysql Host ',NULL,NULL,NULL,NULL,'2021-04-08 03:13:36','2021-04-08 03:13:36'),
-(2,1,'port','端口',NULL,'TEXT',NULL,1,'端口',NULL,NULL,NULL,NULL,'2021-04-17 03:10:28','2021-04-17 03:10:28'),
-(3,1,'params','连接参数',NULL,'TEXT',NULL,0,'输入JSON格式: {\"param\":\"value\"}',NULL,NULL,NULL,NULL,'2021-12-06 10:35:00','2021-12-06 10:35:00'),
-(9,1,'username','用户名',NULL,'TEXT',NULL,1,'用户名','^[0-9A-Za-z_-]+$',NULL,NULL,NULL,'2021-04-12 01:54:39','2021-04-12 01:54:39'),
-(10,1,'password','密码',NULL,'PASSWORD',NULL,1,'密码','',NULL,NULL,NULL,'2021-04-12 01:54:39','2021-04-12 01:54:39'),
-(11,4,'envId','集群环境',NULL,'SELECT',NULL,1,'集群环境',NULL,NULL,NULL,'/api/rest_j/v1/data-source-manager/env-list/all/type/4','2021-05-12 03:03:34','2021-05-12 03:03:34');
-
-INSERT INTO `linkis_ps_dm_datasource_env` VALUES
-(1,'测试环境SIT','测试环境SIT',4,'{\"uris\":\"thrift://localhost:9083\", \"hadoopConf\":{\"hive.metastore.execute.setugi\":\"true\"}}','2021-10-26 14:57:29',NULL,'2021-10-26 14:57:29',NULL),
-(2,'测试环境UAT','测试环境UAT',4,'{\"uris\":\"thrift://localhost:9083\", \"hadoopConf\":{\"hive.metastore.execute.setugi\":\"true\"}}','2022-01-04 17:24:20',NULL,'2022-01-04 17:24:20',NULL);
+
+
+INSERT INTO `linkis_ps_dm_datasource_type` (`name`, `description`, `option`, `classifier`, `icon`, `layers`) VALUES ('mysql', 'mysql数据库', 'mysql数据库', '关系型数据库', '', 3);
+INSERT INTO `linkis_ps_dm_datasource_type` (`name`, `description`, `option`, `classifier`, `icon`, `layers`) VALUES ('kafka', 'kafka', 'kafka', '消息队列', '', 2);
+INSERT INTO `linkis_ps_dm_datasource_type` (`name`, `description`, `option`, `classifier`, `icon`, `layers`) VALUES ('presto', 'presto SQL', 'presto', '大数据存储', '', 3);
+INSERT INTO `linkis_ps_dm_datasource_type` (`name`, `description`, `option`, `classifier`, `icon`, `layers`) VALUES ('hive', 'hive数据库', 'hive', '大数据存储', '', 3);
+INSERT INTO `linkis_ps_dm_datasource_type` (`name`, `description`, `option`, `classifier`, `icon`, `layers`) VALUES ('mongodb', 'default', 'default', 'DEFAULT', NULL, 3);
+
+
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (1, 'host', 'Host', NULL, 'TEXT', NULL, 1, 'mysql Host ', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (1, 'port', '端口', NULL, 'TEXT', NULL, 1, '端口', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (1, 'params', '连接参数', NULL, 'TEXT', NULL, 0, '输入JSON格式: {"param":"value"}', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (1, 'username', '用户名', NULL, 'TEXT', NULL, 1, '用户名', '^[0-9A-Za-z_-]+$', NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (1, 'password', '密码', NULL, 'PASSWORD', NULL, 1, '密码', '', NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (4, 'envId', '集群环境', NULL, 'SELECT', NULL, 1, '集群环境', NULL, NULL, NULL, '/api/rest_j/v1/data-source-manager/env-list/all/type/4', now(), now());
+
+
+INSERT INTO `linkis_ps_dm_datasource_env` (`env_name`, `env_desc`, `datasource_type_id`, `parameter`, `create_time`, `create_user`, `modify_time`, `modify_user`) VALUES ('测试环境SIT', '测试环境SIT', 4, '{"uris":"thrift://localhost:9083", "hadoopConf":{"hive.metastore.execute.setugi":"true"}}', now(), NULL, now(), NULL);
+INSERT INTO `linkis_ps_dm_datasource_env` (`env_name`, `env_desc`, `datasource_type_id`, `parameter`, `create_time`, `create_user`, `modify_time`, `modify_user`) VALUES ('测试环境UAT', '测试环境UAT', 4, '{"uris":"thrift://localhost:9083", "hadoopConf":{"hive.metastore.execute.setugi":"true"}}', now(), NULL, now(), NULL);
+
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 09/10: remove some protected_branches
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 321db8c73ccf22e56e20876618b20070e4f50f75
Author: casionone <ca...@gmail.com>
AuthorDate: Wed Mar 9 21:04:19 2022 +0800
remove some protected_branches
---
.asf.yaml | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index f633ff8..435225a 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -57,30 +57,12 @@ github:
required_pull_request_reviews:
dismiss_stale_reviews: true
required_approving_review_count: 2
- dev-1.1.0:
- required_status_checks:
- strict: true
- required_pull_request_reviews:
- dismiss_stale_reviews: true
- required_approving_review_count: 1
dev-1.1.1:
required_status_checks:
strict: true
required_pull_request_reviews:
dismiss_stale_reviews: true
required_approving_review_count: 1
- dev-1.2.0:
- required_status_checks:
- strict: true
- required_pull_request_reviews:
- dismiss_stale_reviews: true
- required_approving_review_count: 1
- dev-1.3.0:
- required_status_checks:
- strict: true
- required_pull_request_reviews:
- dismiss_stale_reviews: true
- required_approving_review_count: 1
notifications:
commits: commits@linkis.apache.org
issues: dev@linkis.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 06/10: fix:TestEngine with ID 'junit-jupiter' failed to discover tests
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 41f193fe6f80825306f66e4611595b3cbbfd1c8c
Author: casionone <ca...@gmail.com>
AuthorDate: Wed Mar 9 18:23:01 2022 +0800
fix:TestEngine with ID 'junit-jupiter' failed to discover tests
---
pom.xml | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index b1c2e77..cc245b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,16 +6,16 @@
~ The ASF licenses this file to You under the Apache License, Version 2.0
~ (the "License"); you may not use this file except in compliance with
~ the License. You may obtain a copy of the License at
- ~
+ ~
~ http://www.apache.org/licenses/LICENSE-2.0
- ~
+ ~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -137,7 +137,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<log4j2.version>2.17.1</log4j2.version>
<spotless.version>2.4.2</spotless.version>
- <junit5.version>5.6.1</junit5.version>
+ <junit5.version>5.7.2</junit5.version>
<mockito.version>3.9.0</mockito.version>
<assertj.version>3.17.2</assertj.version>
<h2.version>1.4.200</h2.version>
@@ -272,6 +272,11 @@
<artifactId>junit-platform-launcher</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.mockito</groupId>
@@ -644,10 +649,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>3.0.0-M4</version>
<configuration>
<forkCount>3</forkCount>
- <reuseForks>true</reuseForks>
- <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
</configuration>
</plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org