Commit Graph

575 Commits

Author SHA1 Message Date
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
Shiwen Cheng
149b0dab4d
[Improvement][Docker] Sync docker conf templates to the latest conf properties (#4772) 2021-02-23 14:47:10 +08:00
bao liang
62e961e3f1
[Feature][JsonSplit]refactor remove the json in process instance and definition (#4828)
* #4417 [JsonSplit] refactor process definition json

* [#4177] refactor json split. remove json in process definition and process instance

* [#4177] refactor json split. copy process definition need set task code 0L.

* code style

* code style

* code style

* code style

* update

* update
2021-02-22 10:13:32 +08:00
lenboo
2d1d91d1f8 Merge remote-tracking branch 'upstream/dev' into spilit 2021-02-21 14:54:53 +08:00
lenboo
4c9c41933d Merge remote-tracking branch 'upstream/dev' into spilit
# Conflicts:
#	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java
#	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
#	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionVersionServiceImpl.java
2021-02-21 14:54:18 +08:00
zhuangchong
4aac23481e
[Fix-4757][worker] fix worker failover host error (#4799)
* resolve code conflicts

* resolve code conflicts

* resolve code conflicts

* update WorkerGroupServiceImpl code style.

* update worker group service test host data.

* add ZookeeperNodeHandlerTest class

* change WorkerZkNode to Host class.

* add generate host string method.
2021-02-21 00:34:23 +08:00
Simon
abf6723d38
[Feature][JsonSplit] modify saveProcessDefine remove the duplicate code (#4810)
* 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
2021-02-20 15:11:19 +08:00
Shiwen Cheng
8879d8ff60
[Improvement][*] Define version with revision globally and update version to 1.3.6-SNAPSHOT (#4773)
* [Improvement][*] Update version to 1.4.0-SNAPSHOT

* [Improvement][*] Update tab to space under checkstyle

* [Improvement][*] Define version with revision globally

* [Improvement][*] Update version to 1.3.6-SNAPSHOT
2021-02-20 14:22:49 +08:00
zhuangchong
4c8f06002f
fix api swagger params error. (#4818) 2021-02-20 08:16:24 +08:00
dddyszy
ce007813fb
[Improvement][Api] add @Override on the Override method (#4808)
Co-authored-by: 施洲轶 <shizhy@yoozoo.com>
2021-02-19 18:15:43 +08:00
Shiwen Cheng
61397b338a
[Improvement][api] Introduce base service interface for clear code and unify all controllers, services and tests of api (#4798)
* [Improvement][api] Introduce base service interface for clear code

* [Improvement][api] Unify all controllers, services and tests of api

* [Fix][api] Fix unit tests left over from the past

* [Improvement][api] Use RegexUtils.escapeNRT instead of StringUtils.replaceNRTtoUnderline for vulnerable check
2021-02-19 11:52:42 +08:00
zhuangchong
68de43ad27
[Fix-4776][Alert] Alert instance edit page partial parameter values are not displayed (#4782)
* generate warning instance plugin params.

* update PluginParamsTransfer.generatePluginParams method.

* update code style in the AlertPluginInstanceServiceImpl class.

* JSONUtils rollback.

* rerun e2e test.

* update alert channel generate params.

* update email alert channel test class.

* update json utils parse object method.

* update the data structure of the alarm script plug-in script type parameter to String.
2021-02-19 09:50:47 +08:00
Shiwen Cheng
15a5b05883
[Improvement-3369][api] Introduce executor and datasource service interface for clear code (#4759) 2021-02-18 23:27:37 +08:00
Shiwen Cheng
9ae29a756f
[Improvement-3369][api] Introduce resources, scheduler and taskinstance service interface for clear code (#4766)
* [Improvement-3369][api] Introduce resources, scheduler and taskinstance service interface for clear code
2021-02-18 23:17:01 +08:00
Shiwen Cheng
dc55b5ba6f
[Improvement-3369][api] Introduce monitor, processinstance and queue service interface for clear code (#4765)
* [Improvement-3369][api] Introduce monitor, processinstance and queue service interface for clear code
2021-02-18 19:27:13 +08:00
Shiwen Cheng
070424fc78
[Improvement-3369][api] Introduce taskrecord, udffunc, workflowlineage and workergroup service interface for clear code (#4768)
* [Improvement-3369][api] Introduce taskrecord, udffunc, workflowlineage and workergroup service interface for clear code
2021-02-18 19:18:05 +08:00
lenboo
453ba09bb2 Merge branch 'json_split' of https://github.com/apache/incubator-dolphinscheduler into spilit 2021-02-18 17:29:24 +08:00
lenboo
1b9ab88e78 Merge remote-tracking branch 'upstream/dev' into spilit 2021-02-18 17:28:58 +08:00
bao liang
67eae43154
[Feature-4417][JsonSplit] refactor process dag generate (#4790)
* #4417 [JsonSplit] refactor dag generate

* #4417 [JsonSplit] refactor dag generate

* #4417 [JsonSplit] add postNodeVersion and preNodeVersion

* #4417 [JsonSplit] code style

* #4417 [JsonSplit] code style

* #4417 [JsonSplit] code style
2021-02-18 17:19:33 +08:00
Shiwen Cheng
a53195fa15
[Improvement-3369][api] Introduce alert group and users service interface for clear code (#4758) 2021-02-18 15:05:49 +08:00
lenboo
f7ca571f7d Merge remote-tracking branch 'upstream/dev' into spilit 2021-02-18 11:16:31 +08:00
zhuangchong
23591b71a2
[Improvement-4751][API] Improvement the duration field modify the display to a time-based minute-second format (e.g. 1d 10h 20m 1s) (#4752)
* imp ui instance duration field display content.

* update DateUtils format2Duration method.
2021-02-18 10:08:23 +08:00
Simon
061af08765
[Feature][JsonSplit] Modify Project and ProjectUser Mapper (#4753)
* Modify Project and ProjectUser Mapper

* Modify Project and ProjectUser Mapper

* project_code is bigint(20)

* modify ERROR name
2021-02-12 08:28:54 +08:00
JinyLeeChina
763a50d0cf
[Feature][JsonSplit] add relation method and refactor task method (#4737)
* add task query

* modify codestyle

* add task delete/update/swich method

* add task delete/update/swich method

* codestyle

* use updateById save task definition

* modify method name

* code style

* code style

Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-02-09 09:52:29 +08:00
bao liang
f31eee4341
[Feature][JsonSplit] refactor process definition update (#4708)
* add code in task_instance and process instance

* delete process_definition_id in t_ds_task_instance

* add task_code task_definition_version process_definition_code in task instance

* add task_code task_definition_version process_definition_code in task instance

* refactor process instance

* refactor process instance update

* refactor json-split for process definition and task definition
refactor process instance update

* refactor json-split for process definition and task definition
refactor process instance update

* code style

* code style

* code style

* code style

* refactor code
2021-02-07 16:15:35 +08:00
lenboo
9141840bbe merge from dev 2021-02-07 14:51:48 +08:00
zhuangchong
03a2c6b7b7
[Improvement-4450][datasource] Hive/Spark data sources do not support multi-tenancy when Kerberos authentication is enabled (#4593)
* hive/spark jdbc add kerberos paramter.

* update datasource vue paramter placeholder.

* update code style.

* add datasource ApiImplicitParam in the kerberos paramter.

* update constants class code style.

* add code test and code style.

* update BaseDataSourceTest code style.

* update BaseDataSourceTest class code style.

* update DataSourceController class code style.

* update DataSourceController ApiImplicitParam

* update ui create data source vue.
2021-02-06 16:57:59 +08:00
lenboo
591f4f2830 Merge remote-tracking branch 'upstream/dev' into spilit 2021-02-04 10:14:14 +08:00
Simon
c511658f6c
[Feature][JsonSplit] modify updateProcessDefinition/switchProcessDefinitionVersion (#4666)
* processdefinition create/delete method

* init

* add relation parse

* delete process_definition_json

* modify updateProcessDefinition/switchProcessDefinitionVersion

* codestyle

* codestyle

* fix compile error (version type)

* fix compile error (version type)
2021-02-04 10:11:36 +08:00
Shiwen Cheng
424497ecba
[Improvement][Api] Use WebUtils.getCookie instead of BaseService.getCookie (#4559) 2021-02-03 22:09:31 +08:00
zhuangchong
c3f6f962ca
[Improvement-4568][API] When the workflow definition name validation API fails, the system prompts that the workflow definition name already exists (#4569)
* fix dev definition api error prompt.

* imp api definition name verify message prompt.
2021-02-03 17:07:51 +08:00
JinyLeeChina
852710a711
[Feature][JsonSplit] add task delete/update/switch method (#4654)
* add task query

* modify codestyle

* add task delete/update/swich method

* add task delete/update/swich method

* codestyle

* use updateById save task definition

* modify method name

Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-02-03 00:27:22 +08:00
lenboo
6844f67957 Merge remote-tracking branch 'upstream/dev' into spilit 2021-02-02 16:53:28 +08:00
zt-1997
14d49bc584
[FIX-2101]It solves the problem that the name of the branch will not change after the name of the branch is changed in the workflow page and instance page. (#4555)
Co-authored-by: zt-1997 <“18841012545@163.com”>
2021-02-02 16:07:37 +08:00
lenboo
988649a1b2 Merge remote-tracking branch 'upstream/dev' into spilit 2021-02-02 11:31:46 +08:00
lenboo
c8d5454741 merge form dev 2021-01-31 16:45:54 +08:00
CalvinKirs
dc04f88c32 Merge branch 'dev' into alert_param_reduce 2021-01-30 13:26:02 +08:00
JinyLeeChina
47e620fbc9
[Feature][JsonSplit] add task query (#4619)
* add task query

* modify codestyle

Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-01-29 18:11:46 +08:00
zt-1997
afd201e6fa
[FIX-#4592]Fix that the worker group management IP is not displayed correctly. (#4620)
Co-authored-by: zt-1997 <“18841012545@163.com”>
2021-01-29 16:54:39 +08:00
CalvinKirs
8300444f23 code style 2021-01-29 13:43:14 +08:00
CalvinKirs
6877073777 add ut 2021-01-29 13:38:44 +08:00