opendev/gerrit
Code Issues Proposed changes

Make MergeSuperSet not a singleton

Browse Source 
The plan is to add per-instance caching to improve performance.

Change-Id: I5f086adf4cc24eb2075091641d24f751d8f816be
This commit is contained in:
Dave Borowitz
2016-09-12 11:52:13 -04:00
parent 14183e0557
commit 688fc7f7fb
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitResolvingMergeCommitIT.java
View File

@@ -30,6 +30,7 @@ import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.testutil.ConfigSuite;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException;
@@ -47,7 +48,7 @@ import java.util.List;
@NoHttpd
public class SubmitResolvingMergeCommitIT extends AbstractDaemonTest {
@Inject
private MergeSuperSet mergeSuperSet;
private Provider<MergeSuperSet> mergeSuperSet;
@Inject
private Submit submit;
@@ -293,7 +294,7 @@ public class SubmitResolvingMergeCommitIT extends AbstractDaemonTest {
throws MissingObjectException, IncorrectObjectTypeException, IOException,
OrmException {
ChangeSet cs =
mergeSuperSet.completeChangeSet(db, change.change(), user(admin));
mergeSuperSet.get().completeChangeSet(db, change.change(), user(admin));
assertThat(submit.unmergeableChanges(cs).isEmpty()).isEqualTo(expected);
}