The Unified and Autonomous Development Platform
Fix issue #1100 - Do not count project update for scheduled jobs
Robin Shen418c79ebb7d1
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.javaindex edb804fa5b..fc024b680f 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java@@ -1,32 +1,5 @@package io.onedev.server.buildspec.job;-import static io.onedev.server.model.Build.NAME_BRANCH;-import static io.onedev.server.model.Build.NAME_COMMIT;-import static io.onedev.server.model.Build.NAME_JOB;-import static io.onedev.server.model.Build.NAME_PULL_REQUEST;-import static io.onedev.server.model.Build.NAME_TAG;-import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;-import static io.onedev.server.search.entity.build.BuildQueryLexer.And;-import static io.onedev.server.search.entity.build.BuildQueryLexer.InPipelineOf;-import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.HashSet;-import java.util.List;-import java.util.Map;-import java.util.Set;-import java.util.stream.Collectors;--import javax.annotation.Nullable;-import javax.validation.ConstraintValidatorContext;-import javax.validation.Valid;-import javax.validation.constraints.Min;-import javax.validation.constraints.NotEmpty;--import org.apache.wicket.Component;-import org.eclipse.jgit.lib.ObjectId;-import io.onedev.commons.codeassist.InputCompletion;import io.onedev.commons.codeassist.InputStatus;import io.onedev.commons.codeassist.InputSuggestion;@@ -53,14 +26,25 @@ import io.onedev.server.util.EditContext;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.validation.Validatable;import io.onedev.server.util.validation.annotation.ClassValidating;-import io.onedev.server.web.editable.annotation.ChoiceProvider;-import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.Interpolative;-import io.onedev.server.web.editable.annotation.RetryCondition;-import io.onedev.server.web.editable.annotation.SuggestionProvider;+import io.onedev.server.web.editable.annotation.*;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.util.SuggestionUtils;import io.onedev.server.web.util.WicketUtils;+import org.apache.wicket.Component;+import org.eclipse.jgit.lib.ObjectId;++import javax.annotation.Nullable;+import javax.validation.ConstraintValidatorContext;+import javax.validation.Valid;+import javax.validation.constraints.Min;+import javax.validation.constraints.NotEmpty;+import java.io.Serializable;+import java.util.*;+import java.util.stream.Collectors;++import static io.onedev.server.model.Build.*;+import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;+import static io.onedev.server.search.entity.build.BuildQueryLexer.*;@Editable@ClassValidatingdiff --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 8ba12824ee..2700943cfa 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@@ -269,13 +269,12 @@ public class DefaultProjectManager extends BaseEntityManager<Project>if (parent != null && parent.isNew())create(parent);project.setPath(project.calcPath());+ProjectUpdate update = new ProjectUpdate();- update.setProject(project);project.setUpdate(update);+ updateManager.save(update);dao.persist(project);- updateManager.save(update);-var gitDir = storageManager.getProjectDir(project.getId());FileUtils.cleanDir(gitDir);checkGitDir(project.getId());@@ -397,6 +396,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>buildManager.delete(build);dao.remove(project);+ updateManager.delete(project.getUpdate());synchronized (repositoryCache) {Repository repository = repositoryCache.remove(project.getId());diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectUpdateManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectUpdateManager.javaindex ee70cb9491..f007e0a936 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectUpdateManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectUpdateManager.java@@ -1,19 +1,34 @@-package io.onedev.server.entitymanager.impl;--import javax.inject.Inject;-import javax.inject.Singleton;--import io.onedev.server.entitymanager.ProjectUpdateManager;-import io.onedev.server.model.ProjectUpdate;-import io.onedev.server.persistence.dao.BaseEntityManager;-import io.onedev.server.persistence.dao.Dao;--@Singleton-public class DefaultProjectUpdateManager extends BaseEntityManager<ProjectUpdate> implements ProjectUpdateManager {-- @Inject- public DefaultProjectUpdateManager(Dao dao) {- super(dao);- }--}+package io.onedev.server.entitymanager.impl;++import io.onedev.server.entitymanager.ProjectUpdateManager;+import io.onedev.server.event.Listen;+import io.onedev.server.event.project.ProjectCreated;+import io.onedev.server.event.project.ProjectEvent;+import io.onedev.server.event.project.RefUpdated;+import io.onedev.server.model.ProjectUpdate;+import io.onedev.server.persistence.annotation.Transactional;+import io.onedev.server.persistence.dao.BaseEntityManager;+import io.onedev.server.persistence.dao.Dao;++import javax.inject.Inject;+import javax.inject.Singleton;+import java.util.Date;++@Singleton+public class DefaultProjectUpdateManager extends BaseEntityManager<ProjectUpdate> implements ProjectUpdateManager {++ @Inject+ public DefaultProjectUpdateManager(Dao dao) {+ super(dao);+ }++ @Transactional+ @Listen+ public void on(ProjectEvent event) {+ if (event instanceof RefUpdated+ || !(event instanceof ProjectCreated) && event.getUser() != null && !event.getUser().isSystem()) {+ event.getProject().getUpdate().setDate(new Date());+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/event/DefaultListenerRegistry.java b/server-core/src/main/java/io/onedev/server/event/DefaultListenerRegistry.javaindex ef696ee902..92f343aa9a 100644--- a/server-core/src/main/java/io/onedev/server/event/DefaultListenerRegistry.java+++ b/server-core/src/main/java/io/onedev/server/event/DefaultListenerRegistry.java@@ -1,35 +1,25 @@package io.onedev.server.event;-import java.io.ObjectStreamException;-import java.io.Serializable;-import java.lang.reflect.Method;-import java.util.ArrayList;-import java.util.Collection;-import java.util.Collections;-import java.util.HashMap;-import java.util.HashSet;-import java.util.List;-import java.util.Map;-import java.util.Set;-import java.util.concurrent.Callable;-import java.util.concurrent.ConcurrentHashMap;--import javax.inject.Inject;-import javax.inject.Singleton;-import io.onedev.commons.loader.AppLoader;import io.onedev.commons.loader.ManagedSerializedForm;import io.onedev.commons.utils.LockUtils;import io.onedev.server.cluster.ClusterRunnable;import io.onedev.server.cluster.ClusterTask;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.event.project.ProjectCreated;import io.onedev.server.event.project.ProjectEvent;-import io.onedev.server.model.Project;import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Transactional;+import javax.inject.Inject;+import javax.inject.Singleton;+import java.io.ObjectStreamException;+import java.io.Serializable;+import java.lang.reflect.Method;+import java.util.*;+import java.util.concurrent.Callable;+import java.util.concurrent.ConcurrentHashMap;+@Singletonpublic class DefaultListenerRegistry implements ListenerRegistry, Serializable {@@ -112,11 +102,7 @@ public class DefaultListenerRegistry implements ListenerRegistry, Serializable {public void post(Object event) {if (event instanceof ProjectEvent) {ProjectEvent projectEvent = (ProjectEvent) event;- Project project = projectEvent.getProject();- if (!(event instanceof ProjectCreated))- project.getUpdate().setDate(projectEvent.getDate());-- Long projectId = project.getId();+ Long projectId = projectEvent.getProject().getId();transactionManager.runAfterCommit(new ClusterRunnable() {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 1fa05df50f..168e301b23 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@@ -4789,15 +4789,12 @@ public class DataMigrator {}private void migrate109(File dataDir, Stack<Integer> versions) {- Map<String, String> projectIds = new HashMap<>();+ var updateIds = new HashSet<>();for (File file: dataDir.listFiles()) {if (file.getName().startsWith("Projects.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);for (Element element: dom.getRootElement().elements()) {- String id = element.elementTextTrim("id");- Element updateElement = element.element("update");- projectIds.put(updateElement.getTextTrim(), id);- updateElement.detach();+ updateIds.add(element.elementTextTrim("update"));}}}@@ -4805,11 +4802,7 @@ public class DataMigrator {if (file.getName().startsWith("ProjectUpdates.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);for (Element element: dom.getRootElement().elements()) {- String id = element.elementTextTrim("id");- String projectId = projectIds.get(id);- if (projectId != null)- element.addElement("project").setText(projectId);- else+ if (!updateIds.contains(element.elementTextTrim("id")))element.detach();}dom.writeToFile(file, false);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 e6bdb8626a..82f3324285 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@@ -82,7 +82,7 @@ import static io.onedev.server.model.Project.PROP_NAME;@Table(indexes={@Index(columnList="o_parent_id"), @Index(columnList="o_forkedFrom_id"),- @Index(columnList=PROP_NAME)+ @Index(columnList="o_update_id"), @Index(columnList=PROP_NAME)},uniqueConstraints={@UniqueConstraint(columnNames={"o_parent_id", PROP_NAME})})@@ -171,8 +171,9 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel@JoinColumn(nullable=true)@Api(description="Represents the parent project. Remove this property if the project does not have a parent project")private Project parent;-- @OneToOne(mappedBy = "project", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)++ @OneToOne(fetch = FetchType.LAZY)+ @JoinColumn(unique=true, nullable=false)private ProjectUpdate update;@Column(nullable=false)diff --git a/server-core/src/main/java/io/onedev/server/model/ProjectUpdate.java b/server-core/src/main/java/io/onedev/server/model/ProjectUpdate.javaindex a3fe68135b..145f237d92 100644--- a/server-core/src/main/java/io/onedev/server/model/ProjectUpdate.java+++ b/server-core/src/main/java/io/onedev/server/model/ProjectUpdate.java@@ -1,37 +1,28 @@package io.onedev.server.model;-import static io.onedev.server.model.ProjectUpdate.PROP_DATE;+import org.hibernate.annotations.Cache;+import org.hibernate.annotations.CacheConcurrencyStrategy;+import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.Index;+import javax.persistence.Table;import java.util.Date;-import javax.persistence.*;--import io.onedev.server.web.editable.annotation.Editable;+import static io.onedev.server.model.ProjectUpdate.PROP_DATE;@Entity-@Table(indexes={@Index(columnList="o_project_id"), @Index(columnList=PROP_DATE)})-@Editable+@Table(indexes={@Index(columnList=PROP_DATE)})+@Cache(usage= CacheConcurrencyStrategy.READ_WRITE)public class ProjectUpdate extends AbstractEntity {private static final long serialVersionUID = 1L;public static final String PROP_DATE = "date";- @OneToOne- @JoinColumn(unique=true, nullable=false)- private Project project;-@Column(nullable=false)private Date date = new Date();- public Project getProject() {- return project;- }-- public void setProject(Project project) {- this.project = project;- }-public Date getDate() {return date;}