The Unified and Autonomous Development Platform
fix: issue fuzzy query no longer works (#1396)
Robin Shen3dda139346ce
diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex 7304ad6e04..acd038806c 100644--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java@@ -5344,5 +5344,56 @@ public class DataMigrator {}}}++ private void migrate123(File dataDir, Stack<Integer> versions) {+ var issueTouchesDoc = new VersionedXmlDoc();+ var issueTouchesElement = issueTouchesDoc.addElement("list");+ var pullRequestTouchesDoc = new VersionedXmlDoc();+ var pullRequestTouchesElement = pullRequestTouchesDoc.addElement("list");+ var codeCommentTouchesDoc = new VersionedXmlDoc();+ var codeCommentTouchesElement = codeCommentTouchesDoc.addElement("list");++ var issueTouchId = 1L;+ var pullRequestTouchId = 1L;+ var codeCommentTouchId = 1L;+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Issues.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ var issueTouchElement = issueTouchesElement.addElement("io.onedev.server.model.IssueTouch");+ issueTouchElement.addAttribute("revision", "0.0.0");+ issueTouchElement.addElement("id").setText(String.valueOf(issueTouchId++));+ issueTouchElement.addElement("project").setText(element.elementTextTrim("project"));+ issueTouchElement.addElement("issueId").setText(element.elementTextTrim("id"));+ }+ } else if (file.getName().startsWith("PullRequests.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ var pullRequestTouchElement = pullRequestTouchesElement.addElement("io.onedev.server.model.PullRequestTouch");+ pullRequestTouchElement.addAttribute("revision", "0.0.0");+ pullRequestTouchElement.addElement("id").setText(String.valueOf(pullRequestTouchId++));+ pullRequestTouchElement.addElement("project").setText(element.elementTextTrim("targetProject"));+ pullRequestTouchElement.addElement("requestId").setText(element.elementTextTrim("id"));+ }+ } else if (file.getName().startsWith("CodeComments.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ var codeCommentTouchElement = codeCommentTouchesElement.addElement("io.onedev.server.model.CodeCommentTouch");+ codeCommentTouchElement.addAttribute("revision", "0.0.0");+ codeCommentTouchElement.addElement("id").setText(String.valueOf(codeCommentTouchId++));+ codeCommentTouchElement.addElement("project").setText(element.elementTextTrim("project"));+ codeCommentTouchElement.addElement("commentId").setText(element.elementTextTrim("id"));+ }+ } else if (file.getName().startsWith("IssueTouchs.xml")+ || file.getName().startsWith("PullRequestTouchs.xml")+ || file.getName().startsWith("CodeCommentTouchs.xml")) {+ FileUtils.deleteFile(file);+ }+ }++ issueTouchesDoc.writeToFile(new File(dataDir, "IssueTouchs.xml"), true);+ pullRequestTouchesDoc.writeToFile(new File(dataDir, "PullRequestTouchs.xml"), true);+ codeCommentTouchesDoc.writeToFile(new File(dataDir, "CodeCommentTouchs.xml"), true);+ }}diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultCodeCommentTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultCodeCommentTextManager.javaindex 087b3cdea9..0542cecf34 100644--- a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultCodeCommentTextManager.java+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultCodeCommentTextManager.java@@ -66,7 +66,7 @@ public class DefaultCodeCommentTextManager extends ProjectTextManager<CodeCommen@Overrideprotected int getIndexVersion() {- return 5;+ return 6;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextManager.javaindex bef17715b3..7c54ae4fb2 100644--- a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextManager.java+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextManager.java@@ -18,7 +18,6 @@ import io.onedev.server.util.lucene.BooleanQueryBuilder;import io.onedev.server.util.lucene.LuceneUtils;import org.apache.lucene.analysis.Analyzer;import org.apache.lucene.document.Document;-import org.apache.lucene.document.LongPoint;import org.apache.lucene.document.StringField;import org.apache.lucene.document.TextField;import org.apache.lucene.index.Term;@@ -41,7 +40,6 @@ import static io.onedev.server.util.criteria.Criteria.forManyValues;import static java.lang.String.valueOf;import static java.util.stream.Collectors.toSet;import static org.apache.lucene.document.Field.Store.NO;-import static org.apache.lucene.document.LongPoint.newExactQuery;import static org.apache.lucene.search.BooleanClause.Occur.MUST;import static org.apache.lucene.search.BooleanClause.Occur.SHOULD;@@ -85,7 +83,7 @@ public class DefaultIssueTextManager extends ProjectTextManager<Issue> implement@Overrideprotected int getIndexVersion() {- return 6;+ return 7;}@Override@@ -95,12 +93,11 @@ public class DefaultIssueTextManager extends ProjectTextManager<Issue> implement@Overrideprotected void addFields(Document entityDoc, Issue entity) {- entityDoc.add(new LongPoint(FIELD_NUMBER, entity.getNumber()));+ entityDoc.add(new StringField(FIELD_NUMBER, valueOf(entity.getNumber()), NO));entityDoc.add(new StringField(FIELD_CONFIDENTIAL, valueOf(entity.isConfidential()), NO));entityDoc.add(new TextField(FIELD_TITLE, entity.getTitle(), NO));if (entity.getDescription() != null)entityDoc.add(new TextField(FIELD_DESCRIPTION, entity.getDescription(), NO));- StringBuilder builder = new StringBuilder();for (var comment: entity.getComments()) {if (!comment.getUser().equals(userManager.getSystem()))entityDoc.add(new TextField(FIELD_COMMENT, comment.getContent(), NO));@@ -152,7 +149,7 @@ public class DefaultIssueTextManager extends ProjectTextManager<Issue> implementnumberString = numberString.substring(1);try {long number = Long.parseLong(numberString);- contentQueryBuilder.add(new BoostQuery(newExactQuery(FIELD_NUMBER, number), 1f), SHOULD);+ contentQueryBuilder.add(new BoostQuery(getTermQuery(FIELD_NUMBER, valueOf(number)), 1f), SHOULD);} catch (NumberFormatException ignored) {}diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextManager.javaindex f6a3a54b8a..54c7226686 100644--- a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextManager.java+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextManager.java@@ -79,7 +79,7 @@ public class DefaultPullRequestTextManager extends ProjectTextManager<PullReques@Overrideprotected int getIndexVersion() {- return 5;+ return 6;}@Override