commit ead17c19cdae58c0bc89e78b51afe7622ebcc73e
author Zhen Chen <czhen@google.com> Thu Jan 12 22:50:43 2017 -0800
committer Zhen Chen <czhen@google.com> Thu Jan 26 12:44:28 2017 -0800
tree 6f503f96e2160feda5e88e67d0b3604f20af72c7
parent 7f5a86855d9f33026b98d50a49e6811e640a8a8c

Refactor BranchBatch to use CodeReviewCommit directly

We do not use change related stuff in BranchBatch, instead of converting
it back to CodeReviewCommit using a separate function, we can just
initialize it by using the commit during validateChangeList. The check
in the commits() function is not quite useful. If there is any problem
during validateChangeList, we will add it to CommitStatus.

Change-Id: I596b473c60e8d93c2fb9606bd293cba190d07362

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

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
index fdc1dfb..b15fd95 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
@@ -28,7 +28,6 @@
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.MultimapBuilder;
 import com.google.common.collect.SetMultimap;
-import com.google.common.collect.Sets;
 import com.google.gerrit.common.Nullable;
 import com.google.gerrit.common.TimeUtil;
 import com.google.gerrit.common.data.SubmitRecord;
@@ -517,7 +516,7 @@
         checkNotNull(submitting.submitType(),
             "null submit type for %s; expected to previously fail fast",
             submitting);
-        Set<CodeReviewCommit> commitsToSubmit = commits(submitting.changes());
+        Set<CodeReviewCommit> commitsToSubmit = submitting.commits();
         ob.mergeTip = new MergeTip(ob.oldTip, commitsToSubmit);
         SubmitStrategy strategy = createStrategy(or, ob.mergeTip, branch,
             submitting.submitType(), ob.oldTip, submoduleOp, dryrun);
@@ -536,18 +535,6 @@
     return strategies;
   }
 
-  private Set<CodeReviewCommit> commits(List<ChangeData> cds) {
-    LinkedHashSet<CodeReviewCommit> result =
-        Sets.newLinkedHashSetWithExpectedSize(cds.size());
-    for (ChangeData cd : cds) {
-      CodeReviewCommit commit = commitStatus.get(cd.getId());
-      checkState(commit != null,
-          "commit for %s not found by validateChangeList", cd.getId());
-      result.add(commit);
-    }
-    return result;
-  }
-
   private SubmitStrategy createStrategy(OpenRepo or,
       MergeTip mergeTip, Branch.NameKey destBranch, SubmitType submitType,
       CodeReviewCommit branchTip, SubmoduleOp submoduleOp, boolean dryrun)
@@ -590,13 +577,13 @@
   @AutoValue
   abstract static class BranchBatch {
     @Nullable abstract SubmitType submitType();
-    abstract List<ChangeData> changes();
+    abstract Set<CodeReviewCommit> commits();
   }
 
   private BranchBatch validateChangeList(OpenRepo or,
       Collection<ChangeData> submitted) throws IntegrationException {
     logDebug("Validating {} changes", submitted.size());
-    List<ChangeData> toSubmit = new ArrayList<>(submitted.size());
+    Set<CodeReviewCommit> toSubmit = new LinkedHashSet<>(submitted.size());
     SetMultimap<ObjectId, PatchSet.Id> revisions = getRevisions(or, submitted);
 
     SubmitType submitType = null;
@@ -691,7 +678,7 @@
         continue;
       }
       commit.add(or.canMergeFlag);
-      toSubmit.add(cd);
+      toSubmit.add(commit);
     }
     logDebug("Submitting on this run: {}", toSubmit);
     return new AutoValue_MergeOp_BranchBatch(submitType, toSubmit);