The Unified and Autonomous Development Platform
chore: Improved fuzzy query
Robin Shenee4fbf088f52
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.javaindex 9699560073..3e7685b5c9 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java@@ -6823,7 +6823,14 @@ public class DataMigrator {private void migrate172(File dataDir, Stack<Integer> versions) {for (File file : dataDir.listFiles()) {- if (file.getName().startsWith("Users.xml")) {+ if (file.getName().startsWith("Projects.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements()) {+ var path = element.elementText("path").trim();+ element.addElement("pathLen").setText(String.valueOf(path.length()));+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("Users.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);for (Element element : dom.getRootElement().elements())element.addElement("notifyOwnEvents").setText("false");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.javaindex 62d1a57db4..9f58163fa6 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@@ -954,7 +954,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>}if (orders.isEmpty())- orders.add(builder.asc(ProjectQuery.getPath(root, Project.PROP_PATH)));+ orders.add(builder.asc(root.get(Project.PROP_PATH_LEN)));query.orderBy(orders);return query;diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex 53e8260c80..ada2bd1b2a 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -137,6 +137,8 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabelpublic static final String NAME_LABEL = "Label";public static final String PROP_PARENT = "parent";++ public static final String PROP_PATH_LEN = "pathLen";public static final String PROP_USER_AUTHORIZATIONS = "userAuthorizations";@@ -216,6 +218,9 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel@JsonIgnore@Column(nullable=false)private String path;++ @JsonIgnore+ private int pathLen;// SQL Server does not allow duplicate null values for unique column. So we use// special prefix to indicate null@@ -456,6 +461,15 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabelpublic void setPath(String path) {this.path = path;+ pathLen = path.length();+ }++ public int getPathLen() {+ return pathLen;+ }++ public void setPathLen(int pathLen) {+ this.pathLen = pathLen;}@Editable(order=200)diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/FuzzyCriteria.javaindex 95e3c3888f..4e0ba70510 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/FuzzyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/FuzzyCriteria.java@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.codecomment;import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.CodeComment;+import io.onedev.server.util.criteria.AndCriteria;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.criteria.OrCriteria;@@ -9,8 +10,9 @@ import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.From;import javax.persistence.criteria.Predicate;+import java.util.ArrayList;-import static io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer.*;+import static io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer.Is;public class FuzzyCriteria extends Criteria<CodeComment> {@@ -33,11 +35,16 @@ public class FuzzyCriteria extends Criteria<CodeComment> {}private Criteria<CodeComment> parse(String value) {- var normalizedValue = normalizeFuzzyQuery(value);- return new OrCriteria<>(- new ContentCriteria(normalizedValue),- new ReplyCriteria(normalizedValue),- new PathCriteria("*" + value + "*", Is));+ var terms = normalizeFuzzyQuery(value);+ var contentCriteria = new ArrayList<Criteria<CodeComment>>();+ var replyCriteria = new ArrayList<Criteria<CodeComment>>();+ var pathCriterias = new ArrayList<Criteria<CodeComment>>();+ for (var term: terms) {+ contentCriteria.add(new ContentCriteria(term));+ replyCriteria.add(new ReplyCriteria(term));+ pathCriterias.add(new PathCriteria("*" + term + "*", Is));+ }+ return new OrCriteria<>(new AndCriteria<>(contentCriteria), new AndCriteria<>(replyCriteria), new AndCriteria<>(pathCriterias));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FuzzyCriteria.javaindex 0e2cefc30e..dd01a955ac 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FuzzyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FuzzyCriteria.java@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.issue;import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.Issue;+import io.onedev.server.util.criteria.AndCriteria;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.criteria.OrCriteria;@@ -9,6 +10,7 @@ import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.From;import javax.persistence.criteria.Predicate;+import java.util.ArrayList;public class FuzzyCriteria extends Criteria<Issue> {@@ -31,8 +33,16 @@ public class FuzzyCriteria extends Criteria<Issue> {}private Criteria<Issue> parse(String value) {- var normalizedValue = normalizeFuzzyQuery(value);- return new OrCriteria<>(new TitleCriteria(normalizedValue), new DescriptionCriteria(normalizedValue), new CommentCriteria(normalizedValue));+ var terms = normalizeFuzzyQuery(value);+ var titleCriterias = new ArrayList<Criteria<Issue>>();+ var descriptionCriterias = new ArrayList<Criteria<Issue>>();+ var commentCriterias = new ArrayList<Criteria<Issue>>();+ for (var term: terms) {+ titleCriterias.add(new TitleCriteria(term));+ descriptionCriterias.add(new DescriptionCriteria(term));+ commentCriterias.add(new CommentCriteria(term));+ }+ return new OrCriteria<>(new AndCriteria<>(titleCriterias), new AndCriteria<>(descriptionCriterias), new AndCriteria<>(commentCriterias));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/FuzzyCriteria.javaindex 5e6a378a35..456173b808 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/FuzzyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/FuzzyCriteria.java@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.pullrequest;import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.PullRequest;+import io.onedev.server.util.criteria.AndCriteria;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.criteria.OrCriteria;@@ -9,6 +10,7 @@ import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.From;import javax.persistence.criteria.Predicate;+import java.util.ArrayList;public class FuzzyCriteria extends Criteria<PullRequest> {@@ -31,11 +33,16 @@ public class FuzzyCriteria extends Criteria<PullRequest> {}private Criteria<PullRequest> parse(String value) {- var normalizedValue = normalizeFuzzyQuery(value);- return new OrCriteria<>(- new TitleCriteria(normalizedValue),- new DescriptionCriteria(normalizedValue),- new CommentCriteria(normalizedValue));+ var terms = normalizeFuzzyQuery(value);+ var titleCriterias = new ArrayList<Criteria<PullRequest>>();+ var descriptionCriterias = new ArrayList<Criteria<PullRequest>>();+ var commentCriterias = new ArrayList<Criteria<PullRequest>>();+ for (var term: terms) {+ titleCriterias.add(new TitleCriteria(term));+ descriptionCriterias.add(new DescriptionCriteria(term));+ commentCriterias.add(new CommentCriteria(term));+ }+ return new OrCriteria<>(new AndCriteria<>(titleCriterias), new AndCriteria<>(descriptionCriterias), new AndCriteria<>(commentCriterias));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.javaindex 56368f21dc..dd1d5a8f95 100644--- a/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.java+++ b/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.java@@ -222,13 +222,13 @@ public abstract class Criteria<T> implements Serializable {return null;}- protected String normalizeFuzzyQuery(String query) {- return Joiner.on("*").join(Splitter.on(new CharMatcher() {+ public static List<String> normalizeFuzzyQuery(String query) {+ return Splitter.on(new CharMatcher() {@Overridepublic boolean matches(char c) {return !Character.isLetterOrDigit(c);}- }).omitEmptyStrings().trimResults().splitToList(query));+ }).omitEmptyStrings().trimResults().splitToList(query);}}