Commit Graph

2213 Commits

Author SHA1 Message Date
break60
5bff786e7c Fix the problem of data echo in script edit box 2020-04-02 17:00:16 +08:00
break60
8da2a50d16 Corrections to historical jar packages and resource data 2020-04-01 21:05:54 +08:00
break60
8561d65b2b Corrections to historical jar packages and resource data 2020-04-01 17:38:57 +08:00
break60
70571db6d9 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-04-01 13:30:43 +08:00
lgcareer
db30721f5e
init full_name in dml of version 1.2.2 (#2341)
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-04-01 11:56:28 +08:00
break60
2dde60145b Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-04-01 11:13:16 +08:00
Rubik-W
f60edc8e61
fix:mail send fail #2345 (#2346)
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-03-31 21:58:15 +08:00
BoYiZhang
4db2ac232a
Remove invalid code (#2342)
Co-authored-by: zhanglong <zhanglong@ysstech.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-03-31 21:08:59 +08:00
gabry.wu
718e4b15d2
Adapting partial code(file name start with O) to the sonar cloud rule (#2259)
* Adapting partial code(file name start with O) to the sonar cloud rule

* resolve conflict with dev branch

Co-authored-by: dailidong <dailidong66@gmail.com>
2020-03-31 12:13:34 +08:00
break60
becc2de967 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-03-31 11:22:43 +08:00
break60
2b17435337
Supplemental licenses and repair resources cannot be renamed (#2340)
* Change DOM label

* Change name to lowercase

* Limit customization file content to no more than 3000 lines

* dd branch flow node verification

* datax

* datax add custom

* Change normalize.scss import method and animation.scss license modification

* Resource tree code merge

* Modify ans-ui version and timing management style

* Supplemental licenses and repair resources cannot be renamed
2020-03-31 11:11:50 +08:00
break60
b7bf172d62 Supplemental licenses and repair resources cannot be renamed 2020-03-31 10:55:24 +08:00
break60
9ff7b322a8 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-03-31 10:52:52 +08:00
break60
2114c8d95f
Modify ans-ui version and timing management style (#2339)
* Change DOM label

* Change name to lowercase

* Limit customization file content to no more than 3000 lines

* dd branch flow node verification

* datax

* datax add custom

* Change normalize.scss import method and animation.scss license modification

* Resource tree code merge

* Modify ans-ui version and timing management style
2020-03-31 10:51:04 +08:00
break60
92d944edde Modify ans-ui version and timing management style 2020-03-31 09:08:30 +08:00
break60
a56ec7c559 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-03-31 09:07:34 +08:00
dailidong
b5ff3ad39e
Delete ReleaseNotes.md (#2338) 2020-03-31 07:55:17 +08:00
break60
520c40b626 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-03-30 18:08:04 +08:00
Rubik-W
4440b35c4e
fix #2334 (#2335)
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-03-30 16:22:44 +08:00
songgg
f7e89e4561
some annotation optimizations (#2333)
Co-authored-by: songqh <songquanhe@foxmail.com>
2020-03-30 12:09:34 +08:00
break60
3edca1465d Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-03-30 09:14:36 +08:00
liwenhe1993
526e5c91f1
Connection mode of adding Sid to Oracle (#2254)
* Connection mode of adding Sid to Oracle

* Remove code

* Add asf

* Add unit test

* Add unit test

* Add unit test

* solve the conflict
2020-03-28 23:28:35 +08:00
liwenhe1993
6cf7e6c115
Remove .helmignore file (#2328) 2020-03-28 22:07:49 +08:00
liwenhe1993
f6ca5480dd
Support kubernetes deployment (#2153)
* Support kubernetes deployment

* Support kubernetes deployment
2020-03-28 17:45:58 +08:00
t1mon
d4735334a1
Fix SqlTask kerberos load scope unreasonable. #2178 (#2321)
* Optimize PropertyUtils instantiation.

* Fix info error.

* Fix SqlTask kerberos load scope unreasonable. #2178
2020-03-28 17:42:33 +08:00
break60
570f8f523d Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-03-28 17:36:58 +08:00
Rubik-W
a851168a35
fix:Optimize content returned by interface (#2294) 2020-03-28 15:50:14 +08:00
break60
2aa4ac8884 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-03-28 15:46:57 +08:00
lgcareer
38c965ddc9
new feature for #404 add resource tree function (#2323)
* add create resource directory

* add create resource directory

* update the resource test

* add upgrade sql in version 1.2.2

* Adding request parameter id to update queryResourceListPaging

* set isDirectory value is false default

* add full name to update updateResource

* remove request parameter isDirectory to update createResource method

* update queryResourceListPaging with change get to post

* update updateResource method with remove fullName

* File management list modification (#1976)

* add resource component

* add resource tree visitor

* return json string

* update queryResourceList

* upload file need fullName

* add method rootNode

* Shell task resources and authorization resources (#1989)

* File management list modification

* Shell task resources and authorization resources

* download resource when execute task

* download resource when execute task

* update authorization type

* download resource when execute task

* Spark task resource changes (#1990)

* File management list modification

* Shell task resources and authorization resources

* Spark task resource changes

* download resource when execute task

* update udf function service

* add resource type in ResourceComponent

* UDF resource tree and change DAG style (#2019)

* File management list modification

* Shell task resources and authorization resources

* Spark task resource changes

* UDF resource tree and change DAG style

* add deleteIds method in ResourceMapper and ResourceMapperTest

* Add comments on class and method

* add queryResourceByName method in controller

* update verify-name with change name to full name

* update queryResource with add parameter pid

* update queryResource with add parameter pid

* add resource ids in process definition and delete resource need judge whether it is used by any process definition

* Breadcrumb development (#2033)

* File management list modification

* Shell task resources and authorization resources

* Spark task resource changes

* UDF resource tree and change DAG style

* Breadcrumb development

* Breadcrumb development

* Resource tree bug fix (#2040)

* File management list modification

* Shell task resources and authorization resources

* Spark task resource changes

* UDF resource tree and change DAG style

* Breadcrumb development

* Breadcrumb development

* Resource tree bug fix

* update resource service test

* Fix github action rerun failed

* add status of PARENT_RESOURCE_NOT_EXIST

* Fix github action rerun failed (#2067)

* update resource service test

* Fix github action rerun failed

* add status of PARENT_RESOURCE_NOT_EXIST

* Change crumb position

* Change crumb position (#2068)

* build resource process definition map

* UDF changed to multiple choice

* UDF changed to multiple choice (#2077)

* Change crumb position

* UDF changed to multiple choice

* build resource process definition map (#2076)

* update resource service test

* Fix github action rerun failed

* add status of PARENT_RESOURCE_NOT_EXIST

* build resource process definition map

* update resource name also need update all the children full name

* need add queryResource

* update resource name also need update all the children full name (#2096)

* update resource service test

* Fix github action rerun failed

* add status of PARENT_RESOURCE_NOT_EXIST

* build resource process definition map

* update resource name also need update all the children full name

* need add queryResource

* Limit customization file content to no more than 3000 lines

* Limit customization file content to no more than 3000 lines(#2128)

* Limit customization file content to no more than 3000 lines(#2128) (#2140)

* Change crumb position

* UDF changed to multiple choice

* Limit customization file content to no more than 3000 lines

* Limit customization file content to no more than 3000 lines(#2128)

* add queryResourceJarList

* add queryResourceJarList

* add queryResourceJarList

* add queryResourceJarList (#2192)

* update resource service test

* Fix github action rerun failed

* add status of PARENT_RESOURCE_NOT_EXIST

* build resource process definition map

* update resource name also need update all the children full name

* need add queryResource

* add queryResourceJarList

* add queryResourceJarList

* add queryResourceJarList

* Modify the main jar package

* Modify the main jar package (#2200)

* Change crumb position

* UDF changed to multiple choice

* Limit customization file content to no more than 3000 lines

* Limit customization file content to no more than 3000 lines(#2128)

* Modify the main jar package

* add resource filter in order to get filtered resource

* add comments of resource filter

* update list children by resource

* choose main jar with resource tree (#2220)

* update resource service test

* Fix github action rerun failed

* add status of PARENT_RESOURCE_NOT_EXIST

* build resource process definition map

* update resource name also need update all the children full name

* need add queryResource

* add queryResourceJarList

* add queryResourceJarList

* add queryResourceJarList

* add resource filter in order to get filtered resource

* add comments of resource filter

* update list children by resource

* Return null if query resource list is empty

* update queryResource method change parameter pid to id

* getResouDelete checksum and modify parameter namerceId

* revert .env

* remove parameter pid

* Delete request interface

* go back to the last page

* jar interface call

* Fix issue #2234 and #2228

* change resource name with full name

* Fix issue #2234 and #2228 (#2246)

* update resource service test

* Fix github action rerun failed

* add status of PARENT_RESOURCE_NOT_EXIST

* build resource process definition map

* update resource name also need update all the children full name

* need add queryResource

* add queryResourceJarList

* add queryResourceJarList

* add queryResourceJarList

* add resource filter in order to get filtered resource

* add comments of resource filter

* update list children by resource

* Return null if query resource list is empty

* update queryResource method change parameter pid to id

* revert .env

* remove parameter pid

* Fix issue #2234 and #2228

* change resource name with full name

* Fix list query value error

* remove unauth-file with authorize-resource-tree

* Repair data cannot be echoed

* Repair data cannot be echoed

* execute mr and spark task need query resource name before

* Authorized resource interface replacement

* Authorized resource interface replacement

* Filter UDF resources

* Change parameters

* need query all authorized directory children when create task

* Change normalize.scss import method and animation.scss license modification

* Delete file list update processing

* It's fixed that resource not deleted in hdfs when delete it.

* add tooltips

* add tooltips (#2310)

* Echo workflow name and modify udf management name

* [new feature]add resource tree function

* revert front code in order to be same as dev branch

* revert front code in order to be same as dev branch

* revert common.properties and application.properties

* add super method

* update flink parameter test

* update flink parameter and unit test

* update resource service test

* If resource list is empty,need init it

* update flink parameter test

Co-authored-by: break60 <790061044@qq.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
2020-03-28 15:43:07 +08:00
gabry.wu
48d7612cd5
Adapting partial code(file name start with S #2) to the sonar cloud rule (#2270) 2020-03-28 11:50:38 +08:00
liwenhe1993
c706b21c62
taskProps.getScheduleTime() may be null, but there is no check if it … (#2256)
* taskProps.getScheduleTime() may be null, but there is no check if it is null or not

* Add unit test
2020-03-28 10:42:46 +08:00
break60
7780153bdd Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-03-28 10:05:20 +08:00
break60
c52c92e015
Resource tree code merge (#2322)
* Change DOM label

* Change name to lowercase

* Limit customization file content to no more than 3000 lines

* dd branch flow node verification

* datax

* datax add custom

* Change normalize.scss import method and animation.scss license modification

* Resource tree code merge
2020-03-28 09:26:36 +08:00
break60
64b28a5171 Resource tree code merge 2020-03-27 19:16:48 +08:00
break60
fd250ff3d3 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-03-27 15:13:14 +08:00
gabry.wu
eef8bf4e6d
Adapting partial code(file name start with P #2) to the sonar cloud rule (#2260) 2020-03-26 23:36:17 +08:00
孙朝和
d8cba5ff1b
resolve shell task build command nullpointexception (#2267)
Co-authored-by: sunchaohe <sunzhaohe@linklogis.com>
2020-03-26 23:25:15 +08:00
t1mon
efde8fd4e7
Refactor BaseDataSource and unified handling of JDBC resource releases. (#2184)
* Refactor BaseDataSource.isConnectable().

* Add BaseDataSource test.

* Unified handling of JDBC resource releases.

* Fix sonar check error.

* Remove useless logger.

* Refactor BaseDataSource.getJdbcUrl().

* Modify ConnectionUtils.releaseResource().

* Add javadoc

* Remove useless method.

* Add BaseDataSourceTest UT
2020-03-26 23:23:19 +08:00
gabry.wu
d83a94a305
Adapting partial code(file name start with T) to the sonar cloud rule (#2271) 2020-03-26 23:17:28 +08:00
tswstarplanet
74525c28b5
Decouple DruidDataSource in ConnectionFactory and cache DataSource instance (#2232)
* Decouple DruidDataSource in ConnectionFactory and cache DataSource
instance

* init dataSource first

* fix code smell

* add unit test

* add unit test

* add unit test

* add unit test

* fix unit test

* delete useless logger
2020-03-26 20:07:52 +08:00
gabry.wu
42f9385ee4
Adapting partial code(file name start with W) to the sonar cloud rule (#2287) 2020-03-26 20:04:30 +08:00
WeiYe
a1b8386c8c
Update test code logger class name (#2303) 2020-03-26 20:03:44 +08:00
xingchun-chen
5edc2af311
e2e add project and workflow case (#2309)
* add LoginTest license

* Delete useless packages

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

Co-authored-by: chenxingchun <438044805@qq.com>
2020-03-25 22:27:41 +08:00
break60
0d70e065ba
Change normalize.scss import method and animation.scss license modification (#2295)
* Change DOM label

* Change name to lowercase

* Limit customization file content to no more than 3000 lines

* dd branch flow node verification

* datax

* datax add custom

* Change normalize.scss import method and animation.scss license modification
2020-03-24 17:40:09 +08:00
break60
5c2e94e99e Change normalize.scss import method and animation.scss license modification 2020-03-24 10:44:47 +08:00
break60
1964d47bdb Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-03-24 09:57:27 +08:00
khadgarmage
53b62d403f
add ds logs and server status check with e2e test (#2277) 2020-03-23 14:40:08 +08:00
break60
3ced3d594b
datax add custom and add branch flow node verification (#2218)
* Change DOM label

* Change name to lowercase

* Limit customization file content to no more than 3000 lines

* dd branch flow node verification

* datax

* datax add custom
2020-03-23 10:10:31 +08:00
songquanhe-gitstudy
85f55cd5f9
fix: No operations allowed after statement closed when running sql task (#2265)
* sqlTask failed to run

* get correct attribute value and logger content

Co-authored-by: songqh <songquanhe@foxmail.com>
2020-03-22 22:32:20 +08:00
liwenhe1993
34e2f67e0e
when running windows bat script, the handle is invalid in win7 (#2269) 2020-03-22 22:07:59 +08:00