The Unified and Autonomous Development Platform
fix: Automatic State Transition From PR Description (OD-2792)
Robin Shen6b362e91bc39
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.javaindex 92adf1ebf9..eae619510a 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java@@ -8673,6 +8673,13 @@ public class DataMigrator {}}+ private void migrate226TransitionSpecsElement(Element transitionSpecsElement) {+ for (Element transitionSpecElement : transitionSpecsElement.elements()) {+ if (transitionSpecElement.getName().equals("io.onedev.server.model.support.issue.transitionspec.PullRequestOpenedSpec"))+ transitionSpecElement.setName("io.onedev.server.model.support.issue.transitionspec.PullRequestOpenedOrUpdatedSpec");+ }+ }+private void migrate226(File dataDir, Stack<Integer> versions) {for (File file : dataDir.listFiles()) {if (file.getName().startsWith("Settings.xml")) {@@ -8712,6 +8719,24 @@ public class DataMigrator {provisionerElement.setName("io.onedev.server.plugin.provisioner.servershell.ServerShellProvisioner");}}+ } else if (key.equals("ISSUE")) {+ Element valueElement = element.element("value");+ if (valueElement != null) {+ Element transitionSpecsElement = valueElement.element("transitionSpecs");+ if (transitionSpecsElement != null)+ migrate226TransitionSpecsElement(transitionSpecsElement);+ }+ }+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("Projects.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element projectElement : dom.getRootElement().elements()) {+ Element issueSettingElement = projectElement.element("issueSetting");+ if (issueSettingElement != null) {+ Element transitionSpecsElement = issueSettingElement.element("transitionSpecs");+ if (transitionSpecsElement != null)+ migrate226TransitionSpecsElement(transitionSpecsElement);}}dom.writeToFile(file, false);diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.javaindex 1d4d2e6731..c59d44a8bb 100644--- a/server-core/src/main/java/io/onedev/server/model/Issue.java+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java@@ -1207,13 +1207,17 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupportif (pullRequests == null) {pullRequests = new ArrayList<>();- PullRequestInfoService infoManager = OneDev.getInstance(PullRequestInfoService.class);+ PullRequestInfoService infoService = OneDev.getInstance(PullRequestInfoService.class);Collection<Long> pullRequestIds = new HashSet<>();for (ProjectScopedCommit commit: getFixCommits(false))- pullRequestIds.addAll(infoManager.getPullRequestIds(commit.getProject(), commit.getCommitId()));+ pullRequestIds.addAll(infoService.getPullRequestIds(commit.getProject(), commit.getCommitId()));+ pullRequestIds.addAll(infoService.getPullRequestIds(getProject(), getId()));+ getProject().getTree().stream().filter(Project::isCodeManagement).forEach(it ->+ pullRequestIds.addAll(infoService.getPullRequestIds(it, getId())));+ var pullRequestService = OneDev.getInstance(PullRequestService.class);for (Long requestId: pullRequestIds) {- PullRequest request = OneDev.getInstance(PullRequestService.class).get(requestId);+ PullRequest request = pullRequestService.get(requestId);if (request != null && !pullRequests.contains(request))pullRequests.add(request);}diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.javaindex 50cfe26a90..f11022959a 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java@@ -1072,6 +1072,9 @@ public class PullRequest extends ProjectBelongingfor (RevCommit commit: update.getCommits())fixedIssueIds.addAll(getProject().parseFixedIssueIds(commit.getFullMessage()));}+ fixedIssueIds.addAll(getProject().parseFixedIssueIds(getTitle()));+ if (getDescription() != null)+ fixedIssueIds.addAll(getProject().parseFixedIssueIds(getDescription()));}return fixedIssueIds;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.javaindex 5c34371d26..9a464bcf20 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java@@ -42,7 +42,7 @@ import io.onedev.server.model.support.issue.transitionspec.BranchCreatedSpec;import io.onedev.server.model.support.issue.transitionspec.BranchUpdatedSpec;import io.onedev.server.model.support.issue.transitionspec.IssueStateTransitedSpec;import io.onedev.server.model.support.issue.transitionspec.ManualSpec;-import io.onedev.server.model.support.issue.transitionspec.PullRequestOpenedSpec;+import io.onedev.server.model.support.issue.transitionspec.PullRequestOpenedOrUpdatedSpec;import io.onedev.server.model.support.issue.transitionspec.TransitionSpec;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.IssueQueryParseOption;@@ -202,7 +202,7 @@ public class GlobalIssueSetting implements Serializable {branchCreatedSpec.setIssueQuery("referenced in current branch");transitionSpecs.add(branchCreatedSpec);- var pullRequestOpenedSpec = new PullRequestOpenedSpec();+ var pullRequestOpenedSpec = new PullRequestOpenedOrUpdatedSpec();pullRequestOpenedSpec.setToState("In Review");pullRequestOpenedSpec.setBranches("main master");pullRequestOpenedSpec.setIssueQuery("fixed in current pull request");diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/PullRequestOpenedSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/PullRequestOpenedOrUpdatedSpec.javasimilarity index 63%rename from server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/PullRequestOpenedSpec.javarename to server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/PullRequestOpenedOrUpdatedSpec.javaindex ad3207e7cd..08cd46887f 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/PullRequestOpenedSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/PullRequestOpenedOrUpdatedSpec.java@@ -6,17 +6,17 @@ import java.text.MessageFormat;import io.onedev.server.annotation.Editable;-@Editable(order=200, name="Pull request is opened")-public class PullRequestOpenedSpec extends PullRequestSpec {+@Editable(order=200, name="Pull request is opened or updated")+public class PullRequestOpenedOrUpdatedSpec extends PullRequestSpec {private static final long serialVersionUID = 1L;@Overridepublic String getTriggerDescription() {if (getBranches() != null)- return MessageFormat.format(_T("pull request to branches \"{0}\" is opened"), getBranches());+ return MessageFormat.format(_T("pull request to branches \"{0}\" is opened or updated"), getBranches());else- return _T("pull request to any branch is opened");+ return _T("pull request to any branch is opened or updated");}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.javaindex e6e4cdd333..ccb8d4f06e 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java@@ -22,6 +22,14 @@ public class PullRequestDescriptionChangeData extends PullRequestChangeData {newDescription = "";this.newDescription = newDescription;}++ public String getOldDescription() {+ return oldDescription;+ }++ public String getNewDescription() {+ return newDescription;+ }@Overridepublic String getActivity() {diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.javaindex aa669e637f..727f04ee72 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.java@@ -17,6 +17,14 @@ public class PullRequestTitleChangeData extends PullRequestChangeData {this.oldTitle = oldTitle;this.newTitle = newTitle;}++ public String getOldTitle() {+ return oldTitle;+ }++ public String getNewTitle() {+ return newTitle;+ }@Overridepublic String getActivity() {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.javaindex d6c8421f05..5aebc7f141 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java@@ -54,8 +54,11 @@ public class IncludesIssueCriteria extends Criteria<PullRequest> {private Collection<Long> getPullRequestIds(Project project) {Collection<Long> pullRequestIds = new HashSet<>();- for (ObjectId commit: OneDev.getInstance(CommitInfoService.class).getFixCommits(project.getId(), issue.getId(), false))- pullRequestIds.addAll(OneDev.getInstance(PullRequestInfoService.class).getPullRequestIds(project, commit));+ var commitInfoService = OneDev.getInstance(CommitInfoService.class);+ var pullRequestInfoService = OneDev.getInstance(PullRequestInfoService.class);+ for (ObjectId commit: commitInfoService.getFixCommits(project.getId(), issue.getId(), false))+ pullRequestIds.addAll(pullRequestInfoService.getPullRequestIds(project, commit));+ pullRequestIds.addAll(pullRequestInfoService.getPullRequestIds(project, issue.getId()));return pullRequestIds;}diff --git a/server-core/src/main/java/io/onedev/server/service/PullRequestChangeService.java b/server-core/src/main/java/io/onedev/server/service/PullRequestChangeService.javaindex 03d09b2c56..a40cbbd2a5 100644--- a/server-core/src/main/java/io/onedev/server/service/PullRequestChangeService.java+++ b/server-core/src/main/java/io/onedev/server/service/PullRequestChangeService.java@@ -27,4 +27,6 @@ public interface PullRequestChangeService extends EntityService<PullRequestChangList<PullRequestChange> query(User submitter, Date fromDate, Date toDate);+ List<PullRequestChange> queryAfter(Long projectId, Long afterChangeId, int count);+}diff --git a/server-core/src/main/java/io/onedev/server/service/PullRequestService.java b/server-core/src/main/java/io/onedev/server/service/PullRequestService.javaindex fda26812a5..76ab9ed56f 100644--- a/server-core/src/main/java/io/onedev/server/service/PullRequestService.java+++ b/server-core/src/main/java/io/onedev/server/service/PullRequestService.java@@ -97,6 +97,8 @@ public interface PullRequestService extends EntityService<PullRequest> {Collection<Long> getTargetProjectIds();+ List<PullRequest> queryAfter(Long projectId, Long afterRequestId, int count);+Pair<String, String> suggestTitleAndDescription(PullRequest request, ChatModel chatModel,boolean suggestTitle, boolean suggestDescription);diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueChangeService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueChangeService.javaindex e99aa4836b..ab76e2e9c0 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueChangeService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueChangeService.java@@ -53,6 +53,7 @@ import io.onedev.server.event.project.RefUpdated;import io.onedev.server.event.project.build.BuildFinished;import io.onedev.server.event.project.issue.IssueChanged;import io.onedev.server.event.project.pullrequest.PullRequestChanged;+import io.onedev.server.event.project.pullrequest.PullRequestUpdated;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.event.system.SystemStopping;import io.onedev.server.git.GitUtils;@@ -89,7 +90,7 @@ import io.onedev.server.model.support.issue.transitionspec.IssueStateTransitedSpimport io.onedev.server.model.support.issue.transitionspec.NoActivitySpec;import io.onedev.server.model.support.issue.transitionspec.PullRequestDiscardedSpec;import io.onedev.server.model.support.issue.transitionspec.PullRequestMergedSpec;-import io.onedev.server.model.support.issue.transitionspec.PullRequestOpenedSpec;+import io.onedev.server.model.support.issue.transitionspec.PullRequestOpenedOrUpdatedSpec;import io.onedev.server.model.support.issue.transitionspec.PullRequestSpec;import io.onedev.server.model.support.issue.transitionspec.TransitionSpec;import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;@@ -592,13 +593,19 @@ public class DefaultIssueChangeService extends BaseEntityService<IssueChange>else if (event.getChange().getData() instanceof PullRequestDiscardData)on(event.getRequest(), PullRequestDiscardedSpec.class);else if (event.getChange().getData() instanceof PullRequestReopenData)- on(event.getRequest(), PullRequestOpenedSpec.class);+ on(event.getRequest(), PullRequestOpenedOrUpdatedSpec.class);}@Transactional@Listenpublic void on(io.onedev.server.event.project.pullrequest.PullRequestOpened event) {- on(event.getRequest(), PullRequestOpenedSpec.class);+ on(event.getRequest(), PullRequestOpenedOrUpdatedSpec.class);+ }++ @Transactional+ @Listen+ public void on(PullRequestUpdated event) {+ on(event.getRequest(), PullRequestOpenedOrUpdatedSpec.class);}@Transactionaldiff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestChangeService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestChangeService.javaindex 6fbf13918a..4866c1ecbe 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestChangeService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestChangeService.java@@ -7,11 +7,17 @@ import java.util.Objects;import javax.inject.Inject;import javax.inject.Singleton;+import org.hibernate.criterion.Order;+import org.hibernate.criterion.Restrictions;+import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.From;import javax.persistence.criteria.Predicate;+import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.persistence.dao.EntityCriteria;+import org.joda.time.DateTime;import org.jspecify.annotations.Nullable;@@ -173,4 +179,14 @@ public class DefaultPullRequestChangeService extends BaseEntityService<PullRequereturn getSession().createQuery(query).getResultList();}+ @Sessional+ @Override+ public List<PullRequestChange> queryAfter(Long projectId, Long afterChangeId, int count) {+ EntityCriteria<PullRequestChange> criteria = newCriteria();+ criteria.createCriteria("request").add(Restrictions.eq("targetProject.id", projectId));+ criteria.add(Restrictions.gt("id", afterChangeId));+ criteria.addOrder(Order.asc("id"));+ return query(criteria, 0, count);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.javaindex 52133ffea7..a6e6ec5b81 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java@@ -1299,6 +1299,16 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>return getSession().createQuery(criteriaQuery).getResultList();}+ @Sessional+ @Override+ public List<PullRequest> queryAfter(Long projectId, Long afterRequestId, int count) {+ EntityCriteria<PullRequest> criteria = newCriteria();+ criteria.add(org.hibernate.criterion.Restrictions.eq(PullRequest.PROP_TARGET_PROJECT + ".id", projectId));+ criteria.add(org.hibernate.criterion.Restrictions.gt("id", afterRequestId));+ criteria.addOrder(org.hibernate.criterion.Order.asc("id"));+ return query(criteria, 0, count);+ }+@Overridepublic Pair<String, String> suggestTitleAndDescription(PullRequest pullRequest, ChatModel chatModel, boolean suggestTitle, boolean suggestDescription) {if (!suggestTitle && !suggestDescription)diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex d8e1b903a0..475fa27cdc 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -219,26 +219,27 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Input}});- if (!getIssue().getPullRequests().isEmpty()) {- tabs.add(new PageTab(Model.of(_T("Pull Requests")), IssuePullRequestsPage.class, IssuePullRequestsPage.paramsOf(getIssue())) {+ }+ // Do not calculate fix builds now as it might be slow+ tabs.add(new PageTab(Model.of(_T("Fixing Builds")), IssueBuildsPage.class, IssueBuildsPage.paramsOf(getIssue())) {+ @Override+ public Component render(String componentId) {+ return new PageTabHead(componentId, this) {+@Override- public Component render(String componentId) {- return new PageTabHead(componentId, this) {-- @Override- protected Link<?> newLink(String componentId, Class<? extends Page> pageClass, PageParameters pageParams) {- return new ViewStateAwarePageLink<Void>(componentId, pageClass, pageParams, KEY_SCROLL_TOP);- }-- };+ protected Link<?> newLink(String componentId, Class<? extends Page> pageClass, PageParameters pageParams) {+ return new ViewStateAwarePageLink<Void>(componentId, pageClass, pageParams, KEY_SCROLL_TOP);}-- });++ };}- }- // Do not calculate fix builds now as it might be slow- tabs.add(new PageTab(Model.of(_T("Fixing Builds")), IssueBuildsPage.class, IssueBuildsPage.paramsOf(getIssue())) {++ });+ }++ if (!getIssue().getPullRequests().isEmpty()) {+ tabs.add(new PageTab(Model.of(_T("Pull Requests")), IssuePullRequestsPage.class, IssuePullRequestsPage.paramsOf(getIssue())) {@Overridepublic Component render(String componentId) {diff --git a/server-core/src/main/java/io/onedev/server/xodus/DefaultPullRequestInfoService.java b/server-core/src/main/java/io/onedev/server/xodus/DefaultPullRequestInfoService.javaindex 052754fdd6..896e01aeec 100644--- a/server-core/src/main/java/io/onedev/server/xodus/DefaultPullRequestInfoService.java+++ b/server-core/src/main/java/io/onedev/server/xodus/DefaultPullRequestInfoService.java@@ -20,19 +20,25 @@ import org.slf4j.LoggerFactory;import io.onedev.commons.loader.ManagedSerializedForm;import io.onedev.commons.utils.FileUtils;import io.onedev.server.cluster.ClusterTask;-import io.onedev.server.service.ProjectService;-import io.onedev.server.service.PullRequestService;-import io.onedev.server.service.PullRequestUpdateService;import io.onedev.server.event.Listen;import io.onedev.server.event.project.ActiveServerChanged;import io.onedev.server.event.project.ProjectDeleted;+import io.onedev.server.event.project.pullrequest.PullRequestChanged;import io.onedev.server.event.project.pullrequest.PullRequestOpened;import io.onedev.server.event.project.pullrequest.PullRequestUpdated;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestChange;import io.onedev.server.model.PullRequestUpdate;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestChangeData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestDescriptionChangeData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestTitleChangeData;import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.service.ProjectService;+import io.onedev.server.service.PullRequestChangeService;+import io.onedev.server.service.PullRequestService;+import io.onedev.server.service.PullRequestUpdateService;import io.onedev.server.util.concurrent.BatchWorkExecutionService;import io.onedev.server.util.concurrent.BatchWorker;import io.onedev.server.util.concurrent.Prioritized;@@ -40,12 +46,13 @@ import jetbrains.exodus.ArrayByteIterable;import jetbrains.exodus.ByteIterable;import jetbrains.exodus.env.Environment;import jetbrains.exodus.env.Store;+import jetbrains.exodus.env.Transaction;@Singletonpublic class DefaultPullRequestInfoService extends AbstractEnvironmentServiceimplements PullRequestInfoService, Serializable {- private static final int INFO_VERSION = 7;+ private static final int INFO_VERSION = 8;private static final int BATCH_SIZE = 5000;@@ -54,11 +61,17 @@ public class DefaultPullRequestInfoService extends AbstractEnvironmentServiceprivate static final String DEFAULT_STORE = "default";private static final String COMMIT_TO_IDS_STORE = "commitToIds";++ private static final String ISSUE_TO_ID_STORE = "issueToIds";private static final String COMPARISON_BASES_STORE = "comparisonBases";private static final ByteIterable LAST_PULL_REQUEST_UPDATE_KEY = new StringByteIterable("lastPullRequestUpdate");+ private static final ByteIterable LAST_PULL_REQUEST_KEY = new StringByteIterable("lastPullRequest");++ private static final ByteIterable LAST_PULL_REQUEST_CHANGE_KEY = new StringByteIterable("lastPullRequestChange");+private static final int UPDATE_PRIORITY = 100;private static final int CHECK_PRIORITY = 200;@@ -71,13 +84,17 @@ public class DefaultPullRequestInfoService extends AbstractEnvironmentServiceprivate final PullRequestUpdateService pullRequestUpdateService;+ private final PullRequestChangeService pullRequestChangeService;+@Injectpublic DefaultPullRequestInfoService(ProjectService projectService, PullRequestService pullRequestService,PullRequestUpdateService pullRequestUpdateService,+ PullRequestChangeService pullRequestChangeService,BatchWorkExecutionService batchWorkExecutionService) {this.projectService = projectService;this.pullRequestService = pullRequestService;this.pullRequestUpdateService = pullRequestUpdateService;+ this.pullRequestChangeService = pullRequestChangeService;this.batchWorkExecutionService = batchWorkExecutionService;}@@ -110,6 +127,7 @@ public class DefaultPullRequestInfoService extends AbstractEnvironmentServiceEnvironment env = getEnv(projectId.toString());Store defaultStore = getStore(env, DEFAULT_STORE);Store commitToIdsStore = getStore(env, COMMIT_TO_IDS_STORE);+ Store issueToIdsStore = getStore(env, ISSUE_TO_ID_STORE);Long lastPullRequestUpdateId = env.computeInTransaction(txn -> readLong(defaultStore, txn, LAST_PULL_REQUEST_UPDATE_KEY, 0));@@ -132,11 +150,63 @@ public class DefaultPullRequestInfoService extends AbstractEnvironmentServiceif (lastUpdate != null)defaultStore.put(txn, LAST_PULL_REQUEST_UPDATE_KEY, new LongByteIterable(lastUpdate.getId()));});++ Long lastPullRequestId = env.computeInTransaction(txn -> readLong(defaultStore, txn, LAST_PULL_REQUEST_KEY, 0));++ List<PullRequest> unprocessedPullRequests = pullRequestService.queryAfter(projectId, lastPullRequestId, BATCH_SIZE);+ env.executeInTransaction(txn -> {+ PullRequest lastRequest = null;+ for (PullRequest request: unprocessedPullRequests) {+ Project project = request.getTargetProject();+ Long pullRequestId = request.getId();+ addFixedIssues(issueToIdsStore, txn, project, pullRequestId, request.getTitle());+ if (request.getDescription() != null)+ addFixedIssues(issueToIdsStore, txn, project, pullRequestId, request.getDescription());+ lastRequest = request;+ }+ if (lastRequest != null)+ defaultStore.put(txn, LAST_PULL_REQUEST_KEY, new LongByteIterable(lastRequest.getId()));+ });++ Long lastChangeId = env.computeInTransaction(txn -> readLong(defaultStore, txn, LAST_PULL_REQUEST_CHANGE_KEY, 0));++ List<PullRequestChange> unprocessedChanges = pullRequestChangeService.queryAfter(projectId, lastChangeId, BATCH_SIZE);+ env.executeInTransaction(txn -> {+ PullRequestChange lastChange = null;+ for (PullRequestChange change: unprocessedChanges) {+ PullRequestChangeData data = change.getData();+ PullRequest request = change.getRequest();+ Project project = request.getTargetProject();+ Long pullRequestId = request.getId();+ if (data instanceof PullRequestTitleChangeData) {+ PullRequestTitleChangeData changeData = (PullRequestTitleChangeData) data;+ addFixedIssues(issueToIdsStore, txn, project, pullRequestId, changeData.getNewTitle());+ } else if (data instanceof PullRequestDescriptionChangeData) {+ PullRequestDescriptionChangeData changeData = (PullRequestDescriptionChangeData) data;+ addFixedIssues(issueToIdsStore, txn, project, pullRequestId, changeData.getNewDescription());+ }+ lastChange = change;+ }+ if (lastChange != null)+ defaultStore.put(txn, LAST_PULL_REQUEST_CHANGE_KEY, new LongByteIterable(lastChange.getId()));+ });+logger.debug("Collected pull request info (project: {})", projectPath);- return unprocessedPullRequestUpdates.size() == BATCH_SIZE;+ return unprocessedPullRequestUpdates.size() == BATCH_SIZE+ || unprocessedPullRequests.size() == BATCH_SIZE+ || unprocessedChanges.size() == BATCH_SIZE;}-++ private void addFixedIssues(Store issueToIdsStore, Transaction txn, Project project, Long pullRequestId, String text) {+ for (Long issueId: project.parseFixedIssueIds(text)) {+ ByteIterable issueKey = new LongByteIterable(issueId);+ Collection<Long> pullRequestIds = readLongs(issueToIdsStore, txn, issueKey);+ pullRequestIds.add(pullRequestId);+ writeLongs(issueToIdsStore, txn, issueKey, pullRequestIds);+ }+ }+@Overridepublic Collection<Long> getPullRequestIds(Project project, ObjectId commitId) {Long projectId = project.getId();@@ -156,6 +226,25 @@ public class DefaultPullRequestInfoService extends AbstractEnvironmentService});}+ @Override+ public Collection<Long> getPullRequestIds(Project project, Long issueId) {+ Long projectId = project.getId();++ return projectService.runOnActiveServer(projectId, new ClusterTask<Collection<Long>>() {++ private static final long serialVersionUID = 1L;++ @Override+ public Collection<Long> call() throws Exception {+ Environment env = getEnv(projectId.toString());+ Store store = getStore(env, ISSUE_TO_ID_STORE);++ return env.computeInTransaction(txn -> readLongs(store, txn, new LongByteIterable(issueId)));+ }++ });+ }+@Sessional@Listenpublic void on(PullRequestOpened event) {@@ -168,6 +257,12 @@ public class DefaultPullRequestInfoService extends AbstractEnvironmentServicebatchWorkExecutionService.submit(getBatchWorker(event.getProject().getId()), new Prioritized(UPDATE_PRIORITY));}+ @Sessional+ @Listen+ public void on(PullRequestChanged event) {+ batchWorkExecutionService.submit(getBatchWorker(event.getProject().getId()), new Prioritized(UPDATE_PRIORITY));+ }+@Sessional@Listenpublic void on(SystemStarted event) {diff --git a/server-core/src/main/java/io/onedev/server/xodus/PullRequestInfoService.java b/server-core/src/main/java/io/onedev/server/xodus/PullRequestInfoService.javaindex 66f796b9df..f88da22481 100644--- a/server-core/src/main/java/io/onedev/server/xodus/PullRequestInfoService.java+++ b/server-core/src/main/java/io/onedev/server/xodus/PullRequestInfoService.java@@ -12,6 +12,8 @@ import io.onedev.server.model.PullRequest;public interface PullRequestInfoService {Collection<Long> getPullRequestIds(Project project, ObjectId commitId);++ Collection<Long> getPullRequestIds(Project project, Long issueId);@NullableObjectId getComparisonBase(PullRequest request, ObjectId commitId1, ObjectId commitId2);