opendev/gerrit
Code Issues Proposed changes

Merge "MergeOp: Order keys in problems multimap by ID"

Browse Source
This commit is contained in:
Dave Borowitz 2016-01-11 20:31:52 +00:00 committed by Gerrit Code Review
commit 0cef341883
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,7 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import com.google.common.collect.MultimapBuilder; import com.google.common.collect.MultimapBuilder;
import com.google.common.collect.Ordering;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.google.common.collect.Table; import com.google.common.collect.Table;
import com.google.common.hash.Hasher; import com.google.common.hash.Hasher;
@ -286,7 +287,13 @@ public class MergeOp implements AutoCloseable {
commits = new HashMap<>(); commits = new HashMap<>();
openRepos = new HashMap<>(); openRepos = new HashMap<>();
problems = MultimapBuilder.linkedHashKeys().arrayListValues(1).build(); problems = MultimapBuilder.treeKeys(
Ordering.natural().onResultOf(new Function<Change.Id, Integer>() {
@Override
public Integer apply(Change.Id in) {
return in.get();
}
})).arrayListValues(1).build();
} }
private OpenRepo openRepo(Project.NameKey project) private OpenRepo openRepo(Project.NameKey project)