Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[bug][db] Table relation_project_user have duplicate record #9536

Merged
merged 8 commits into from
Apr 27, 2022
Merged

[bug][db] Table relation_project_user have duplicate record #9536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ad3a3bb
bugfix:relation_project_user duplicate
leiwingqueen Apr 17, 2022
c5f5dba
update sql ddl
leiwingqueen Apr 17, 2022
ea4fe72
resolve conflict
leiwingqueen Apr 17, 2022
da6633e
fix syntax err
leiwingqueen Apr 18, 2022
46ef30d
change comment
leiwingqueen Apr 19, 2022
7bff597
variable change name
leiwingqueen Apr 22, 2022
8d7e172
variable change name
leiwingqueen Apr 22, 2022
b6817d0
remote final keyword
leiwingqueen Apr 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 15 additions & 16 deletions ...uler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
import java.util.Map;
import java.util.Set;
import java.util.TimeZone;
import java.util.Arrays;
import java.util.stream.Collectors;

/**
Expand Down Expand Up @@ -521,7 +522,6 @@ public Map<String, Object> deleteUserById(User loginUser, int id) throws IOExcep
userMapper.queryTenantCodeByUserId(id);



accessTokenMapper.deleteAccessTokenByUserId(id);

userMapper.deleteById(id);
Expand Down Expand Up @@ -557,10 +557,7 @@ public Map<String, Object> grantProject(User loginUser, int userId, String proje
if (check(result, StringUtils.isEmpty(projectIds), Status.SUCCESS)) {
return result;
}

String[] projectIdArr = projectIds.split(",");

for (String projectId : projectIdArr) {
Arrays.stream(projectIds.split(",")).distinct().forEach(projectId -> {
Date now = new Date();
ProjectUser projectUser = new ProjectUser();
projectUser.setUserId(userId);
Expand All @@ -569,8 +566,7 @@ public Map<String, Object> grantProject(User loginUser, int userId, String proje
projectUser.setCreateTime(now);
projectUser.setUpdateTime(now);
projectUserMapper.insert(projectUser);
}

});
putMsg(result, Status.SUCCESS);

return result;
Expand Down Expand Up @@ -609,15 +605,18 @@ public Map<String, Object> grantProjectByCode(final User loginUser, final int us
return result;
}

// 4. maintain the relationship between project and user
final Date today = new Date();
ProjectUser projectUser = new ProjectUser();
projectUser.setUserId(userId);
projectUser.setProjectId(project.getId());
projectUser.setPerm(7);
projectUser.setCreateTime(today);
projectUser.setUpdateTime(today);
this.projectUserMapper.insert(projectUser);
// 4. maintain the relationship between project and user if not exists
ProjectUser projectUser = projectUserMapper.queryProjectRelation(project.getId(), userId);
if (projectUser == null) {
Date today = new Date();
projectUser = new ProjectUser();
projectUser.setUserId(userId);
projectUser.setProjectId(project.getId());
projectUser.setPerm(7);
projectUser.setCreateTime(today);
projectUser.setUpdateTime(today);
this.projectUserMapper.insert(projectUser);
}

this.putMsg(result, Status.SUCCESS);
return result;
Expand Down
3 changes: 2 additions & 1 deletion dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,8 @@ CREATE TABLE t_ds_relation_project_user
perm int(11) DEFAULT '1',
create_time datetime DEFAULT NULL,
update_time datetime DEFAULT NULL,
PRIMARY KEY (id)
PRIMARY KEY (id),
UNIQUE KEY uniq_uid_pid(user_id,project_id)
);

-- ----------------------------
Expand Down
2 changes: 1 addition & 1 deletion dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ CREATE TABLE `t_ds_relation_project_user` (
`create_time` datetime DEFAULT NULL COMMENT 'create time',
`update_time` datetime DEFAULT NULL COMMENT 'update time',
PRIMARY KEY (`id`),
KEY `user_id_index` (`user_id`) USING BTREE
UNIQUE KEY uniq_uid_pid(user_id,project_id)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;

-- ----------------------------
Expand Down
3 changes: 2 additions & 1 deletion dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,8 @@ CREATE TABLE t_ds_relation_project_user (
perm int DEFAULT '1' ,
create_time timestamp DEFAULT NULL ,
update_time timestamp DEFAULT NULL ,
PRIMARY KEY (id)
PRIMARY KEY (id),
SbloodyS marked this conversation as resolved.
Show resolved Hide resolved
CONSTRAINT t_ds_relation_project_user_un UNIQUE (user_id, project_id)
) ;
create index relation_project_user_id_index on t_ds_relation_project_user (user_id);

Expand Down
5 changes: 5 additions & 0 deletions ...nscheduler-dao/src/main/resources/sql/upgrade/2.0.6_schema/mysql/dolphinscheduler_ddl.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,8 @@ d//
delimiter ;
CALL uc_dolphin_T_t_ds_alert_R_sign;
DROP PROCEDURE uc_dolphin_T_t_ds_alert_R_sign;

-- add unique key to t_ds_relation_project_user
ALTER TABLE t_ds_relation_project_user ADD UNIQUE KEY uniq_uid_pid(user_id,project_id);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think we should add to new SQL directory named 3.0.0?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think we should add to new SQL directory named 3.0.0?

It's a bug fix. I think it should be included in 2.0.6-release. WDYT? @zhongjiajie

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general, I think change targe branch with dev database change should add to 3.0.0_schema, and committer judge whether should release in bug fix version. If it is only put in 2.0.5 and not in 3.0.0, it may be that the 3.0.0-bate release will miss this commit.

But in case, dev branch without 3.0.0_schema folder,(and that is my wrong, i forgot to add it after 3.0.0-release) so i think it could change into 2.0.6 or 3.0.0

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general, I think change targe branch with dev database change should add to 3.0.0_schema, and committer judge whether should release in bug fix version. If it is only put in 2.0.5 and not in 3.0.0, it may be that the 3.0.0-bate release will miss this commit.

But in case, dev branch without 3.0.0_schema folder,(and that is my wrong, i forgot to add it after 3.0.0-release) so i think it could change into 2.0.6 or 3.0.0

I agree with you. @zhongjiajie



6 changes: 5 additions & 1 deletion ...duler-dao/src/main/resources/sql/upgrade/2.0.6_schema/postgresql/dolphinscheduler_ddl.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,8 @@ $BODY$;

select dolphin_update_metadata();

d//
d//

-- add unique key to t_ds_relation_project_user
CREATE UNIQUE INDEX t_ds_relation_project_user_un
on t_ds_relation_project_user (user_id, project_id);