1. 30 3月, 2021 3 次提交
  2. 29 3月, 2021 8 次提交
  3. 26 3月, 2021 4 次提交
  4. 25 3月, 2021 2 次提交
    • L
      Merge remote-tracking branch 'upstream/dev' into spilit · f05ba849
      lenboo 提交于
      # 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
      f05ba849
    • S
      [feature][jsonsplit]fix copy/export/import processDefinition bugs (#5146) · cd195072
      Simon 提交于
      * 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
      cd195072
  5. 24 3月, 2021 4 次提交
    • S
      [Feature][jsonsplit]add ProcessServiceTest (#5097) · 3c9b214d
      Simon 提交于
      * 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
      3c9b214d
    • W
      [Feature][JsonSplit] task page, rename field "description" to "desc" (#5137) · e53367bd
      wen-hemin 提交于
      * fix: task page, rename "description" to "desc"
      
      * fix: The default value of field dependence is null.
      
      * fix: frontend compile check
      Co-authored-by: Nwen-hemin <wenhemin@apache.com>
      e53367bd
    • S
      [Feature][JsonSplit]fix modifyBy field (#5112) · 21b7b77d
      Simon 提交于
      * 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
      21b7b77d
    • J
      [Feature][JsonSplit] fix taskId in processDefinitionJson (#5136) · 1eaf1f62
      JinyLeeChina 提交于
      * 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
      Co-authored-by: NJinyLeeChina <297062848@qq.com>
      1eaf1f62
  6. 23 3月, 2021 4 次提交
    • W
      [Improvement][Api] Optimize query processInstanceList #5134 (#5135) · 5d264c9f
      wenjun 提交于
      * Batch query user rather than several query
      5d264c9f
    • S
      [Feature-5062][*] Create/Edit/Delete Worker Group in Web UI (#5113) · 0d065c07
      Shiwen Cheng 提交于
      * [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: Ndailidong <dailidong66@gmail.com>
      0d065c07
    • K
      [Bug][PGSQL] Delete the stopped workflow without deleting the correspon… (#5066) · f109a758
      Kirs 提交于
      * [Bug][Api] Delete the stopped workflow without deleting the corresponding sub process, the workflow instance name is not displayed in the sub process
      
      * fix ut
      
      * fix ut err
      
      * sql style
      
      * fix error
      f109a758
    • J
      [Feature][JsonSplit] Fix api bug (#5102) · d99934d0
      JinyLeeChina 提交于
      * 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: NJinyLeeChina <297062848@qq.com>
      d99934d0
  7. 22 3月, 2021 1 次提交
  8. 20 3月, 2021 1 次提交
    • Z
      [Improvement][dao] Resource features SQL slow query optimization. (#4947) · ba039dc2
      zhuangchong 提交于
      * 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.
      ba039dc2
  9. 19 3月, 2021 4 次提交
  10. 18 3月, 2021 5 次提交
  11. 17 3月, 2021 2 次提交
  12. 16 3月, 2021 2 次提交