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:50 UTC

[incubator-linkis] 08/11: Added DataSourceUtils tool class for creating datasource #1574

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