Skip to content

The Unified and Autonomous Development Platform

chore: Improve label loading performance

Robin Shen12ff4107163a
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildLabelManager.java
index 42f34e0524..a3f419f2ec 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildLabelManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildLabelManager.java
@@ -1,9 +1,13 @@
package io.onedev.server.entitymanager;
+import io.onedev.server.model.Build;
import io.onedev.server.model.BuildLabel;
+import java.util.List;
+
public interface BuildLabelManager extends EntityLabelManager<BuildLabel> {
void create(BuildLabel buildLabel);
-
+
+ void populateLabels(List<Build> builds);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
index 5c2d1170cc..c71de09a7a 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
@@ -54,7 +54,8 @@ public interface BuildManager extends EntityManager<Build> {
List<Build> query(Project project, String fuzzyQuery, int count);
- List<Build> query(@Nullable Project project, EntityQuery<Build> buildQuery, int firstResult, int maxResults);
+ List<Build> query(@Nullable Project project, EntityQuery<Build> buildQuery,
+ boolean loadLabels, int firstResult, int maxResults);
int count(@Nullable Project project, Criteria<Build> buildCriteria);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PackBlobManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PackBlobManager.java
index 858aeab5dd..39d87dc23c 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PackBlobManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PackBlobManager.java
@@ -1,5 +1,6 @@
package io.onedev.server.entitymanager;
+import io.onedev.server.model.Pack;
import io.onedev.server.model.PackBlob;
import io.onedev.server.model.Project;
import io.onedev.server.persistence.dao.EntityManager;
@@ -8,6 +9,7 @@ import javax.annotation.Nullable;
import java.io.File;
import java.io.InputStream;
import java.io.OutputStream;
+import java.util.Collection;
public interface PackBlobManager extends EntityManager<PackBlob> {
@@ -53,5 +55,7 @@ public interface PackBlobManager extends EntityManager<PackBlob> {
void syncPacks(Long projectId, String activeServer);
File getPackBlobFile(Long projectId, String sha256Hash);
+
+ void populateBlobs(Collection<Pack> packs);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PackLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PackLabelManager.java
index f4b3715fcc..8c89a21169 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PackLabelManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PackLabelManager.java
@@ -1,9 +1,14 @@
package io.onedev.server.entitymanager;
+import io.onedev.server.model.Pack;
import io.onedev.server.model.PackLabel;
+import java.util.Collection;
+
public interface PackLabelManager extends EntityLabelManager<PackLabel> {
void create(PackLabel packLabel);
+ void populateLabels(Collection<Pack> packs);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PackManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PackManager.java
index 2ce0674730..8abc44a48e 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PackManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PackManager.java
@@ -17,7 +17,7 @@ import java.util.Map;
public interface PackManager extends EntityManager<Pack> {
List<Pack> query(@Nullable Project project, EntityQuery<Pack> packQuery,
- boolean loadBlobs, int firstResult, int maxResults);
+ boolean loadLabelsAndBlobs, int firstResult, int maxResults);
int count(@Nullable Project project, Criteria<Pack> packCriteria);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectLabelManager.java
index bf27cc00d1..ff9d01b1bb 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectLabelManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectLabelManager.java
@@ -1,9 +1,14 @@
package io.onedev.server.entitymanager;
+import io.onedev.server.model.Project;
import io.onedev.server.model.ProjectLabel;
+import java.util.Collection;
+
public interface ProjectLabelManager extends EntityLabelManager<ProjectLabel> {
void create(ProjectLabel projectLabel);
+
+ void populateLabels(Collection<Project> projects);
}
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.java
index 01cbdee0d8..6c504d98b3 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
@@ -68,7 +68,7 @@ public interface ProjectManager extends EntityManager<Project> {
Repository getRepository(Long projectId);
- List<Project> query(EntityQuery<Project> query, int firstResult, int maxResults);
+ List<Project> query(EntityQuery<Project> query, boolean loadLabels, int firstResult, int maxResults);
int count(Criteria<Project> criteria);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestLabelManager.java
index ce3c08beb8..32da813278 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestLabelManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestLabelManager.java
@@ -1,9 +1,14 @@
package io.onedev.server.entitymanager;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestLabel;
+import java.util.Collection;
+
public interface PullRequestLabelManager extends EntityLabelManager<PullRequestLabel> {
void create(PullRequestLabel pullRequestLabel);
+ void populateLabels(Collection<PullRequest> pullRequests);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
index c7b867e317..35281701d5 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
@@ -54,7 +54,7 @@ public interface PullRequestManager extends EntityManager<PullRequest> {
void checkReviews(PullRequest request, boolean sourceUpdated);
List<PullRequest> query(@Nullable Project targetProject, EntityQuery<PullRequest> requestQuery,
- boolean loadReviewsAndBuilds, int firstResult, int maxResults);
+ boolean loadLabelsAndReviewsAndBuilds, int firstResult, int maxResults);
int count(@Nullable Project targetProject, Criteria<PullRequest> requestCriteria);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildLabelManager.java
index c061d4c597..7b9d1ce70f 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildLabelManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildLabelManager.java
@@ -2,6 +2,8 @@ package io.onedev.server.entitymanager.impl;
import javax.inject.Inject;
import javax.inject.Singleton;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
import com.google.common.base.Preconditions;
import io.onedev.server.entitymanager.BuildLabelManager;
@@ -10,8 +12,12 @@ import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Build;
import io.onedev.server.model.BuildLabel;
import io.onedev.server.model.LabelSpec;
+import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.dao.Dao;
+import java.util.ArrayList;
+import java.util.List;
+
@Singleton
public class DefaultBuildLabelManager extends BaseEntityLabelManager<BuildLabel> implements BuildLabelManager {
@@ -33,5 +39,21 @@ public class DefaultBuildLabelManager extends BaseEntityLabelManager<BuildLabel>
Preconditions.checkState(buildLabel.isNew());
dao.persist(buildLabel);
}
-
+
+ @Sessional
+ @Override
+ public void populateLabels(List<Build> builds) {
+ var builder = getSession().getCriteriaBuilder();
+ CriteriaQuery<BuildLabel> labelQuery = builder.createQuery(BuildLabel.class);
+ Root<BuildLabel> labelRoot = labelQuery.from(BuildLabel.class);
+ labelQuery.select(labelRoot);
+ labelQuery.where(labelRoot.get(BuildLabel.PROP_BUILD).in(builds));
+
+ for (var build: builds)
+ build.setLabels(new ArrayList<>());
+
+ for (var label: getSession().createQuery(labelQuery).getResultList())
+ label.getBuild().getLabels().add(label);
+ }
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
index 18757d254e..694dded651 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
@@ -95,7 +95,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
private final TransactionManager transactionManager;
- private final SettingManager settingManager;
+ private final BuildLabelManager labelManager;
private final ClusterManager clusterManager;
@@ -115,7 +115,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
public DefaultBuildManager(Dao dao, BuildParamManager buildParamManager,
TaskScheduler taskScheduler, BuildDependenceManager buildDependenceManager,
ProjectManager projectManager, SessionManager sessionManager,
- TransactionManager transactionManager, SettingManager settingManager,
+ TransactionManager transactionManager, BuildLabelManager labelManager,
ClusterManager clusterManager, StorageManager storageManager,
Set<BuildStorageSyncer> storageSyncers) {
super(dao);
@@ -125,7 +125,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
this.taskScheduler = taskScheduler;
this.sessionManager = sessionManager;
this.transactionManager = transactionManager;
- this.settingManager = settingManager;
+ this.labelManager = labelManager;
this.clusterManager = clusterManager;
this.storageManager = storageManager;
this.storageSyncers = storageSyncers;
@@ -508,12 +508,15 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
@Sessional
@Override
public List<Build> query(@Nullable Project project, EntityQuery<Build> buildQuery,
- int firstResult, int maxResults) {
+ boolean loadLabels, int firstResult, int maxResults) {
CriteriaQuery<Build> criteriaQuery = buildCriteriaQuery(project, getSession(), buildQuery);
Query<Build> query = getSession().createQuery(criteriaQuery);
query.setFirstResult(firstResult);
query.setMaxResults(maxResults);
- return query.getResultList();
+ var builds = query.getResultList();
+ if (!builds.isEmpty() && loadLabels)
+ labelManager.populateLabels(builds);
+ return builds;
}
private void applyOrders(From<Build, Build> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder builder,
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackBlobManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackBlobManager.java
index 91cac0ca31..be56fd4d5e 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackBlobManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackBlobManager.java
@@ -14,6 +14,7 @@ import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.event.Listen;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStopping;
+import io.onedev.server.model.Pack;
import io.onedev.server.model.PackBlob;
import io.onedev.server.model.PackBlobReference;
import io.onedev.server.model.Project;
@@ -35,12 +36,18 @@ import org.quartz.ScheduleBuilder;
import javax.inject.Inject;
import javax.inject.Singleton;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.JoinType;
+import javax.persistence.criteria.Root;
import javax.ws.rs.client.*;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.StreamingOutput;
import java.io.*;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.Date;
import java.util.UUID;
@@ -234,6 +241,27 @@ public class DefaultPackBlobManager extends BaseEntityManager<PackBlob>
return new File(packsDir, getPacksRelativeDirPath(sha256Hash));
}
+ @Sessional
+ @Override
+ public void populateBlobs(Collection<Pack> packs) {
+ var builder = getSession().getCriteriaBuilder();
+ CriteriaQuery<Object[]> referenceAndBlobQuery = builder.createQuery(Object[].class);
+ Root<PackBlobReference> referenceRoot = referenceAndBlobQuery.from(PackBlobReference.class);
+ Join<PackBlob, PackBlob> blobJoin = referenceRoot.join(PackBlobReference.PROP_PACK_BLOB, JoinType.INNER);
+ referenceAndBlobQuery.multiselect(referenceRoot, blobJoin);
+ referenceAndBlobQuery.where(referenceRoot.get(PackBlobReference.PROP_PACK).in(packs));
+
+ for (var pack : packs)
+ pack.setBlobReferences(new ArrayList<>());
+
+ for (Object[] referenceAndBlob : getSession().createQuery(referenceAndBlobQuery).getResultList()) {
+ PackBlobReference reference = (PackBlobReference) referenceAndBlob[0];
+ PackBlob blob = (PackBlob) referenceAndBlob[1];
+ reference.setPackBlob(blob);
+ reference.getPack().getBlobReferences().add(reference);
+ }
+ }
+
@Override
public void initUpload(Long projectId, String uuid) {
projectManager.runOnActiveServer(projectId, () -> {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackLabelManager.java
index 1fd5dbde52..b254ac508d 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackLabelManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackLabelManager.java
@@ -7,10 +7,15 @@ import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.LabelSpec;
import io.onedev.server.model.Pack;
import io.onedev.server.model.PackLabel;
+import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.dao.Dao;
import javax.inject.Inject;
import javax.inject.Singleton;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.Collection;
@Singleton
public class DefaultPackLabelManager extends BaseEntityLabelManager<PackLabel> implements PackLabelManager {
@@ -33,5 +38,21 @@ public class DefaultPackLabelManager extends BaseEntityLabelManager<PackLabel> i
Preconditions.checkState(packLabel.isNew());
dao.persist(packLabel);
}
-
+
+ @Sessional
+ @Override
+ public void populateLabels(Collection<Pack> packs) {
+ var builder = getSession().getCriteriaBuilder();
+ CriteriaQuery<PackLabel> labelQuery = builder.createQuery(PackLabel.class);
+ Root<PackLabel> labelRoot = labelQuery.from(PackLabel.class);
+ labelQuery.select(labelRoot);
+ labelQuery.where(labelRoot.get(PackLabel.PROP_PACK).in(packs));
+
+ for (var pack: packs)
+ pack.setLabels(new ArrayList<>());
+
+ for (var label: getSession().createQuery(labelQuery).getResultList())
+ label.getPack().getLabels().add(label);
+ }
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackManager.java
index da65abd2e5..1d47679bb7 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackManager.java
@@ -3,10 +3,7 @@ package io.onedev.server.entitymanager.impl;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import io.onedev.commons.loader.ManagedSerializedForm;
-import io.onedev.server.entitymanager.PackBlobAuthorizationManager;
-import io.onedev.server.entitymanager.PackBlobReferenceManager;
-import io.onedev.server.entitymanager.PackManager;
-import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.*;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.project.pack.PackPublished;
import io.onedev.server.model.*;
@@ -45,18 +42,25 @@ public class DefaultPackManager extends BaseEntityManager<Pack>
private final PackBlobReferenceManager blobReferenceManager;
+ private final PackBlobManager blobManager;
+
private final ProjectManager projectManager;
+ private final PackLabelManager labelManager;
+
private final ListenerRegistry listenerRegistry;
@Inject
public DefaultPackManager(Dao dao, PackBlobAuthorizationManager blobAuthorizationManager,
- PackBlobReferenceManager blobReferenceManager,
- ProjectManager projectManager, ListenerRegistry listenerRegistry) {
+ PackBlobReferenceManager blobReferenceManager,
+ PackBlobManager blobManager, ProjectManager projectManager,
+ PackLabelManager labelManager, ListenerRegistry listenerRegistry) {
super(dao);
this.blobAuthorizationManager = blobAuthorizationManager;
this.blobReferenceManager = blobReferenceManager;
+ this.blobManager = blobManager;
this.projectManager = projectManager;
+ this.labelManager = labelManager;
this.listenerRegistry = listenerRegistry;
}
@@ -91,29 +95,17 @@ public class DefaultPackManager extends BaseEntityManager<Pack>
@Sessional
@Override
- public List<Pack> query(Project project, EntityQuery<Pack> packQuery, boolean loadBlobs,
- int firstResult, int maxResults) {
+ public List<Pack> query(Project project, EntityQuery<Pack> packQuery,
+ boolean loadLabelsAndBlobs, int firstResult, int maxResults) {
CriteriaQuery<Pack> criteriaQuery = buildCriteriaQuery(project, getSession(), packQuery);
Query<Pack> query = getSession().createQuery(criteriaQuery);
query.setFirstResult(firstResult);
query.setMaxResults(maxResults);
- List<Pack> packs = query.getResultList();
-
- var builder = getSession().getCriteriaBuilder();
- CriteriaQuery<Object[]> referenceAndBlobQuery = builder.createQuery(Object[].class);
- Root<PackBlobReference> referenceRoot = referenceAndBlobQuery.from(PackBlobReference.class);
- Join<PackBlob, PackBlob> blobJoin = referenceRoot.join(PackBlobReference.PROP_PACK_BLOB, JoinType.INNER);
- referenceAndBlobQuery.multiselect(referenceRoot, blobJoin);
- referenceAndBlobQuery.where(referenceRoot.get(PackBlobReference.PROP_PACK).in(packs));
-
- for (var pack: packs)
- pack.setBlobReferences(new ArrayList<>());
+ var packs = query.getResultList();
- for (Object[] referenceAndBlob: getSession().createQuery(referenceAndBlobQuery).getResultList()) {
- PackBlobReference reference = (PackBlobReference) referenceAndBlob[0];
- PackBlob blob = (PackBlob) referenceAndBlob[1];
- reference.setPackBlob(blob);
- reference.getPack().getBlobReferences().add(reference);
+ if (!packs.isEmpty() && loadLabelsAndBlobs) {
+ labelManager.populateLabels(packs);
+ blobManager.populateBlobs(packs);
}
return packs;
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectLabelManager.java
index 5a01f773da..5ba874554c 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectLabelManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectLabelManager.java
@@ -1,8 +1,5 @@
package io.onedev.server.entitymanager.impl;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
import com.google.common.base.Preconditions;
import io.onedev.server.entitymanager.LabelSpecManager;
import io.onedev.server.entitymanager.ProjectLabelManager;
@@ -10,8 +7,16 @@ import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.LabelSpec;
import io.onedev.server.model.Project;
import io.onedev.server.model.ProjectLabel;
+import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.dao.Dao;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.Collection;
+
@Singleton
public class DefaultProjectLabelManager extends BaseEntityLabelManager<ProjectLabel> implements ProjectLabelManager {
@@ -33,5 +38,21 @@ public class DefaultProjectLabelManager extends BaseEntityLabelManager<ProjectLa
Preconditions.checkState(projectLabel.isNew());
dao.persist(projectLabel);
}
-
+
+ @Sessional
+ @Override
+ public void populateLabels(Collection<Project> projects) {
+ var builder = getSession().getCriteriaBuilder();
+ CriteriaQuery<ProjectLabel> labelQuery = builder.createQuery(ProjectLabel.class);
+ Root<ProjectLabel> labelRoot = labelQuery.from(ProjectLabel.class);
+ labelQuery.select(labelRoot);
+ labelQuery.where(labelRoot.get(ProjectLabel.PROP_PROJECT).in(projects));
+
+ for (var project: projects)
+ project.setLabels(new ArrayList<>());
+
+ for (var label: getSession().createQuery(labelQuery).getResultList())
+ label.getProject().getLabels().add(label);
+ }
+
}
\ No newline at end of file
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.java
index 7f907e41e9..945080702e 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
@@ -177,6 +177,8 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
private final PackBlobManager packBlobManager;
+ private final ProjectLabelManager labelManager;
+
private final Collection<String> reservedNames = Sets.newHashSet("robots.txt", "sitemap.xml", "sitemap.txt",
"favicon.ico", "favicon.png", "logo.png", "wicket", "projects");
@@ -201,7 +203,8 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
ProjectLastEventDateManager lastEventDateManager, PullRequestManager pullRequestManager,
AttachmentManager attachmentManager, BatchWorkManager batchWorkManager,
VisitInfoManager visitInfoManager, StorageManager storageManager,
- PackBlobManager packBlobManager, Set<ProjectNameReservation> nameReservations) {
+ PackBlobManager packBlobManager, ProjectLabelManager labelManager,
+ Set<ProjectNameReservation> nameReservations) {
super(dao);
this.commitInfoManager = commitInfoManager;
@@ -225,6 +228,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
this.visitInfoManager = visitInfoManager;
this.storageManager = storageManager;
this.packBlobManager = packBlobManager;
+ this.labelManager = labelManager;
for (ProjectNameReservation reservation : nameReservations)
reservedNames.addAll(reservation.getReserved());
@@ -975,12 +979,17 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
@Sessional
@Override
- public List<Project> query(EntityQuery<Project> query, int firstResult, int maxResults) {
+ public List<Project> query(EntityQuery<Project> query, boolean loadLabels, int firstResult, int maxResults) {
CriteriaQuery<Project> criteriaQuery = buildCriteriaQuery(getSession(), query);
Query<Project> projectQuery = getSession().createQuery(criteriaQuery);
projectQuery.setFirstResult(firstResult);
projectQuery.setMaxResults(maxResults);
- return projectQuery.getResultList();
+ var projects = projectQuery.getResultList();
+
+ if (!projects.isEmpty() && loadLabels)
+ labelManager.populateLabels(projects);
+
+ return projects;
}
@Sessional
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestLabelManager.java
index fe01f6e591..e4e89f0521 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestLabelManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestLabelManager.java
@@ -1,14 +1,22 @@
package io.onedev.server.entitymanager.impl;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
import com.google.common.base.Preconditions;
import io.onedev.server.entitymanager.LabelSpecManager;
import io.onedev.server.entitymanager.PullRequestLabelManager;
-import io.onedev.server.model.*;
+import io.onedev.server.model.AbstractEntity;
+import io.onedev.server.model.LabelSpec;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.PullRequestLabel;
+import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.dao.Dao;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.Collection;
+
@Singleton
public class DefaultPullRequestLabelManager extends BaseEntityLabelManager<PullRequestLabel>
implements PullRequestLabelManager {
@@ -31,5 +39,21 @@ public class DefaultPullRequestLabelManager extends BaseEntityLabelManager<PullR
Preconditions.checkState(pullRequestLabel.isNew());
dao.persist(pullRequestLabel);
}
-
+
+ @Sessional
+ @Override
+ public void populateLabels(Collection<PullRequest> pullRequests) {
+ var builder = getSession().getCriteriaBuilder();
+ CriteriaQuery<PullRequestLabel> labelQuery = builder.createQuery(PullRequestLabel.class);
+ Root<PullRequestLabel> labelRoot = labelQuery.from(PullRequestLabel.class);
+ labelQuery.select(labelRoot);
+ labelQuery.where(labelRoot.get(PullRequestLabel.PROP_REQUEST).in(pullRequests));
+
+ for (var pullRequest: pullRequests)
+ pullRequest.setLabels(new ArrayList<>());
+
+ for (var label: getSession().createQuery(labelQuery).getResultList())
+ label.getRequest().getLabels().add(label);
+ }
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index 80ac8aafac..8ac413f9a0 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -92,6 +92,8 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
private final BuildManager buildManager;
+ private final PullRequestLabelManager labelManager;
+
private final CommitInfoManager commitInfoManager;
private final PullRequestChangeManager changeManager;
@@ -109,10 +111,10 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
@Inject
public DefaultPullRequestManager(Dao dao, PullRequestUpdateManager updateManager,
PullRequestReviewManager reviewManager, ListenerRegistry listenerRegistry,
- PullRequestChangeManager changeManager, BuildManager buildManager,
- TransactionManager transactionManager, ProjectManager projectManager,
- CommitInfoManager commitInfoManager, ClusterManager clusterManager,
- UserManager userManager, GitService gitService,
+ PullRequestChangeManager changeManager, BuildManager buildManager,
+ PullRequestLabelManager labelManager, TransactionManager transactionManager,
+ ProjectManager projectManager, CommitInfoManager commitInfoManager,
+ ClusterManager clusterManager, UserManager userManager, GitService gitService,
PendingSuggestionApplyManager pendingSuggestionApplyManager,
PullRequestInfoManager pullRequestInfoManager) {
super(dao);
@@ -123,6 +125,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
this.listenerRegistry = listenerRegistry;
this.changeManager = changeManager;
this.buildManager = buildManager;
+ this.labelManager = labelManager;
this.projectManager = projectManager;
this.commitInfoManager = commitInfoManager;
this.pendingSuggestionApplyManager = pendingSuggestionApplyManager;
@@ -856,16 +859,17 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
@Sessional
@Override
public List<PullRequest> query(@Nullable Project targetProject, EntityQuery<PullRequest> requestQuery,
- boolean loadReviewsAndBuilds, int firstResult, int maxResults) {
+ boolean loadLabelsAndReviewsAndBuilds, int firstResult, int maxResults) {
CriteriaQuery<PullRequest> criteriaQuery = buildCriteriaQuery(getSession(), targetProject, requestQuery);
Query<PullRequest> query = getSession().createQuery(criteriaQuery);
query.setFirstResult(firstResult);
query.setMaxResults(maxResults);
List<PullRequest> requests = query.getResultList();
- if (!requests.isEmpty() && loadReviewsAndBuilds) {
+ if (!requests.isEmpty() && loadLabelsAndReviewsAndBuilds) {
reviewManager.populateReviews(requests);
buildManager.populateBuilds(requests);
+ labelManager.populateLabels(requests);
}
return requests;
diff --git a/server-core/src/main/java/io/onedev/server/model/ProjectLabel.java b/server-core/src/main/java/io/onedev/server/model/ProjectLabel.java
index b19ac06a23..00be698b3a 100644
--- a/server-core/src/main/java/io/onedev/server/model/ProjectLabel.java
+++ b/server-core/src/main/java/io/onedev/server/model/ProjectLabel.java
@@ -11,12 +11,15 @@ import javax.persistence.UniqueConstraint;
import io.onedev.server.model.support.EntityLabel;
import io.onedev.server.rest.annotation.Api;
import io.onedev.server.rest.annotation.Immutable;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
@Entity
@Table(
indexes={@Index(columnList="o_project_id"), @Index(columnList="o_spec_id")},
uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_spec_id"})}
)
+@Cache(usage= CacheConcurrencyStrategy.READ_WRITE)
public class ProjectLabel extends EntityLabel {
private static final long serialVersionUID = 1L;
@@ -25,7 +28,7 @@ public class ProjectLabel extends EntityLabel {
public static String PROP_SPEC = "spec";
- @ManyToOne
+ @ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(nullable=false)
@Api(description = "id of <a href='/~help/api/io.onedev.server.rest.ProjectResource'>project</a>")
@Immutable
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/BuildResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/BuildResource.java
index 10e4506a6d..0cb2d4a478 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/BuildResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/BuildResource.java
@@ -133,7 +133,7 @@ public class BuildResource {
throw new InvalidParamException("Error parsing query", e);
}
- return buildManager.query(null, parsedQuery, offset, count);
+ return buildManager.query(null, parsedQuery, false, offset, count);
}
@Api(order=700)
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java
index ecd98bdd5b..c593b0f61d 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java
@@ -182,7 +182,7 @@ public class ProjectResource {
throw new InvalidParamException("Error parsing query", e);
}
- return projectManager.query(parsedQuery, offset, count);
+ return projectManager.query(parsedQuery, false, offset, count);
}
@Api(order=750)
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
index 0e2b52b0a3..554b66d3cb 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
@@ -924,13 +924,13 @@ public abstract class BuildListPanel extends Panel {
});
}
- dataProvider = new LoadableDetachableDataProvider<Build, Void>() {
+ dataProvider = new LoadableDetachableDataProvider<>() {
@Override
public Iterator<? extends Build> iterator(long first, long count) {
try {
- return getBuildManager().query(getProject(), queryModel.getObject(),
- (int)first, (int)count).iterator();
+ return getBuildManager().query(getProject(), queryModel.getObject(),
+ true, (int) first, (int) count).iterator();
} catch (ExplicitException e) {
error(e.getMessage());
return new ArrayList<Build>().iterator();
@@ -946,7 +946,7 @@ public abstract class BuildListPanel extends Panel {
} catch (ExplicitException e) {
error(e.getMessage());
}
- }
+ }
return 0;
}
@@ -959,10 +959,10 @@ public abstract class BuildListPanel extends Panel {
protected Build load() {
return getBuildManager().load(buildId);
}
-
+
};
}
-
+
};
if (expectedCount != 0 && expectedCount != dataProvider.size())
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/BuildParam.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/BuildParam.java
index 0ff4e89cd1..e5920867f5 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/BuildParam.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/BuildParam.java
@@ -40,7 +40,7 @@ public class BuildParam extends ParamSegment {
}
query = new BuildQuery(criteria);
}
- List<Build> builds = buildManager.query(project, query, 0, count);
+ List<Build> builds = buildManager.query(project, query, false, 0, count);
for (Build build: builds)
suggestions.put(build.getSummary(project), String.valueOf(build.getNumber()));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/ProjectParam.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/ProjectParam.java
index dc6010c0e9..1fd97d59ad 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/ProjectParam.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/ProjectParam.java
@@ -29,7 +29,7 @@ public class ProjectParam extends ParamSegment {
else
query = new ProjectQuery(new PathCriteria("**/*" + matchWith + "*/**", ProjectQueryLexer.Is));
Map<String, String> suggestions = new LinkedHashMap<>();
- for (Project project: projectManager.query(query, 0, count))
+ for (Project project: projectManager.query(query, false, 0, count))
suggestions.put(project.getPath(), String.valueOf(project.getPath()));
return suggestions;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java
index 83f8d86ec9..44cbb172ba 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java
@@ -458,8 +458,8 @@ public abstract class PackListPanel extends Panel {
@Override
public Iterator<? extends Pack> iterator(long first, long count) {
try {
- return getPackManager().query(getProject(), queryModel.getObject(), true,
- (int) first, (int) count).iterator();
+ return getPackManager().query(getProject(), queryModel.getObject(),
+ true, (int) first, (int) count).iterator();
} catch (ExplicitException e) {
error(e.getMessage());
return new ArrayList<Pack>().iterator();
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
index a0027b5925..e18e907a06 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
@@ -976,14 +976,14 @@ public class ProjectListPanel extends Panel {
.setVisible(canCreateProjects));
}
- dataProvider = new LoadableDetachableDataProvider<Project, Void>() {
+ dataProvider = new LoadableDetachableDataProvider<>() {
@Override
public Iterator<? extends Project> iterator(long first, long count) {
try {
ProjectQuery query = queryModel.getObject();
- if (query != null)
- return getProjectManager().query(query, (int)first, (int)count).iterator();
+ if (query != null)
+ return getProjectManager().query(query, true, (int) first, (int) count).iterator();
} catch (ExplicitException e) {
error(e.getMessage());
}
@@ -994,7 +994,7 @@ public class ProjectListPanel extends Panel {
public long calcSize() {
try {
ProjectQuery query = queryModel.getObject();
- if (query != null)
+ if (query != null)
return getProjectManager().count(query.getCriteria());
} catch (ExplicitException e) {
error(e.getMessage());
@@ -1011,10 +1011,10 @@ public class ProjectListPanel extends Panel {
protected Project load() {
return getProjectManager().load(projectId);
}
-
+
};
}
-
+
};
if (expectedCount != 0 && expectedCount != dataProvider.size())
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
index 6c47a0b6af..8ed511bde2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
@@ -958,10 +958,8 @@ public abstract class PullRequestListPanel extends Panel {
public Iterator<? extends PullRequest> iterator(long first, long count) {
try {
var query = queryModel.getObject();
- if (query != null) {
- return getPullRequestManager().query(getProject(), query,
- true, (int) first, (int) count).iterator();
- }
+ if (query != null)
+ return getPullRequestManager().query(getProject(), query, true, (int) first, (int) count).iterator();
} catch (ExplicitException e) {
error(e.getMessage());
}
diff --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.java
index 7a3a084d04..66a6573a52 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
@@ -405,7 +405,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
String queryString = getProjectManager().getFavoriteQuery();
ProjectQuery query = ProjectQuery.parse(queryString);
- for (Project project: getProjectManager().query(query, 0, WebConstants.PAGE_SIZE))
+ for (Project project: getProjectManager().query(query, false, 0, WebConstants.PAGE_SIZE))
projectsView.add(newItem(projectsView.newChildId(), project));
fragment.add(projectsView);
@@ -414,7 +414,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
@Override
protected void appendMore(AjaxRequestTarget target, int offset, int count) {
- for (Project project: getProjectManager().query(query, offset, count)) {
+ for (Project project: getProjectManager().query(query, false, offset, count)) {
Component item = newItem(projectsView.newChildId(), project);
projectsView.add(item);
String script = String.format("$('#%s ul').append('<li id=\"%s\"></li>');",
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
index 07bad9bbfa..11b2335cb0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
@@ -591,7 +591,7 @@ public abstract class BuildDetailPage extends ProjectPage
@Override
protected List<Build> query(EntityQuery<Build> query, int offset, int count, ProjectScope projectScope) {
BuildManager buildManager = OneDev.getInstance(BuildManager.class);
- return buildManager.query(projectScope!=null?projectScope.getProject():null, query, offset, count);
+ return buildManager.query(projectScope!=null?projectScope.getProject():null, query, false, offset, count);
}
@Override