The Unified and Autonomous Development Platform
fix: content-Length header incorrect for deployed site files (#1378)
Robin Shenc87338b58633
diff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.javaindex a9ad3b591e..45a6f9bd27 100644--- a/server-core/src/main/java/io/onedev/server/OneDev.java+++ b/server-core/src/main/java/io/onedev/server/OneDev.java@@ -346,6 +346,12 @@ public class OneDev extends AbstractPlugin implements Serializable, Runnable {}}+ public static File getIndexDir() {+ File indexDir = new File(Bootstrap.getSiteDir(), "index");+ FileUtils.createDir(indexDir);+ return indexDir;+ }+public static File getAssetsDir() {return new File(Bootstrap.getSiteDir(), "assets");}diff --git a/server-core/src/main/java/io/onedev/server/attachment/DefaultAttachmentManager.java b/server-core/src/main/java/io/onedev/server/attachment/DefaultAttachmentManager.javaindex 1c6a92f20c..69af28ba15 100644--- a/server-core/src/main/java/io/onedev/server/attachment/DefaultAttachmentManager.java+++ b/server-core/src/main/java/io/onedev/server/attachment/DefaultAttachmentManager.java@@ -18,12 +18,12 @@ import io.onedev.server.event.project.issue.IssuesCopied;import io.onedev.server.event.project.issue.IssuesMoved;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.event.system.SystemStopping;+import io.onedev.server.exception.AttachmentTooLargeException;import io.onedev.server.model.Issue;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.exception.AttachmentTooLargeException;import io.onedev.server.util.artifact.FileInfo;import io.onedev.server.util.schedule.SchedulableTask;import io.onedev.server.util.schedule.TaskScheduler;@@ -326,23 +326,18 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableT@Sessional@Overridepublic void execute() {- var localServer = clusterManager.getLocalServerAddress();- for (var entry: projectManager.getActiveServers().entrySet()) {- var projectId = entry.getKey();- var activeServer = entry.getValue();- if (localServer.equals(activeServer)) {- try {- File tempAttachmentBase = new File(projectManager.getAttachmentDir(projectId), TEMP);- if (tempAttachmentBase.exists()) {- for (File attachmentGroupDir: tempAttachmentBase.listFiles()) {- if (System.currentTimeMillis() - attachmentGroupDir.lastModified() > TEMP_PRESERVE_PERIOD) {- FileUtils.deleteDir(attachmentGroupDir);- }+ for (var projectId: projectManager.getActiveIds()) {+ try {+ File tempAttachmentBase = new File(projectManager.getAttachmentDir(projectId), TEMP);+ if (tempAttachmentBase.exists()) {+ for (File attachmentGroupDir: tempAttachmentBase.listFiles()) {+ if (System.currentTimeMillis() - attachmentGroupDir.lastModified() > TEMP_PRESERVE_PERIOD) {+ FileUtils.deleteDir(attachmentGroupDir);}}- } catch (Exception e) {- logger.error("Error cleaning up temp attachments", e);}+ } catch (Exception e) {+ logger.error("Error cleaning up temp attachments", e);}}}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.javaindex 679db0c903..675c6255c4 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java@@ -10,6 +10,7 @@ import io.onedev.server.util.artifact.ArtifactInfo;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.facade.ProjectCache;import io.onedev.server.util.facade.ProjectFacade;+import io.onedev.server.util.patternset.PatternSet;import org.apache.shiro.authz.Permission;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.Repository;@@ -78,6 +79,8 @@ public interface ProjectManager extends EntityManager<Project> {Collection<Long> getSubtreeIds(Long projectId);+ Collection<Long> getPathMatchingIds(PatternSet patternSet);+Collection<Project> getPermittedProjects(Permission permission);ProjectCache cloneCache();@@ -88,7 +91,7 @@ public interface ProjectManager extends EntityManager<Project> {@NullableString getActiveServer(Long projectId, boolean mustExist);- Map<Long, String> getActiveServers();+ Collection<Long> getActiveIds();<T> T runOnActiveServer(Long projectId, ClusterTask<T> task);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 0fbd32d2a0..75871a6e38 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@@ -1052,6 +1052,11 @@ public class DefaultProjectManager extends BaseEntityManager<Project>return cache.getSubtreeIds(projectId);}+ @Override+ public Collection<Long> getPathMatchingIds(PatternSet patternSet) {+ return cache.getMatchingIds(patternSet);+ }+@Overridepublic Collection<Long> getIds() {return new HashSet<>(cache.keySet());@@ -1124,12 +1129,13 @@ public class DefaultProjectManager extends BaseEntityManager<Project>}@Override- public Map<Long, String> getActiveServers() {- return new HashMap<>(activeServers);+ public Collection<Long> getActiveIds() {+ var localServer = clusterManager.getLocalServerAddress();+ return activeServers.project(Map.Entry::getKey, entry -> entry.getValue().equals(localServer));}-- private String updateActiveServer(Long projectId,- Map<String, ProjectReplica> replicasOfProject,++ private String updateActiveServer(Long projectId,+ Map<String, ProjectReplica> replicasOfProject,boolean syncReplicas) {var effectiveReplicasOfProject = new LinkedHashMap<String, ProjectReplica>();for (var entry : replicasOfProject.entrySet()) {@@ -1251,7 +1257,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>String mediaType = Files.probeContentType(siteArtifact.toPath());if (mediaType == null)mediaType = MediaType.APPLICATION_OCTET_STREAM;- return new FileInfo(siteArtifactPath, siteArtifact.length(), siteArtifact.lastModified(), mediaType);+ return new FileInfo(siteArtifactPath, siteArtifact.lastModified(), siteArtifact.length(), mediaType);} else {return new DirectoryInfo(siteArtifactPath, siteArtifact.lastModified(), null);}diff --git a/server-core/src/main/java/io/onedev/server/git/GitUtils.java b/server-core/src/main/java/io/onedev/server/git/GitUtils.javaindex f19c384f91..260f8e3543 100644--- a/server-core/src/main/java/io/onedev/server/git/GitUtils.java+++ b/server-core/src/main/java/io/onedev/server/git/GitUtils.java@@ -4,6 +4,7 @@ import com.google.common.base.Objects;import com.google.common.base.*;import com.google.common.collect.Iterables;import io.onedev.commons.utils.PathUtils;+import io.onedev.commons.utils.StringUtils;import io.onedev.server.git.command.IsAncestorCommand;import io.onedev.server.git.exception.ObjectNotFoundException;import io.onedev.server.git.exception.ObsoleteCommitException;@@ -538,6 +539,13 @@ public class GitUtils {}}+ public static String getBlobName(String blobPath) {+ String blobName = blobPath;+ if (blobPath.indexOf('/') != -1)+ blobName = StringUtils.substringAfterLast(blobPath, "/");+ return blobName;+ }+public static void sign(ObjectBuilder object, PGPSecretKeyRing signingKey) {JcePBESecretKeyDecryptorBuilder decryptorBuilder = new JcePBESecretKeyDecryptorBuilder().setProvider(BouncyCastleProvider.PROVIDER_NAME);diff --git a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.javaindex ee8e56455e..932004fe28 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java@@ -444,7 +444,7 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManagerStore dailyContributionsStore = getStore(env, DAILY_CONTRIBUTIONS_STORE);Repository repository = projectManager.getRepository(project.getId());- PatternSet filePatterns = project.findCodeAnalysisPatterns();+ PatternSet filePatterns = PatternSet.parse(project.findCodeAnalysisPatterns());ObjectId lastCommitId = env.computeInTransaction(txn -> {ObjectId innerLastCommitId;@@ -624,7 +624,7 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManagerreturn null;});- PatternSet filePatterns = project.findCodeAnalysisPatterns();+ PatternSet filePatterns = PatternSet.parse(project.findCodeAnalysisPatterns());if (lastCommitId == null) {env.executeInTransaction(txn -> {Map<Integer, Map<String, Integer>> lineStats = new HashMap<>();@@ -1049,14 +1049,9 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManager@Sessional@Listenpublic void on(SystemStarted event) {- var localServer = clusterManager.getLocalServerAddress();- for (var entry: projectManager.getActiveServers().entrySet()) {- var projectId = entry.getKey();- var activeServer = entry.getValue();- if (localServer.equals(activeServer)) {- checkVersion(getEnvDir(projectId.toString()));- collect(projectId);- }+ for (var projectId: projectManager.getActiveIds()) {+ checkVersion(getEnvDir(projectId.toString()));+ collect(projectId);}}diff --git a/server-core/src/main/java/io/onedev/server/infomanager/DefaultIssueInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultIssueInfoManager.javaindex 92d47cefe4..6403434e3a 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/DefaultIssueInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultIssueInfoManager.java@@ -3,14 +3,13 @@ package io.onedev.server.infomanager;import com.google.common.base.Preconditions;import io.onedev.commons.loader.ManagedSerializedForm;import io.onedev.commons.utils.FileUtils;-import io.onedev.server.cluster.ClusterManager;import io.onedev.server.cluster.ClusterTask;import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.event.Listen;-import io.onedev.server.event.project.ProjectDeleted;import io.onedev.server.event.project.ActiveServerChanged;+import io.onedev.server.event.project.ProjectDeleted;import io.onedev.server.event.project.issue.*;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.model.Issue;@@ -68,19 +67,15 @@ public class DefaultIssueInfoManager extends AbstractMultiEnvironmentManagerprivate final IssueChangeManager issueChangeManager;- private final ClusterManager clusterManager;-private final ProjectManager projectManager;@Injectpublic DefaultIssueInfoManager(IssueManager issueManager, IssueChangeManager issueChangeManager,- BatchWorkManager batchWorkManager, ProjectManager projectManager,- ClusterManager clusterManager) {+ BatchWorkManager batchWorkManager, ProjectManager projectManager) {this.issueManager = issueManager;this.issueChangeManager = issueChangeManager;this.batchWorkManager = batchWorkManager;this.projectManager = projectManager;- this.clusterManager = clusterManager;}public Object writeReplace() throws ObjectStreamException {@@ -246,14 +241,9 @@ public class DefaultIssueInfoManager extends AbstractMultiEnvironmentManager@Sessional@Listenpublic void on(SystemStarted event) {- var localServer = clusterManager.getLocalServerAddress();- for (var entry: projectManager.getActiveServers().entrySet()) {- var projectId = entry.getKey();- var activeServer = entry.getValue();- if (localServer.equals(activeServer)) {- checkVersion(getEnvDir(projectId.toString()));- batchWorkManager.submit(getBatchWorker(projectId), new Prioritized(PRIORITY));- }+ for (var projectId: projectManager.getActiveIds()) {+ checkVersion(getEnvDir(projectId.toString()));+ batchWorkManager.submit(getBatchWorker(projectId), new Prioritized(PRIORITY));}}diff --git a/server-core/src/main/java/io/onedev/server/infomanager/DefaultPullRequestInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultPullRequestInfoManager.javaindex f77a1d4597..44b9ad5fcb 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/DefaultPullRequestInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultPullRequestInfoManager.java@@ -2,13 +2,12 @@ package io.onedev.server.infomanager;import io.onedev.commons.loader.ManagedSerializedForm;import io.onedev.commons.utils.FileUtils;-import io.onedev.server.cluster.ClusterManager;import io.onedev.server.cluster.ClusterTask;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.PullRequestUpdateManager;import io.onedev.server.event.Listen;-import io.onedev.server.event.project.ProjectDeleted;import io.onedev.server.event.project.ActiveServerChanged;+import io.onedev.server.event.project.ProjectDeleted;import io.onedev.server.event.project.pullrequest.PullRequestOpened;import io.onedev.server.event.project.pullrequest.PullRequestUpdated;import io.onedev.server.event.system.SystemStarted;@@ -64,15 +63,12 @@ public class DefaultPullRequestInfoManager extends AbstractMultiEnvironmentManagprivate final PullRequestUpdateManager pullRequestUpdateManager;- private final ClusterManager clusterManager;-@Injectpublic DefaultPullRequestInfoManager(ProjectManager projectManager, PullRequestUpdateManager pullRequestUpdateManager,- BatchWorkManager batchWorkManager, ClusterManager clusterManager) {+ BatchWorkManager batchWorkManager) {this.projectManager = projectManager;this.pullRequestUpdateManager = pullRequestUpdateManager;this.batchWorkManager = batchWorkManager;- this.clusterManager = clusterManager;}public Object writeReplace() throws ObjectStreamException {@@ -164,14 +160,9 @@ public class DefaultPullRequestInfoManager extends AbstractMultiEnvironmentManag@Sessional@Listenpublic void on(SystemStarted event) {- var localServer = clusterManager.getLocalServerAddress();- for (var entry: projectManager.getActiveServers().entrySet()) {- var projectId = entry.getKey();- var activeServer = entry.getValue();- if (localServer.equals(activeServer)) {- checkVersion(getEnvDir(projectId.toString()));- batchWorkManager.submit(getBatchWorker(projectId), new Prioritized(PRIORITY));- }+ for (var projectId: projectManager.getActiveIds()) {+ checkVersion(getEnvDir(projectId.toString()));+ batchWorkManager.submit(getBatchWorker(projectId), new Prioritized(PRIORITY));}}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 c0d55e2287..d2d511293c 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@@ -1631,15 +1631,15 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabelreturn null;}- public PatternSet findCodeAnalysisPatterns() {+ public String findCodeAnalysisPatterns() {Project current = this;do {if (current.getCodeAnalysisSetting().getAnalyzeFiles() != null)- return PatternSet.parse(current.getCodeAnalysisSetting().getAnalyzeFiles());+ return current.getCodeAnalysisSetting().getAnalyzeFiles();current = current.getParent();} while (current != null);-- return PatternSet.parse("**");++ return "**";}public MergeStrategy findDefaultMergeStrategy() {diff --git a/server-core/src/main/java/io/onedev/server/search/code/CodeIndexManager.java b/server-core/src/main/java/io/onedev/server/search/code/CodeIndexManager.javaindex 2392cf6c0b..7a12be260f 100644--- a/server-core/src/main/java/io/onedev/server/search/code/CodeIndexManager.java+++ b/server-core/src/main/java/io/onedev/server/search/code/CodeIndexManager.java@@ -13,8 +13,6 @@ public interface CodeIndexManager {boolean isIndexed(Long projectId, ObjectId commitId);- String getIndexVersion();-String getIndexVersion(@Nullable SymbolExtractor<Symbol> extractor);}diff --git a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexManager.java b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexManager.javaindex 6e34a5868a..dcc79107da 100644--- a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexManager.java+++ b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexManager.java@@ -279,19 +279,14 @@ public class DefaultCodeIndexManager implements CodeIndexManager, Serializable {@Overridepublic void doWorks(List<Prioritized> works) {- sessionManager.run(new Runnable() {+ sessionManager.run(() -> {+ Preconditions.checkState(works.size() == 1);- @Override- public void run() {- Preconditions.checkState(works.size() == 1);-- Project project = projectManager.load(projectId);- ObjectId commitId = ((IndexWork) works.iterator().next()).getCommitId();- doIndex(project, commitId);-- listenerRegistry.post(new CommitIndexed(project, commitId.copy()));- }+ Project project = projectManager.load(projectId);+ ObjectId commitId = ((IndexWork) works.iterator().next()).getCommitId();+ doIndex(project, commitId);+ listenerRegistry.post(new CommitIndexed(project, commitId.copy()));});}@@ -305,7 +300,7 @@ public class DefaultCodeIndexManager implements CodeIndexManager, Serializable {try {logger.debug("Indexing commit (project: {}, commit: {})", project.getPath(), commit.getName());IndexResult indexResult = index(projectManager.getRepository(project.getId()),- commit, writer, searcher, project.findCodeAnalysisPatterns());+ commit, writer, searcher, PatternSet.parse(project.findCodeAnalysisPatterns()));writer.commit();return indexResult;} catch (Exception e) {@@ -335,8 +330,7 @@ public class DefaultCodeIndexManager implements CodeIndexManager, Serializable {}}- @Override- public String getIndexVersion() {+ private String getIndexVersion() {return DigestUtils.md5Hex(DATA_VERSION + ";" + SymbolExtractorRegistry.getVersion());}@@ -357,7 +351,7 @@ public class DefaultCodeIndexManager implements CodeIndexManager, Serializable {private static final long serialVersionUID = 1L;@Override- public Boolean call() throws Exception {+ public Boolean call() {File indexDir = projectManager.getIndexDir(projectId);try (Directory directory = FSDirectory.open(indexDir.toPath())) {if (DirectoryReader.indexExists(directory)) {diff --git a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeSearchManager.java b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeSearchManager.javaindex 6470f9ebce..32f2edce7f 100644--- a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeSearchManager.java+++ b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeSearchManager.java@@ -241,7 +241,7 @@ public class DefaultCodeSearchManager implements CodeSearchManager, SerializableBytesRef bytesRef = document.getBinaryValue(BLOB_SYMBOL_LIST.name());if (bytesRef != null) {try {- symbolsRef.set((List<Symbol>) SerializationUtils.deserialize(bytesRef.bytes));+ symbolsRef.set(SerializationUtils.deserialize(bytesRef.bytes));} catch (Exception e) {logger.error("Error deserializing symbols", e);}@@ -325,13 +325,12 @@ public class DefaultCodeSearchManager implements CodeSearchManager, Serializableprivate static final long serialVersionUID = 1L;@Override- public String call() throws Exception {- FileQuery.Builder builder = new FileQuery.Builder();- builder.caseSensitive(true);- builder.count(MAX_BLOB_PATH_QUERY_COUNT);-+ public String call() {+ var query = new FileQuery.Builder(fileName)+ .caseSensitive(true)+ .count(MAX_BLOB_PATH_QUERY_COUNT)+ .build();String blobPath = null;- BlobQuery query = builder.fileNames(fileName).build();try {for (QueryHit hit: search(projectId, commit, query)) {if (partialBlobPath == null || hit.getBlobPath().contains(partialBlobPath)) {@@ -343,7 +342,7 @@ public class DefaultCodeSearchManager implements CodeSearchManager, Serializable}}}- } catch (TooGeneralQueryException e) {+ } catch (TooGeneralQueryException ignored) {} catch (InterruptedException e) {throw new RuntimeException(e);}diff --git a/server-core/src/main/java/io/onedev/server/search/code/FieldConstants.java b/server-core/src/main/java/io/onedev/server/search/code/FieldConstants.javaindex a66a0fd98e..b98c837988 100644--- a/server-core/src/main/java/io/onedev/server/search/code/FieldConstants.java+++ b/server-core/src/main/java/io/onedev/server/search/code/FieldConstants.java@@ -4,9 +4,9 @@ import org.apache.lucene.index.Term;import org.apache.lucene.search.TermQuery;public enum FieldConstants {- BLOB_INDEX_VERSION, BLOB_HASH, BLOB_PATH, BLOB_NAME, BLOB_SYMBOL_LIST,+ PROJECT_ID, BLOB_INDEX_VERSION, BLOB_HASH, BLOB_PATH, BLOB_NAME, BLOB_SYMBOL_LIST,BLOB_PRIMARY_SYMBOLS, BLOB_SECONDARY_SYMBOLS, BLOB_TEXT, COMMIT_INDEX_VERSION, COMMIT_HASH,- META, LAST_COMMIT, LAST_COMMIT_HASH, LAST_COMMIT_INDEX_VERSION;+ META, BLOB, LAST_COMMIT, LAST_COMMIT_HASH, LAST_COMMIT_INDEX_VERSION;public TermQuery getTermQuery(String value) {return new TermQuery(getTerm(value));diff --git a/server-core/src/main/java/io/onedev/server/search/code/hit/TextHit.java b/server-core/src/main/java/io/onedev/server/search/code/hit/TextHit.javaindex 1db05ad010..8ed6e03209 100644--- a/server-core/src/main/java/io/onedev/server/search/code/hit/TextHit.java+++ b/server-core/src/main/java/io/onedev/server/search/code/hit/TextHit.java@@ -14,25 +14,24 @@ public class TextHit extends QueryHit {private static final long serialVersionUID = 1L;- private final String lineContent;+ private final String line;- public TextHit(String blobPath, String lineContent, PlanarRange hitPos) {+ public TextHit(String blobPath, PlanarRange hitPos, String line) {super(blobPath, hitPos);-- this.lineContent = lineContent;+ this.line = line;}- public String getLineContent() {- return lineContent;+ public String getLine() {+ return line;}@Overridepublic Component render(String componentId) {if (getTokenPos() != null) {- return new HighlightableLabel(componentId, lineContent,+ return new HighlightableLabel(componentId, line,new LinearRange(getTokenPos().getFromColumn(), getTokenPos().getToColumn()));} else {- return new HighlightableLabel(componentId, lineContent, null);+ return new HighlightableLabel(componentId, line, null);}}diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/BlobQuery.java b/server-core/src/main/java/io/onedev/server/search/code/query/BlobQuery.javaindex 3fc6154da9..ef550f61fc 100644--- a/server-core/src/main/java/io/onedev/server/search/code/query/BlobQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/code/query/BlobQuery.java@@ -62,25 +62,5 @@ public abstract class BlobQuery implements Serializable {}protected abstract void applyConstraints(BooleanQuery.Builder query);-- public static abstract class Builder {-- protected String directory;-- protected int count;-- public Builder directory(String directory) {- this.directory = directory;- return this;- }-- public Builder count(int count) {- this.count = count;- return this;- }-- public abstract BlobQuery build();-- }}diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/FileQuery.java b/server-core/src/main/java/io/onedev/server/search/code/query/FileQuery.javaindex 2e6b15271d..5ab6262ffa 100644--- a/server-core/src/main/java/io/onedev/server/search/code/query/FileQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/code/query/FileQuery.java@@ -1,110 +1,97 @@package io.onedev.server.search.code.query;-import static io.onedev.server.search.code.FieldConstants.BLOB_NAME;--import java.util.List;--import javax.annotation.Nullable;--import org.apache.lucene.index.Term;-import org.apache.lucene.search.BooleanClause.Occur;+import com.google.common.base.Preconditions;+import io.onedev.server.search.code.hit.FileHit;+import io.onedev.server.search.code.hit.QueryHit;import org.apache.lucene.search.BooleanQuery;import org.apache.lucene.search.IndexSearcher;-import org.apache.lucene.search.WildcardQuery;import org.eclipse.jgit.treewalk.TreeWalk;-import com.google.common.base.Preconditions;--import io.onedev.commons.utils.LinearRange;-import io.onedev.server.search.code.hit.FileHit;-import io.onedev.server.search.code.hit.QueryHit;-import io.onedev.server.util.match.WildcardUtils;+import javax.annotation.Nullable;+import java.util.List;public class FileQuery extends BlobQuery {private static final long serialVersionUID = 1L;- private final String fileNames;-- private final String excludeFileName;+ private final String term;private final boolean caseSensitive;- private FileQuery(String fileNames, @Nullable String excludeFileName, boolean caseSensitive,- @Nullable String directory, int count) {+ private final String excludeFileName;++ private FileQuery(String term, boolean caseSensitive, @Nullable String excludeFileName,+ @Nullable String directory, int count) {super(directory, count);-- this.fileNames = fileNames;- this.excludeFileName = excludeFileName;++ this.term = term;this.caseSensitive = caseSensitive;+ this.excludeFileName = excludeFileName;}@Overridepublic void collect(IndexSearcher searcher, TreeWalk treeWalk, List<QueryHit> hits) {String blobPath = treeWalk.getPathString();String blobName = blobPath.substring(blobPath.lastIndexOf('/')+1);- if (caseSensitive) {- if (WildcardUtils.matchString(fileNames, blobName)- && (excludeFileName == null || !excludeFileName.equals(blobName))) {- LinearRange match = WildcardUtils.rangeOfMatch(fileNames, blobName);- hits.add(new FileHit(blobPath, match));- }- } else {- if (WildcardUtils.matchString(fileNames, blobName.toLowerCase())- && (excludeFileName == null || !excludeFileName.equalsIgnoreCase(blobName))) {- LinearRange match = WildcardUtils.rangeOfMatch(fileNames, blobName.toLowerCase());- hits.add(new FileHit(blobPath, match));- }- }+ var match = getOption().matches(blobName, excludeFileName);+ if (match != null)+ hits.add(new FileHit(blobPath, match.orElse(null)));}@Overrideprotected void applyConstraints(BooleanQuery.Builder builder) {- boolean tooGeneral = true;- for (char ch: fileNames.toCharArray()) {- if (ch != '?' && ch != '*' && ch != ',' && ch != '.') {- tooGeneral = false;- break;- }- }- if (tooGeneral)- throw new TooGeneralQueryException();-- builder.add(new WildcardQuery(new Term(BLOB_NAME.name(), fileNames.toLowerCase())), Occur.MUST);+ getOption().applyConstraints(builder);}- public static class Builder extends BlobQuery.Builder {+ private FileQueryOption getOption() {+ return new FileQueryOption(term, caseSensitive);+ }++ public static class Builder {- private String excludeFileName;+ private String term;private boolean caseSensitive;-- private String fileNames;-- public Builder excludeFileName(String excludeFileName) {- this.excludeFileName = excludeFileName;- return this;++ private String excludeFileName;++ private String directory;++ private int count;++ public Builder(String term) {+ this.term = term;+ }++ public Builder(FileQueryOption option) {+ this(option.getTerm());+ caseSensitive(option.isCaseSensitive());}public Builder caseSensitive(boolean caseSensitive) {this.caseSensitive = caseSensitive;return this;}-- public Builder fileNames(String fileNames) {- this.fileNames = fileNames;++ public Builder excludeFileName(@Nullable String excludeFileName) {+ this.excludeFileName = excludeFileName;return this;}- @Override- public BlobQuery build() {- Preconditions.checkArgument(fileNames!=null, "File names should be specified");- Preconditions.checkArgument(count!=0, "Query count should be specified");-- return new FileQuery(fileNames, excludeFileName, caseSensitive,- directory, count);+ public Builder directory(String directory) {+ this.directory = directory;+ return this;+ }++ public Builder count(int count) {+ this.count = count;+ return this;}-- }+ public FileQuery build() {+ Preconditions.checkState(term != null);+ Preconditions.checkState(count != 0);+ return new FileQuery(term, caseSensitive, excludeFileName, directory, count);+ }+ }}diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/FileQueryOption.java b/server-core/src/main/java/io/onedev/server/search/code/query/FileQueryOption.javaindex 9892ca1980..0f60cb79f9 100644--- a/server-core/src/main/java/io/onedev/server/search/code/query/FileQueryOption.java+++ b/server-core/src/main/java/io/onedev/server/search/code/query/FileQueryOption.java@@ -1,43 +1,89 @@package io.onedev.server.search.code.query;-import io.onedev.server.web.component.codequeryoption.FileQueryOptionPanel;+import com.google.common.base.Preconditions;+import io.onedev.commons.utils.LinearRange;+import io.onedev.server.util.match.WildcardUtils;+import io.onedev.server.web.component.codequeryoption.FileQueryOptionEditor;+import org.apache.lucene.index.Term;+import org.apache.lucene.search.BooleanClause;+import org.apache.lucene.search.BooleanQuery;+import org.apache.lucene.search.WildcardQuery;import org.apache.wicket.markup.html.form.FormComponentPanel;import org.apache.wicket.model.Model;+import javax.annotation.Nullable;+import java.util.Optional;++import static io.onedev.server.search.code.FieldConstants.BLOB_NAME;+import static io.onedev.server.util.match.WildcardUtils.rangeOfMatch;+import static java.util.Optional.ofNullable;+public class FileQueryOption implements QueryOption {private static final long serialVersionUID = 1L;- private String term;+ private final String term;- private boolean caseSensitive;+ private final boolean caseSensitive;+ public FileQueryOption(@Nullable String term, boolean caseSensitive) {+ this.term = term;+ this.caseSensitive = caseSensitive;+ }++ public FileQueryOption() {+ this(null, false);+ }++ @Nullablepublic String getTerm() {return term;}- public void setTerm(String term) {- this.term = term;- }-public boolean isCaseSensitive() {return caseSensitive;}- public void setCaseSensitive(boolean caseSensitive) {- this.caseSensitive = caseSensitive;+ public void applyConstraints(BooleanQuery.Builder builder) {+ Preconditions.checkNotNull(term != null);++ boolean tooGeneral = true;+ for (char ch: term.toCharArray()) {+ if (ch != '?' && ch != '*' && ch != ',' && ch != '.') {+ tooGeneral = false;+ break;+ }+ }+ if (tooGeneral)+ throw new TooGeneralQueryException();++ builder.add(new WildcardQuery(new Term(BLOB_NAME.name(), term.toLowerCase())), BooleanClause.Occur.MUST);}- @Override- public BlobQuery.Builder newInsideCommitQueryBuilder() {- return new FileQuery.Builder()- .fileNames(term.toLowerCase())- .caseSensitive(caseSensitive);+ @Nullable+ public Optional<LinearRange> matches(String blobName, @Nullable String excludeFileName) {+ Preconditions.checkNotNull(term != null);++ if (caseSensitive) {+ if (WildcardUtils.matchString(term, blobName)+ && (excludeFileName == null || !excludeFileName.equals(blobName))) {+ return ofNullable(rangeOfMatch(term, blobName));+ } else {+ return null;+ }+ } else {+ if (WildcardUtils.matchString(term, blobName.toLowerCase())+ && (excludeFileName == null || !excludeFileName.equalsIgnoreCase(blobName))) {+ return ofNullable(rangeOfMatch(term, blobName.toLowerCase()));+ } else {+ return null;+ }+ }}@Overridepublic FormComponentPanel<? extends QueryOption> newOptionEditor(String componentId) {- return new FileQueryOptionPanel(componentId, Model.of(this));+ return new FileQueryOptionEditor(componentId, Model.of(this));}-+}diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/QueryOption.java b/server-core/src/main/java/io/onedev/server/search/code/query/QueryOption.javaindex 2e510b0e20..fb09e644b1 100644--- a/server-core/src/main/java/io/onedev/server/search/code/query/QueryOption.java+++ b/server-core/src/main/java/io/onedev/server/search/code/query/QueryOption.java@@ -5,9 +5,7 @@ import org.apache.wicket.markup.html.form.FormComponentPanel;import java.io.Serializable;public interface QueryOption extends Serializable {-- BlobQuery.Builder newInsideCommitQueryBuilder();-+FormComponentPanel<? extends QueryOption> newOptionEditor(String componentId);}diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.java b/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.javaindex be5be41e7a..89abae85b7 100644--- a/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.java@@ -1,33 +1,29 @@package io.onedev.server.search.code.query;import com.google.common.base.Preconditions;-import com.google.common.base.Splitter;import io.onedev.commons.jsymbol.Symbol;-import io.onedev.commons.utils.LinearRange;import io.onedev.server.OneDev;+import io.onedev.server.search.code.CodeSearchManager;import io.onedev.server.search.code.hit.QueryHit;import io.onedev.server.search.code.hit.SymbolHit;-import io.onedev.server.search.code.CodeSearchManager;-import io.onedev.server.util.match.WildcardUtils;-import org.apache.lucene.index.Term;-import org.apache.lucene.search.BooleanClause.Occur;import org.apache.lucene.search.BooleanQuery;import org.apache.lucene.search.IndexSearcher;-import org.apache.lucene.search.WildcardQuery;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.treewalk.TreeWalk;import javax.annotation.Nullable;import java.util.List;-import static io.onedev.server.search.code.FieldConstants.*;-public class SymbolQuery extends BlobQuery {private static final long serialVersionUID = 1L;private final String term;+ private final boolean caseSensitive;++ private final String fileNames;+private final String excludeTerm;private final String excludeBlobPath;@@ -36,22 +32,23 @@ public class SymbolQuery extends BlobQuery {private final Boolean local;- private final boolean caseSensitive;-- private final String fileNames;-- private SymbolQuery(String term, @Nullable String excludeTerm, @Nullable String excludeBlobPath,- @Nullable Boolean primary, @Nullable Boolean local, boolean caseSensitive, @Nullable String directory,- @Nullable String fileNames, int count) {+ private SymbolQuery(String term, boolean caseSensitive, String fileNames,+ @Nullable String excludeTerm, @Nullable String excludeBlobPath,+ @Nullable Boolean primary, @Nullable Boolean local,+ @Nullable String directory, int count) {super(directory, count);-+this.term = term;+ this.caseSensitive = caseSensitive;+ this.fileNames = fileNames;this.excludeTerm = excludeTerm;this.excludeBlobPath = excludeBlobPath;this.primary = primary;this.local = local;- this.caseSensitive = caseSensitive;- this.fileNames = fileNames;+ }++ private SymbolQueryOption getOption() {+ return new SymbolQueryOption(term, caseSensitive, fileNames);}@Override@@ -61,137 +58,95 @@ public class SymbolQuery extends BlobQuery {List<Symbol> symbols = OneDev.getInstance(CodeSearchManager.class).getSymbols(searcher, blobId, blobPath);if (symbols != null) {- for (Symbol symbol: symbols) {- if (hits.size() < getCount()) {- if ((primary==null || primary.booleanValue() == symbol.isPrimary())- && symbol.getName() != null- && symbol.isSearchable()- && (local == null || local.booleanValue() == symbol.isLocalInHierarchy())) {- String normalizedTerm;- if (!caseSensitive)- normalizedTerm = term.toLowerCase();- else- normalizedTerm = term;-- String normalizedSymbolName;- if (!caseSensitive)- normalizedSymbolName = symbol.getName().toLowerCase();- else- normalizedSymbolName = symbol.getName();-- String normalizedExcludeTerm;- if (excludeTerm != null) {- if (!caseSensitive)- normalizedExcludeTerm = excludeTerm.toLowerCase();- else- normalizedExcludeTerm = excludeTerm;- } else {- normalizedExcludeTerm = null;- }- if (WildcardUtils.matchString(normalizedTerm, normalizedSymbolName)- && (normalizedExcludeTerm == null || !normalizedSymbolName.equals(normalizedExcludeTerm))- && (excludeBlobPath == null || !excludeBlobPath.equals(blobPath))) {- LinearRange match = WildcardUtils.rangeOfMatch(normalizedTerm, normalizedSymbolName);- hits.add(new SymbolHit(blobPath, symbol, match));- }- }- } else {- break;- }- }+ var matches = getOption().matches(blobPath, symbols, excludeTerm, excludeBlobPath,+ primary, local, getCount() - hits.size());+ for (var match: matches)+ hits.add(new SymbolHit(blobPath, match.getSymbol(), match.getPosition()));}}@Overrideprotected void applyConstraints(BooleanQuery.Builder builder) {- if (fileNames != null) {- BooleanQuery.Builder subQueryBuilder = new BooleanQuery.Builder();- for (String pattern: Splitter.on(",").omitEmptyStrings().trimResults().split(fileNames.toLowerCase()))- subQueryBuilder.add(new WildcardQuery(new Term(BLOB_NAME.name(), pattern)), Occur.SHOULD);- BooleanQuery subQuery = subQueryBuilder.build();- if (subQuery.clauses().size() != 0)- builder.add(subQuery, Occur.MUST);- }-- boolean tooGeneral = true;- for (char ch: term.toCharArray()) {- if (ch != '?' && ch != '*') {- tooGeneral = false;- break;- }- }- if (tooGeneral)- throw new TooGeneralQueryException();-- if (primary != null) {- String fieldName;- if (primary)- fieldName = BLOB_PRIMARY_SYMBOLS.name();- else- fieldName = BLOB_SECONDARY_SYMBOLS.name();-- builder.add(new WildcardQuery(new Term(fieldName, term.toLowerCase())), Occur.MUST);- }+ getOption().applyConstraints(builder, primary);}-- public static class Builder extends BlobQuery.Builder {++ public static class Builder {private String term;+ private boolean caseSensitive;++ private String fileNames;+private String excludeTerm;-+private String excludeBlobPath;-+private Boolean primary;-+private Boolean local;- private boolean caseSensitive;-- private String fileNames;+ private String directory;- public Builder term(String term) {+ private int count;++ public Builder(String term) {this.term = term;- return this;}- public Builder excludeTerm(String excludeTerm) {+ public Builder(SymbolQueryOption option) {+ this(option.getTerm());+ caseSensitive(option.isCaseSensitive());+ fileNames(option.getFileNames());+ }++ public Builder caseSensitive(boolean caseSensitive) {+ this.caseSensitive = caseSensitive;+ return this;+ }++ public Builder fileNames(@Nullable String fileNames) {+ this.fileNames = fileNames;+ return this;+ }++ public Builder excludeTerm(@Nullable String excludeTerm) {this.excludeTerm = excludeTerm;return this;}-- public Builder excludeBlobPath(String excludeBlobPath) {++ public Builder excludeBlobPath(@Nullable String excludeBlobPath) {this.excludeBlobPath = excludeBlobPath;return this;}-- public Builder primary(Boolean primary) {++ public Builder primary(@Nullable Boolean primary) {this.primary = primary;return this;}-- public Builder local(Boolean local) {++ public Builder local(@Nullable Boolean local) {this.local = local;return this;}- public Builder caseSensitive(boolean caseSensitive) {- this.caseSensitive = caseSensitive;+ public Builder directory(@Nullable String directory) {+ this.directory = directory;return this;}-- public Builder fileNames(String fileNames) {- this.fileNames = fileNames;++ public Builder count(int count) {+ this.count = count;return this;}- @Override- public BlobQuery build() {- Preconditions.checkArgument(term!=null, "Query term should be specified");- Preconditions.checkArgument(count!=0, "Query count should be specified");- return new SymbolQuery(term, excludeTerm, excludeBlobPath, primary, local,- caseSensitive, directory, fileNames, count);+ public SymbolQuery build() {+ Preconditions.checkState(term != null);+ Preconditions.checkState(count != 0);+ return new SymbolQuery(term, caseSensitive, fileNames, excludeTerm,+ excludeBlobPath, primary, local, directory, count);}}+}diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQueryOption.java b/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQueryOption.javaindex 9e017bb853..90d13823eb 100644--- a/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQueryOption.java+++ b/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQueryOption.java@@ -1,55 +1,165 @@package io.onedev.server.search.code.query;-import io.onedev.server.web.component.codequeryoption.SymbolQueryOptionPanel;+import com.google.common.base.Preconditions;+import com.google.common.base.Splitter;+import io.onedev.commons.jsymbol.Symbol;+import io.onedev.commons.utils.LinearRange;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.util.patternset.PatternSet;+import io.onedev.server.web.component.codequeryoption.SymbolQueryOptionEditor;+import org.apache.lucene.index.Term;+import org.apache.lucene.search.BooleanClause;+import org.apache.lucene.search.BooleanQuery;+import org.apache.lucene.search.WildcardQuery;import org.apache.wicket.markup.html.form.FormComponentPanel;import org.apache.wicket.model.Model;+import javax.annotation.Nullable;+import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import static io.onedev.server.search.code.FieldConstants.*;+import static io.onedev.server.util.match.WildcardUtils.matchString;+import static io.onedev.server.util.match.WildcardUtils.rangeOfMatch;+public class SymbolQueryOption implements QueryOption {private static final long serialVersionUID = 1L;- private String term;-- private String fileNames;-- private boolean caseSensitive;+ private final String term;++ private final boolean caseSensitive;++ private final String fileNames;++ public SymbolQueryOption(@Nullable String term, boolean caseSensitive, @Nullable String fileNames) {+ this.term = term;+ this.caseSensitive = caseSensitive;+ this.fileNames = fileNames;+ }++ public SymbolQueryOption() {+ this(null, false, null);+ }+ @Nullablepublic String getTerm() {return term;}- public void setTerm(String term) {- this.term = term;- }-public String getFileNames() {return fileNames;}- public void setFileNames(String fileNames) {- this.fileNames = fileNames;- }-public boolean isCaseSensitive() {return caseSensitive;}++ public List<Match> matches(String blobPath, List<Symbol> symbols, @Nullable String excludeTerm,+ @Nullable String excludeBlobPath, @Nullable Boolean primary,+ @Nullable Boolean local, int count) {+ Preconditions.checkNotNull(term != null);++ var matches = new ArrayList<Match>();+ for (Symbol symbol: symbols) {+ if (matches.size() < count) {+ if ((primary==null || primary.booleanValue() == symbol.isPrimary())+ && symbol.getName() != null+ && symbol.isSearchable()+ && (local == null || local.booleanValue() == symbol.isLocalInHierarchy())) {+ String normalizedTerm;+ if (!caseSensitive)+ normalizedTerm = term.toLowerCase();+ else+ normalizedTerm = term;- public void setCaseSensitive(boolean caseSensitive) {- this.caseSensitive = caseSensitive;+ String normalizedSymbolName;+ if (!caseSensitive)+ normalizedSymbolName = symbol.getName().toLowerCase();+ else+ normalizedSymbolName = symbol.getName();++ String normalizedExcludeTerm;+ if (excludeTerm != null) {+ if (!caseSensitive)+ normalizedExcludeTerm = excludeTerm.toLowerCase();+ else+ normalizedExcludeTerm = excludeTerm;+ } else {+ normalizedExcludeTerm = null;+ }+ if (matchString(normalizedTerm, normalizedSymbolName)+ && !normalizedSymbolName.equals(normalizedExcludeTerm)+ && !blobPath.equals(excludeBlobPath)) {+ matches.add(new Match(symbol, rangeOfMatch(normalizedTerm, normalizedSymbolName)));+ }+ }+ } else {+ break;+ }+ }+ return matches;}- @Override- public BlobQuery.Builder newInsideCommitQueryBuilder() {- return new SymbolQuery.Builder()- .term(term)- .primary(true)- .caseSensitive(caseSensitive)- .fileNames(fileNames);+ public void applyConstraints(BooleanQuery.Builder builder, @Nullable Boolean primary) {+ Preconditions.checkNotNull(term != null);+ if (fileNames != null) {+ BooleanQuery.Builder subQueryBuilder = new BooleanQuery.Builder();+ for (String pattern: Splitter.on(",").omitEmptyStrings().trimResults().split(fileNames.toLowerCase()))+ subQueryBuilder.add(new WildcardQuery(new Term(BLOB_NAME.name(), pattern)), BooleanClause.Occur.SHOULD);+ BooleanQuery subQuery = subQueryBuilder.build();+ if (subQuery.clauses().size() != 0)+ builder.add(subQuery, BooleanClause.Occur.MUST);+ }++ boolean tooGeneral = true;+ for (char ch: term.toCharArray()) {+ if (ch != '?' && ch != '*') {+ tooGeneral = false;+ break;+ }+ }+ if (tooGeneral)+ throw new TooGeneralQueryException();++ if (primary != null) {+ String fieldName;+ if (primary)+ fieldName = BLOB_PRIMARY_SYMBOLS.name();+ else+ fieldName = BLOB_SECONDARY_SYMBOLS.name();++ builder.add(new WildcardQuery(new Term(fieldName, term.toLowerCase())), BooleanClause.Occur.MUST);+ }}@Overridepublic FormComponentPanel<? extends QueryOption> newOptionEditor(String componentId) {- return new SymbolQueryOptionPanel(componentId, Model.of(this));+ return new SymbolQueryOptionEditor(componentId, Model.of(this));+ }++ public static class Match implements Serializable {++ private static final long serialVersionUID = 1L;++ private final Symbol symbol;++ private final LinearRange position;++ public Match(Symbol symbol, @Nullable LinearRange position) {+ this.symbol = symbol;+ this.position = position;+ }++ public Symbol getSymbol() {+ return symbol;+ }++ @Nullable+ public LinearRange getPosition() {+ return position;+ }}}diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/TextQuery.java b/server-core/src/main/java/io/onedev/server/search/code/query/TextQuery.javaindex fc1d72818c..c30e2ac2c2 100644--- a/server-core/src/main/java/io/onedev/server/search/code/query/TextQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/code/query/TextQuery.java@@ -1,217 +1,91 @@package io.onedev.server.search.code.query;import com.google.common.base.Preconditions;-import com.google.common.base.Splitter;-import io.onedev.commons.utils.LinearRange;-import io.onedev.commons.utils.PlanarRange;-import io.onedev.server.search.code.IndexConstants;import io.onedev.server.search.code.hit.QueryHit;import io.onedev.server.search.code.hit.TextHit;-import io.onedev.server.search.code.query.regex.RegexLiterals;-import io.onedev.server.util.ContentDetector;-import org.apache.commons.lang3.CharUtils;-import org.apache.lucene.index.Term;-import org.apache.lucene.search.BooleanClause.Occur;import org.apache.lucene.search.BooleanQuery;import org.apache.lucene.search.IndexSearcher;-import org.apache.lucene.search.WildcardQuery;import org.eclipse.jgit.lib.ObjectLoader;import org.eclipse.jgit.treewalk.TreeWalk;import javax.annotation.Nullable;import java.io.IOException;import java.util.List;-import java.util.regex.Matcher;-import java.util.regex.Pattern;--import static io.onedev.server.search.code.IndexConstants.NGRAM_SIZE;-import static io.onedev.server.search.code.FieldConstants.BLOB_NAME;-import static io.onedev.server.search.code.FieldConstants.BLOB_TEXT;public class TextQuery extends BlobQuery {private static final long serialVersionUID = 1L;- private static int MAX_LINE_LEN = 1024;-private final String term;-+private final boolean regex;-- private final boolean caseSensitive;-+private final boolean wholeWord;-++ private final boolean caseSensitive;+private final String fileNames;- private transient Pattern pattern;-- private TextQuery(String term, boolean regex, boolean caseSensitive, boolean wholeWord,- @Nullable String directory, @Nullable String fileNames, int count) {+ private TextQuery(String term, boolean regex, boolean wholeWord, boolean caseSensitive,+ @Nullable String fileNames, @Nullable String directory, int count) {super(directory, count);-this.term = term;this.regex = regex;- this.caseSensitive = caseSensitive;this.wholeWord = wholeWord;+ this.caseSensitive = caseSensitive;this.fileNames = fileNames;}- @Nullable- private Pattern getPattern() {- if (regex) {- if (pattern == null) {- String expression = term;- if (wholeWord) {- if (!expression.startsWith("\\b"))- expression = "\\b" + expression;- if (!expression.endsWith("\\b"))- expression = expression + "\\b";- }- if (caseSensitive)- pattern = Pattern.compile(expression);- else- pattern = Pattern.compile(expression, Pattern.CASE_INSENSITIVE);- }- return pattern;- } else {- return null;- }- }-@Overridepublic void collect(IndexSearcher searcher, TreeWalk treeWalk, List<QueryHit> hits) {ObjectLoader objectLoader;try {objectLoader = treeWalk.getObjectReader().open(treeWalk.getObjectId(0));- if (objectLoader.getSize() <= IndexConstants.MAX_INDEXABLE_SIZE) {- String blobPath = treeWalk.getPathString();- String content = ContentDetector.convertToText(objectLoader.getCachedBytes(), blobPath);- if (content != null) {- Pattern pattern = getPattern();- if (pattern != null) {- int lineNo = 0;- for (String line: Splitter.on('\n').split(content)) {- if (line.length() <= MAX_LINE_LEN) {- Matcher matcher = pattern.matcher(line);- while (matcher.find()) {- LinearRange range = new LinearRange(matcher.start(), matcher.end());- PlanarRange position = new PlanarRange(lineNo, range.getFrom(), lineNo, range.getTo());- hits.add(new TextHit(blobPath, line, position));- if (hits.size() >= getCount())- break;- }- if (hits.size() >= getCount())- break;- }- lineNo++;- }- } else {- String normalizedTerm;- if (!caseSensitive)- normalizedTerm = term.toLowerCase();- else- normalizedTerm = term;-- int lineNo = 0;- for (String line: Splitter.on('\n').split(content)) {- if (line.length() <= MAX_LINE_LEN) {- String normalizedLine;- if (!caseSensitive)- normalizedLine = line.toLowerCase();- else- normalizedLine = line;-- int start = normalizedLine.indexOf(normalizedTerm, 0);- while (start != -1) {- int end = start + normalizedTerm.length();- if (wholeWord) {- char beforeChar;- if (start == 0)- beforeChar = ' ';- else- beforeChar = line.charAt(start-1);-- char afterChar;- if (end == line.length())- afterChar = ' ';- else- afterChar = line.charAt(end);-- if (!isWordChar(beforeChar) && !isWordChar(afterChar)) {- LinearRange range = new LinearRange(start, end);- PlanarRange position = new PlanarRange(lineNo, range.getFrom(), lineNo, range.getTo());- hits.add(new TextHit(blobPath, line, position));- if (hits.size() >= getCount())- break;- }- } else {- LinearRange range = new LinearRange(start, end);- PlanarRange position = new PlanarRange(lineNo, range.getFrom(), lineNo, range.getTo());- hits.add(new TextHit(blobPath, line, position));- if (hits.size() >= getCount())- break;- }- start = normalizedLine.indexOf(normalizedTerm, end);- }- if (hits.size() >= getCount())- break;- }- lineNo++;- }- }- }- }+ var blobPath = treeWalk.getPathString();+ for (var match: getOption().matches(blobPath, objectLoader, getCount() - hits.size()))+ hits.add(new TextHit(blobPath, match.getPosition(), match.getLine()));} catch (IOException e) {throw new RuntimeException(e);}}- private boolean isWordChar(char ch) {- return CharUtils.isAsciiAlphanumeric(ch) || ch == '_';- }-@Overrideprotected void applyConstraints(BooleanQuery.Builder builder) {- if (fileNames != null) {- BooleanQuery.Builder subQueryBuilder = new BooleanQuery.Builder();- for (String pattern: Splitter.on(",").omitEmptyStrings().trimResults().split(fileNames.toLowerCase()))- subQueryBuilder.add(new WildcardQuery(new Term(BLOB_NAME.name(), pattern)), Occur.SHOULD);- BooleanQuery subQuery = subQueryBuilder.build();- if (subQuery.clauses().size() != 0)- builder.add(subQuery, Occur.MUST);- }-- if (regex)- builder.add(new RegexLiterals(term).asNGramQuery(BLOB_TEXT.name(), NGRAM_SIZE), Occur.MUST);- else if (term.length() >= NGRAM_SIZE)- builder.add(new NGramLuceneQuery(BLOB_TEXT.name(), term, NGRAM_SIZE), Occur.MUST);- else- throw new TooGeneralQueryException();+ getOption().applyConstraints(builder);+ }++ private TextQueryOption getOption() {+ return new TextQueryOption(term, regex, wholeWord, caseSensitive, fileNames);}- public static class Builder extends BlobQuery.Builder {+ public static class Builder {private String term;private boolean regex;-+private boolean wholeWord;-+private boolean caseSensitive;-+private String fileNames;- public Builder term(String term) {+ private String directory;++ private int count;++ public Builder(String term) {this.term = term;- return this;}- public Builder count(int count) {- this.count = count;- return this;+ public Builder(TextQueryOption option) {+ this(option.getTerm());+ regex(option.isRegex());+ wholeWord(option.isWholeWord());+ caseSensitive(option.isCaseSensitive());+ fileNames(option.getFileNames());}-+public Builder regex(boolean regex) {this.regex = regex;return this;@@ -221,29 +95,32 @@ public class TextQuery extends BlobQuery {this.wholeWord = wholeWord;return this;}-+public Builder caseSensitive(boolean caseSensitive) {this.caseSensitive = caseSensitive;return this;}-++ public Builder fileNames(String fileNames) {+ this.fileNames = fileNames;+ return this;+ }+public Builder directory(String directory) {this.directory = directory;return this;}-- public Builder fileNames(String fileNames) {- this.fileNames = fileNames;++ public Builder count(int count) {+ this.count = count;return this;}- @Override- public BlobQuery build() {- Preconditions.checkArgument(term!=null, "Query term should be specified");- Preconditions.checkArgument(count!=0, "Query count should be specified");- return new TextQuery(term, regex, caseSensitive, wholeWord, directory, fileNames, count);+ public TextQuery build() {+ Preconditions.checkState(term != null);+ Preconditions.checkState(count != 0);+ return new TextQuery(term, regex, wholeWord, caseSensitive,+ fileNames, directory, count);}-}-}diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/TextQueryOption.java b/server-core/src/main/java/io/onedev/server/search/code/query/TextQueryOption.javaindex 067b6735ff..7a3d77bbeb 100644--- a/server-core/src/main/java/io/onedev/server/search/code/query/TextQueryOption.java+++ b/server-core/src/main/java/io/onedev/server/search/code/query/TextQueryOption.java@@ -1,76 +1,242 @@package io.onedev.server.search.code.query;-import io.onedev.server.web.component.codequeryoption.TextQueryOptionPanel;+import com.google.common.base.Preconditions;+import com.google.common.base.Splitter;+import io.onedev.commons.utils.LinearRange;+import io.onedev.commons.utils.PlanarRange;+import io.onedev.server.search.code.IndexConstants;+import io.onedev.server.search.code.query.regex.RegexLiterals;+import io.onedev.server.util.ContentDetector;+import io.onedev.server.web.component.codequeryoption.TextQueryOptionEditor;+import org.apache.commons.lang3.CharUtils;+import org.apache.lucene.index.Term;+import org.apache.lucene.search.BooleanClause;+import org.apache.lucene.search.BooleanQuery;+import org.apache.lucene.search.WildcardQuery;import org.apache.wicket.markup.html.form.FormComponentPanel;import org.apache.wicket.model.Model;+import org.eclipse.jgit.lib.ObjectLoader;++import javax.annotation.Nullable;+import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;+import java.util.regex.Matcher;+import java.util.regex.Pattern;++import static io.onedev.server.search.code.FieldConstants.BLOB_NAME;+import static io.onedev.server.search.code.FieldConstants.BLOB_TEXT;+import static io.onedev.server.search.code.IndexConstants.NGRAM_SIZE;public class TextQueryOption implements QueryOption {private static final long serialVersionUID = 1L;- private String term;-- private boolean regex;+ private static int MAX_LINE_LEN = 1024;++ private final String term;- private boolean caseSensitive;+ private final boolean regex;- private boolean wholeWord;+ private final boolean wholeWord;++ private final boolean caseSensitive;++ private final String fileNames;- private String fileNames;+ private transient Pattern pattern;++ public TextQueryOption(@Nullable String term, boolean regex, boolean wholeWord,+ boolean caseSensitive, @Nullable String fileNames) {+ this.term = term;+ this.regex = regex;+ this.wholeWord = wholeWord;+ this.caseSensitive = caseSensitive;+ this.fileNames = fileNames;+ }++ public TextQueryOption() {+ this(null, false, false, false, null);+ }+ @Nullablepublic String getTerm() {return term;}- public void setTerm(String term) {- this.term = term;- }-public boolean isRegex() {return regex;}- public void setRegex(boolean regex) {- this.regex = regex;- }-public boolean isCaseSensitive() {return caseSensitive;}- public void setCaseSensitive(boolean caseSensitive) {- this.caseSensitive = caseSensitive;- }-public boolean isWholeWord() {return wholeWord;}- public void setWholeWord(boolean wholeWord) {- this.wholeWord = wholeWord;- }-public String getFileNames() {return fileNames;}- public void setFileNames(String fileNames) {- this.fileNames = fileNames;+ @Nullable+ private Pattern getPattern() {+ if (regex) {+ if (pattern == null) {+ String expression = term;+ if (wholeWord) {+ if (!expression.startsWith("\\b"))+ expression = "\\b" + expression;+ if (!expression.endsWith("\\b"))+ expression = expression + "\\b";+ }+ if (caseSensitive)+ pattern = Pattern.compile(expression);+ else+ pattern = Pattern.compile(expression, Pattern.CASE_INSENSITIVE);+ }+ return pattern;+ } else {+ return null;+ }+ }++ private boolean isWordChar(char ch) {+ return CharUtils.isAsciiAlphanumeric(ch) || ch == '_';}- @Override- public BlobQuery.Builder newInsideCommitQueryBuilder() {- return new TextQuery.Builder()- .term(term)- .regex(regex)- .caseSensitive(caseSensitive)- .wholeWord(wholeWord)- .fileNames(fileNames);+ public List<Match> matches(String blobPath, ObjectLoader objectLoader, int count) {+ Preconditions.checkNotNull(term != null);++ var matches = new ArrayList<Match>();+ if (objectLoader.getSize() <= IndexConstants.MAX_INDEXABLE_SIZE) {+ String content = ContentDetector.convertToText(objectLoader.getCachedBytes(), blobPath);+ if (content != null) {+ Pattern pattern = getPattern();+ if (pattern != null) {+ int lineNo = 0;+ for (String line: Splitter.on('\n').split(content)) {+ if (line.length() <= MAX_LINE_LEN) {+ Matcher matcher = pattern.matcher(line);+ while (matcher.find()) {+ LinearRange range = new LinearRange(matcher.start(), matcher.end());+ PlanarRange position = new PlanarRange(lineNo, range.getFrom(), lineNo, range.getTo());+ matches.add(new Match(line, position));+ if (matches.size() >= count)+ break;+ }+ if (matches.size() >= count)+ break;+ }+ lineNo++;+ }+ } else {+ String normalizedTerm;+ if (!caseSensitive)+ normalizedTerm = term.toLowerCase();+ else+ normalizedTerm = term;++ int lineNo = 0;+ for (String line: Splitter.on('\n').split(content)) {+ if (line.length() <= MAX_LINE_LEN) {+ String normalizedLine;+ if (!caseSensitive)+ normalizedLine = line.toLowerCase();+ else+ normalizedLine = line;++ int start = normalizedLine.indexOf(normalizedTerm, 0);+ while (start != -1) {+ int end = start + normalizedTerm.length();+ if (wholeWord) {+ char beforeChar;+ if (start == 0)+ beforeChar = ' ';+ else+ beforeChar = line.charAt(start-1);++ char afterChar;+ if (end == line.length())+ afterChar = ' ';+ else+ afterChar = line.charAt(end);++ if (!isWordChar(beforeChar) && !isWordChar(afterChar)) {+ LinearRange range = new LinearRange(start, end);+ PlanarRange position = new PlanarRange(lineNo, range.getFrom(), lineNo, range.getTo());+ matches.add(new Match(line, position));+ if (matches.size() >= count)+ break;+ }+ } else {+ LinearRange range = new LinearRange(start, end);+ PlanarRange position = new PlanarRange(lineNo, range.getFrom(), lineNo, range.getTo());+ matches.add(new Match(line, position));+ if (matches.size() >= count)+ break;+ }+ start = normalizedLine.indexOf(normalizedTerm, end);+ }+ if (matches.size() >= count)+ break;+ }+ lineNo++;+ }+ }+ }+ }+ return matches;+ }++ public void applyConstraints(BooleanQuery.Builder builder) {+ Preconditions.checkNotNull(term != null);++ if (fileNames != null) {+ BooleanQuery.Builder subQueryBuilder = new BooleanQuery.Builder();+ for (String pattern: Splitter.on(",").omitEmptyStrings().trimResults().split(fileNames.toLowerCase()))+ subQueryBuilder.add(new WildcardQuery(new Term(BLOB_NAME.name(), pattern)), BooleanClause.Occur.SHOULD);+ BooleanQuery subQuery = subQueryBuilder.build();+ if (subQuery.clauses().size() != 0)+ builder.add(subQuery, BooleanClause.Occur.MUST);+ }++ if (regex)+ builder.add(new RegexLiterals(term).asNGramQuery(BLOB_TEXT.name(), NGRAM_SIZE), BooleanClause.Occur.MUST);+ else if (term.length() >= NGRAM_SIZE)+ builder.add(new NGramLuceneQuery(BLOB_TEXT.name(), term, NGRAM_SIZE), BooleanClause.Occur.MUST);+ else+ throw new TooGeneralQueryException();}@Overridepublic FormComponentPanel<? extends QueryOption> newOptionEditor(String componentId) {- return new TextQueryOptionPanel(componentId, Model.of(this));+ return new TextQueryOptionEditor(componentId, Model.of(this));}+ public static class Match implements Serializable {++ private static final long serialVersionUID = 1L;++ private final String line;++ private final PlanarRange position;++ public Match(String line, @Nullable PlanarRange position) {+ this.line = line;+ this.position = position;+ }++ public String getLine() {+ return line;+ }++ @Nullable+ public PlanarRange getPosition() {+ return position;+ }++ }+}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 e8a004a6b1..5d26941ceb 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@@ -4,6 +4,7 @@ import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.WordUtils;+import io.onedev.server.OneDev;import io.onedev.server.cluster.ClusterManager;import io.onedev.server.cluster.ClusterTask;import io.onedev.server.entitymanager.ProjectManager;@@ -159,9 +160,7 @@ public abstract class ProjectTextManager<T extends ProjectBelonging> implements}private File getIndexDir() {- File indexDir = new File(Bootstrap.getSiteDir(), "index");- FileUtils.createDir(indexDir);- return new File(indexDir, getIndexName());+ return new File(OneDev.getIndexDir(), getIndexName());}@Sessional@@ -400,17 +399,17 @@ public abstract class ProjectTextManager<T extends ProjectBelonging> implementsfor (var entry : clusterManager.runOnAllServers((ClusterTask<Map<Long, Float>>) () -> {if (searcherManager != null) {try {- IndexSearcher indexSearcher = searcherManager.acquire();+ IndexSearcher searcher = searcherManager.acquire();try {- Map<Long, Float> theEntityScores = new HashMap<>();- TopDocs topDocs = indexSearcher.search(parse(queryString), firstResult + maxResults);+ Map<Long, Float> innerEntityScores = new HashMap<>();+ TopDocs topDocs = searcher.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);+ Document doc = searcher.doc(scoreDoc.doc);+ innerEntityScores.put(valueOf(doc.get(FIELD_ENTITY_ID)), scoreDoc.score);}- return theEntityScores;+ return innerEntityScores;} finally {- searcherManager.release(indexSearcher);+ searcherManager.release(searcher);}} catch (IOException e) {throw new RuntimeException(e);diff --git a/server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.java b/server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.javaindex fff11a9d31..a0278dad88 100644--- a/server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.java+++ b/server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.java@@ -1,26 +1,18 @@package io.onedev.server.util.facade;-import java.io.Serializable;-import java.util.ArrayList;-import java.util.Collection;-import java.util.Collections;-import java.util.Comparator;-import java.util.HashMap;-import java.util.HashSet;-import java.util.List;-import java.util.Map;-import java.util.stream.Collectors;--import javax.annotation.Nullable;-import com.google.common.collect.Sets;-import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.util.MapProxy;import io.onedev.server.util.Similarities;-import io.onedev.server.util.match.WildcardUtils;+import io.onedev.server.util.match.PathMatcher;+import io.onedev.server.util.patternset.PatternSet;++import javax.annotation.Nullable;+import java.io.Serializable;+import java.util.*;+import java.util.stream.Collectors;import static io.onedev.server.util.match.WildcardUtils.matchPath;import static java.util.Comparator.comparing;@@ -54,6 +46,15 @@ public class ProjectCache extends MapProxy<Long, ProjectFacade> implements Seriareturn ids;}+ public Collection<Long> getMatchingIds(PatternSet patternSet) {+ Collection<Long> ids = new HashSet<>();+ for (ProjectFacade project: values()) {+ if (patternSet.matches(new PathMatcher(), project.getPath()))+ ids.add(project.getId());+ }+ return ids;+ }+public Collection<Long> getSubtreeIds(Long id) {return getSubtreeIds(values(), id);}diff --git a/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.java b/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.javaindex b6a735b65f..8b0c2648ef 100644--- a/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.java+++ b/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.java@@ -131,9 +131,9 @@ public class PatternSet implements Serializable {public String toString() {StringBuilder builder = new StringBuilder();for (String include: getIncludes())- builder.append(include).append(" ");+ builder.append(quoteIfNecessary(include)).append(" ");for (String exclude: getExcludes())- builder.append("-").append(exclude).append(" ");+ builder.append("-").append("\"" + exclude + "\"").append(" ");return builder.toString().trim();}diff --git a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/FileQueryOptionPanel.html b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/FileQueryOptionEditor.htmlsimilarity index 76%rename from server-core/src/main/java/io/onedev/server/web/component/codequeryoption/FileQueryOptionPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/component/codequeryoption/FileQueryOptionEditor.htmlindex ffa3008107..88d9b6564e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/FileQueryOptionPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/FileQueryOptionEditor.html@@ -1,11 +1,11 @@<wicket:panel><div wicket:id="term" class="form-group">- <label>File Name <span class="text-danger">*</span></label>+ <label class="control-label">File Name <span class="text-danger">*</span></label><input wicket:id="term" name="searchFor" class="form-control" type="text"><p class="form-text text-muted">(* = any string, ? = any character)</p><div wicket:id="feedback" class="mt-2"></div></div><div class="form-group">- <label class="checkbox"><input wicket:id="caseSensitive" type="checkbox"> Case sensitive</label>+ <label class="checkbox"><input wicket:id="caseSensitive" type="checkbox"> Case Sensitive</label></div></wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/FileQueryOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/FileQueryOptionEditor.javasimilarity index 76%rename from server-core/src/main/java/io/onedev/server/web/component/codequeryoption/FileQueryOptionPanel.javarename to server-core/src/main/java/io/onedev/server/web/component/codequeryoption/FileQueryOptionEditor.javaindex c9a2c581e4..8fb5b3486a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/FileQueryOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/FileQueryOptionEditor.java@@ -1,6 +1,5 @@package io.onedev.server.web.component.codequeryoption;-import io.onedev.server.search.code.query.BlobQuery;import io.onedev.server.search.code.query.FileQuery;import io.onedev.server.search.code.query.FileQueryOption;import io.onedev.server.search.code.query.TooGeneralQueryException;@@ -14,13 +13,13 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;-public class FileQueryOptionPanel extends FormComponentPanel<FileQueryOption> {+public class FileQueryOptionEditor extends FormComponentPanel<FileQueryOption> {private TextField<String> term;private CheckBox caseSensitive;- public FileQueryOptionPanel(String id, IModel<FileQueryOption> model) {+ public FileQueryOptionEditor(String id, IModel<FileQueryOption> model) {super(id, model);}@@ -34,12 +33,8 @@ public class FileQueryOptionPanel extends FormComponentPanel<FileQueryOption> {term = new TextField<>("term", Model.of(option.getTerm()));term.setRequired(true).setLabel(Model.of("File name"));term.add(validatable -> {- BlobQuery query = new FileQuery.Builder()- .fileNames(validatable.getValue())- .count(1)- .build();try {- query.asLuceneQuery();+ new FileQuery.Builder(validatable.getValue()).count(1).build().asLuceneQuery();} catch (TooGeneralQueryException e) {validatable.error(messageSource -> "Search is too general");}@@ -64,10 +59,7 @@ public class FileQueryOptionPanel extends FormComponentPanel<FileQueryOption> {@Overridepublic void convertInput() {- var option = new FileQueryOption();- option.setTerm(term.getConvertedInput());- option.setCaseSensitive(caseSensitive.getConvertedInput());- setConvertedInput(option);+ setConvertedInput(new FileQueryOption(term.getConvertedInput(), caseSensitive.getConvertedInput()));}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/SymbolQueryOptionPanel.html b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/SymbolQueryOptionEditor.htmlsimilarity index 72%rename from server-core/src/main/java/io/onedev/server/web/component/codequeryoption/SymbolQueryOptionPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/component/codequeryoption/SymbolQueryOptionEditor.htmlindex f2e2db2105..bc2ac7d215 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/SymbolQueryOptionPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/SymbolQueryOptionEditor.html@@ -1,15 +1,15 @@<wicket:panel><div wicket:id="term" class="form-group">- <label>Symbol Name <span class="text-danger">*</span></label>+ <label class="control-label">Symbol Name <span class="text-danger">*</span></label><input wicket:id="term" name="searchFor" class="form-control" type="text"><p class="form-text text-muted">(* = any string, ? = any character)</p><div wicket:id="feedback" class="mt-2"></div></div><div class="form-group">- <label class="checkbox"><input wicket:id="caseSensitive" type="checkbox"> Case sensitive</label>+ <label class="checkbox"><input wicket:id="caseSensitive" type="checkbox"> Case Sensitive</label></div><div class="form-group">- <label>File name patterns (separated by comma)</label>+ <label class="control-label">File Name Patterns (separated by comma)</label><input wicket:id="fileNames" class="form-control" type="text" placeholder="File name patterns such as *.java, *.c"></div></wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/SymbolQueryOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/SymbolQueryOptionEditor.javasimilarity index 78%rename from server-core/src/main/java/io/onedev/server/web/component/codequeryoption/SymbolQueryOptionPanel.javarename to server-core/src/main/java/io/onedev/server/web/component/codequeryoption/SymbolQueryOptionEditor.javaindex 7d6ece0e53..a683099e02 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/SymbolQueryOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/SymbolQueryOptionEditor.java@@ -1,7 +1,6 @@package io.onedev.server.web.component.codequeryoption;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.search.code.query.BlobQuery;import io.onedev.server.search.code.query.SymbolQuery;import io.onedev.server.search.code.query.SymbolQueryOption;import io.onedev.server.search.code.query.TooGeneralQueryException;@@ -16,7 +15,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.validation.IValidationError;-public class SymbolQueryOptionPanel extends FormComponentPanel<SymbolQueryOption> {+public class SymbolQueryOptionEditor extends FormComponentPanel<SymbolQueryOption> {private TextField<String> term;@@ -24,7 +23,7 @@ public class SymbolQueryOptionPanel extends FormComponentPanel<SymbolQueryOptionprivate TextField<String> fileNames;- public SymbolQueryOptionPanel(String id, IModel<SymbolQueryOption> model) {+ public SymbolQueryOptionEditor(String id, IModel<SymbolQueryOption> model) {super(id, model);}@@ -41,9 +40,11 @@ public class SymbolQueryOptionPanel extends FormComponentPanel<SymbolQueryOptionif (StringUtils.isBlank(validatable.getValue())) {validatable.error(messageSource -> "This field is required");} else {- BlobQuery query = new SymbolQuery.Builder().term(validatable.getValue()).count(1).build();try {- query.asLuceneQuery();+ new SymbolQuery.Builder(validatable.getValue())+ .count(1)+ .build()+ .asLuceneQuery();} catch (TooGeneralQueryException e) {validatable.error((IValidationError) messageSource -> "Search is too general");}@@ -70,11 +71,7 @@ public class SymbolQueryOptionPanel extends FormComponentPanel<SymbolQueryOption@Overridepublic void convertInput() {- var option = new SymbolQueryOption();- option.setTerm(term.getConvertedInput());- option.setCaseSensitive(caseSensitive.getConvertedInput());- option.setFileNames(fileNames.getConvertedInput());- setConvertedInput(option);+ setConvertedInput(new SymbolQueryOption(term.getConvertedInput(), caseSensitive.getConvertedInput(), fileNames.getConvertedInput()));}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/TextQueryOptionPanel.html b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/TextQueryOptionEditor.htmlsimilarity index 70%rename from server-core/src/main/java/io/onedev/server/web/component/codequeryoption/TextQueryOptionPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/component/codequeryoption/TextQueryOptionEditor.htmlindex 9855aefb83..a40e0eadd5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/TextQueryOptionPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/TextQueryOptionEditor.html@@ -1,18 +1,18 @@<wicket:panel><div wicket:id="term" class="form-group">- <label>Text <span class="text-danger">*</span></label>+ <label class="control-label">Search For <span class="text-danger">*</span></label><input wicket:id="term" name="searchFor" class="form-control" type="text"><div wicket:id="feedback" class="mt-2"></div></div><div class="form-group"><div class="checkbox-inline">- <label class="checkbox"><input wicket:id="regex" type="checkbox"> Regular expression</label>- <label class="checkbox"><input wicket:id="wholeWord" type="checkbox"> Whole word</label>- <label class="checkbox"><input wicket:id="caseSensitive" type="checkbox"> Case sensitive</label>+ <label class="checkbox"><input wicket:id="regex" type="checkbox"> Regular Expression</label>+ <label class="checkbox"><input wicket:id="wholeWord" type="checkbox"> Whole Word</label>+ <label class="checkbox"><input wicket:id="caseSensitive" type="checkbox"> Case Sensitive</label></div></div><div class="form-group">- <label>File name patterns (separated by comma)</label>+ <label class="control-label">File Name Patterns (separated by comma)</label><input wicket:id="fileNames" class="form-control" type="text" placeholder="File name patterns such as *.java, *.c"></div></wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/TextQueryOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/TextQueryOptionEditor.javasimilarity index 74%rename from server-core/src/main/java/io/onedev/server/web/component/codequeryoption/TextQueryOptionPanel.javarename to server-core/src/main/java/io/onedev/server/web/component/codequeryoption/TextQueryOptionEditor.javaindex 7d16a3f10a..2a4df4b5ec 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/TextQueryOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/TextQueryOptionEditor.java@@ -1,6 +1,5 @@package io.onedev.server.web.component.codequeryoption;-import io.onedev.server.search.code.query.BlobQuery;import io.onedev.server.search.code.query.TextQuery;import io.onedev.server.search.code.query.TextQueryOption;import io.onedev.server.search.code.query.TooGeneralQueryException;@@ -18,7 +17,7 @@ import org.apache.wicket.validation.IValidationError;import java.util.regex.Pattern;import java.util.regex.PatternSyntaxException;-public class TextQueryOptionPanel extends FormComponentPanel<TextQueryOption> {+public class TextQueryOptionEditor extends FormComponentPanel<TextQueryOption> {private TextField<String> term;@@ -30,7 +29,7 @@ public class TextQueryOptionPanel extends FormComponentPanel<TextQueryOption> {private TextField<String> fileNames;- public TextQueryOptionPanel(String id, IModel<TextQueryOption> model) {+ public TextQueryOptionEditor(String id, IModel<TextQueryOption> model) {super(id, model);}@@ -42,17 +41,17 @@ public class TextQueryOptionPanel extends FormComponentPanel<TextQueryOption> {WebMarkupContainer termContainer = new WebMarkupContainer("term");add(termContainer);term = new TextField<>("term", Model.of(option.getTerm()));- term.setRequired(true).setLabel(Model.of("Text"));+ term.setRequired(true).setLabel(Model.of("Search for"));term.add(validatable -> {- boolean regex = this.regex.getInput()!=null?true:false;- BlobQuery query = new TextQuery.Builder()- .term(validatable.getValue()).regex(regex)- .count(1)- .build();+ boolean regex = this.regex.getInput() != null;try {if (regex)Pattern.compile(validatable.getValue());- query.asLuceneQuery();+ new TextQuery.Builder(validatable.getValue())+ .regex(regex)+ .count(1)+ .build()+ .asLuceneQuery();} catch (PatternSyntaxException e) {validatable.error((IValidationError) messageSource -> "Invalid PCRE syntax");} catch (TooGeneralQueryException e) {@@ -82,12 +81,6 @@ public class TextQueryOptionPanel extends FormComponentPanel<TextQueryOption> {@Overridepublic void convertInput() {- var option = new TextQueryOption();- option.setTerm(term.getConvertedInput());- option.setRegex(regex.getConvertedInput());- option.setWholeWord(wholeWord.getConvertedInput());- option.setCaseSensitive(caseSensitive.getConvertedInput());- option.setFileNames(fileNames.getConvertedInput());- setConvertedInput(option);+ setConvertedInput(new TextQueryOption(term.getConvertedInput(), regex.getConvertedInput(), wholeWord.getConvertedInput(), caseSensitive.getConvertedInput(), fileNames.getConvertedInput()));}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/RevisionAndPathParam.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/RevisionAndPathParam.javaindex da5ee24612..7e1b4e2a84 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/RevisionAndPathParam.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/RevisionAndPathParam.java@@ -1,17 +1,15 @@package io.onedev.server.web.component.commandpalette;-import java.util.LinkedHashMap;-import java.util.Map;--import io.onedev.server.search.code.query.BlobQuery;-import org.eclipse.jgit.lib.ObjectId;-import io.onedev.server.OneDev;import io.onedev.server.model.Project;import io.onedev.server.search.code.CodeSearchManager;import io.onedev.server.search.code.hit.QueryHit;import io.onedev.server.search.code.query.FileQuery;import io.onedev.server.search.code.query.TooGeneralQueryException;+import org.eclipse.jgit.lib.ObjectId;++import java.util.LinkedHashMap;+import java.util.Map;public class RevisionAndPathParam extends ParamSegment {@@ -34,10 +32,9 @@ public class RevisionAndPathParam extends ParamSegment {if (project.getDefaultBranch() != null) {CodeSearchManager codeSearchManager = OneDev.getInstance(CodeSearchManager.class);ObjectId commitId = project.getObjectId(project.getDefaultBranch(), true);- FileQuery.Builder builder = new FileQuery.Builder();- builder.fileNames("*" + matchWith + "*");- builder.count(count);- BlobQuery query = builder.build();+ var query = new FileQuery.Builder("*" + matchWith + "*")+ .count(count)+ .build();try {for (QueryHit hit: codeSearchManager.search(project, commitId, query)) {String revisionAndPath = project.getDefaultBranch() + "/" + hit.getBlobPath();diff --git a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.javaindex 36bcf84cc5..d6939cca9b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java@@ -147,8 +147,7 @@ public abstract class SymbolTooltipPanel extends Panel {if (symbolName.length() >= IndexConstants.NGRAM_SIZE) {int maxQueryEntries = OneDev.getInstance(SettingManager.class).getPerformanceSetting().getMaxCodeSearchEntries();- BlobQuery query = new TextQuery.Builder()- .term(symbolName)+ var query = new TextQuery.Builder(symbolName).wholeWord(true).caseSensitive(true).count(maxQueryEntries)@@ -238,21 +237,21 @@ public abstract class SymbolTooltipPanel extends Panel {ObjectId commit = getProject().getRevCommit(revision, true);BlobQuery query;if (symbolHits.size() < QUERY_ENTRIES) {- query = new SymbolQuery.Builder().term(symbolName)+ query = new SymbolQuery.Builder(symbolName)+ .caseSensitive(true).excludeBlobPath(blobIdent.path).primary(true).local(false)- .caseSensitive(true).count(QUERY_ENTRIES).build();symbolHits.addAll(searchManager.search(getProject(), commit, query));}if (symbolHits.size() < QUERY_ENTRIES) {- query = new SymbolQuery.Builder().term(symbolName)+ query = new SymbolQuery.Builder(symbolName)+ .caseSensitive(true).excludeBlobPath(blobIdent.path).primary(false).local(false)- .caseSensitive(true).count(QUERY_ENTRIES - symbolHits.size()).build();symbolHits.addAll(searchManager.search(getProject(), commit, query));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex b0494e2046..abc79cea0a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -25,9 +25,9 @@ import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.search.code.hit.QueryHit;import io.onedev.server.search.code.CodeIndexManager;import io.onedev.server.search.code.CodeSearchManager;+import io.onedev.server.search.code.hit.QueryHit;import io.onedev.server.search.code.query.BlobQuery;import io.onedev.server.search.code.query.TextQuery;import io.onedev.server.security.SecurityUtils;@@ -272,10 +272,9 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,List<QueryHit> queryHits;if (state.query != null) {int maxQueryEntries = getSettingManager().getPerformanceSetting().getMaxCodeSearchEntries();- BlobQuery query = new TextQuery.Builder()- .term(state.query)+ BlobQuery query = new TextQuery.Builder(state.query).wholeWord(true)- .caseSensitive(true)+ .caseSensitive(true).count(maxQueryEntries).build();try {@@ -1341,8 +1340,6 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,public String urlAfterEdit;- public boolean renderSource;-public String query;public String initialNewPath;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.javaindex 8dccb218a9..bec4b1c490 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java@@ -6,15 +6,14 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.git.BlobIdent;import io.onedev.server.model.Project;-import io.onedev.server.search.code.hit.QueryHit;import io.onedev.server.search.code.CodeSearchManager;-import io.onedev.server.search.code.query.SymbolQuery;-import io.onedev.server.search.code.query.FileQueryOption;-import io.onedev.server.search.code.query.QueryOption;-import io.onedev.server.search.code.query.SymbolQueryOption;-import io.onedev.server.search.code.query.TextQueryOption;+import io.onedev.server.search.code.hit.QueryHit;+import io.onedev.server.search.code.query.*;import io.onedev.server.web.WebSession;import io.onedev.server.web.behavior.RunTaskBehavior;+import io.onedev.server.web.component.codequeryoption.FileQueryOptionEditor;+import io.onedev.server.web.component.codequeryoption.SymbolQueryOptionEditor;+import io.onedev.server.web.component.codequeryoption.TextQueryOptionEditor;import io.onedev.server.web.component.tabbable.AjaxActionTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;@@ -136,6 +135,15 @@ public abstract class AdvancedSearchPanel extends Panel {}.setSelected(option instanceof SymbolQueryOption));form.add(new Tabbable("tabs", tabs));++ if (option instanceof FileQueryOption)+ optionEditor = new FileQueryOptionEditor("option", Model.of((FileQueryOption) option));+ else if (option instanceof SymbolQueryOption)+ optionEditor = new SymbolQueryOptionEditor("option", Model.of((SymbolQueryOption) option));+ else+ optionEditor = new TextQueryOptionEditor("option", Model.of((TextQueryOption) option));++form.add(optionEditor = option.newOptionEditor("option"));optionEditor.setOutputMarkupId(true);form.add(new CheckBox("insideCurrentDir", new IModel<>() {@@ -182,30 +190,39 @@ public abstract class AdvancedSearchPanel extends Panel {var count = getMaxQueryEntries();if (revision != null) {try {+ var directory = getDirectory(insideCurrentDir);var searchManager = OneDev.getInstance(CodeSearchManager.class);- if (option instanceof SymbolQueryOption) {- SymbolQuery.Builder builder = (SymbolQuery.Builder) option.newInsideCommitQueryBuilder();- var query = builder.primary(true)- .directory(getDirectory(insideCurrentDir))+ if (option instanceof TextQueryOption) {+ var query = new TextQuery.Builder((TextQueryOption) option)+ .directory(directory)+ .count(count)+ .build();+ ObjectId commit = project.getRevCommit(revision, true);+ hits = searchManager.search(project, commit, query);+ } else if (option instanceof FileQueryOption) {+ var query = new FileQuery.Builder((FileQueryOption) option)+ .directory(directory).count(count).build();ObjectId commit = project.getRevCommit(revision, true);hits = searchManager.search(project, commit, query);-- if (hits.size() < count) {- query = builder.primary(false)- .directory(getDirectory(insideCurrentDir))- .count(count)- .build();- hits.addAll(searchManager.search(project, commit, query));- }} else {- var query = option.newInsideCommitQueryBuilder()- .directory(getDirectory(insideCurrentDir))+ var query = new SymbolQuery.Builder((SymbolQueryOption) option)+ .primary(true)+ .directory(directory).count(count).build();ObjectId commit = project.getRevCommit(revision, true);hits = searchManager.search(project, commit, query);++ if (hits.size() < count) {+ query = new SymbolQuery.Builder((SymbolQueryOption) option)+ .primary(false)+ .directory(directory)+ .count(count-hits.size())+ .build();+ hits.addAll(searchManager.search(project, commit, query));+ }}} catch (InterruptedException e) {throw new RuntimeException(e);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.javaindex 4f0c4b751f..65cca11502 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java@@ -78,8 +78,7 @@ public abstract class QuickSearchPanel extends Panel {try {// first try an exact search against primary symbol to make sure the result// always contains exact match if exists- BlobQuery query = new SymbolQuery.Builder()- .term(searchInput)+ BlobQuery query = new SymbolQuery.Builder(searchInput).primary(true).count(count).build();@@ -87,7 +86,7 @@ public abstract class QuickSearchPanel extends Panel {// now do wildcard search but exclude the exact match returned aboveif (symbolHits.size() < count) {- query = new SymbolQuery.Builder().term("*"+searchInput+"*")+ query = new SymbolQuery.Builder("*"+searchInput+"*").excludeTerm(searchInput).primary(true).count(count-symbolHits.size())@@ -97,15 +96,12 @@ public abstract class QuickSearchPanel extends Panel {// do the same for file namesif (symbolHits.size() < count) {- query = new FileQuery.Builder()- .fileNames(searchInput)- .count(count-symbolHits.size())- .build();+ query = new FileQuery.Builder(searchInput).count(count-symbolHits.size()).build();symbolHits.addAll(searchManager.search(projectModel.getObject(), commit, query));}if (symbolHits.size() < count) {- query = new FileQuery.Builder().fileNames("*"+searchInput+"*")+ query = new FileQuery.Builder("*"+searchInput+"*").excludeFileName(searchInput).count(count-symbolHits.size()).build();@@ -114,23 +110,21 @@ public abstract class QuickSearchPanel extends Panel {// do the same for secondary symbolsif (symbolHits.size() < count) {- query = new SymbolQuery.Builder()- .term(searchInput)+ query = new SymbolQuery.Builder(searchInput).primary(false).count(count-symbolHits.size())- .build();+ .build();symbolHits.addAll(searchManager.search(projectModel.getObject(), commit, query));}if (symbolHits.size() < count) {- query = new SymbolQuery.Builder().term("*"+searchInput+"*")+ query = new SymbolQuery.Builder("*"+searchInput+"*").excludeTerm(searchInput).primary(false).count(count-symbolHits.size()).build();symbolHits.addAll(searchManager.search(projectModel.getObject(), commit, query));}-} catch (Exception e) {if (ExceptionUtils.find(e, TooGeneralQueryException.class) != null)symbolHits = new ArrayList<>();diff --git a/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.java b/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.javaindex 199b3dfbef..04c8c64037 100644--- a/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.java+++ b/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.java@@ -14,14 +14,7 @@ public class InterpolativePatternSetGrammarTest {@Testpublic void test() {- Function<String, String> variableResolver = new Function<String, String>() {-- @Override- public String apply(String t) {- return t;- }-- };+ Function<String, String> variableResolver = t -> t;PatternSet expected, actual;String interpolated;diff --git a/server-core/src/test/java/io/onedev/server/util/patternset/PatternSetGrammarTest.java b/server-core/src/test/java/io/onedev/server/util/patternset/PatternSetGrammarTest.javaindex 4f9435bb0e..fe35192af1 100644--- a/server-core/src/test/java/io/onedev/server/util/patternset/PatternSetGrammarTest.java+++ b/server-core/src/test/java/io/onedev/server/util/patternset/PatternSetGrammarTest.java@@ -1,10 +1,9 @@package io.onedev.server.util.patternset;-import static org.junit.Assert.*;-+import com.google.common.collect.Sets;import org.junit.Test;-import com.google.common.collect.Sets;+import static org.junit.Assert.assertEquals;public class PatternSetGrammarTest {