Skip to content

The Unified and Autonomous Development Platform

fix: Project fuzzy query does not return best match result (OD-2340)

Robin Shen23ac5bae4603
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index ccfa7dc131..5549fc792e 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
@@ -63,6 +63,7 @@ import javax.inject.Singleton;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
+import javax.persistence.criteria.Order;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
@@ -1041,7 +1042,10 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
query.where(getPredicates(projectQuery.getCriteria(), query, root, builder));
- List<javax.persistence.criteria.Order> orders = new ArrayList<>();
+ List<Order> orders = new ArrayList<>();
+ if (projectQuery.getCriteria() != null)
+ orders.addAll(projectQuery.getCriteria().getPreferOrders(builder, root));
+
for (EntitySort sort : projectQuery.getSorts()) {
if (sort.getDirection() == ASCENDING)
orders.add(builder.asc(ProjectQuery.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));
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.java
index af644846cc..25ee67e8ad 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
@@ -38,6 +38,7 @@ import javax.inject.Singleton;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
+import javax.persistence.criteria.Order;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
@@ -906,7 +907,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
query.where(getPredicates(targetProject, requestQuery.getCriteria(), query, root, builder));
- List<javax.persistence.criteria.Order> orders = new ArrayList<>();
+ List<Order> orders = new ArrayList<>();
if (requestQuery.getCriteria() != null)
orders.addAll(requestQuery.getCriteria().getPreferOrders(builder, root));
for (EntitySort sort: requestQuery.getSorts()) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.java
index 0dbb1a5d9d..ae23265ea1 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.java
@@ -3,11 +3,13 @@ package io.onedev.server.search.entity.project;
import static io.onedev.server.search.entity.project.ProjectQueryLexer.Is;
import java.util.ArrayList;
+import java.util.List;
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
+import javax.persistence.criteria.Order;
import javax.persistence.criteria.Predicate;
import com.google.common.base.Splitter;
@@ -49,6 +51,11 @@ public class FuzzyCriteria extends Criteria<Project> {
return new AndCriteria<>(criterias);
}
+ @Override
+ public List<Order> getPreferOrders(CriteriaBuilder builder, From<Project, Project> from) {
+ return List.of(builder.asc(from.get(Project.PROP_PATH_LEN)));
+ }
+
@Override
public String toStringWithoutParens() {
return "~" + StringUtils.escape(value, "~") + "~";