Commit Graph

2213 Commits

Author SHA1 Message Date
老佛爷
4a25127f6d
Merge pull request #1904 from lfyee/dev
Remove ScheduleUtil,use the existing CronUtils
2020-02-07 21:35:24 +08:00
zhangzy
0eec3b8661 Remove useless code 2020-02-07 19:17:47 +08:00
zhangzy
6b586f31fc pom add ut, add cronutils ut 2020-02-07 18:34:38 +08:00
zhangzy
61593cfe6b ut change 2020-02-07 17:35:12 +08:00
zhangzy
515255b919 ut 2020-02-07 17:18:27 +08:00
zhangzy
a09d2d9d0a add CronUtils ut 2020-02-07 16:43:24 +08:00
zhangzy
5a8cb0fb21 Merge branch 'dev' of github.com:apache/incubator-dolphinscheduler into dev 2020-02-07 16:32:31 +08:00
Rubik
fccbcc8d7d
fix: The constructor has passed in an taskAppId, no need to get from taskAppId. (#1906) 2020-02-07 16:13:50 +08:00
zhangzy
9d944d3f76 Optimize duplicate code
Use public methods to simplify duplicate code
2020-02-07 15:47:07 +08:00
zhangzy
662233e0dd Remove ScheduleUtil,use the existing CronUtils
CronUtils is a public quartz tools, then the project dolphinscheduler-api can remove dolphinscheduler-server
2020-02-07 10:15:42 +08:00
Jave-Chen
b3b075d915
Fix bug: Use try-with-resources or close this "Statement" in a "finally" clause. (#1702)
* #1701  Fix bug: Use try-with-resources or close this "Statement" in a "finally" clause.

* fix some indent

* refix code smell
2020-02-06 19:32:31 +08:00
dailidong
18750dfc08
remove jasper-runtime jar, not need anymore (#1900)
* update README about DolphinScheduler

* Update issue templates

* update

* regularize api pom xml
update rpc maven compile to 1.8

* regularize api pom xml

* change commons.lang3.StringUtils to common.utils.StringUtils

* update pom.xml

* update

* correct equals method

* jasper-runtime is needed when api server start

* jasper-runtime jar is needed when api server start

* combine logback config of master/worker/alert/api server to one logback.xml

* remove tomcat runtime jar

* add UT

* add license

* remove jasper-runtime jar, not need anymore

Co-authored-by: DS <escheduler@outlook.com>
2020-02-06 18:52:44 +08:00
dailidong
c63cd3e237
combine logback config of master/worker/alert/api server to one (#1898)
* combine logback config of master/worker/alert/api server to one logback.xml
2020-02-06 11:08:06 +08:00
魔方不在手
f942e5ced3
[feature] data synchronization function (#1881)
* feature:data synchronization function

* feature:data synchronization function

* feature:data synchronization function

* fix:add license

* fix:resource close bug

* fix:remove class author

* fix:Improve test coverage

* fix:add UT

* fix:add UT

* fix:data sync node renamed to datax

* fix:add UT

* fix: UT bug

* fix:Optimize variable name

* fix:pom

* fix:Variable name error

* fix:optimize the code
2020-02-06 09:29:23 +08:00
dailidong
dbbc6f58da
jasper-runtime jar is needed when api server start (#1896)
* update README about DolphinScheduler

* Update issue templates

* update

* regularize api pom xml
update rpc maven compile to 1.8

* regularize api pom xml

* change commons.lang3.StringUtils to common.utils.StringUtils

* update pom.xml

* update

* correct equals method

* jasper-runtime is needed when api server start

* jasper-runtime jar is needed when api server start

Co-authored-by: DS <escheduler@outlook.com>
2020-02-05 09:21:21 +08:00
Yelli
78bfe918d0
change datasource null check position (#1883) 2020-02-03 11:07:19 +08:00
Tboy
42b3e5bd10
fix api server startup failure (#1886)
* move version to parent pom

* move version properties to parent pom for easy management

* remove freemarker dependency

* delete CombinedApplicationServer

* #1871 correct spelling

* #1873 some updates for TaskQueueZkImpl

* #1875 remove unused properties in pom

* #1878
1. remove tomcat dependency
2. remove combined_logback.xml in api module
3. format pom.xml for not aligning

* #1885 fix api server startup failure
1. add jsp-2.1 dependency
2. remove jasper-runtime dependency
2020-02-03 11:06:31 +08:00
Yelli
5169689c35
class overrides equals() and should therefore also override hashCode() (#1882) 2020-02-03 10:24:24 +08:00
Tboy
6b0debec79
some updates for pom (#1879)
* move version to parent pom

* move version properties to parent pom for easy management

* remove freemarker dependency

* delete CombinedApplicationServer

* #1871 correct spelling

* #1873 some updates for TaskQueueZkImpl

* #1875 remove unused properties in pom

* #1878
1. remove tomcat dependency
2. remove combined_logback.xml in api module
3. format pom.xml for not aligning
2020-02-01 16:10:17 +08:00
Tboy
a5536617dd
remove unused properties in pom (#1876)
* #1875 remove unused properties in pom
2020-01-30 19:50:04 +08:00
Tboy
38eaaa98e6 some updates for TaskQueueZkImpl (#1874)
small changes, no need more people review, I will merge.
2020-01-27 21:09:11 +08:00
Tboy
0712ccc342 #1871 correct spelling (#1872)
* move version to parent pom

* move version properties to parent pom for easy management

* remove freemarker dependency

* delete CombinedApplicationServer

* #1871 correct spelling
2020-01-26 13:30:59 +08:00
DS
541f71c74a Update README.md (#1870)
fix wrong upgrade url
2020-01-24 10:11:30 +08:00
DS
b5a1028f79 Update README_zh_CN.md (#1869)
fix wrong upgrade url
2020-01-24 10:08:38 +08:00
DS
8574762b37 Update README_zh_CN.md (#1868) 2020-01-24 10:01:48 +08:00
DS
3c9508a147 Update README.md (#1867) 2020-01-24 09:50:21 +08:00
Jave-Chen
ff9009a5ae #1864 fix dependency and createCommand date check (#1865) 2020-01-22 23:16:13 +08:00
gabry.wu
0d5c6e4e7c [Feature] set acquireTriggersWithinLock true (#1866)
issue: https://github.com/apache/incubator-dolphinscheduler/issues/1863
2020-01-22 21:09:12 +08:00
gabry.wu
a1b918c364 [Feature] createSchedule should return schedule's Id (#1861)
issue: https://github.com/apache/incubator-dolphinscheduler/issues/1860
2020-01-20 16:35:17 +08:00
liwenhe1993
30db5c1467 Api module relp server module/1756 (#1766)
* Remove server module on api module

1. Remove server module and add dao module.
2. Move quartz in server module to dao module.
3. Update config and class.


to resolve conflicts,I deleted CombinedApplicationServer.java

Co-authored-by: dailidong <dailidong66@gmail.com>
2020-01-20 16:26:23 +08:00
break60
9549910fcc Fix UDF function list delete data without refresh and page data display widened #1851 (#1853)
* fix udfs assignment and task instance page jump #1789

* jest add coverage display

* Fix data echo, style, popup cannot be closed and license

* Fix data echo, style, popup cannot be closed and license

* fix

* Requests the previous page when there is no data on the list page

* Fix DAG task nodes keep requesting API and tooltip background color modification

* Modify list tooltip theme color

* Fix UDF function list delete data without refresh and page data display widened
2020-01-19 11:59:06 +08:00
Jave-Chen
16913bacd7 fix return, obj error (#1855) 2020-01-17 21:55:50 +08:00
Jave-Chen
d371745ddf Fix bug: Use try-with-resources or close this "Socket" in a "finally" clause. (#1716)
* #1714
2020-01-17 19:17:30 +08:00
Jave-Chen
c522ea7ebb Fix bug: NullPointerException etc. (#1721)
* #1720 Fix bug: NullPointerException etc.

* fix code smell

* Update DateInterval.java

refactor equals method

Co-authored-by: dailidong <dailidong66@gmail.com>
2020-01-17 16:55:01 +08:00
gabry.wu
abe80fc538 [Feature] python task logs print delayed (#1844)
* [Feature] python task logs print delayed
#1843
2020-01-17 16:04:59 +08:00
samz406
aa91572def fix Misspelled words (#1841)
* modify UdfFuncServiceTest UT

* fix get tenantCode my NPE

* add  ResourcesServiceTest

* add error log

* add BaseServiceTest BaseServiceTest UT

* update

* fix word spelling

* Revert "fix word spelling"

This reverts commit 19bde51350.

* fix Misspelled words
2020-01-17 15:04:53 +08:00
break60
60bb2deb2a Modify list tooltip theme color (#1845)
* fix udfs assignment and task instance page jump #1789

* jest add coverage display

* Fix data echo, style, popup cannot be closed and license

* Fix data echo, style, popup cannot be closed and license

* fix

* Requests the previous page when there is no data on the list page

* Fix DAG task nodes keep requesting API and tooltip background color modification

* Modify list tooltip theme color
2020-01-17 15:02:47 +08:00
lilin
9ebe177e11 fix Misspelled words 2020-01-16 16:55:45 +08:00
lilin
25c63336bf Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into apache-dev
# Conflicts:
#	pom.xml
2020-01-16 16:32:08 +08:00
lilin
55923016b4 Revert "fix word spelling"
This reverts commit 19bde51350.
2020-01-16 15:57:16 +08:00
lilin
19bde51350 fix word spelling 2020-01-16 15:43:58 +08:00
老佛爷
1c77708a89 Supplementary data by schedule (#1830)
* Supplementary data by schedule

* fix sonar check bug

* fix code duplicated blocks

* ut

* loop by day

* MasterExecThread test

* test add licene

Co-authored-by: dailidong <dailidong66@gmail.com>
2020-01-16 15:33:00 +08:00
qiaozhanwei
53814425b7 revert #1686 (#1840)
* remove LogViewServiceGrpc.java file and pom modify

* remove kazoo

* remove kazoo

* remove kazoo

* remove common monitor package

* add license

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* install.sh remove python kazoo

* add system param whether repeat running

* remove kazoo modify

* BusinessTimeUtils remove whther repeat running inner param

* add AccessTokenMapperTest UT

* CI UT yml modify,start postgresql and zookeeper by default

* add AlertGroupMapperTest UT in github action

* Conflicts reslove

* AlertMappert UT modify

* AlertMappert UT modify

* AlertMappert UT modify

* CommandMapperTest UT modify

* DataSourceMapperTest UT modify

* fix #1775 bug,delete process definition when process instance is running

* verifyTenantIsNull remove process definnition id print log

* revert #1686

* revert #1686
2020-01-16 15:09:13 +08:00
break60
5739afb95a Fix DAG task nodes keep requesting API and tooltip background color modification (#1837)
* fix udfs assignment and task instance page jump #1789

* jest add coverage display

* Fix data echo, style, popup cannot be closed and license

* Fix data echo, style, popup cannot be closed and license

* fix

* Requests the previous page when there is no data on the list page

* Fix DAG task nodes keep requesting API and tooltip background color modification
2020-01-16 11:27:43 +08:00
gabry.wu
c531c88e7e [Feature] AbstractCommandExecutor.commandType difficult to understand (#1833)
issue: https://github.com/apache/incubator-dolphinscheduler/issues/1831
2020-01-16 11:27:22 +08:00
samz406
c558da0b75 add BaseServiceTest BaseDAGServiceTest UT (#1835)
* modify UdfFuncServiceTest UT

* fix get tenantCode my NPE

* add  ResourcesServiceTest

* add error log

* add BaseServiceTest BaseServiceTest UT

* update
2020-01-16 11:25:40 +08:00
lgcareer
779672ec2a [Fix issue #1770]check udf and data source in order to fix issue 1770 (#1826)
* check udf and data source in order to fix issue 1770

* check udf and data source in order to fix issue 1770

* update testListAuthorizedUdfFunc
2020-01-15 15:07:00 +08:00
lilin
b34f9745dc update 2020-01-15 14:56:17 +08:00
lilin
b4a6d5440f add BaseServiceTest BaseServiceTest UT 2020-01-15 14:11:09 +08:00
ZHAOLIPAN
07f96375b3 replace strings with constants already exist. (#1825) 2020-01-15 14:00:28 +08:00