The Unified and Autonomous Development Platform
chore: Continue to improve mass projects performance
Robin Shen77d1677eb2ba
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 0d15dbde32..9309a5c43f 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@@ -1129,12 +1129,12 @@ public class DefaultProjectManager extends BaseEntityManager<Project>@Overridepublic Collection<Long> getSubtreeIds(Long projectId) {- return cache.clone().getSubtreeIds(projectId);+ return cache.getSubtreeIds(projectId);}@Overridepublic Collection<Long> getPathMatchingIds(PatternSet patternSet) {- return cache.clone().getMatchingIds(patternSet);+ return cache.getMatchingIds(patternSet);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ChildLinkPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ChildLinkPanel.javaindex ce281951ba..d207640ec4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ChildLinkPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ChildLinkPanel.java@@ -1,5 +1,6 @@package io.onedev.server.web.component.project.childrentree;+import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Panel;@@ -19,10 +20,23 @@ abstract class ChildLinkPanel extends Panel {@Overrideprotected void onInitialize() {super.onInitialize();- WebMarkupContainer link = newChildLink("link", child.getId());- link.add(new ProjectAvatar("avatar", child.getId()));- link.add(new Label("name", child.getName()));- add(link);+ if (child.getId() != null) {+ WebMarkupContainer link = newChildLink("link", child.getId());+ link.add(new ProjectAvatar("avatar", child.getId()));+ link.add(new Label("name", child.getName()));+ add(link);+ } else {+ var link = new WebMarkupContainer("link") {+ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ tag.setName("span");+ }+ };+ link.add(new WebMarkupContainer("avatar").setVisible(false));+ link.add(new Label("name", "<span class='text-warning'>Too many projects to display</span>").setEscapeModelStrings(false));+ add(link);+ }}protected abstract WebMarkupContainer newChildLink(String componentId, Long childId);diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ProjectChildrenTree.java b/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ProjectChildrenTree.javaindex 5bc1aeccf6..dc791fd77c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ProjectChildrenTree.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ProjectChildrenTree.java@@ -1,5 +1,6 @@package io.onedev.server.web.component.project.childrentree;+import java.util.Collections;import java.util.HashSet;import java.util.Iterator;import java.util.Set;@@ -13,38 +14,71 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.util.facade.ProjectCache;import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;public class ProjectChildrenTree extends NestedTree<ProjectFacade> {+ private static final int MAX_DISPLAY_NODES = 1000;++ public static final ProjectFacade MARK_PROJECT = new ProjectFacade(null, null, null, null, null, false, false, null, null, null, null);+private final Set<Long> expandedProjectIds = new HashSet<>();public ProjectChildrenTree(String id, Long projectId) {super(id, new ITreeProvider<ProjectFacade>() {+ private final IModel<ProjectCache> projectCacheModel = new LoadableDetachableModel<ProjectCache>() {++ @Override+ protected ProjectCache load() {+ return getProjectManager().cloneCache();+ }++ };+@Overridepublic void detach() {+ projectCacheModel.detach();}@Overridepublic Iterator<? extends ProjectFacade> getRoots() {- return getProjectManager().getChildren(projectId).iterator();+ var roots = projectCacheModel.getObject().getChildren(projectId);+ if (roots.size() > MAX_DISPLAY_NODES) {+ roots = roots.subList(0, MAX_DISPLAY_NODES);+ roots.add(MARK_PROJECT);+ }+ return roots.iterator();}@Overridepublic boolean hasChildren(ProjectFacade node) {- return !getProjectManager().getChildren(node.getId()).isEmpty();+ if (node.getId() != null)+ return !projectCacheModel.getObject().getChildren(node.getId()).isEmpty();+ else+ return false;}@Overridepublic Iterator<? extends ProjectFacade> getChildren(ProjectFacade node) {- return getProjectManager().getChildren(node.getId()).iterator();+ if (node.getId() != null) {+ var children = projectCacheModel.getObject().getChildren(node.getId());+ if (children.size() > MAX_DISPLAY_NODES) {+ children = children.subList(0, MAX_DISPLAY_NODES);+ children.add(MARK_PROJECT);+ }+ return children.iterator();+ } else {+ return Collections.emptyIterator();+ }}@Override@@ -65,21 +99,27 @@ public class ProjectChildrenTree extends NestedTree<ProjectFacade> {@Overridepublic void expand(ProjectFacade t) {super.expand(t);- getExpandedProjectIds().add(t.getId());+ if (t.getId() != null)+ getExpandedProjectIds().add(t.getId());}@Overridepublic void collapse(ProjectFacade t) {super.collapse(t);- getExpandedProjectIds().remove(t.getId());+ if (t.getId() != null)+ getExpandedProjectIds().remove(t.getId());}@Overridepublic State getState(ProjectFacade t) {- if (getExpandedProjectIds().contains(t.getId()))- return State.EXPANDED;- else+ if (t.getId() != null) {+ if (getExpandedProjectIds().contains(t.getId()))+ return State.EXPANDED;+ else+ return State.COLLAPSED;+ } else {return State.COLLAPSED;+ }}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex cd1a7e3259..ba11d54f04 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -45,6 +45,7 @@ import io.onedev.server.model.Project;import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.timetracking.TimeTrackingManager;+import io.onedev.server.util.facade.ProjectCache;import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.web.WebConstants;import io.onedev.server.web.asset.dropdowntriangleindicator.DropdownTriangleIndicatorCssResourceReference;@@ -115,6 +116,15 @@ import io.onedev.server.web.util.ProjectAware;public abstract class ProjectPage extends LayoutPage implements ProjectAware {protected final IModel<Project> projectModel;++ private final IModel<ProjectCache> projectCacheModel = new LoadableDetachableModel<ProjectCache>() {++ @Override+ protected ProjectCache load() {+ return getProjectManager().cloneCache();+ }++ };public ProjectPage(PageParameters params) {super(params);@@ -391,6 +401,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {@Overrideprotected void onDetach() {projectModel.detach();+ projectCacheModel.detach();super.onDetach();}@@ -474,7 +485,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {link.add(new Label("label", project.getName()));item.add(link);- List<ProjectFacade> children = getProjectManager().getChildren(project.getId());+ List<ProjectFacade> children = projectCacheModel.getObject().getChildren(project.getId());if (!children.isEmpty()) {Long projectId = project.getId();item.add(new DropdownLink("children") {