The Unified and Autonomous Development Platform
Fix issue #563 - Make max entries of code search configurable
Robin Shencd629f9b90ce
diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex e80e80009e..d78b627cad 100644--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java@@ -3520,4 +3520,22 @@ public class DataMigrator {}}+ private void migrate76(File dataDir, Stack<Integer> versions) {+ Map<String, Integer> stateOrdinals = new HashMap<>();+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Settings.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ if (element.elementTextTrim("key").equals("PERFORMANCE")) {+ Element valueElement = element.element("value");+ if (valueElement != null) {+ valueElement.addElement("maxCodeSearchEntries").setText("100");+ }+ }+ }+ dom.writeToFile(file, false);+ }+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/PerformanceSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/PerformanceSetting.javaindex 1903697840..bca168ea46 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/PerformanceSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/PerformanceSetting.java@@ -21,6 +21,8 @@ public class PerformanceSetting implements Serializable {private int maxUploadFileSize = 20;+ private int maxCodeSearchEntries = 100;+public PerformanceSetting() {HardwareAbstractionLayer hardware = new SystemInfo().getHardware();cpuIntensiveTaskConcurrency = hardware.getProcessor().getLogicalProcessorCount();@@ -81,4 +83,13 @@ public class PerformanceSetting implements Serializable {this.maxUploadFileSize = maxUploadFileSize;}+ @Editable(order=800, description="Maximum number of entries to return when search code in repository")+ public int getMaxCodeSearchEntries() {+ return maxCodeSearchEntries;+ }++ public void setMaxCodeSearchEntries(int maxCodeSearchEntries) {+ this.maxCodeSearchEntries = maxCodeSearchEntries;+ }+}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 72586a5178..94a4a3ad80 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@@ -30,6 +30,7 @@ import org.eclipse.jgit.lib.ObjectId;import io.onedev.commons.jsymbol.Symbol;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.git.Blob;import io.onedev.server.git.BlobIdent;import io.onedev.server.model.Project;@@ -46,7 +47,6 @@ import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.blob.render.BlobRendererer;-import io.onedev.server.web.page.project.blob.search.result.SearchResultPanel;@SuppressWarnings("serial")public abstract class SymbolTooltipPanel extends Panel {@@ -143,11 +143,13 @@ public abstract class SymbolTooltipPanel extends Panel {List<QueryHit> hits;// do this check to avoid TooGeneralQueryExceptionif (symbolName.length() >= IndexConstants.NGRAM_SIZE) {+ int maxQueryEntries = OneDev.getInstance(SettingManager.class)+ .getPerformanceSetting().getMaxCodeSearchEntries();BlobQuery query = new TextQuery.Builder().term(symbolName).wholeWord(true).caseSensitive(true)- .count(SearchResultPanel.MAX_QUERY_ENTRIES)+ .count(maxQueryEntries).build();try {SearchManager searchManager = OneDev.getInstance(SearchManager.class);diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.javaindex 7ea1e2fbd0..3813feb18b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java@@ -88,7 +88,7 @@ public abstract class BasePage extends WebPage {if (cookie != null)darkMode = cookie.getValue().equals("yes");else- darkMode = false;+ darkMode = true;}public boolean isDarkMode() {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 6fea9fe839..9d96314565 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@@ -64,6 +64,7 @@ import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.PullRequestUpdateManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.event.RefUpdated;import io.onedev.server.git.BlobContent;import io.onedev.server.git.BlobEdits;@@ -290,11 +291,13 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,List<QueryHit> queryHits;if (state.query != null) {+ int maxQueryEntries = OneDev.getInstance(SettingManager.class)+ .getPerformanceSetting().getMaxCodeSearchEntries();BlobQuery query = new TextQuery.Builder().term(state.query).wholeWord(true).caseSensitive(true)- .count(SearchResultPanel.MAX_QUERY_ENTRIES)+ .count(maxQueryEntries).build();try {SearchManager searchManager = OneDev.getInstance(SearchManager.class);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 2f22844aa9..ee45dac189 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@@ -38,6 +38,7 @@ import org.eclipse.jgit.lib.ObjectId;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.StringUtils;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.SearchManager;@@ -52,7 +53,6 @@ import io.onedev.server.web.behavior.RunTaskBehavior;import io.onedev.server.web.component.tabbable.AjaxActionTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;-import io.onedev.server.web.page.project.blob.search.result.SearchResultPanel;@SuppressWarnings("serial")public abstract class AdvancedSearchPanel extends Panel {@@ -514,6 +514,10 @@ public abstract class AdvancedSearchPanel extends Panel {}+ private static int getMaxQueryEntries() {+ return OneDev.getInstance(SettingManager.class).getPerformanceSetting().getMaxCodeSearchEntries();+ }+protected String getDirectory(boolean insideDir) {BlobIdent blobIdent = getCurrentBlob();if (blobIdent == null || blobIdent.path == null || !blobIdent.path.contains("/") || !insideDir)@@ -539,6 +543,8 @@ public abstract class AdvancedSearchPanel extends Panel {@Overridepublic List<QueryHit> query(AdvancedSearchPanel context) throws InterruptedException {+ int maxQueryEntries = getMaxQueryEntries();+SearchManager searchManager = OneDev.getInstance(SearchManager.class);List<QueryHit> hits;BlobQuery query = new SymbolQuery.Builder()@@ -547,19 +553,19 @@ public abstract class AdvancedSearchPanel extends Panel {.caseSensitive(caseSensitive).directory(context.getDirectory(insideCurrentDir)).fileNames(fileNames)- .count(SearchResultPanel.MAX_QUERY_ENTRIES)+ .count(maxQueryEntries).build();ObjectId commit = context.projectModel.getObject().getRevCommit(context.revisionModel.getObject(), true);hits = searchManager.search(context.projectModel.getObject(), commit, query);- if (hits.size() < SearchResultPanel.MAX_QUERY_ENTRIES) {+ if (hits.size() < maxQueryEntries) {query = new SymbolQuery.Builder().term(term).primary(false).caseSensitive(caseSensitive).directory(context.getDirectory(insideCurrentDir)).fileNames(fileNames)- .count(SearchResultPanel.MAX_QUERY_ENTRIES - hits.size())+ .count(maxQueryEntries - hits.size()).build();hits.addAll(searchManager.search(context.projectModel.getObject(), commit, query));}@@ -584,7 +590,7 @@ public abstract class AdvancedSearchPanel extends Panel {.fileNames(term).caseSensitive(caseSensitive).directory(context.getDirectory(insideCurrentDir))- .count(SearchResultPanel.MAX_QUERY_ENTRIES)+ .count(getMaxQueryEntries()).build();ObjectId commit = context.projectModel.getObject().getRevCommit(context.revisionModel.getObject(), true);return searchManager.search(context.projectModel.getObject(), commit, query);@@ -615,7 +621,7 @@ public abstract class AdvancedSearchPanel extends Panel {.wholeWord(wholeWord).directory(context.getDirectory(insideCurrentDir)).fileNames(fileNames)- .count(SearchResultPanel.MAX_QUERY_ENTRIES)+ .count(getMaxQueryEntries()).build();ObjectId commit = context.projectModel.getObject().getRevCommit(context.revisionModel.getObject(), true);return searchManager.search(context.projectModel.getObject(), commit, query);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 5aaff488d6..4c9c5b1430 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@@ -34,6 +34,7 @@ import org.eclipse.jgit.lib.ObjectId;import io.onedev.commons.utils.StringUtils;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.SearchManager;@@ -48,7 +49,6 @@ import io.onedev.server.web.behavior.RunTaskBehavior;import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.blob.render.BlobRendererer;-import io.onedev.server.web.page.project.blob.search.result.SearchResultPanel;@SuppressWarnings("serial")public abstract class QuickSearchPanel extends Panel {@@ -280,7 +280,9 @@ public abstract class QuickSearchPanel extends Panel {@Overrideprotected void runTask(AjaxRequestTarget target) {- List<QueryHit> hits = querySymbols(searchInput, SearchResultPanel.MAX_QUERY_ENTRIES);+ int maxQueryEntries = OneDev.getInstance(SettingManager.class)+ .getPerformanceSetting().getMaxCodeSearchEntries();+ List<QueryHit> hits = querySymbols(searchInput, maxQueryEntries);onMoreQueried(target, hits);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.javaindex 2530179f0b..295fd6c812 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java@@ -30,6 +30,8 @@ import org.eclipse.jgit.lib.FileMode;import io.onedev.commons.jsymbol.util.HighlightableLabel;import io.onedev.commons.utils.LinearRange;import io.onedev.commons.utils.PlanarRange;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.git.BlobIdent;import io.onedev.server.search.code.hit.FileHit;import io.onedev.server.search.code.hit.QueryHit;@@ -43,8 +45,6 @@ import io.onedev.server.web.page.project.blob.render.BlobRendererer;@SuppressWarnings("serial")public abstract class SearchResultPanel extends Panel {- public static final int MAX_QUERY_ENTRIES = 1000;-private enum ExpandStatus {EXPAND_ALL, COLLAPSE_ALL};private static final String HITS_ID = "hits";@@ -71,10 +71,10 @@ public abstract class SearchResultPanel extends Panel {public SearchResultPanel(String id, BlobRenderContext context, List<QueryHit> hits) {super(id);-+this.context = context;- hasMore = (hits.size() == MAX_QUERY_ENTRIES);+ hasMore = (hits.size() == getMaxQueryEntries());Map<String, MatchedBlob> hitsByBlob = new LinkedHashMap<>();@@ -117,6 +117,10 @@ public abstract class SearchResultPanel extends Panel {});}}++ private int getMaxQueryEntries() {+ return OneDev.getInstance(SettingManager.class).getPerformanceSetting().getMaxCodeSearchEntries();+ }@SuppressWarnings("deprecation")private void onActiveIndexChange(AjaxRequestTarget target) {@@ -249,7 +253,7 @@ public abstract class SearchResultPanel extends Panel {protected void onInitialize() {super.onInitialize();- String message = "(too many matches, displaying " + MAX_QUERY_ENTRIES + " of them)";+ String message = "(too many matches, displaying " + getMaxQueryEntries() + " of them)";add(new Label("hasMoreMessage", message).setVisible(hasMore));add(prevMatchLink = new AjaxLink<Void>("prevMatch") {