The Unified and Autonomous Development Platform
fix: sorting issues by Type is broken (#1474)
Robin Shen64bf48efa6dc
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.javaindex 71661d0432..dfd74c2d3e 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java@@ -302,7 +302,7 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Ageprivate CriteriaQuery<Agent> buildCriteriaQuery(org.hibernate.Session session, EntityQuery<Agent> agentQuery) {CriteriaBuilder builder = session.getCriteriaBuilder();- CriteriaQuery<Agent> query = builder.createQuery(Agent.class).distinct(true);+ CriteriaQuery<Agent> query = builder.createQuery(Agent.class);Root<Agent> root = query.from(Agent.class);query.select(root);@@ -345,7 +345,7 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Ageif (agentCriteria != null)criteriaQuery.where(agentCriteria.getPredicate(criteriaQuery, root, builder));- criteriaQuery.select(builder.countDistinct(root));+ criteriaQuery.select(builder.count(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex 9a314a4707..286f35074d 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -530,7 +530,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Buiprivate CriteriaQuery<Build> buildCriteriaQuery(@Nullable Project project,Session session, EntityQuery<Build> buildQuery) {CriteriaBuilder builder = session.getCriteriaBuilder();- CriteriaQuery<Build> query = builder.createQuery(Build.class).distinct(true);+ CriteriaQuery<Build> query = builder.createQuery(Build.class);Root<Build> root = query.from(Build.class);query.select(root);@@ -596,7 +596,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements BuicriteriaQuery.where(getPredicates(project, buildCriteria, criteriaQuery, root, builder));- criteriaQuery.select(builder.countDistinct(root));+ criteriaQuery.select(builder.count(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.javaindex b41c24558e..4492175b5b 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java@@ -248,7 +248,7 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> imprivate CriteriaQuery<CodeComment> buildCriteriaQuery(Project project, Session session,PullRequest request, EntityQuery<CodeComment> commentQuery) {CriteriaBuilder builder = session.getCriteriaBuilder();- CriteriaQuery<CodeComment> query = builder.createQuery(CodeComment.class).distinct(true);+ CriteriaQuery<CodeComment> query = builder.createQuery(CodeComment.class);Root<CodeComment> root = query.from(CodeComment.class);query.where(getPredicates(project, commentQuery.getCriteria(), request, query, root, builder));@@ -288,7 +288,7 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> imcriteriaQuery.where(getPredicates(project, commentCriteria, request, criteriaQuery, root, builder));- criteriaQuery.select(builder.countDistinct(root));+ criteriaQuery.select(builder.count(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex 71494eb697..7f7c032eff 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java@@ -63,6 +63,8 @@ import java.io.Serializable;import java.util.*;import java.util.stream.Collectors;+import static java.util.stream.Collectors.*;+@Singletonpublic class DefaultIssueManager extends BaseEntityManager<Issue> implements IssueManager, Serializable {@@ -251,7 +253,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Isspublic List<Issue> query(@Nullable ProjectScope projectScope, EntityQuery<Issue> issueQuery,boolean loadFieldsAndLinks, int firstResult, int maxResults) {CriteriaBuilder builder = getSession().getCriteriaBuilder();- CriteriaQuery<Issue> criteriaQuery = builder.createQuery(Issue.class).distinct(true);+ CriteriaQuery<Issue> criteriaQuery = builder.createQuery(Issue.class);Root<Issue> root = criteriaQuery.from(Issue.class);criteriaQuery.where(getPredicates(projectScope, issueQuery.getCriteria(), criteriaQuery, builder, root));@@ -284,7 +286,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements IsscriteriaQuery.where(getPredicates(projectScope, issueCriteria, criteriaQuery, builder, root));- criteriaQuery.select(builder.countDistinct(root));+ criteriaQuery.select(builder.count(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();}@@ -319,7 +321,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss} else if (!SecurityUtils.isAdministrator()) {Collection<Project> projects = projectManager.getPermittedProjects(new AccessProject());if (!projects.isEmpty()) {- Collection<Long> projectIds = projects.stream().map(it->it.getId()).collect(Collectors.toSet());+ Collection<Long> projectIds = projects.stream().map(it->it.getId()).collect(toSet());predicates.add(builder.or(getPredicate(builder, root, projectIds),getAuthorizationPredicate(query, builder, root, projectIds)));diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex 4719a51e78..6a748b6492 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -843,7 +843,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>private CriteriaQuery<PullRequest> buildCriteriaQuery(Session session, @Nullable Project targetProject,EntityQuery<PullRequest> requestQuery) {CriteriaBuilder builder = session.getCriteriaBuilder();- CriteriaQuery<PullRequest> query = builder.createQuery(PullRequest.class).distinct(true);+ CriteriaQuery<PullRequest> query = builder.createQuery(PullRequest.class);Root<PullRequest> root = query.from(PullRequest.class);query.where(getPredicates(targetProject, requestQuery.getCriteria(), query, root, builder));@@ -894,7 +894,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>criteriaQuery.where(getPredicates(targetProject, requestCriteria, criteriaQuery, root, builder));- criteriaQuery.select(builder.countDistinct(root));+ criteriaQuery.select(builder.count(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.javaindex 4753d053f4..bc3a1aaf52 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java@@ -1,18 +1,14 @@package io.onedev.server.search.entity.codecomment;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;-import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.match.WildcardUtils;+import javax.persistence.criteria.*;+import java.util.ArrayList;+import java.util.List;+public class ReplyCriteria extends Criteria<CodeComment> {private static final long serialVersionUID = 1L;@@ -25,10 +21,17 @@ public class ReplyCriteria extends Criteria<CodeComment> {@Overridepublic Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {- Join<?, ?> join = from.join(CodeComment.PROP_REPLIES, JoinType.LEFT);- Path<String> attribute = join.get(CodeCommentReply.PROP_CONTENT);- join.on(builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%"));- return join.isNotNull();+ Subquery<CodeCommentReply> replyQuery = query.subquery(CodeCommentReply.class);+ Root<CodeCommentReply> replyRoot = replyQuery.from(CodeCommentReply.class);+ replyQuery.select(replyRoot);++ List<Predicate> predicates = new ArrayList<>();+ predicates.add(builder.equal(replyRoot.get(CodeCommentReply.PROP_COMMENT), from));+ predicates.add(builder.like(+ builder.lower(replyRoot.get(CodeCommentReply.PROP_CONTENT)),+ "%" + value.toLowerCase() + "%"));++ return builder.exists(replyQuery.where(builder.and(predicates.toArray(new Predicate[0]))));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.javaindex 427b18a731..6755736aea 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java@@ -1,17 +1,13 @@package io.onedev.server.search.entity.issue;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;-import io.onedev.server.model.Issue;import io.onedev.server.model.IssueComment;import io.onedev.server.util.criteria.Criteria;+import javax.persistence.criteria.*;+import java.util.ArrayList;+import java.util.List;+public class CommentCriteria extends Criteria<Issue> {private static final long serialVersionUID = 1L;@@ -24,10 +20,17 @@ public class CommentCriteria extends Criteria<Issue> {@Overridepublic Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {- Join<?, ?> join = from.join(Issue.PROP_COMMENTS, JoinType.LEFT);- Path<String> attribute = join.get(IssueComment.PROP_CONTENT);- join.on(builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%"));- return join.isNotNull();+ Subquery<IssueComment> commentQuery = query.subquery(IssueComment.class);+ Root<IssueComment> commentRoot = commentQuery.from(IssueComment.class);+ commentQuery.select(commentRoot);++ List<Predicate> predicates = new ArrayList<>();+ predicates.add(builder.equal(commentRoot.get(IssueComment.PROP_ISSUE), from));+ predicates.add(builder.like(+ builder.lower(commentRoot.get(IssueComment.PROP_CONTENT)),+ "%" + value.toLowerCase() + "%"));++ return builder.exists(commentQuery.where(builder.and(predicates.toArray(new Predicate[0]))));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.javaindex 7de0a7e7fc..47e51db396 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java@@ -5,6 +5,8 @@ import io.onedev.server.model.PullRequestComment;import io.onedev.server.util.criteria.Criteria;import javax.persistence.criteria.*;+import java.util.ArrayList;+import java.util.List;public class CommentCriteria extends Criteria<PullRequest> {@@ -18,10 +20,17 @@ public class CommentCriteria extends Criteria<PullRequest> {@Overridepublic Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {- Join<?, ?> join = from.join(PullRequest.PROP_COMMENTS, JoinType.LEFT);- Path<String> attribute = join.get(PullRequestComment.PROP_CONTENT);- join.on(builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%"));- return join.isNotNull();+ Subquery<PullRequestComment> commentQuery = query.subquery(PullRequestComment.class);+ Root<PullRequestComment> commentRoot = commentQuery.from(PullRequestComment.class);+ commentQuery.select(commentRoot);++ List<Predicate> predicates = new ArrayList<>();+ predicates.add(builder.equal(commentRoot.get(PullRequestComment.PROP_REQUEST), from));+ predicates.add(builder.like(+ builder.lower(commentRoot.get(PullRequestComment.PROP_CONTENT)),+ "%" + value.toLowerCase() + "%"));++ return builder.exists(commentQuery.where(builder.and(predicates.toArray(new Predicate[0]))));}@Override