The Unified and Autonomous Development Platform
Fix issue #1347 - Can not create issue with title starting with "["
Robin Shen07bf4dfe1346
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 484ece6452..2f0d0d7363 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@@ -16,7 +16,6 @@ import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.util.concurrent.BatchWorkManager;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.Field.Store;@@ -40,6 +39,8 @@ import java.util.HashMap;import java.util.List;import java.util.Map;+import static io.onedev.server.util.lucene.LuceneUtils.escape;+@Singletonpublic class DefaultCodeCommentTextManager extends ProjectTextManager<CodeComment>implements CodeCommentTextManager {@@ -101,32 +102,37 @@ public class DefaultCodeCommentTextManager extends ProjectTextManager<CodeCommen});}+ @Nullableprivate Query buildQuery(Project project, String queryString) {BooleanQueryBuilder queryBuilder = new BooleanQueryBuilder();queryBuilder.add(LongPoint.newExactQuery(FIELD_PROJECT_ID, project.getId()), Occur.MUST);BooleanQueryBuilder contentQueryBuilder = new BooleanQueryBuilder();- queryString = LuceneUtils.escape(queryString);- Query pathQuery = new BoostQuery(new WildcardQuery(new Term(FIELD_PATH, "*" + queryString + "*")), 0.75f);- try (Analyzer analyzer = newAnalyzer()) {- Map<String, Float> boosts = new HashMap<>();- boosts.put(FIELD_COMMENT, 0.75f);- boosts.put(FIELD_REPLIES, 0.5f);- MultiFieldQueryParser parser = new MultiFieldQueryParser(- new String[] {FIELD_COMMENT, FIELD_REPLIES}, analyzer, boosts) {-- protected Query newTermQuery(Term term, float boost) {- return new BoostQuery(new PrefixQuery(term), boost);- }-- };- contentQueryBuilder.add(parser.parse(LuceneUtils.escape(queryString)), Occur.SHOULD);- } catch (ParseException e) {- throw new RuntimeException(e);+ var escaped = escape(queryString);+ if (escaped != null) {+ Query pathQuery = new BoostQuery(new WildcardQuery(new Term(FIELD_PATH, "*" + escaped + "*")), 0.75f);+ try (Analyzer analyzer = newAnalyzer()) {+ Map<String, Float> boosts = new HashMap<>();+ boosts.put(FIELD_COMMENT, 0.75f);+ boosts.put(FIELD_REPLIES, 0.5f);+ MultiFieldQueryParser parser = new MultiFieldQueryParser(+ new String[] {FIELD_COMMENT, FIELD_REPLIES}, analyzer, boosts) {++ protected Query newTermQuery(Term term, float boost) {+ return new BoostQuery(new PrefixQuery(term), boost);+ }++ };+ contentQueryBuilder.add(parser.parse(escaped), Occur.SHOULD);+ } catch (ParseException e) {+ throw new RuntimeException(e);+ }+ queryBuilder.add(contentQueryBuilder.build(), Occur.MUST);++ return queryBuilder.build();+ } else {+ return null;}- queryBuilder.add(contentQueryBuilder.build(), Occur.MUST);-- return queryBuilder.build();}@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 a004b27ede..26546e9870 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@@ -48,6 +48,8 @@ import java.io.ObjectStreamException;import java.util.*;import java.util.stream.Collectors;+import static org.apache.lucene.document.LongPoint.newExactQuery;+@Singletonpublic class DefaultIssueTextManager extends ProjectTextManager<Issue> implements IssueTextManager {@@ -205,14 +207,14 @@ public class DefaultIssueTextManager extends ProjectTextManager<Issue> implementif (projectScope.isRecursive())projectQueryBuilder.add(buildQuery(projectManager.getSubtreeIds(project.getId())), Occur.SHOULD);else if (SecurityUtils.canAccessConfidentialIssues(projectScope.getProject()))- projectQueryBuilder.add(LongPoint.newExactQuery(FIELD_PROJECT_ID, project.getId()), Occur.SHOULD);+ projectQueryBuilder.add(newExactQuery(FIELD_PROJECT_ID, project.getId()), Occur.SHOULD);elseprojectQueryBuilder.add(getNonConfidentialQuery(project), Occur.SHOULD);if (projectScope.isInherited()) {for (Project ancestor: projectScope.getProject().getAncestors()) {if (SecurityUtils.canAccessConfidentialIssues(ancestor))- projectQueryBuilder.add(LongPoint.newExactQuery(FIELD_PROJECT_ID, ancestor.getId()), Occur.SHOULD);+ projectQueryBuilder.add(newExactQuery(FIELD_PROJECT_ID, ancestor.getId()), Occur.SHOULD);else if (SecurityUtils.canAccess(ancestor))projectQueryBuilder.add(getNonConfidentialQuery(ancestor), Occur.SHOULD);}@@ -236,7 +238,7 @@ public class DefaultIssueTextManager extends ProjectTextManager<Issue> implementnumberString = numberString.substring(1);try {Long number = Long.valueOf(numberString);- contentQueryBuilder.add(new BoostQuery(LongPoint.newExactQuery(FIELD_NUMBER, number), 1f), Occur.SHOULD);+ contentQueryBuilder.add(new BoostQuery(newExactQuery(FIELD_NUMBER, number), 1f), Occur.SHOULD);} catch (NumberFormatException e) {}@@ -252,7 +254,11 @@ public class DefaultIssueTextManager extends ProjectTextManager<Issue> implementreturn new BoostQuery(new PrefixQuery(term), boost);}};- contentQueryBuilder.add(parser.parse(LuceneUtils.escape(queryString)), Occur.SHOULD);+ var escaped = LuceneUtils.escape(queryString);+ if (escaped != null)+ contentQueryBuilder.add(parser.parse(escaped), Occur.SHOULD);+ else+ return null;} catch (ParseException e) {throw new RuntimeException(e);}@@ -281,7 +287,7 @@ public class DefaultIssueTextManager extends ProjectTextManager<Issue> implementBooleanQueryBuilder nonConfidentialQueryBuilder = new BooleanQueryBuilder();nonConfidentialQueryBuilder.add(Criteria.forManyValues(FIELD_PROJECT_ID, projectIdsWithoutConfidentialIssuePermission, allIds), Occur.MUST);- nonConfidentialQueryBuilder.add(LongPoint.newExactQuery(FIELD_CONFIDENTIAL, 0L), Occur.MUST);+ nonConfidentialQueryBuilder.add(newExactQuery(FIELD_CONFIDENTIAL, 0L), Occur.MUST);queryBuilder.add(nonConfidentialQueryBuilder.build(), Occur.SHOULD);return queryBuilder.build();}@@ -289,36 +295,27 @@ public class DefaultIssueTextManager extends ProjectTextManager<Issue> implementprivate BooleanQuery getNonConfidentialQuery(Project project) {BooleanQueryBuilder builder = new BooleanQueryBuilder();- builder.add(LongPoint.newExactQuery(FIELD_PROJECT_ID, project.getId()), Occur.MUST);- builder.add(LongPoint.newExactQuery(FIELD_CONFIDENTIAL, 0L), Occur.MUST);+ builder.add(newExactQuery(FIELD_PROJECT_ID, project.getId()), Occur.MUST);+ builder.add(newExactQuery(FIELD_CONFIDENTIAL, 0L), Occur.MUST);return builder.build();}@Overridepublic List<Issue> query(@Nullable ProjectScope projectScope, String queryString,boolean loadFieldsAndLinks, int firstResult, int maxResults) {- Query query = buildQuery(projectScope, queryString);- if (query != null) {- List<Issue> issues = search(query, firstResult, maxResults);-- if (loadFieldsAndLinks && !issues.isEmpty()) {- fieldManager.populateFields(issues);- linkManager.populateLinks(issues);- }-- return issues;- } else {- return new ArrayList<>();+ var issues = search(buildQuery(projectScope, queryString), firstResult, maxResults);++ if (loadFieldsAndLinks && !issues.isEmpty()) {+ fieldManager.populateFields(issues);+ linkManager.populateLinks(issues);}++ return issues;}@Overridepublic long count(@Nullable ProjectScope projectScope, String queryString) {- Query query = buildQuery(projectScope, queryString);- if (query != null)- return count(query);- else- return 0;+ return count(buildQuery(projectScope, queryString));}}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 aab69f18db..9778729fad 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@@ -41,9 +41,14 @@ import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;import java.io.ObjectStreamException;-import java.util.*;+import java.util.Collection;+import java.util.HashMap;+import java.util.List;+import java.util.Map;import java.util.stream.Collectors;+import static org.apache.lucene.document.LongPoint.newExactQuery;+@Singletonpublic class DefaultPullRequestTextManager extends ProjectTextManager<PullRequest>implements PullRequestTextManager {@@ -151,7 +156,7 @@ public class DefaultPullRequestTextManager extends ProjectTextManager<PullRequesprivate Query buildQuery(@Nullable Project project, String queryString) {BooleanQueryBuilder queryBuilder = new BooleanQueryBuilder();if (project != null) {- queryBuilder.add(LongPoint.newExactQuery(FIELD_PROJECT_ID, project.getId()), Occur.MUST);+ queryBuilder.add(newExactQuery(FIELD_PROJECT_ID, project.getId()), Occur.MUST);} else if (!SecurityUtils.isAdministrator()) {Collection<Project> projects = projectManager.getPermittedProjects(new ReadCode());if (!projects.isEmpty()) {@@ -171,7 +176,7 @@ public class DefaultPullRequestTextManager extends ProjectTextManager<PullRequesnumberString = numberString.substring(1);try {Long number = Long.valueOf(numberString);- contentQueryBuilder.add(new BoostQuery(LongPoint.newExactQuery(FIELD_NUMBER, number), 1f), Occur.SHOULD);+ contentQueryBuilder.add(new BoostQuery(newExactQuery(FIELD_NUMBER, number), 1f), Occur.SHOULD);} catch (NumberFormatException ignored) {}@@ -188,7 +193,11 @@ public class DefaultPullRequestTextManager extends ProjectTextManager<PullReques}};- contentQueryBuilder.add(parser.parse(LuceneUtils.escape(queryString)), Occur.SHOULD);+ var escaped = LuceneUtils.escape(queryString);+ if (escaped != null)+ contentQueryBuilder.add(parser.parse(escaped), Occur.SHOULD);+ else+ return null;} catch (ParseException e) {throw new RuntimeException(e);}@@ -199,27 +208,18 @@ public class DefaultPullRequestTextManager extends ProjectTextManager<PullReques@Overridepublic List<PullRequest> query(@Nullable Project project, String queryString,- boolean loadReviewsAndBuilds, int firstResult, int maxResults) {- Query query = buildQuery(project, queryString);- if (query != null) {- List<PullRequest> requests = search(query, firstResult, maxResults);- if (!requests.isEmpty() && loadReviewsAndBuilds) {- reviewManager.populateReviews(requests);- buildManager.populateBuilds(requests);- }- return requests;- } else {- return new ArrayList<>();+ boolean loadReviewsAndBuilds, int firstResult, int maxResults) {+ List<PullRequest> requests = search(buildQuery(project, queryString), firstResult, maxResults);+ if (!requests.isEmpty() && loadReviewsAndBuilds) {+ reviewManager.populateReviews(requests);+ buildManager.populateBuilds(requests);}+ return requests;}@Overridepublic long count(@Nullable Project project, String queryString) {- Query query = buildQuery(project, queryString);- if (query != null)- return count(query);- else- return 0;+ return count(buildQuery(project, queryString));}}diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/ProjectTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/ProjectTextManager.javaindex 2bbca468a0..e8a004a6b1 100644--- a/server-core/src/main/java/io/onedev/server/search/entitytext/ProjectTextManager.java+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/ProjectTextManager.java@@ -367,72 +367,80 @@ public abstract class ProjectTextManager<T extends ProjectBelonging> implements}}- protected long count(Query query) {- String queryString = query.toString();- return clusterManager.runOnAllServers(() -> {- if (searcherManager != null) {- try {- IndexSearcher indexSearcher = searcherManager.acquire();+ protected long count(@Nullable Query query) {+ if (query != null) {+ String queryString = query.toString();+ return clusterManager.runOnAllServers(() -> {+ if (searcherManager != null) {try {- TotalHitCountCollector collector = new TotalHitCountCollector();- indexSearcher.search(parse(queryString), collector);- return (long) collector.getTotalHits();- } finally {- searcherManager.release(indexSearcher);+ IndexSearcher indexSearcher = searcherManager.acquire();+ try {+ TotalHitCountCollector collector = new TotalHitCountCollector();+ indexSearcher.search(parse(queryString), collector);+ return (long) collector.getTotalHits();+ } finally {+ searcherManager.release(indexSearcher);+ }+ } catch (IOException e) {+ throw new RuntimeException(e);}- } catch (IOException e) {- throw new RuntimeException(e);+ } else {+ return 0L;}- } else {- return 0L;- }- }).values().stream().reduce(0L, Long::sum);+ }).values().stream().reduce(0L, Long::sum);+ } else {+ return 0;+ }}- protected List<T> search(Query query, int firstResult, int maxResults) {- String queryString = query.toString();- Map<Long, Float> entityScores = new HashMap<>();- for (var entry: clusterManager.runOnAllServers((ClusterTask<Map<Long, Float>>) () -> {- if (searcherManager != null) {- try {- IndexSearcher indexSearcher = searcherManager.acquire();+ protected List<T> search(@Nullable Query query, int firstResult, int maxResults) {+ if (query != null) {+ String queryString = query.toString();+ Map<Long, Float> entityScores = new HashMap<>();+ for (var entry : clusterManager.runOnAllServers((ClusterTask<Map<Long, Float>>) () -> {+ if (searcherManager != null) {try {- Map<Long, Float> theEntityScores = new HashMap<>();- TopDocs topDocs = indexSearcher.search(parse(queryString), firstResult + maxResults);- for (var scoreDoc: topDocs.scoreDocs) {- Document doc = indexSearcher.doc(scoreDoc.doc);- theEntityScores.put(valueOf(doc.get(FIELD_ENTITY_ID)), scoreDoc.score);+ IndexSearcher indexSearcher = searcherManager.acquire();+ try {+ Map<Long, Float> theEntityScores = new HashMap<>();+ TopDocs topDocs = indexSearcher.search(parse(queryString), firstResult + maxResults);+ for (var scoreDoc : topDocs.scoreDocs) {+ Document doc = indexSearcher.doc(scoreDoc.doc);+ theEntityScores.put(valueOf(doc.get(FIELD_ENTITY_ID)), scoreDoc.score);+ }+ return theEntityScores;+ } finally {+ searcherManager.release(indexSearcher);}- return theEntityScores;- } finally {- searcherManager.release(indexSearcher);+ } catch (IOException e) {+ throw new RuntimeException(e);}- } catch (IOException e) {- throw new RuntimeException(e);+ } else {+ return new HashMap<>();}+ }).entrySet()) {+ entityScores.putAll(entry.getValue());+ }++ List<Long> entityIds = new ArrayList<>(entityScores.keySet());+ entityIds.sort((o1, o2) -> {+ Float score1 = entityScores.get(o1);+ Float score2 = entityScores.get(o2);+ return Float.compare(score1, score2) * -1;+ });++ if (firstResult < entityIds.size()) {+ EntityCriteria<T> criteria = EntityCriteria.of(entityClass);+ criteria.add(Restrictions.in(+ AbstractEntity.PROP_ID,+ entityIds.subList(firstResult, Math.min(firstResult + maxResults, entityIds.size()))));++ List<T> entities = dao.query(criteria);+ entities.sort(comparingInt(o -> entityIds.indexOf(o.getId())));+ return entities;} else {- return new HashMap<>();+ return new ArrayList<>();}- }).entrySet()) {- entityScores.putAll(entry.getValue());- }-- List<Long> entityIds = new ArrayList<>(entityScores.keySet());- entityIds.sort((o1, o2) -> {- Float score1 = entityScores.get(o1);- Float score2 = entityScores.get(o2);- return Float.compare(score1, score2) * -1;- });-- if (firstResult < entityIds.size()) {- EntityCriteria<T> criteria = EntityCriteria.of(entityClass);- criteria.add(Restrictions.in(- AbstractEntity.PROP_ID,- entityIds.subList(firstResult, Math.min(firstResult + maxResults, entityIds.size()))));-- List<T> entities = dao.query(criteria);- entities.sort(comparingInt(o -> entityIds.indexOf(o.getId())));- return entities;} else {return new ArrayList<>();}diff --git a/server-core/src/main/java/io/onedev/server/util/lucene/LuceneUtils.java b/server-core/src/main/java/io/onedev/server/util/lucene/LuceneUtils.javaindex 9d5290f024..9fa9e34b16 100644--- a/server-core/src/main/java/io/onedev/server/util/lucene/LuceneUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/lucene/LuceneUtils.java@@ -2,15 +2,19 @@ package io.onedev.server.util.lucene;import java.util.concurrent.atomic.AtomicBoolean;+import io.onedev.commons.utils.StringUtils;import org.apache.lucene.search.Query;import org.apache.lucene.search.QueryVisitor;import org.bouncycastle.util.Arrays;+import javax.annotation.Nullable;+public class LuceneUtils {private static final char[] SPECIAL_CHARS = new char[] {'+', '-', '&', '|', '!', '(', ')','{', '}', '[', ']', '^', '"', '~', '*', '?', ':', '\\', '/'};+ @Nullablepublic static String escape(String queryString) {StringBuilder builder = new StringBuilder();for (char ch: queryString.toCharArray()) {@@ -20,10 +24,14 @@ public class LuceneUtils {builder.append(ch);}- return builder.toString()+ var escaped = builder.toString().replace("AND", "and").replace("OR", "or").replace("NOT", "not");+ if (StringUtils.isNotBlank(escaped))+ return escaped;+ else+ return null;}public static boolean isEmpty(Query query) {