You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by al...@apache.org on 2022/02/28 09:31:42 UTC
[incubator-linkis] branch dev-1.1.1 updated (246d35d -> 5f6b6dc)
This is an automated email from the ASF dual-hosted git repository.
allenlliu pushed a change to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git.
from 246d35d Merge pull request #1534 from WeDataSphere/dev-udf
new 7bac74d Gateway supports adding login user suffix after user login #1537
new 6d6fdfd Delete unused class
new 7a9ef99 Optimize code
new 4244f7d add license
new fd8d318 Add label information of openLookeng EC
new e9ecd42 Added default abstract implementation of ComputationSingleExecutorEngineConnFactory
new a033e0c Correct spelling errors
new 4400df8 Added DataSourceUtils tool class for creating datasource #1574
new 70721bb remove resourceHeartbeat report
new c24fcf3 Optimize code
new 5f6b6dc Optimize code
The 11 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:
db/linkis_ddl.sql | 2 +-
.../linkis/server/conf/ModuleConfiguration.scala | 25 -----
.../linkis/server/conf/ServerConfiguration.scala | 26 ++++-
.../apache/linkis/mybatis/DataSourceConfig.java | 60 +-----------
...{DataSourceConfig.java => DataSourceUtils.java} | 38 ++++----
.../linkis/protocol/engine/JobProgressInfo.scala | 22 -----
.../linkis/protocol/engine/IfCanKillRequest.scala | 23 -----
.../linkis/protocol/engine/JobProgressInfo.scala | 9 +-
.../service/impl/DefaultECMHealthService.scala | 8 --
...bstractComputationSingleExecutorECFactory.scala | 6 +-
.../manager/label/conf/LabelCommonConfig.java | 3 +
.../manager/label/entity/engine/EngineType.scala | 2 +
.../label/utils/EngineTypeLabelCreator.java | 3 +
.../service/impl/DefaultResourceManager.scala | 1 +
.../spark/config/SparkConfiguration.scala | 2 +-
.../engineplugin/spark/utils/EngineUtils.scala | 2 +-
.../metadata/condition/DataSourceCondition.java} | 16 +--
.../metadata/hive/config/LinkisMybatisConfig.java | 107 +++------------------
.../org/apache/linkis/metadata/util/DWSConfig.java | 58 -----------
19 files changed, 89 insertions(+), 324 deletions(-)
delete mode 100644 linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/conf/ModuleConfiguration.scala
copy linkis-commons/linkis-mybatis/src/main/java/org/apache/linkis/mybatis/{DataSourceConfig.java => DataSourceUtils.java} (77%)
delete mode 100644 linkis-commons/linkis-protocol/src/main/java/org/apache/linkis/protocol/engine/JobProgressInfo.scala
delete mode 100644 linkis-commons/linkis-protocol/src/main/scala/org/apache/linkis/protocol/engine/IfCanKillRequest.scala
copy linkis-commons/linkis-httpclient/src/main/scala/org/apache/linkis/httpclient/config/HttpClientConstant.scala => linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/creation/AbstractComputationSingleExecutorECFactory.scala (81%)
copy linkis-public-enhancements/linkis-datasource/{linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/MdmConfiguration.java => linkis-metadata/src/main/java/org/apache/linkis/metadata/condition/DataSourceCondition.java} (62%)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 11/11: Optimize code
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
allenlliu pushed a commit to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 5f6b6dc4d3030e709f13477c06cb349c7a39ed07
Author: peacewong <wp...@gmail.com>
AuthorDate: Mon Feb 28 16:53:28 2022 +0800
Optimize code
---
.../apache/linkis/engineplugin/spark/config/SparkConfiguration.scala | 2 +-
.../scala/org/apache/linkis/engineplugin/spark/utils/EngineUtils.scala | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/config/SparkConfiguration.scala b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/config/SparkConfiguration.scala
index b2aade9..1f9d3dd 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/config/SparkConfiguration.scala
+++ b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/config/SparkConfiguration.scala
@@ -75,7 +75,7 @@ object SparkConfiguration extends Logging {
val SQL_EXTENSION_TIMEOUT = CommonVars("wds.linkis.dws.ujes.spark.extension.timeout", 3000L)
val SPARK_NF_FRACTION_LENGTH = CommonVars[Int]("wds.linkis.engine.spark.fraction.length", 30)
val SHOW_DF_MAX_RES = CommonVars("wds.linkis.show.df.max.res", Int.MaxValue)
- val MDQ_APPLICATION_NAME = CommonVars("wds.linkis.mdq.application.name", "linkis-ps-publicservice")
+ val MDQ_APPLICATION_NAME = CommonVars("wds.linkis.mdq.application.name", "linkis-ps-datasource")
val DOLPHIN_LIMIT_LEN = CommonVars("wds.linkis.dolphin.limit.len", 5000)
val IS_VIEWFS_ENV = CommonVars("wds.linkis.spark.engine.is.viewfs.env", true)
diff --git a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/utils/EngineUtils.scala b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/utils/EngineUtils.scala
index 1962d8c..0c64803 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/utils/EngineUtils.scala
+++ b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/utils/EngineUtils.scala
@@ -21,7 +21,7 @@ import java.io.{IOException, InputStream, OutputStream}
import java.net.ServerSocket
import java.util.HashMap
-import org.apache.commons.lang3.StringUtils
+import org.apache.commons.lang.StringUtils
import org.apache.linkis.common.conf.CommonVars
import org.apache.linkis.common.io.FsPath
import org.apache.linkis.common.utils.Utils
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 04/11: add license
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
allenlliu pushed a commit to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 4244f7dcc9f147786abd635aec3a5ee094f03f5e
Author: peacewong <wp...@gmail.com>
AuthorDate: Mon Feb 21 18:05:32 2022 +0800
add license
---
.../apache/linkis/protocol/engine/JobProgressInfo.scala | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/linkis-commons/linkis-protocol/src/main/scala/org/apache/linkis/protocol/engine/JobProgressInfo.scala b/linkis-commons/linkis-protocol/src/main/scala/org/apache/linkis/protocol/engine/JobProgressInfo.scala
index 90d5804..e78f1e4 100644
--- a/linkis-commons/linkis-protocol/src/main/scala/org/apache/linkis/protocol/engine/JobProgressInfo.scala
+++ b/linkis-commons/linkis-protocol/src/main/scala/org/apache/linkis/protocol/engine/JobProgressInfo.scala
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ */
+
package org.apache.linkis.protocol.engine
case class JobProgressInfo(id: String, totalTasks: Int, runningTasks: Int, failedTasks: Int, succeedTasks: Int)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 01/11: Gateway supports adding login user suffix after user login #1537
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
allenlliu pushed a commit to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 7bac74d8923f85e2e9f81dcab40ed25ec769b3ec
Author: peacewong <wp...@gmail.com>
AuthorDate: Mon Feb 21 17:37:14 2022 +0800
Gateway supports adding login user suffix after user login #1537
---
.../linkis/server/conf/ModuleConfiguration.scala | 25 ---------------------
.../linkis/server/conf/ServerConfiguration.scala | 26 ++++++++++++++++++----
2 files changed, 22 insertions(+), 29 deletions(-)
diff --git a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/conf/ModuleConfiguration.scala b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/conf/ModuleConfiguration.scala
deleted file mode 100644
index 35cf98d..0000000
--- a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/conf/ModuleConfiguration.scala
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * 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.
- */
-
-package org.apache.linkis.server.conf
-
-import org.apache.linkis.common.conf.CommonVars
-
-
-object ModuleConfiguration {
- val DATA_OPERATE = CommonVars("wds.linkis.data.operate", "false")
-}
diff --git a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/conf/ServerConfiguration.scala b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/conf/ServerConfiguration.scala
index 921b0d1..718dabf 100644
--- a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/conf/ServerConfiguration.scala
+++ b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/conf/ServerConfiguration.scala
@@ -38,25 +38,38 @@ object ServerConfiguration extends Logging{
throw new BDPInitServerException(10010, "DataWorkCloud service must set the version, please add property [[wds.linkis.server.version]] to properties file.")
}
- val cryptKey = new BASE64Encoder().encode(CommonVars("wds.linkis.crypt.key", "bdp-for-server").getValue.getBytes)
+ val cryptKey = new BASE64Encoder().encode(CommonVars("wds.linkis.crypt.key", "bdp-for-server").getValue.getBytes)
+
private val ticketHeader = CommonVars("wds.linkis.ticket.header", "bfs_").getValue
- def getUsernameByTicket(ticketId: String): Option[String] = if(StringUtils.isEmpty(ticketId)) None
+
+ def getUsernameByTicket(ticketId: String): Option[String] = if (StringUtils.isEmpty(ticketId)) None
else {
val userName = DESUtil.decrypt(ticketId, ServerConfiguration.cryptKey)
if(userName.startsWith(ticketHeader)) Some(userName.substring(ticketHeader.length))
else None
}
- def getUsernameByTicket(ticketId: Any): Option[String] = if(ticketId == null) None else getUsernameByTicket(ticketId.toString)
+ def getUsernameByTicket(ticketId: Any): Option[String] = if (ticketId == null) None else getUsernameByTicket(ticketId.toString)
+
def getTicketByUsername(userName: String): String = {
+ if (LINKIE_USERNAME_SUFFIX_ENABLE) {
+ val username = userName.split(",")(0)
+ val time = userName.split(",")(1)
+ val proxyUser = username + LINKIE_USERNAME_SUFFIX_NAME
+ logger.info(s"$username will be proxied as ${proxyUser}")
+ DESUtil.encrypt(ticketHeader + proxyUser + "," + time, ServerConfiguration.cryptKey)
+ } else {
DESUtil.encrypt(ticketHeader + userName, ServerConfiguration.cryptKey)
+ }
}
val BDP_TEST_USER = CommonVars("wds.linkis.test.user", "")
val BDP_SERVER_HOME = CommonVars("wds.linkis.server.home", CommonVars("LINKIS_HOME", "").getValue)
val BDP_SERVER_DISTINCT_MODE = CommonVars("wds.linkis.server.distinct.mode", new Boolean(true))
- if(!BDP_SERVER_DISTINCT_MODE.getValue && StringUtils.isEmpty(BDP_SERVER_HOME.getValue))
+
+ if (!BDP_SERVER_DISTINCT_MODE.getValue && StringUtils.isEmpty(BDP_SERVER_HOME.getValue)) {
throw new BDPInitServerException(11000, "wds.linkis.server.home或BDP_SERVER_HOME haven't set!")
+ }
val BDP_SERVER_SOCKET_MODE = CommonVars("wds.linkis.server.socket.mode", new Boolean(false))
val BDP_SERVER_IDENT_STRING = CommonVars("wds.linkis.server.ident.string", "true")
val BDP_SERVER_SERVER_JETTY_NAME = CommonVars("wds.linkis.server.jetty.name", "")
@@ -102,4 +115,9 @@ object ServerConfiguration extends Logging{
val IS_GATEWAY = CommonVars("wds.linkis.is.gateway", "false")
val BDP_SERVER_WEB_ALLOW_ORIGIN = CommonVars("wds.linkis.server.web.alloworigin", "*")
val BDP_SERVER_WEB_ALLOW_METHOD = CommonVars("wds.linkis.server.web.allowmethod", "POST,GET,OPTIONS,PUT,HEAD,DELETE")
+
+ val LINKIE_USERNAME_SUFFIX_ENABLE = CommonVars("linkis.username.suffix.enable", false).getValue
+
+ val LINKIE_USERNAME_SUFFIX_NAME = CommonVars("linkis.username.suffix.name", "_c").getValue
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 07/11: Correct spelling errors
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
allenlliu pushed a commit to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit a033e0c16871563ace4aa7d0971c32ecd0f3f32a
Author: peacewong <wp...@gmail.com>
AuthorDate: Mon Feb 28 16:34:35 2022 +0800
Correct spelling errors
---
db/linkis_ddl.sql | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/db/linkis_ddl.sql b/db/linkis_ddl.sql
index 97944d8..ce5cf26 100644
--- a/db/linkis_ddl.sql
+++ b/db/linkis_ddl.sql
@@ -737,7 +737,7 @@ CREATE TABLE `linkis_cg_manager_label_resource` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
DROP TABLE IF EXISTS `linkis_cg_rm_resource_action_record`;
-CREATE TABLE linkis_cg_rm_resource_check (
+CREATE TABLE linkis_cg_rm_resource_action_record (
`id` INT(20) NOT NULL AUTO_INCREMENT,
`label_value` VARCHAR(100) NOT NULL,
`ticket_id` VARCHAR(100) NOT NULL,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 06/11: Added default abstract implementation of ComputationSingleExecutorEngineConnFactory
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
allenlliu pushed a commit to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit e9ecd420f45826b0b3a735f90217f7d9808a5de4
Author: peacewong <wp...@gmail.com>
AuthorDate: Mon Feb 28 16:33:07 2022 +0800
Added default abstract implementation of ComputationSingleExecutorEngineConnFactory
---
...bstractComputationSingleExecutorECFactory.scala | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/creation/AbstractComputationSingleExecutorECFactory.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/creation/AbstractComputationSingleExecutorECFactory.scala
new file mode 100644
index 0000000..224f0d0
--- /dev/null
+++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/creation/AbstractComputationSingleExecutorECFactory.scala
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ */
+
+package org.apache.linkis.engineconn.computation.executor.creation
+
+abstract class AbstractComputationSingleExecutorECFactory extends ComputationSingleExecutorEngineConnFactory {
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 02/11: Delete unused class
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
allenlliu pushed a commit to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 6d6fdfd25656da72c0798057de0f0b9a72d99bc6
Author: peacewong <wp...@gmail.com>
AuthorDate: Mon Feb 21 17:48:57 2022 +0800
Delete unused class
---
.../linkis/protocol/engine/IfCanKillRequest.scala | 23 ----------------------
1 file changed, 23 deletions(-)
diff --git a/linkis-commons/linkis-protocol/src/main/scala/org/apache/linkis/protocol/engine/IfCanKillRequest.scala b/linkis-commons/linkis-protocol/src/main/scala/org/apache/linkis/protocol/engine/IfCanKillRequest.scala
deleted file mode 100644
index 7de63cc..0000000
--- a/linkis-commons/linkis-protocol/src/main/scala/org/apache/linkis/protocol/engine/IfCanKillRequest.scala
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * 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.
- */
-
-package org.apache.linkis.protocol.engine
-
-
-case class IfCanKillRequest(engineInstance:String)
-
-case class IfCanKillResponse(flag:Boolean, reason:String)
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 10/11: Optimize code
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
allenlliu pushed a commit to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit c24fcf390f9c1bd56cb3e7b579e238caf9cf49f3
Author: peacewong <wp...@gmail.com>
AuthorDate: Mon Feb 28 16:53:17 2022 +0800
Optimize code
---
.../linkis/resourcemanager/service/impl/DefaultResourceManager.scala | 1 +
1 file changed, 1 insertion(+)
diff --git a/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/org/apache/linkis/resourcemanager/service/impl/DefaultResourceManager.scala b/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/org/apache/linkis/resourcemanager/service/impl/DefaultResourceManager.scala
index fe46db6..84a121a 100644
--- a/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/org/apache/linkis/resourcemanager/service/impl/DefaultResourceManager.scala
+++ b/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/org/apache/linkis/resourcemanager/service/impl/DefaultResourceManager.scala
@@ -227,6 +227,7 @@ class DefaultResourceManager extends ResourceManager with Logging with Initializ
}
} {
case exception: RMWarnException => return NotEnoughResource(exception.getMessage)
+ case exception: Exception => throw exception
}
val usedResource = labelResourceService.getLabelResource(label)
if (usedResource == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 08/11: Added DataSourceUtils tool class for creating datasource #1574
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
allenlliu pushed a commit to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 4400df834821f5fae0ccbd4389cde0bc96f0ae7b
Author: peacewong <wp...@gmail.com>
AuthorDate: Mon Feb 28 16:45:14 2022 +0800
Added DataSourceUtils tool class for creating datasource #1574
---
.../apache/linkis/mybatis/DataSourceConfig.java | 60 +-----------
...{DataSourceConfig.java => DataSourceUtils.java} | 38 ++++----
.../metadata/condition/DataSourceCondition.java | 33 +++++++
.../metadata/hive/config/LinkisMybatisConfig.java | 107 +++------------------
.../org/apache/linkis/metadata/util/DWSConfig.java | 58 -----------
5 files changed, 72 insertions(+), 224 deletions(-)
diff --git a/linkis-commons/linkis-mybatis/src/main/java/org/apache/linkis/mybatis/DataSourceConfig.java b/linkis-commons/linkis-mybatis/src/main/java/org/apache/linkis/mybatis/DataSourceConfig.java
index 69bfb6e..a248a6b 100644
--- a/linkis-commons/linkis-mybatis/src/main/java/org/apache/linkis/mybatis/DataSourceConfig.java
+++ b/linkis-commons/linkis-mybatis/src/main/java/org/apache/linkis/mybatis/DataSourceConfig.java
@@ -17,9 +17,6 @@
package org.apache.linkis.mybatis;
-import org.apache.linkis.common.utils.JavaLog;
-import org.apache.linkis.mybatis.conf.MybatisConfiguration;
-
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
@@ -27,66 +24,13 @@ import org.springframework.context.annotation.Configuration;
import javax.sql.DataSource;
-import com.alibaba.druid.pool.DruidDataSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
@Configuration
@ConfigurationProperties
-public class DataSourceConfig extends JavaLog {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(DataSourceConfig.class);
+public class DataSourceConfig {
@Bean(name = "dataSource", destroyMethod = "close")
@ConditionalOnMissingBean
public DataSource dataSource() {
- String dbUrl = MybatisConfiguration.BDP_SERVER_MYBATIS_DATASOURCE_URL.getValue();
- String username = MybatisConfiguration.BDP_SERVER_MYBATIS_DATASOURCE_USERNAME.getValue();
- String password = MybatisConfiguration.BDP_SERVER_MYBATIS_DATASOURCE_PASSWORD.getValue();
- String driverClassName =
- MybatisConfiguration.BDP_SERVER_MYBATIS_DATASOURCE_DRIVER_CLASS_NAME.getValue();
- int initialSize = MybatisConfiguration.BDP_SERVER_MYBATIS_DATASOURCE_INITIALSIZE.getValue();
- int minIdle = MybatisConfiguration.BDP_SERVER_MYBATIS_DATASOURCE_MINIDLE.getValue();
- int maxActive = MybatisConfiguration.BDP_SERVER_MYBATIS_DATASOURCE_MAXACTIVE.getValue();
- int maxWait = MybatisConfiguration.BDP_SERVER_MYBATIS_DATASOURCE_MAXWAIT.getValue();
- int timeBetweenEvictionRunsMillis =
- MybatisConfiguration.BDP_SERVER_MYBATIS_DATASOURCE_TBERM.getValue();
- int minEvictableIdleTimeMillis =
- MybatisConfiguration.BDP_SERVER_MYBATIS_DATASOURCE_MEITM.getValue();
- String validationQuery =
- MybatisConfiguration.BDP_SERVER_MYBATIS_DATASOURCE_VALIDATIONQUERY.getValue();
- boolean testWhileIdle =
- MybatisConfiguration.BDP_SERVER_MYBATIS_DATASOURCE_TESTWHILEIDLE.getValue();
- boolean testOnBorrow =
- MybatisConfiguration.BDP_SERVER_MYBATIS_DATASOURCE_TESTONBORROW.getValue();
- boolean testOnReturn =
- MybatisConfiguration.BDP_SERVER_MYBATIS_DATASOURCE_TESTONRETURN.getValue();
- boolean poolPreparedStatements =
- MybatisConfiguration.BDP_SERVER_MYBATIS_DATASOURCE_POOLPREPAREDSTATEMENTS
- .getValue();
- boolean removeAbandoned =
- MybatisConfiguration.MYBATIS_DATASOURCE_REMOVE_ABANDONED_ENABLED.getValue();
- int removeAbandonedTimeout =
- MybatisConfiguration.MYBATIS_DATASOURCE_REMOVE_ABANDONED_TIMEOUT.getValue();
- DruidDataSource datasource = new DruidDataSource();
- info("Database connection address information(数据库连接地址信息)=" + dbUrl);
- datasource.setUrl(dbUrl);
- datasource.setUsername(username);
- datasource.setPassword(password);
- datasource.setDriverClassName(driverClassName);
- datasource.setInitialSize(initialSize);
- datasource.setMinIdle(minIdle);
- datasource.setMaxActive(maxActive);
- datasource.setMaxWait(maxWait);
- datasource.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
- datasource.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
- datasource.setValidationQuery(validationQuery);
- datasource.setTestWhileIdle(testWhileIdle);
- datasource.setTestOnBorrow(testOnBorrow);
- datasource.setTestOnReturn(testOnReturn);
- datasource.setPoolPreparedStatements(poolPreparedStatements);
- datasource.setRemoveAbandoned(removeAbandoned);
- datasource.setRemoveAbandonedTimeout(removeAbandonedTimeout);
- return datasource;
+ return DataSourceUtils.buildDataSource(null, null, null);
}
}
diff --git a/linkis-commons/linkis-mybatis/src/main/java/org/apache/linkis/mybatis/DataSourceConfig.java b/linkis-commons/linkis-mybatis/src/main/java/org/apache/linkis/mybatis/DataSourceUtils.java
similarity index 77%
copy from linkis-commons/linkis-mybatis/src/main/java/org/apache/linkis/mybatis/DataSourceConfig.java
copy to linkis-commons/linkis-mybatis/src/main/java/org/apache/linkis/mybatis/DataSourceUtils.java
index 69bfb6e..0bd401f 100644
--- a/linkis-commons/linkis-mybatis/src/main/java/org/apache/linkis/mybatis/DataSourceConfig.java
+++ b/linkis-commons/linkis-mybatis/src/main/java/org/apache/linkis/mybatis/DataSourceUtils.java
@@ -17,13 +17,9 @@
package org.apache.linkis.mybatis;
-import org.apache.linkis.common.utils.JavaLog;
import org.apache.linkis.mybatis.conf.MybatisConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
+import org.apache.commons.lang.StringUtils;
import javax.sql.DataSource;
@@ -31,18 +27,26 @@ import com.alibaba.druid.pool.DruidDataSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@Configuration
-@ConfigurationProperties
-public class DataSourceConfig extends JavaLog {
+public class DataSourceUtils {
- private static final Logger LOGGER = LoggerFactory.getLogger(DataSourceConfig.class);
+ private static final Logger logger = LoggerFactory.getLogger(DataSourceUtils.class);
- @Bean(name = "dataSource", destroyMethod = "close")
- @ConditionalOnMissingBean
- public DataSource dataSource() {
- String dbUrl = MybatisConfiguration.BDP_SERVER_MYBATIS_DATASOURCE_URL.getValue();
- String username = MybatisConfiguration.BDP_SERVER_MYBATIS_DATASOURCE_USERNAME.getValue();
- String password = MybatisConfiguration.BDP_SERVER_MYBATIS_DATASOURCE_PASSWORD.getValue();
+ /**
+ * @param dbUrl Can be Null, take the default value
+ * @param username Can be Null, take the default value
+ * @param pwd Can be Null, take the default value
+ * @return
+ */
+ public static DataSource buildDataSource(String dbUrl, String username, String pwd) {
+ if (StringUtils.isBlank(dbUrl)) {
+ dbUrl = MybatisConfiguration.BDP_SERVER_MYBATIS_DATASOURCE_URL.getValue();
+ }
+ if (StringUtils.isBlank(username)) {
+ username = MybatisConfiguration.BDP_SERVER_MYBATIS_DATASOURCE_USERNAME.getValue();
+ }
+ if (StringUtils.isBlank(pwd)) {
+ pwd = MybatisConfiguration.BDP_SERVER_MYBATIS_DATASOURCE_PASSWORD.getValue();
+ }
String driverClassName =
MybatisConfiguration.BDP_SERVER_MYBATIS_DATASOURCE_DRIVER_CLASS_NAME.getValue();
int initialSize = MybatisConfiguration.BDP_SERVER_MYBATIS_DATASOURCE_INITIALSIZE.getValue();
@@ -69,10 +73,10 @@ public class DataSourceConfig extends JavaLog {
int removeAbandonedTimeout =
MybatisConfiguration.MYBATIS_DATASOURCE_REMOVE_ABANDONED_TIMEOUT.getValue();
DruidDataSource datasource = new DruidDataSource();
- info("Database connection address information(数据库连接地址信息)=" + dbUrl);
+ logger.info("Database connection address information(数据库连接地址信息)=" + dbUrl);
datasource.setUrl(dbUrl);
datasource.setUsername(username);
- datasource.setPassword(password);
+ datasource.setPassword(pwd);
datasource.setDriverClassName(driverClassName);
datasource.setInitialSize(initialSize);
datasource.setMinIdle(minIdle);
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/condition/DataSourceCondition.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/condition/DataSourceCondition.java
new file mode 100644
index 0000000..842540a
--- /dev/null
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/condition/DataSourceCondition.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ */
+
+package org.apache.linkis.metadata.condition;
+
+import org.apache.linkis.common.conf.CommonVars;
+
+import org.springframework.context.annotation.Condition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+
+public class DataSourceCondition implements Condition {
+
+ @Override
+ public boolean matches(
+ ConditionContext conditionContext, AnnotatedTypeMetadata annotatedTypeMetadata) {
+ return CommonVars.apply("linkis.metatdata.datasource.use.self", true).getValue();
+ }
+}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/hive/config/LinkisMybatisConfig.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/hive/config/LinkisMybatisConfig.java
index baaf40e..c0457df 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/hive/config/LinkisMybatisConfig.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/hive/config/LinkisMybatisConfig.java
@@ -18,55 +18,43 @@
package org.apache.linkis.metadata.hive.config;
import org.apache.linkis.hadoop.common.conf.HadoopConf;
+import org.apache.linkis.metadata.condition.DataSourceCondition;
import org.apache.linkis.metadata.util.DWSConfig;
import org.apache.linkis.metadata.util.HiveUtils;
+import org.apache.linkis.mybatis.DataSourceUtils;
import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.annotation.EnableTransactionManagement;
-import com.alibaba.druid.pool.DruidDataSource;
+import javax.sql.DataSource;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.sql.SQLException;
import java.util.HashMap;
@Configuration
@EnableTransactionManagement(order = 2)
public class LinkisMybatisConfig {
- private Logger logger = LoggerFactory.getLogger(this.getClass());
+ private static final Logger logger = LoggerFactory.getLogger(LinkisMybatisConfig.class);
- private DruidDataSource hiveDataSource() {
- DruidDataSource datasource = new DruidDataSource();
- int initialSize = 1;
- int minIdle = 1;
- int maxActive = 20;
- int maxWait = 6000;
- int timeBetweenEvictionRunsMillis = 60000;
- int minEvictableIdleTimeMillis = 300000;
- String validationQuery = "SELECT 1";
- boolean testWhileIdle = true;
- boolean testOnBorrow = true;
- boolean testOnReturn = true;
+ private DataSource hiveDataSource() {
String url = DWSConfig.HIVE_META_URL.getValue();
String username = DWSConfig.HIVE_META_USER.getValue();
String password = DWSConfig.HIVE_META_PASSWORD.getValue();
- org.apache.hadoop.conf.Configuration hiveConf = null;
if (StringUtils.isBlank(url)
|| StringUtils.isBlank(username)
|| StringUtils.isBlank(password)) {
- hiveConf = HiveUtils.getDefaultConf(HadoopConf.HADOOP_ROOT_USER().getValue());
- logger.info("从配置文件中读取hive数据库连接地址");
+ org.apache.hadoop.conf.Configuration hiveConf =
+ HiveUtils.getDefaultConf(HadoopConf.HADOOP_ROOT_USER().getValue());
+ logger.info("from hive conf to pares meta store JDBC url");
url = hiveConf.get("javax.jdo.option.ConnectionURL");
username = hiveConf.get("javax.jdo.option.ConnectionUserName");
password = hiveConf.get("javax.jdo.option.ConnectionPassword");
@@ -76,75 +64,18 @@ public class LinkisMybatisConfig {
}
}
- logger.info("数据库连接地址信息=" + url);
- datasource.setUrl(url);
- datasource.setUsername(username);
- datasource.setPassword(password);
- datasource.setInitialSize(initialSize);
- datasource.setMinIdle(minIdle);
- datasource.setMaxActive(maxActive);
- datasource.setMaxWait(maxWait);
- datasource.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
- datasource.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
- datasource.setValidationQuery(validationQuery);
- datasource.setTestWhileIdle(testWhileIdle);
- datasource.setTestOnBorrow(testOnBorrow);
- datasource.setTestOnReturn(testOnReturn);
- return datasource;
+ return DataSourceUtils.buildDataSource(url, username, password);
}
- private DruidDataSource mysqlDataSource() {
- DruidDataSource datasource = new DruidDataSource();
- String dbUrl = DWSConfig.BDP_SERVER_MYBATIS_DATASOURCE_URL.getValue();
- String username = DWSConfig.BDP_SERVER_MYBATIS_DATASOURCE_USERNAME.getValue();
- String password = DWSConfig.BDP_SERVER_MYBATIS_DATASOURCE_PASSWORD.getValue();
- String driverClassName =
- DWSConfig.BDP_SERVER_MYBATIS_DATASOURCE_DRIVER_CLASS_NAME.getValue();
- int initialSize = DWSConfig.BDP_SERVER_MYBATIS_DATASOURCE_INITIALSIZE.getValue();
- int minIdle = DWSConfig.BDP_SERVER_MYBATIS_DATASOURCE_MINIDLE.getValue();
- int maxActive = DWSConfig.BDP_SERVER_MYBATIS_DATASOURCE_MAXACTIVE.getValue();
- int maxWait = DWSConfig.BDP_SERVER_MYBATIS_DATASOURCE_MAXWAIT.getValue();
- int timeBetweenEvictionRunsMillis =
- DWSConfig.BDP_SERVER_MYBATIS_DATASOURCE_TBERM.getValue();
- int minEvictableIdleTimeMillis = DWSConfig.BDP_SERVER_MYBATIS_DATASOURCE_MEITM.getValue();
- String validationQuery = DWSConfig.BDP_SERVER_MYBATIS_DATASOURCE_VALIDATIONQUERY.getValue();
- boolean testWhileIdle = DWSConfig.BDP_SERVER_MYBATIS_DATASOURCE_TESTWHILEIDLE.getValue();
- boolean testOnBorrow = DWSConfig.BDP_SERVER_MYBATIS_DATASOURCE_TESTONBORROW.getValue();
- boolean testOnReturn = DWSConfig.BDP_SERVER_MYBATIS_DATASOURCE_TESTONRETURN.getValue();
- boolean poolPreparedStatements =
- DWSConfig.BDP_SERVER_MYBATIS_DATASOURCE_POOLPREPAREDSTATEMENTS.getValue();
- datasource.setUrl(dbUrl);
- datasource.setUsername(username);
- datasource.setPassword(password);
- datasource.setDriverClassName(driverClassName);
- datasource.setInitialSize(initialSize);
- datasource.setMinIdle(minIdle);
- datasource.setMaxActive(maxActive);
- datasource.setMaxWait(maxWait);
- datasource.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
- datasource.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
- datasource.setValidationQuery(validationQuery);
- datasource.setTestWhileIdle(testWhileIdle);
- datasource.setTestOnBorrow(testOnBorrow);
- datasource.setTestOnReturn(testOnReturn);
- datasource.setPoolPreparedStatements(poolPreparedStatements);
- logger.info("Database connection address information(数据库连接地址信息)=" + dbUrl);
- return datasource;
+ private DataSource mysqlDataSource() {
+ return DataSourceUtils.buildDataSource(null, null, null);
}
@Bean(name = "dataSource")
+ @Conditional(DataSourceCondition.class)
public DynamicDataSource mutiDataSource() {
-
- DruidDataSource hiveDataSource = hiveDataSource();
- DruidDataSource mysqlDataSource = mysqlDataSource();
-
- try {
- hiveDataSource.init();
- mysqlDataSource.init();
- } catch (SQLException sql) {
- logger.error("连接数据库失败：", sql);
- }
-
+ DataSource hiveDataSource = hiveDataSource();
+ DataSource mysqlDataSource = mysqlDataSource();
DynamicDataSource dynamicDataSource = new DynamicDataSource();
HashMap<Object, Object> hashMap = new HashMap<>();
hashMap.put(DSEnum.FIRST_DATA_SOURCE, hiveDataSource);
@@ -153,10 +84,4 @@ public class LinkisMybatisConfig {
dynamicDataSource.setDefaultTargetDataSource(mysqlDataSource);
return dynamicDataSource;
}
-
- @Primary
- public PlatformTransactionManager annotationDrivenTransactionManager(
- @Qualifier("dataSource") DynamicDataSource dataSource) {
- return new DataSourceTransactionManager(dataSource);
- }
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/util/DWSConfig.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/util/DWSConfig.java
index d178d7c..fa6c7e5 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/util/DWSConfig.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/util/DWSConfig.java
@@ -22,12 +22,6 @@ import org.apache.linkis.common.conf.CommonVars$;
public class DWSConfig {
- public static CommonVars<String> HADOOP_CONF_DIR =
- CommonVars$.MODULE$.apply(
- "hadoop.config.dir",
- CommonVars$.MODULE$
- .apply("HADOOP_CONF_DIR", "/appcom/config/hadoop-config")
- .getValue());
public static CommonVars<String> HIVE_CONF_DIR =
CommonVars$.MODULE$.apply(
"hive.config.dir",
@@ -40,58 +34,6 @@ public class DWSConfig {
public static CommonVars<String> HIVE_META_PASSWORD =
CommonVars$.MODULE$.apply("hive.meta.password", "");
- public static final CommonVars<String> BDP_SERVER_MYBATIS_MAPPER_LOCATIONS =
- CommonVars.apply("wds.linkis.server.mybatis.mapperLocations", "");
- public static final CommonVars<String> BDP_SERVER_MYBATIS_TYPEALIASESPACKAGE =
- CommonVars.apply("wds.linkis.server.mybatis.typeAliasesPackage", "");
- public static final CommonVars<String> BDP_SERVER_MYBATIS_CONFIGLOCATION =
- CommonVars.apply(
- "wds.linkis.server.mybatis.configLocation", "classpath:/mybatis-config.xml");
- public static final CommonVars<String> BDP_SERVER_MYBATIS_BASEPACKAGE =
- CommonVars.apply("wds.linkis.server.mybatis.BasePackage", "");
- public static final CommonVars<String> BDP_SERVER_MYBATIS_DATASOURCE_URL =
- CommonVars.apply("wds.linkis.server.mybatis.datasource.url", "");
- public static final CommonVars<String> BDP_SERVER_MYBATIS_DATASOURCE_USERNAME =
- CommonVars.apply("wds.linkis.server.mybatis.datasource.username", "");
- public static final CommonVars<String> BDP_SERVER_MYBATIS_DATASOURCE_PASSWORD =
- CommonVars.apply("wds.linkis.server.mybatis.datasource.password", "");
- public static final CommonVars<String> BDP_SERVER_MYBATIS_DATASOURCE_DRIVER_CLASS_NAME =
- CommonVars.apply(
- "wds.linkis.server.mybatis.datasource.driver-class-name",
- "com.mysql.jdbc.Driver");
- public static final CommonVars<Integer> BDP_SERVER_MYBATIS_DATASOURCE_INITIALSIZE =
- CommonVars.apply("wds.linkis.server.mybatis.datasource.initialSize", new Integer(1));
- public static final CommonVars<Integer> BDP_SERVER_MYBATIS_DATASOURCE_MINIDLE =
- CommonVars.apply("wds.linkis.server.mybatis.datasource.minIdle", new Integer(1));
- public static final CommonVars<Integer> BDP_SERVER_MYBATIS_DATASOURCE_MAXACTIVE =
- CommonVars.apply("wds.linkis.server.mybatis.datasource.maxActive", new Integer(20));
- public static final CommonVars<Integer> BDP_SERVER_MYBATIS_DATASOURCE_MAXWAIT =
- CommonVars.apply("wds.linkis.server.mybatis.datasource.maxWait", new Integer(6000));
- public static final CommonVars<Integer> BDP_SERVER_MYBATIS_DATASOURCE_TBERM =
- CommonVars.apply(
- "wds.linkis.server.mybatis.datasource.timeBetweenEvictionRunsMillis",
- new Integer(60000));
- public static final CommonVars<Integer> BDP_SERVER_MYBATIS_DATASOURCE_MEITM =
- CommonVars.apply(
- "wds.linkis.server.mybatis.datasource.minEvictableIdleTimeMillis",
- new Integer(300000));
- public static final CommonVars<String> BDP_SERVER_MYBATIS_DATASOURCE_VALIDATIONQUERY =
- CommonVars.apply("wds.linkis.server.mybatis.datasource.validationQuery", "SELECT 1");
-
- public static final CommonVars<Boolean> BDP_SERVER_MYBATIS_DATASOURCE_TESTWHILEIDLE =
- CommonVars.apply(
- "wds.linkis.server.mybatis.datasource.testWhileIdle", new Boolean(true));
- public static final CommonVars<Boolean> BDP_SERVER_MYBATIS_DATASOURCE_TESTONBORROW =
- CommonVars.apply(
- "wds.linkis.server.mybatis.datasource.testOnBorrow", new Boolean(false));
- public static final CommonVars<Boolean> BDP_SERVER_MYBATIS_DATASOURCE_TESTONRETURN =
- CommonVars.apply(
- "wds.linkis.server.mybatis.datasource.testOnReturn", new Boolean(false));
- public static final CommonVars<Boolean> BDP_SERVER_MYBATIS_DATASOURCE_POOLPREPAREDSTATEMENTS =
- CommonVars.apply(
- "wds.linkis.server.mybatis.datasource.poolPreparedStatements",
- new Boolean(true));
-
// wds.linkis.metadata.hive.encode.enable配置HIVE BASE64加解密
public static final CommonVars<Boolean> HIVE_PASS_ENCODE_ENABLED =
CommonVars.apply("wds.linkis.metadata.hive.encode.enabled", new Boolean(false));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 03/11: Optimize code
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
allenlliu pushed a commit to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 7a9ef99bd56debe6ad8a499c6e2f985127c1671f
Author: peacewong <wp...@gmail.com>
AuthorDate: Mon Feb 21 17:51:58 2022 +0800
Optimize code
---
.../linkis/protocol/engine/JobProgressInfo.scala | 22 ----------------------
.../linkis/protocol/engine/JobProgressInfo.scala | 20 +-------------------
2 files changed, 1 insertion(+), 41 deletions(-)
diff --git a/linkis-commons/linkis-protocol/src/main/java/org/apache/linkis/protocol/engine/JobProgressInfo.scala b/linkis-commons/linkis-protocol/src/main/java/org/apache/linkis/protocol/engine/JobProgressInfo.scala
deleted file mode 100644
index 59ea191..0000000
--- a/linkis-commons/linkis-protocol/src/main/java/org/apache/linkis/protocol/engine/JobProgressInfo.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * 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.
- */
-
-package org.apache.linkis.protocol.engine
-
-
-case class JobProgressInfo(id: String, totalTasks: Int, runningTasks: Int, failedTasks: Int, succeedTasks: Int)
-
diff --git a/linkis-commons/linkis-protocol/src/main/scala/org/apache/linkis/protocol/engine/JobProgressInfo.scala b/linkis-commons/linkis-protocol/src/main/scala/org/apache/linkis/protocol/engine/JobProgressInfo.scala
index 7364547..90d5804 100644
--- a/linkis-commons/linkis-protocol/src/main/scala/org/apache/linkis/protocol/engine/JobProgressInfo.scala
+++ b/linkis-commons/linkis-protocol/src/main/scala/org/apache/linkis/protocol/engine/JobProgressInfo.scala
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * 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.
- */
-
package org.apache.linkis.protocol.engine
-
-//case class JobProgressInfo(id: String, totalTasks: Int, runningTasks: Int, failedTasks: Int, succeedTasks: Int)
\ No newline at end of file
+case class JobProgressInfo(id: String, totalTasks: Int, runningTasks: Int, failedTasks: Int, succeedTasks: Int)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 05/11: Add label information of openLookeng EC
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
allenlliu pushed a commit to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit fd8d31836991a5ae7014a01291713d234f856449
Author: peacewong <wp...@gmail.com>
AuthorDate: Mon Feb 28 16:31:25 2022 +0800
Add label information of openLookeng EC
---
.../java/org/apache/linkis/manager/label/conf/LabelCommonConfig.java | 3 +++
.../org/apache/linkis/manager/label/entity/engine/EngineType.scala | 2 ++
.../org/apache/linkis/manager/label/utils/EngineTypeLabelCreator.java | 3 +++
3 files changed, 8 insertions(+)
diff --git a/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/conf/LabelCommonConfig.java b/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/conf/LabelCommonConfig.java
index 1b934af..e27b7ba 100644
--- a/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/conf/LabelCommonConfig.java
+++ b/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/conf/LabelCommonConfig.java
@@ -72,6 +72,9 @@ public class LabelCommonConfig {
public static final CommonVars<String> PRESTO_ENGINE_VERSION =
CommonVars.apply("wds.linkis.presto.engine.version", "0.234");
+ public static final CommonVars<String> OPENLOOKENG_ENGINE_VERSION =
+ CommonVars.apply("wds.linkis.openlookeng.engine.version", "1.5.0");
+
public static final CommonVars<String> PERMANENT_LABEL =
CommonVars.apply("wds.linkis.am.permanent.label", "tenant");
diff --git a/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineType.scala b/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineType.scala
index aae0dd8..de1a843 100644
--- a/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineType.scala
+++ b/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineType.scala
@@ -55,6 +55,8 @@ object EngineType extends Enumeration with Logging {
val DATAX = Value("datax")
+ val OPENLOOKENG = Value("openlookeng")
+
def mapFsTypeToEngineType(fsType: String): String = {
fsType match {
case "file" =>
diff --git a/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/utils/EngineTypeLabelCreator.java b/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/utils/EngineTypeLabelCreator.java
index 00d96aa..b91bc0a 100644
--- a/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/utils/EngineTypeLabelCreator.java
+++ b/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/utils/EngineTypeLabelCreator.java
@@ -70,6 +70,9 @@ public class EngineTypeLabelCreator {
defaultVersion.put(
EngineType.FLINK().toString(),
LabelCommonConfig.FLINK_ENGINE_VERSION.getValue());
+ defaultVersion.put(
+ EngineType.OPENLOOKENG().toString(),
+ LabelCommonConfig.FLINK_ENGINE_VERSION.getValue());
defaultVersion.put("*", "*");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 09/11: remove resourceHeartbeat report
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
allenlliu pushed a commit to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 70721bb6a7a90141968667203a67824b562f181a
Author: peacewong <wp...@gmail.com>
AuthorDate: Mon Feb 28 16:52:56 2022 +0800
remove resourceHeartbeat report
---
.../linkis/ecm/server/service/impl/DefaultECMHealthService.scala | 8 --------
1 file changed, 8 deletions(-)
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultECMHealthService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultECMHealthService.scala
index 921d43c..fa32193 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultECMHealthService.scala
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultECMHealthService.scala
@@ -96,15 +96,7 @@ class DefaultECMHealthService extends ECMHealthService with ECMEventListener {
override def reportHealth(report: ECMHealthReport): Unit = {
val heartbeat: NodeHeartbeatMsg = transferECMHealthReportToNodeHeartbeatMsg(report)
- val resourceHeartbeat: NodeHeartbeatResourceMsg = new NodeHeartbeatResourceMsg
- resourceHeartbeat.setHealthyInfo(heartbeat.getHealthyInfo)
- resourceHeartbeat.setHeartBeatMsg(heartbeat.getHeartBeatMsg)
- resourceHeartbeat.setNodeResource(heartbeat.getNodeResource)
- resourceHeartbeat.setOverLoadInfo(heartbeat.getOverLoadInfo)
- resourceHeartbeat.setServiceInstance(heartbeat.getServiceInstance)
- resourceHeartbeat.setStatus(heartbeat.getStatus)
Sender.getSender(MANAGER_SPRING_NAME).send(heartbeat)
- Sender.getSender(MANAGER_SPRING_NAME).send(resourceHeartbeat)
}
private def transferECMHealthReportToNodeHeartbeatMsg(report: ECMHealthReport) = {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org