JinyLeeChina
a467fffd7b
[Feature][JsonSplit] fix taskId in json ( #5165 )
...
* modify checkDAGRing and ProcessService method
* merge
* modify dagRing
* modify process instance for project home page
* fix save process bug
* codeStyle
* Fix logical bug in saving process definition
* codeSytle
* Fix bug in interface of queryProcessDefinitionList
* codeSytle
* Fix api bug"
* fix taskId in processDefinitionJson
* fix json taskId
* codeStyle
Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-03-29 14:22:40 +08:00
lenboo
0914699fc5
Merge branch 'json_split' of https://github.com/apache/incubator-dolphinscheduler into spilit
2021-03-26 00:06:26 +08:00
lenboo
f05ba84968
Merge remote-tracking branch 'upstream/dev' into spilit
...
# Conflicts:
# dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.java
# dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapperTest.java
2021-03-25 23:54:01 +08:00
Simon
cd19507271
[feature][jsonsplit]fix copy/export/import processDefinition bugs ( #5146 )
...
* Modify Project and ProjectUser Mapper
* Modify Project and ProjectUser Mapper
* project_code is bigint(20)
* modify ERROR name
* modify saveProcessDefine, remove the duplicate code with createTaskAndRelation
* modify import/export processdefinition, add genProcessData
* fix ut and bug
* code style
* repalce project_id with code
* conflicts solve
* conflicts solve
* conflicts solve
* bugfix
* modify listResources mothod and remove getResourceIds mothod
* 1
* conflicts solve
* modify listResources mothod and remove getResourceIds mothod
* modify listResources mothod and remove getResourceIds mothod
* replace processDefinitionVersion with processDefinitionLog
* codestyle
* codestyle
* add mapper module ut
* codestyle
* fix ProcessInstanceMapperTest
* codestyle
* conflicts solve
* conflicts solve
* conflicts solve
* conflicts solve
* conflicts solve
* fix ProcessInstanceMapperTest
* fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest
* fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest
* fix TaskInstanceMapperTest
* add TaskDefinitionLogMapperTest/TaskDefinitionMapperTest and bugfix
* codestyle
* codestyle
* Refactor process lineage
* Refactor process lineage
* codestyle
* codestyle
* Refactor process lineage
* Refactor process lineage
* add WorkFlowLineageMapperTest/WorkFlowLineageServiceTest
* add WorkFlowLineageMapperTest/WorkFlowLineageServiceTest
* add ProcessServiceTest
* 1
* 1
* fix copy/export/import processDefinition bugs
* 1
* codestyle
2021-03-25 18:27:47 +08:00
Simon
21b7b77d50
[Feature][JsonSplit]fix modifyBy field ( #5112 )
...
* Modify Project and ProjectUser Mapper
* Modify Project and ProjectUser Mapper
* project_code is bigint(20)
* modify ERROR name
* modify saveProcessDefine, remove the duplicate code with createTaskAndRelation
* modify import/export processdefinition, add genProcessData
* fix ut and bug
* code style
* repalce project_id with code
* conflicts solve
* conflicts solve
* conflicts solve
* bugfix
* modify listResources mothod and remove getResourceIds mothod
* 1
* conflicts solve
* modify listResources mothod and remove getResourceIds mothod
* modify listResources mothod and remove getResourceIds mothod
* replace processDefinitionVersion with processDefinitionLog
* codestyle
* codestyle
* add mapper module ut
* codestyle
* fix ProcessInstanceMapperTest
* codestyle
* conflicts solve
* conflicts solve
* conflicts solve
* conflicts solve
* conflicts solve
* fix ProcessInstanceMapperTest
* fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest
* fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest
* fix TaskInstanceMapperTest
* add TaskDefinitionLogMapperTest/TaskDefinitionMapperTest and bugfix
* codestyle
* codestyle
* Refactor process lineage
* Refactor process lineage
* codestyle
* codestyle
* Refactor process lineage
* Refactor process lineage
* add WorkFlowLineageMapperTest/WorkFlowLineageServiceTest
* add WorkFlowLineageMapperTest/WorkFlowLineageServiceTest
* add ProcessServiceTest
* 1
* 1
* fix modifyBy field
* 1
* ut fix
2021-03-24 14:54:34 +08:00
wenjun
5d264c9f20
[Improvement][Api] Optimize query processInstanceList #5134 ( #5135 )
...
* Batch query user rather than several query
2021-03-23 23:48:13 +08:00
Shiwen Cheng
0d065c0712
[Feature-5062][*] Create/Edit/Delete Worker Group in Web UI ( #5113 )
...
* [Improvement][Server] Rename MASTER_PREFIX to MASTER_TYPE and WORKER_PREFIX to WORKER_TYPE
* [Feature][Api&Dao] Support api and dao of worker group
* [Feature][UI] Support to create, edit and delete worker group
* [Feature][API&UI] Support work groups from database and zookeeper to display together in worker group management
* [Feature][API&Dao] Support long ip list and check request parameters when saving worker group
* [Feature][*] Refactor ipList to addrList
* [Feature][Server] Support host manager to select worker host by worker group in database
* [Improvement][Server] Improve the config of master and worker
* [Improvement][*] Rename zkRegistered to systemDefault
* [Improvement][Test] Fix unit test and improve ui
* [Improvement][Server] Improve getServerMaps
Co-authored-by: dailidong <dailidong66@gmail.com>
2021-03-23 23:47:41 +08:00
JinyLeeChina
d99934d0da
[Feature][JsonSplit] Fix api bug ( #5102 )
...
* modify checkDAGRing and ProcessService method
* merge
* modify dagRing
* modify process instance for project home page
* fix save process bug
* codeStyle
* Fix logical bug in saving process definition
* codeSytle
* Fix bug in interface of queryProcessDefinitionList
* codeSytle
* Fix api bug"
Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-03-23 10:44:25 +08:00
lenboo
010b49c933
merge from dev
2021-03-22 15:18:16 +08:00
zhuangchong
ba039dc252
[Improvement][dao] Resource features SQL slow query optimization. ( #4947 )
...
* Resourse features SQL slow query optimization.
* update resource mapper queryResourcePaging method.
* split resource and resource_uesr sql statement.
* determine the size of the collection.
* update process service class code style.
* update ResourceUserMapper java class code style.
* add resourceUserMapper in the test config file.
* solve code smell
* split paging query join statement.
* update ResourceUserMapper class.
* remove sql join statement.
* update resource test class code style.
* update ResourcesServiceTest test class.
* rerun ut.
* update user service test class.
* solve query resource list method code smell.
2021-03-20 12:50:26 +08:00
guohaozhang
4a6e8b7afa
[Fix-#5103] fix resource rename cause can not update ( #5107 )
2021-03-19 14:51:12 +08:00
wenjun
086e716441
[Improvement][Dao] SQL optimization - check exist #5069 ( #5070 )
2021-03-18 22:49:12 +08:00
Shiwen Cheng
5856a12855
[Improvement-4984][Worker] Refactor and Improve worker load balance ( #4996 )
...
* [Improvement][Remote] Improve unit tests
* [Improvement][Worker] Improve worker load balance
* [Improvement][Worker] Fix code smells
* [Improvement][Worker] Rename weight to hostWeight
2021-03-18 10:03:58 +08:00
zhuangchong
705715c313
[Improvement-5059][API] Verify that the new workflow definition version is the current version before removing it #5059 ( #5060 )
...
* this process definition version is used, not allowed to delete.
* update ProcessDefinitionVersionServiceTest test class.
* update check has associated process definition sql.
2021-03-18 09:37:17 +08:00
lenboo
cf63fc1fee
Merge remote-tracking branch 'upstream/dev' into spilit
2021-03-16 15:50:06 +08:00
Simon
00dcc3f78e
[Feature][jsonsplit]add WorkFlowLineageMapperTest/WorkFlowLineageServiceTest ( #5047 )
...
* Modify Project and ProjectUser Mapper
* Modify Project and ProjectUser Mapper
* project_code is bigint(20)
* modify ERROR name
* modify saveProcessDefine, remove the duplicate code with createTaskAndRelation
* modify import/export processdefinition, add genProcessData
* fix ut and bug
* code style
* repalce project_id with code
* conflicts solve
* conflicts solve
* conflicts solve
* bugfix
* modify listResources mothod and remove getResourceIds mothod
* 1
* conflicts solve
* modify listResources mothod and remove getResourceIds mothod
* modify listResources mothod and remove getResourceIds mothod
* replace processDefinitionVersion with processDefinitionLog
* codestyle
* codestyle
* add mapper module ut
* codestyle
* fix ProcessInstanceMapperTest
* codestyle
* conflicts solve
* conflicts solve
* conflicts solve
* conflicts solve
* conflicts solve
* fix ProcessInstanceMapperTest
* fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest
* fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest
* fix TaskInstanceMapperTest
* add TaskDefinitionLogMapperTest/TaskDefinitionMapperTest and bugfix
* codestyle
* codestyle
* Refactor process lineage
* Refactor process lineage
* codestyle
* codestyle
* Refactor process lineage
* Refactor process lineage
* add WorkFlowLineageMapperTest/WorkFlowLineageServiceTest
* add WorkFlowLineageMapperTest/WorkFlowLineageServiceTest
2021-03-16 15:44:45 +08:00
JinyLeeChina
d98c2c5cfe
[Feature][JsonSplit] Fix bug in interface of queryProcessDefinitionList ( #5043 )
...
* modify checkDAGRing and ProcessService method
* merge
* modify dagRing
* modify process instance for project home page
* fix save process bug
* codeStyle
* Fix logical bug in saving process definition
* codeSytle
* Fix bug in interface of queryProcessDefinitionList
* codeSytle
Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-03-16 15:44:03 +08:00
Kirs
6bf5031f45
[FIX] fix MySQL datasource jdbc connect parameters ( #4851 )
...
* [FIX-CVE-2020-11974] fix MySQLDataSource Security
* remove useless code
* add ut
* A more reasonable way
* code style
* fix test error
* code style
* update exception msg
2021-03-16 14:40:07 +08:00
Simon
22ec6c069d
[Feature][jsonsplit]Refactor process lineage ( #5034 )
...
* Modify Project and ProjectUser Mapper
* Modify Project and ProjectUser Mapper
* project_code is bigint(20)
* modify ERROR name
* modify saveProcessDefine, remove the duplicate code with createTaskAndRelation
* modify import/export processdefinition, add genProcessData
* fix ut and bug
* code style
* repalce project_id with code
* conflicts solve
* conflicts solve
* conflicts solve
* bugfix
* modify listResources mothod and remove getResourceIds mothod
* 1
* conflicts solve
* modify listResources mothod and remove getResourceIds mothod
* modify listResources mothod and remove getResourceIds mothod
* replace processDefinitionVersion with processDefinitionLog
* codestyle
* codestyle
* add mapper module ut
* codestyle
* fix ProcessInstanceMapperTest
* codestyle
* conflicts solve
* conflicts solve
* conflicts solve
* conflicts solve
* conflicts solve
* fix ProcessInstanceMapperTest
* fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest
* fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest
* fix TaskInstanceMapperTest
* add TaskDefinitionLogMapperTest/TaskDefinitionMapperTest and bugfix
* codestyle
* codestyle
* Refactor process lineage
* Refactor process lineage
* codestyle
* codestyle
* Refactor process lineage
* Refactor process lineage
2021-03-12 18:22:34 +08:00
lenboo
a574d2e38c
Merge remote-tracking branch 'upstream/dev' into spilit
2021-03-12 10:44:43 +08:00
Shiwen Cheng
ae608e024a
[Fix-5037][Server] Fix that both the master and the worker is hanging after restarting and stopping ( #5038 )
...
* [Fix-5037][Server] Fix that both the master and the worker is hanging after restarting and stopping
* [Improvement][*] Replace commons.lang.StringUtils with common.utils.StringUtils
2021-03-12 09:33:30 +08:00
lenboo
6ef54ebe9b
Merge remote-tracking branch 'upstream/dev' into spilit
2021-03-11 17:01:29 +08:00
Shiwen Cheng
beb5adb985
[Feature][MR] Support mapreduce name ( #5029 )
2021-03-11 12:35:08 +08:00
Simon
40bcb2e818
[Feature][jsonsplit]fix TaskInstanceMapperTest ( #5010 )
...
* fix TaskInstanceMapperTest
2021-03-09 12:55:56 +08:00
JinyLeeChina
c010ac1f1d
[Feature][JsonSplit] Fix logical bug in saving process definition ( #5009 )
...
* modify checkDAGRing and ProcessService method
* modify process instance for project home page
* fix save process bug
* Fix logical bug in saving process definition
Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-03-09 12:54:25 +08:00
JinyLeeChina
7f0678d3be
[Feature][JsonSplit] Fix save process bug ( #5001 )
...
* modify checkDAGRing and ProcessService method
* merge
* modify dagRing
* modify process instance for project home page
* fix save process bug
* codeStyle
Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-03-08 17:01:02 +08:00
Simon
ab18ca0acb
[Feature][jsonsplit]fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest ( #5000 )
...
* Modify Project and ProjectUser Mapper
* Modify Project and ProjectUser Mapper
* project_code is bigint(20)
* modify ERROR name
* modify saveProcessDefine, remove the duplicate code with createTaskAndRelation
* modify import/export processdefinition, add genProcessData
* fix ut and bug
* code style
* repalce project_id with code
* conflicts solve
* conflicts solve
* conflicts solve
* bugfix
* modify listResources mothod and remove getResourceIds mothod
* 1
* conflicts solve
* modify listResources mothod and remove getResourceIds mothod
* modify listResources mothod and remove getResourceIds mothod
* replace processDefinitionVersion with processDefinitionLog
* codestyle
* codestyle
* add mapper module ut
* codestyle
* fix ProcessInstanceMapperTest
* codestyle
* conflicts solve
* conflicts solve
* conflicts solve
* conflicts solve
* conflicts solve
* fix ProcessInstanceMapperTest
* fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest
* fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest
2021-03-08 14:36:52 +08:00
Simon
6111f05250
[Feature][jsonspilt]fix ProcessInstanceMapperTest ( #4989 )
...
* Modify Project and ProjectUser Mapper
* Modify Project and ProjectUser Mapper
* project_code is bigint(20)
* modify ERROR name
* modify saveProcessDefine, remove the duplicate code with createTaskAndRelation
* modify import/export processdefinition, add genProcessData
* fix ut and bug
* code style
* repalce project_id with code
* conflicts solve
* conflicts solve
* conflicts solve
* bugfix
* modify listResources mothod and remove getResourceIds mothod
* 1
* conflicts solve
* modify listResources mothod and remove getResourceIds mothod
* modify listResources mothod and remove getResourceIds mothod
* replace processDefinitionVersion with processDefinitionLog
* codestyle
* codestyle
* add mapper module ut
* codestyle
* fix ProcessInstanceMapperTest
* codestyle
* conflicts solve
* conflicts solve
* conflicts solve
* conflicts solve
* conflicts solve
* fix ProcessInstanceMapperTest
2021-03-08 10:22:36 +08:00
bao liang
5e2b97b573
[feature-4417][JsonSplit]refactor json in process instance and process definition ( #4993 )
...
* remove the use of json
* remove json in process definition and process instance
2021-03-08 08:44:34 +08:00
JinyLeeChina
39a9c0c392
[Feature][jsonspilt]modify process instance for project home page ( #4991 )
...
* modify checkDAGRing and ProcessService method
* merge
* modify dagRing
* modify process instance for project home page
Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-03-07 18:12:01 +08:00
Simon
bd4b2f85a9
[Feature][jsonsplit]add ProcessTaskRelationServiceImplTest/TaskDefinitionServiceImplTest ( #4949 )
...
* Modify Project and ProjectUser Mapper
* Modify Project and ProjectUser Mapper
* project_code is bigint(20)
* modify ERROR name
* modify saveProcessDefine, remove the duplicate code with createTaskAndRelation
* modify import/export processdefinition, add genProcessData
* fix ut and bug
* code style
* repalce project_id with code
* conflicts solve
* conflicts solve
* conflicts solve
* bugfix
* modify listResources mothod and remove getResourceIds mothod
* 1
* conflicts solve
* modify listResources mothod and remove getResourceIds mothod
* modify listResources mothod and remove getResourceIds mothod
* replace processDefinitionVersion with processDefinitionLog
* codestyle
* codestyle
* add ProcessTaskRelationServiceImplTest/TaskDefinitionServiceImplTest
* conflicts solve
* conflicts solve
* conflicts solve
* add ProcessTaskRelationServiceImplTest/TaskDefinitionServiceImplTest
* codestyle
2021-03-06 10:56:49 +08:00
lenboo
5bda7c344c
Merge remote-tracking branch 'upstream/dev' into spilit
2021-03-05 22:11:55 +08:00
Shiwen Cheng
8112f5bcb5
[Fix][API] Fix KeeperException ( #4961 )
...
fix #4705
2021-03-05 21:34:54 +08:00
dddyszy
01b71f1a0d
[Fix-4839][Server] Process cannot stop when killed with retry ( #4841 )
...
* [Fix-4839][Server] Process cannot stop when killed with retry
* [Fix-4839][Server] Process cannot stop when killed with retry
2021-03-04 21:10:11 +08:00
Simon
8b35e21390
[Feature][jsonsplit] replace processDefinitionVersion with processDefinitionLog ( #4942 )
...
* Modify Project and ProjectUser Mapper
* project_code is bigint(20)
* modify saveProcessDefine, remove the duplicate code with createTaskAndRelation
* modify import/export processdefinition, add genProcessData
* modify listResources mothod and remove getResourceIds mothod
* 1
* conflicts solve
* modify listResources mothod and remove getResourceIds mothod
* modify listResources mothod and remove getResourceIds mothod
* replace processDefinitionVersion with processDefinitionLog
2021-03-04 12:57:10 +08:00
JinyLeeChina
779596cf05
[Feature][JsonSplit] modify checkDAGRing and ProcessService method ( #4931 )
...
* modify checkDAGRing and ProcessService method
* merge
* modify dagRing
Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-03-04 10:22:14 +08:00
lenboo
dcf97920aa
merge from dev 2021-03-03
2021-03-03 10:44:12 +08:00
Simon
0c2b065db0
[Feature][jsonsplit]modify listResources mothod and remove getResourceIds mothod ( #4928 )
...
* Modify Project and ProjectUser Mapper
* Modify Project and ProjectUser Mapper
* project_code is bigint(20)
* modify ERROR name
* modify saveProcessDefine, remove the duplicate code with createTaskAndRelation
* modify import/export processdefinition, add genProcessData
* fix ut and bug
* code style
* repalce project_id with code
* conflicts solve
* conflicts solve
* conflicts solve
* bugfix
* modify listResources mothod and remove getResourceIds mothod
* 1
* conflicts solve
* modify listResources mothod and remove getResourceIds mothod
* modify listResources mothod and remove getResourceIds mothod
2021-03-03 10:29:27 +08:00
zhuangchong
ba2bb22100
[Improvement][API] create project success return project id ( #4927 )
...
* create project success return project id.
* update return data structure
2021-03-02 18:03:59 +08:00
Simon
c342980032
[Feature][jsonsplit] repalce project_id with code ( #4904 )
...
* Modify Project and ProjectUser Mapper
* Modify Project and ProjectUser Mapper
* project_code is bigint(20)
* modify ERROR name
* modify saveProcessDefine, remove the duplicate code with createTaskAndRelation
* modify import/export processdefinition, add genProcessData
* fix ut and bug
* code style
* repalce project_id with code
* conflicts solve
* conflicts solve
* conflicts solve
* bugfix
2021-03-02 16:43:19 +08:00
lenboo
2603d52044
Merge remote-tracking branch 'upstream/dev' into spilit
2021-03-01 15:20:34 +08:00
Simon
6d087ccce0
[Feature][JsonSplit] fix processDefinitionService ut and bug ( #4894 )
...
* Modify Project and ProjectUser Mapper
* Modify Project and ProjectUser Mapper
* project_code is bigint(20)
* modify ERROR name
* modify saveProcessDefine, remove the duplicate code with createTaskAndRelation
* modify import/export processdefinition, add genProcessData
* fix ut and bug
* code style
2021-03-01 15:01:17 +08:00
zhuangchong
139211f3dd
Reduce queries after successful project creation. ( #4901 )
2021-02-27 21:39:21 +08:00
zhuangchong
a388b6853d
Optimize HashMap Initial Capacity. ( #4896 )
2021-02-27 21:36:03 +08:00
lenboo
0571681ac4
Merge remote-tracking branch 'upstream/json_split' into spilit
2021-02-25 18:09:48 +08:00
lenboo
ccc5aa91d8
merge from dev
2021-02-25 18:09:32 +08:00
zhuangchong
ffe215f685
[Fix-4816][API] The API calls the workflow instance query interface and queries all the data when the time parameter is wrong ( #4817 )
...
* fix process instance query paramter is date,date parse error.
* solve code duplication.
* update checkAndParseDateParameter call parameters.
* update instance service test.
* update check and parse date parameters method.
* update BaseService class code style.
* Update check data parameter result judgment condition.
2021-02-25 09:16:27 +08:00
WilliamChen-luckbob
e47e4a70ab
[Fix] while repeat running, the global parameters will not set to the user specified start parameters. ( #4779 )
...
* [fix]when repeat running, there are no startparams which was set in the first start
* [fix] cannot set global param while rerun process instance
* fix code format
* delete unrelated test
* Update ExecutorControllerTest.java
* fix code smell
* Update ExecutorService2Test.java
don't know why e2e failed
* replace duplicate code
2021-02-24 23:48:23 +08:00
Simon
2fdeba0988
[Feature][JsonSplit]modify import/export processdefinition, add genProcessData ( #4864 )
...
* Modify Project and ProjectUser Mapper
* Modify Project and ProjectUser Mapper
* project_code is bigint(20)
* modify ERROR name
* modify saveProcessDefine, remove the duplicate code with createTaskAndRelation
* modify import/export processdefinition, add genProcessData
2021-02-24 18:55:45 +08:00
lenboo
2afc9f3bfc
merge from dev
2021-02-24 12:10:07 +08:00
