ChangeUtil: Avoid RefDatabase#getRefs

Change-Id: I9c2ce8e233fc4e74f5ff738e0185c27fe79a4cc1
2019-01-04 16:37:24 -08:00
parent 1acab02049
commit a9d003ed93
4 changed files with 32 additions and 19 deletions
--- a/java/com/google/gerrit/server/change/RebaseChangeOp.java
+++ b/java/com/google/gerrit/server/change/RebaseChangeOp.java
@@ -174,8 +174,10 @@ public class RebaseChangeOp implements BatchUpdateOp {
            baseCommitId.name());

    rebasedPatchSetId =
-        ChangeUtil.nextPatchSetIdFromChangeRefsMap(
-            ctx.getRepoView().getRefs(originalPatchSet.getId().getParentKey().toRefPrefix()),
+        ChangeUtil.nextPatchSetIdFromChangeRefs(
+            ctx.getRepoView()
+                .getRefs(originalPatchSet.getId().getParentKey().toRefPrefix())
+                .keySet(),
            notes.getChange().currentPatchSetId());
    patchSetInserter =
        patchSetInserterFactory