Make MergeSuperSet not a singleton

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

View File

@@ -54,7 +54,7 @@ public class SubmittedTogether implements RestReadView<ChangeResource> {
private final ChangeJson.Factory json;
private final Provider<ReviewDb> dbProvider;
private final Provider<InternalChangeQuery> queryProvider;
private final MergeSuperSet mergeSuperSet;
private final Provider<MergeSuperSet> mergeSuperSet;
private final Provider<WalkSorter> sorter;
@Option(name = "-o", usage = "Output options")
@@ -66,7 +66,7 @@ public class SubmittedTogether implements RestReadView<ChangeResource> {
SubmittedTogether(ChangeJson.Factory json,
Provider<ReviewDb> dbProvider,
Provider<InternalChangeQuery> queryProvider,
MergeSuperSet mergeSuperSet,
Provider<MergeSuperSet> mergeSuperSet,
Provider<WalkSorter> sorter) {
this.json = json;
this.dbProvider = dbProvider;
@@ -96,7 +96,7 @@ public class SubmittedTogether implements RestReadView<ChangeResource> {
if (c.getStatus().isOpen()) {
ChangeSet cs =
mergeSuperSet.completeChangeSet(
mergeSuperSet.get().completeChangeSet(
dbProvider.get(), c, resource.getControl().getUser());
cds = cs.changes().asList();
hidden = cs.nonVisibleChanges().size();