remove unused code (#1204)

* update english documents * refactor zk client * update documents * update zkclient * update zkclient * update documents * add architecture-design * change i18n * update i18n * update english documents * add architecture-design * update english documents * update en-US documents * add architecture-design * update demo site * add mybatis plus model * modify mybatisplus * modify mybatisplus * change interface by mybatisplus * add unit test * refactor dao interface. * add unit test for dao... * add unit test for dao... * add unit test for dao... * Merge remote-tracking branch 'upstream/dev-db' into dev-db # Conflicts: # dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml # dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml # escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml # escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml # escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java * Merge remote-tracking branch 'upstream/dev-db' into dev-db # Conflicts: # dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml # dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml # escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml # escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml # escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java # escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java * Merge remote-tracking branch 'upstream/dev-db' into dev-db # Conflicts: # dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml # dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml # dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml * update some dao bugs * update for some bugs * update some bugs * Merge remote-tracking branch 'upstream/dev-db' into dev-db # Conflicts: # dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml # dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml # dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml * update * update * add multiply settings for application.yml * add multiply settings for application.yml * revert * update configuration settings in task record dao... * change application_master to application-master * change application_master to application-master * update application.yml to application.properties * revert * revert * add properties * add properties * revert * revert * add api start up.. add alert send try catch * update dao info level * fix bug: task cannot submit when recovery failover * fix bug: task cannot submit when recovery failover * merge from dev-db * revert * revert * fix bug: get process definition list failed. * fix bug: process instance interval is error * revert * revert * update * support stop submit success tasks * update kill process * update for stop process * update for stop process * add some logs for stop process * update for small bug. * add check strategy before submit task * revert * update * update * revert * wait task instance exists if null. * revert * update * change desc to description. * add check user and definitions function when delete tenant * update * change desc to description. * change desc to description. * change desc to description. * remove check resources when delete tenant * change desc to description. * change mybatisplus version to 3.2.0 * update * change the notice to apache. * update * update postgre sql * fix bug: phone can be empty. * fix bug: postgre test error. * update create table for postgre quartz * fix some bugs about postgre. * update create table for postgre quartz * add postgre db performance monitor * add postgre performance monitor * update performance monitor * revert * revert * fix bug: tasks queue length error * remove datasource.properties * change chinese sql to english. * change chinese sql to english. * remove unused code. * remove unused code.
5 years ago · c207c9d9fd
4 changed files with 0 additions and 212 deletions
--- a/dolphinscheduler-api/src/test/resources/dao/data_source.properties
+++ b/dolphinscheduler-api/src/test/resources/dao/data_source.properties
@ -1,53 +0,0 @@
 # base spring data source configuration
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.url=jdbc:mysql://192.168.10.32:3306/dolphinscheduler?characterEncoding=UTF-8
 spring.datasource.username=root
 spring.datasource.password=root@123
 # connection configuration
 spring.datasource.initialSize=5
 # min connection number
 spring.datasource.minIdle=5
 # max connection number
 spring.datasource.maxActive=50
 # max wait time for get a connection in milliseconds. if configuring maxWait, fair locks are enabled by default and concurrency efficiency decreases.
 # If necessary, unfair locks can be used by configuring the useUnfairLock attribute to true.
 spring.datasource.maxWait=60000
 # milliseconds for check to close free connections
 spring.datasource.timeBetweenEvictionRunsMillis=60000
 # the Destroy thread detects the connection interval and closes the physical connection in milliseconds if the connection idle time is greater than or equal to minEvictableIdleTimeMillis.
 spring.datasource.timeBetweenConnectErrorMillis=60000
 # the longest time a connection remains idle without being evicted, in milliseconds
 spring.datasource.minEvictableIdleTimeMillis=300000
 #the SQL used to check whether the connection is valid requires a query statement. If validation Query is null, testOnBorrow, testOnReturn, and testWhileIdle will not work.
 spring.datasource.validationQuery=SELECT 1
 #check whether the connection is valid for timeout, in seconds
 spring.datasource.validationQueryTimeout=3
 # when applying for a connection, if it is detected that the connection is idle longer than time Between Eviction Runs Millis,
 # validation Query is performed to check whether the connection is valid
 spring.datasource.testWhileIdle=true
 #execute validation to check if the connection is valid when applying for a connection
 spring.datasource.testOnBorrow=true
 #execute validation to check if the connection is valid when the connection is returned
 spring.datasource.testOnReturn=false
 spring.datasource.defaultAutoCommit=true
 spring.datasource.keepAlive=true
 # open PSCache, specify count PSCache for every connection
 spring.datasource.poolPreparedStatements=true
 spring.datasource.maxPoolPreparedStatementPerConnectionSize=20
 # data quality analysis is not currently in use. please ignore the following configuration
 # task record flag
 task.record.flag=false
 task.record.datasource.url=jdbc:mysql://192.168.xx.xx:3306/etl?characterEncoding=UTF-8
 task.record.datasource.username=xx
 task.record.datasource.password=xx
--- a/dolphinscheduler-common/src/test/resources/dao/data_source.properties
+++ b/dolphinscheduler-common/src/test/resources/dao/data_source.properties
@ -1,53 +0,0 @@
 # base spring data source configuration
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.url=jdbc:mysql://192.168.10.32:3306/dolphinscheduler?characterEncoding=UTF-8
 spring.datasource.username=root
 spring.datasource.password=root@123
 # connection configuration
 spring.datasource.initialSize=5
 # min connection number
 spring.datasource.minIdle=5
 # max connection number
 spring.datasource.maxActive=50
 # max wait time for get a connection in milliseconds. if configuring maxWait, fair locks are enabled by default and concurrency efficiency decreases.
 # If necessary, unfair locks can be used by configuring the useUnfairLock attribute to true.
 spring.datasource.maxWait=60000
 # milliseconds for check to close free connections
 spring.datasource.timeBetweenEvictionRunsMillis=60000
 # the Destroy thread detects the connection interval and closes the physical connection in milliseconds if the connection idle time is greater than or equal to minEvictableIdleTimeMillis.
 spring.datasource.timeBetweenConnectErrorMillis=60000
 # the longest time a connection remains idle without being evicted, in milliseconds
 spring.datasource.minEvictableIdleTimeMillis=300000
 #the SQL used to check whether the connection is valid requires a query statement. If validation Query is null, testOnBorrow, testOnReturn, and testWhileIdle will not work.
 spring.datasource.validationQuery=SELECT 1
 #check whether the connection is valid for timeout, in seconds
 spring.datasource.validationQueryTimeout=3
 # when applying for a connection, if it is detected that the connection is idle longer than time Between Eviction Runs Millis,
 # validation Query is performed to check whether the connection is valid
 spring.datasource.testWhileIdle=true
 #execute validation to check if the connection is valid when applying for a connection
 spring.datasource.testOnBorrow=true
 #execute validation to check if the connection is valid when the connection is returned
 spring.datasource.testOnReturn=false
 spring.datasource.defaultAutoCommit=true
 spring.datasource.keepAlive=true
 # open PSCache, specify count PSCache for every connection
 spring.datasource.poolPreparedStatements=true
 spring.datasource.maxPoolPreparedStatementPerConnectionSize=20
 # data quality analysis is not currently in use. please ignore the following configuration
 # task record flag
 task.record.flag=false
 task.record.datasource.url=jdbc:mysql://192.168.xx.xx:3306/etl?characterEncoding=UTF-8
 task.record.datasource.username=xx
 task.record.datasource.password=xx
--- a/dolphinscheduler-dao/src/test/resources/dao/data_source.properties
+++ b/dolphinscheduler-dao/src/test/resources/dao/data_source.properties
@ -1,53 +0,0 @@
 # base spring data source configuration
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.url=jdbc:mysql://192.168.10.32:3306/dolphinscheduler?characterEncoding=UTF-8
 spring.datasource.username=root
 spring.datasource.password=root@123
 # connection configuration
 spring.datasource.initialSize=5
 # min connection number
 spring.datasource.minIdle=5
 # max connection number
 spring.datasource.maxActive=50
 # max wait time for get a connection in milliseconds. if configuring maxWait, fair locks are enabled by default and concurrency efficiency decreases.
 # If necessary, unfair locks can be used by configuring the useUnfairLock attribute to true.
 spring.datasource.maxWait=60000
 # milliseconds for check to close free connections
 spring.datasource.timeBetweenEvictionRunsMillis=60000
 # the Destroy thread detects the connection interval and closes the physical connection in milliseconds if the connection idle time is greater than or equal to minEvictableIdleTimeMillis.
 spring.datasource.timeBetweenConnectErrorMillis=60000
 # the longest time a connection remains idle without being evicted, in milliseconds
 spring.datasource.minEvictableIdleTimeMillis=300000
 #the SQL used to check whether the connection is valid requires a query statement. If validation Query is null, testOnBorrow, testOnReturn, and testWhileIdle will not work.
 spring.datasource.validationQuery=SELECT 1
 #check whether the connection is valid for timeout, in seconds
 spring.datasource.validationQueryTimeout=3
 # when applying for a connection, if it is detected that the connection is idle longer than time Between Eviction Runs Millis,
 # validation Query is performed to check whether the connection is valid
 spring.datasource.testWhileIdle=true
 #execute validation to check if the connection is valid when applying for a connection
 spring.datasource.testOnBorrow=true
 #execute validation to check if the connection is valid when the connection is returned
 spring.datasource.testOnReturn=false
 spring.datasource.defaultAutoCommit=true
 spring.datasource.keepAlive=true
 # open PSCache, specify count PSCache for every connection
 spring.datasource.poolPreparedStatements=true
 spring.datasource.maxPoolPreparedStatementPerConnectionSize=20
 # data quality analysis is not currently in use. please ignore the following configuration
 # task record flag
 task.record.flag=false
 task.record.datasource.url=jdbc:mysql://192.168.xx.xx:3306/etl?characterEncoding=UTF-8
 task.record.datasource.username=xx
 task.record.datasource.password=xx
--- a/dolphinscheduler-server/src/test/resources/dao/data_source.properties
+++ b/dolphinscheduler-server/src/test/resources/dao/data_source.properties
@ -1,53 +0,0 @@
 # base spring data source configuration
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.url=jdbc:mysql://192.168.10.32:3306/dolphinscheduler?characterEncoding=UTF-8
 spring.datasource.username=root
 spring.datasource.password=root@123
 # connection configuration
 spring.datasource.initialSize=5
 # min connection number
 spring.datasource.minIdle=5
 # max connection number
 spring.datasource.maxActive=50
 # max wait time for get a connection in milliseconds. if configuring maxWait, fair locks are enabled by default and concurrency efficiency decreases.
 # If necessary, unfair locks can be used by configuring the useUnfairLock attribute to true.
 spring.datasource.maxWait=60000
 # milliseconds for check to close free connections
 spring.datasource.timeBetweenEvictionRunsMillis=60000
 # the Destroy thread detects the connection interval and closes the physical connection in milliseconds if the connection idle time is greater than or equal to minEvictableIdleTimeMillis.
 spring.datasource.timeBetweenConnectErrorMillis=60000
 # the longest time a connection remains idle without being evicted, in milliseconds
 spring.datasource.minEvictableIdleTimeMillis=300000
 #the SQL used to check whether the connection is valid requires a query statement. If validation Query is null, testOnBorrow, testOnReturn, and testWhileIdle will not work.
 spring.datasource.validationQuery=SELECT 1
 #check whether the connection is valid for timeout, in seconds
 spring.datasource.validationQueryTimeout=3
 # when applying for a connection, if it is detected that the connection is idle longer than time Between Eviction Runs Millis,
 # validation Query is performed to check whether the connection is valid
 spring.datasource.testWhileIdle=true
 #execute validation to check if the connection is valid when applying for a connection
 spring.datasource.testOnBorrow=true
 #execute validation to check if the connection is valid when the connection is returned
 spring.datasource.testOnReturn=false
 spring.datasource.defaultAutoCommit=true
 spring.datasource.keepAlive=true
 # open PSCache, specify count PSCache for every connection
 spring.datasource.poolPreparedStatements=true
 spring.datasource.maxPoolPreparedStatementPerConnectionSize=20
 # data quality analysis is not currently in use. please ignore the following configuration
 # task record flag
 task.record.flag=false
 task.record.datasource.url=jdbc:mysql://192.168.xx.xx:3306/etl?characterEncoding=UTF-8
 task.record.datasource.username=xx
 task.record.datasource.password=xx