Store SubmitTypeRecord lazily in ChangeData

Add convenience method isOk() to SubmitTypeRecord to make it easier
for callers to check whether this result was successful.

Change-Id: I1551d5fdce208631f4d97d815fa882ff44502467

gerrit-common/src/main/java/com/google/gerrit/common/data/SubmitTypeRecord.java

@@ -56,6 +56,10 @@ public class SubmitTypeRecord {
     this.errorMessage = errorMessage;
   }
 
+  public boolean isOk() {
+    return status == Status.OK;
+  }
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java

@@ -697,7 +697,7 @@ public class MergeOp implements AutoCloseable {
         continue;
       }
 
-      SubmitType st = getSubmitType(cd, ps);
+      SubmitType st = getSubmitType(cd);
       if (st == null) {
         logProblem(changeId, "No submit type for change");
         continue;
@@ -742,15 +742,10 @@ public class MergeOp implements AutoCloseable {
     }
   }
 
-  private SubmitType getSubmitType(ChangeData cd, PatchSet ps) {
+  private SubmitType getSubmitType(ChangeData cd) {
     try {
-      SubmitTypeRecord r = new SubmitRuleEvaluator(cd).setPatchSet(ps)
+      SubmitTypeRecord str = cd.submitTypeRecord();
-          .getSubmitType();
+      return str.isOk() ? str.type : null;
-      if (r.status != SubmitTypeRecord.Status.OK) {
-        logError("Failed to get submit type for " + cd.getId());
-        return null;
-      }
-      return r.type;
     } catch (OrmException e) {
       logError("Failed to get submit type for " + cd.getId(), e);
       return null;

gerrit-server/src/main/java/com/google/gerrit/server/git/MergeSuperSet.java

@@ -25,7 +25,6 @@ import com.google.gerrit.reviewdb.client.Project;
 import com.google.gerrit.reviewdb.server.ReviewDb;
 import com.google.gerrit.server.change.Submit;
 import com.google.gerrit.server.config.GerritServerConfig;
-import com.google.gerrit.server.project.SubmitRuleEvaluator;
 import com.google.gerrit.server.query.change.ChangeData;
 import com.google.gerrit.server.query.change.InternalChangeQuery;
 import com.google.gwtorm.server.OrmException;
@@ -104,11 +103,12 @@ public class MergeSuperSet {
         for (Change.Id cId : pc.get(project)) {
           ChangeData cd = changeDataFactory.create(db, cId);
 
-          SubmitTypeRecord r = new SubmitRuleEvaluator(cd).getSubmitType();
+          SubmitTypeRecord str = cd.submitTypeRecord();
-          if (r.status != SubmitTypeRecord.Status.OK) {
+          if (!str.isOk()) {
-            logErrorAndThrow("Failed to get submit type for " + cd.getId());
+            logErrorAndThrow("Failed to get submit type for " + cd.getId()
+                + ": " + str.errorMessage);
           }
-          if (r.type == SubmitType.CHERRY_PICK) {
+          if (str.type == SubmitType.CHERRY_PICK) {
             ret.add(cd);
             continue;
           }

gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeData.java

@@ -316,6 +316,7 @@ public class ChangeData {
   private List<ChangeMessage> messages;
   private List<SubmitRecord> submitRecords;
   private ChangedLines changedLines;
+  private SubmitTypeRecord submitTypeRecord;
   private Boolean mergeable;
   private Set<Account.Id> editsByUser;
   private Set<Account.Id> reviewedBy;
@@ -753,6 +754,13 @@ public class ChangeData {
     return submitRecords;
   }
 
+  public SubmitTypeRecord submitTypeRecord() throws OrmException {
+    if (submitTypeRecord == null) {
+      submitTypeRecord = new SubmitRuleEvaluator(this).getSubmitType();
+    }
+    return submitTypeRecord;
+  }
+
   public void setMergeable(Boolean mergeable) {
     this.mergeable = mergeable;
   }
@@ -772,18 +780,18 @@ public class ChangeData {
         }
         try (Repository repo = repoManager.openRepository(c.getProject())) {
           Ref ref = repo.getRefDatabase().exactRef(c.getDest().get());
-          SubmitTypeRecord rec = new SubmitRuleEvaluator(this)
+          SubmitTypeRecord str = submitTypeRecord();
-              .getSubmitType();
+          if (!str.isOk()) {
-          if (rec.status != SubmitTypeRecord.Status.OK) {
+            // If submit type rules are broken, it's definitely not mergeable.
-            throw new OrmException(
+            // No need to log, as SubmitRuleEvaluator already did it for us.
-                "Error in mergeability check: " + rec.errorMessage);
+            return false;
           }
           String mergeStrategy = mergeUtilFactory
               .create(projectCache.get(c.getProject()))
               .mergeStrategyName();
           mergeable = mergeabilityCache.get(
               ObjectId.fromString(ps.getRevision().get()),
-              ref, rec.type, mergeStrategy, c.getDest(), repo);
+              ref, str.type, mergeStrategy, c.getDest(), repo);
         } catch (IOException e) {
           throw new OrmException(e);
         }

gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsPredicate.java

@@ -16,7 +16,6 @@ package com.google.gerrit.server.query.change;
 
 import com.google.common.collect.Lists;
 import com.google.gerrit.common.data.SubmitTypeRecord;
-import com.google.gerrit.extensions.client.SubmitType;
 import com.google.gerrit.reviewdb.client.Change;
 import com.google.gerrit.reviewdb.server.ReviewDb;
 import com.google.gerrit.server.git.CodeReviewCommit;
@@ -26,7 +25,6 @@ import com.google.gerrit.server.git.strategy.SubmitDryRun;
 import com.google.gerrit.server.project.NoSuchProjectException;
 import com.google.gerrit.server.project.ProjectCache;
 import com.google.gerrit.server.project.ProjectState;
-import com.google.gerrit.server.project.SubmitRuleEvaluator;
 import com.google.gerrit.server.query.OperatorPredicate;
 import com.google.gerrit.server.query.OrPredicate;
 import com.google.gerrit.server.query.Predicate;
@@ -98,14 +96,14 @@ class ConflictsPredicate extends OrPredicate<ChangeData> {
           if (!otherChange.getDest().equals(c.getDest())) {
             return false;
           }
-          SubmitType submitType = getSubmitType(object);
+          SubmitTypeRecord str = object.submitTypeRecord();
-          if (submitType == null) {
+          if (!str.isOk()) {
             return false;
           }
           ObjectId other = ObjectId.fromString(
               object.currentPatchSet().getRevision().get());
           ConflictKey conflictsKey =
-              new ConflictKey(changeDataCache.getTestAgainst(), other, submitType,
+              new ConflictKey(changeDataCache.getTestAgainst(), other, str.type,
                   changeDataCache.getProjectState().isUseContentMerge());
           Boolean conflicts = args.conflictsCache.getIfPresent(conflictsKey);
           if (conflicts != null) {
@@ -115,7 +113,7 @@ class ConflictsPredicate extends OrPredicate<ChangeData> {
                 args.repoManager.openRepository(otherChange.getProject());
               CodeReviewRevWalk rw = CodeReviewCommit.newRevWalk(repo)) {
             conflicts = !args.submitDryRun.run(
-                submitType, repo, rw, otherChange.getDest(),
+                str.type, repo, rw, otherChange.getDest(),
                 changeDataCache.getTestAgainst(), other,
                 getAlreadyAccepted(repo, rw));
             args.conflictsCache.put(conflictsKey, conflicts);
@@ -131,14 +129,6 @@ class ConflictsPredicate extends OrPredicate<ChangeData> {
           return 5;
         }
 
-        private SubmitType getSubmitType(ChangeData cd) throws OrmException {
-          SubmitTypeRecord r = new SubmitRuleEvaluator(cd).getSubmitType();
-          if (r.status != SubmitTypeRecord.Status.OK) {
-            return null;
-          }
-          return r.type;
-        }
-
         private Set<RevCommit> getAlreadyAccepted(Repository repo, RevWalk rw)
             throws IntegrationException {
           try {