You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ke...@apache.org on 2021/12/29 04:57:44 UTC
[dolphinscheduler] branch dev updated: fix a few bugs (#7703)
This is an automated email from the ASF dual-hosted git repository.
kerwin pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 71ccb42 fix a few bugs (#7703)
71ccb42 is described below
commit 71ccb42697e197b2668a08a83eb9bb19261b4f5a
Author: calvin <ji...@163.com>
AuthorDate: Wed Dec 29 12:57:36 2021 +0800
fix a few bugs (#7703)
---
.../apache/dolphinscheduler/api/controller/TaskGroupController.java | 4 ++--
.../org/apache/dolphinscheduler/api/service/TaskGroupService.java | 2 +-
dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql | 1 -
.../src/main/resources/sql/dolphinscheduler_postgresql.sql | 1 -
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskGroupController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskGroupController.java
index ba0b9af..79c61b5 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskGroupController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskGroupController.java
@@ -180,11 +180,11 @@ public class TaskGroupController extends BaseController {
}
/**
- * query task group list paging by project id
+ * query task group list paging by project code
*
* @param loginUser login user
* @param pageNo page number
- * @param projectCode project id
+ * @param projectCode project code
* @param pageSize page size
* @return queue list
*/
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskGroupService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskGroupService.java
index e950589..4b15ca8 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskGroupService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskGroupService.java
@@ -85,7 +85,7 @@ public interface TaskGroupService {
* @param loginUser login user
* @param pageNo page no
* @param pageSize page size
- * @param name name
+ * @param projectCode project code
* @return the result code and msg
*/
Map<String, Object> queryTaskGroupByProjectCode(User loginUser, int pageNo, int pageSize, Long projectCode);
diff --git a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql
index 40a21ea..87ac612 100644
--- a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql
+++ b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql
@@ -1073,7 +1073,6 @@ CREATE TABLE t_ds_task_group
project_code bigint(20) DEFAULT '0',
use_size int(11) DEFAULT '0' ,
user_id int(11) DEFAULT NULL ,
- project_id int(11) DEFAULT NULL ,
status int(4) DEFAULT '1' ,
create_time datetime DEFAULT NULL ,
update_time datetime DEFAULT NULL ,
diff --git a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql
index f6c5df1..bfd8402 100644
--- a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql
+++ b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql
@@ -1057,7 +1057,6 @@ CREATE TABLE t_ds_task_group (
project_code bigint DEFAULT '0' ,
use_size int DEFAULT '0' ,
user_id int DEFAULT NULL ,
- project_id int DEFAULT NULL ,
status int DEFAULT '1' ,
create_time timestamp DEFAULT NULL ,
update_time timestamp DEFAULT NULL ,