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 2023/10/09 07:06:05 UTC
[linkis] 05/11: add ps datasource server conf
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/linkis.git
commit 01ae62a563f838aaa7d58977814da7472d3364d9
Author: peacewong <wp...@gmail.com>
AuthorDate: Fri Sep 22 14:56:19 2023 +0800
add ps datasource server conf
---
linkis-commons/linkis-mybatis/pom.xml | 26 ++++++++++++++++++++++
.../apache/linkis/rpc/conf/RPCConfiguration.scala | 10 +++++++++
.../linkis/rpc/conf/RPCConfigurationTest.scala | 2 --
3 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/linkis-commons/linkis-mybatis/pom.xml b/linkis-commons/linkis-mybatis/pom.xml
index b87a1ed66..1481f2008 100644
--- a/linkis-commons/linkis-mybatis/pom.xml
+++ b/linkis-commons/linkis-mybatis/pom.xml
@@ -37,6 +37,32 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-autoconfigure</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.zaxxer</groupId>
+ <artifactId>HikariCP</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
</dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala
index 32f12da27..3a34e42a0 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala
@@ -80,6 +80,16 @@ object RPCConfiguration {
CommonVars("wds.linkis.gateway.conf.linkismanager.list", "linkisManager,engineplugin").getValue
.split(",")
+ val LINKIS_DATASOURCE_SERVICE_NAME: CommonVars[String] =
+ CommonVars("linkis.gateway.conf.linkisdatasource.name", "linkis-ps-datasource")
+
+ val LINKIS_DATASOURCE_SERVICE_LIST: Array[String] =
+ CommonVars(
+ "linkis.gateway.conf.linkisdatasource.list",
+ "data-source-manager,metadataquery,datasource,metadataQuery,metadatamanager"
+ ).getValue
+ .split(",")
+
val BDP_RPC_INSTANCE_ALIAS_SERVICE_REFRESH_INTERVAL: CommonVars[TimeType] =
CommonVars("wds.linkis.rpc.instancealias.refresh.interval", new TimeType("3s"))
diff --git a/linkis-commons/linkis-rpc/src/test/scala/org/apache/linkis/rpc/conf/RPCConfigurationTest.scala b/linkis-commons/linkis-rpc/src/test/scala/org/apache/linkis/rpc/conf/RPCConfigurationTest.scala
index 5aaadd133..ed1d39ce8 100644
--- a/linkis-commons/linkis-rpc/src/test/scala/org/apache/linkis/rpc/conf/RPCConfigurationTest.scala
+++ b/linkis-commons/linkis-rpc/src/test/scala/org/apache/linkis/rpc/conf/RPCConfigurationTest.scala
@@ -37,7 +37,6 @@ class RPCConfigurationTest {
val enablepublicservice = RPCConfiguration.ENABLE_PUBLIC_SERVICE.getValue
val publicserviceapplicationname = RPCConfiguration.PUBLIC_SERVICE_APPLICATION_NAME.getValue
val publicservicelist = RPCConfiguration.PUBLIC_SERVICE_LIST
- val metadataqueryservicelist = RPCConfiguration.METADATAQUERY_SERVICE_LIST
Assertions.assertTrue(25 == bdprpcbroadcastthreadsize.intValue())
Assertions.assertTrue(400 == bdprpcreceiverasynconsumerthreadmax.intValue())
@@ -48,7 +47,6 @@ class RPCConfigurationTest {
Assertions.assertTrue(enablepublicservice)
Assertions.assertEquals("linkis-ps-publicservice", publicserviceapplicationname)
Assertions.assertTrue(publicservicelist.size > 0)
- Assertions.assertTrue(metadataqueryservicelist.size > 0)
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org