You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by jo...@apache.org on 2020/04/15 10:30:42 UTC
[incubator-dolphinscheduler] branch dev updated: Update
worker_group_id to worker_group (#2433)
This is an automated email from the ASF dual-hosted git repository.
journey pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 347f05f Update worker_group_id to worker_group (#2433)
347f05f is described below
commit 347f05f08c3203c9e0890b244134196c79a27b9c
Author: xingchun-chen <55...@users.noreply.github.com>
AuthorDate: Wed Apr 15 18:30:31 2020 +0800
Update worker_group_id to worker_group (#2433)
* 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
* Update worker_group_id to worker_group in init.sql
* Update worker_group_id to worker_group in init.sql
* Update worker_group_id to worker_group
Co-authored-by: chenxingchun <43...@qq.com>
---
docker/postgres/docker-entrypoint-initdb/init.sql | 6 ++--
.../dolphinscheduler/dao/entity/ErrorCommand.java | 35 +++++++++++-----------
2 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/docker/postgres/docker-entrypoint-initdb/init.sql b/docker/postgres/docker-entrypoint-initdb/init.sql
index b48ddde..b26520e 100755
--- a/docker/postgres/docker-entrypoint-initdb/init.sql
+++ b/docker/postgres/docker-entrypoint-initdb/init.sql
@@ -234,7 +234,7 @@ CREATE TABLE t_ds_command (
dependence varchar(255) DEFAULT NULL ,
update_time timestamp DEFAULT NULL ,
process_instance_priority int DEFAULT NULL ,
- worker_group_id int DEFAULT '-1' ,
+ worker_group varchar(64),
PRIMARY KEY (id)
) ;
@@ -275,7 +275,7 @@ CREATE TABLE t_ds_error_command (
update_time timestamp DEFAULT NULL ,
dependence text ,
process_instance_priority int DEFAULT NULL ,
- worker_group_id int DEFAULT '-1' ,
+ worker_group varchar(64),
message text ,
PRIMARY KEY (id)
);
@@ -748,7 +748,7 @@ CREATE SEQUENCE t_ds_worker_server_id_sequence;
ALTER TABLE t_ds_worker_server ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_worker_server_id_sequence');
--- Records of t_ds_user，user : admin , password : dolphinscheduler123
+-- Records of t_ds_user?user : admin , password : dolphinscheduler123
INSERT INTO t_ds_user(user_name,user_password,user_type,email,phone,tenant_id,create_time,update_time) VALUES ('admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', 'xxx@qq.com', 'xx', '0', '2018-03-27 15:48:50', '2018-10-24 17:40:22');
-- Records of t_ds_alertgroup，dolphinscheduler warning group
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ErrorCommand.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ErrorCommand.java
index 7f3eb38..127c5b7 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ErrorCommand.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ErrorCommand.java
@@ -101,9 +101,9 @@ public class ErrorCommand {
private String message;
/**
- * worker group id
+ * worker group
*/
- private int workerGroupId;
+ private String workerGroup;
public ErrorCommand(){}
@@ -257,17 +257,25 @@ public class ErrorCommand {
this.updateTime = updateTime;
}
- public int getWorkerGroupId() {
- return workerGroupId;
+ public String getWorkerGroup() {
+ return workerGroup;
}
- public void setWorkerGroupId(int workerGroupId) {
- this.workerGroupId = workerGroupId;
+ public void setWorkerGroup(String workerGroup) {
+ this.workerGroup = workerGroup;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
}
@Override
public String toString() {
- return "Command{" +
+ return "ErrorCommand{" +
"id=" + id +
", commandType=" + commandType +
", processDefinitionId=" + processDefinitionId +
@@ -281,17 +289,8 @@ public class ErrorCommand {
", startTime=" + startTime +
", processInstancePriority=" + processInstancePriority +
", updateTime=" + updateTime +
- ", message=" + message +
+ ", message='" + message + '\'' +
+ ", workerGroup='" + workerGroup + '\'' +
'}';
}
-
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-
-
}