diff --git a/java/com/google/gerrit/httpd/raw/CatServlet.java b/java/com/google/gerrit/httpd/raw/CatServlet.java index 4b5c22775a..051b33a07f 100644 --- a/java/com/google/gerrit/httpd/raw/CatServlet.java +++ b/java/com/google/gerrit/httpd/raw/CatServlet.java @@ -143,7 +143,7 @@ public class CatServlet extends HttpServlet { return; } } else { - PatchSet patchSet = psUtil.get(requestDb.get(), notes, patchKey.getParentKey()); + PatchSet patchSet = psUtil.get(notes, patchKey.getParentKey()); if (patchSet == null) { rsp.sendError(HttpServletResponse.SC_NOT_FOUND); return; diff --git a/java/com/google/gerrit/server/ApprovalCopier.java b/java/com/google/gerrit/server/ApprovalCopier.java index c3d3b602e5..708380442b 100644 --- a/java/com/google/gerrit/server/ApprovalCopier.java +++ b/java/com/google/gerrit/server/ApprovalCopier.java @@ -137,7 +137,7 @@ public class ApprovalCopier { @Nullable Config repoConfig, Iterable dontCopy) throws OrmException { - PatchSet ps = psUtil.get(db, notes, psId); + PatchSet ps = psUtil.get(notes, psId); if (ps == null) { return Collections.emptyList(); } diff --git a/java/com/google/gerrit/server/PatchSetUtil.java b/java/com/google/gerrit/server/PatchSetUtil.java index 8f26082363..9405486b9b 100644 --- a/java/com/google/gerrit/server/PatchSetUtil.java +++ b/java/com/google/gerrit/server/PatchSetUtil.java @@ -15,16 +15,11 @@ package com.google.gerrit.server; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.collect.ImmutableMap.toImmutableMap; -import static com.google.gerrit.server.ChangeUtil.PS_ID_ORDER; import static java.util.Objects.requireNonNull; -import static java.util.function.Function.identity; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import com.google.common.collect.Sets; -import com.google.common.collect.Streams; import com.google.gerrit.common.data.LabelFunction; import com.google.gerrit.common.data.LabelType; import com.google.gerrit.extensions.restapi.ResourceConflictException; @@ -37,7 +32,6 @@ import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.notedb.ChangeNotes; import com.google.gerrit.server.notedb.ChangeUpdate; -import com.google.gerrit.server.notedb.NotesMigration; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectState; import com.google.gwtorm.server.OrmException; @@ -46,7 +40,6 @@ import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; import java.sql.Timestamp; -import java.util.Collections; import java.util.List; import java.util.Set; import org.eclipse.jgit.lib.ObjectId; @@ -57,7 +50,6 @@ import org.eclipse.jgit.revwalk.RevWalk; /** Utilities for manipulating patch sets. */ @Singleton public class PatchSetUtil { - private final NotesMigration migration; private final Provider approvalsUtilProvider; private final ProjectCache projectCache; private final Provider dbProvider; @@ -65,62 +57,38 @@ public class PatchSetUtil { @Inject PatchSetUtil( - NotesMigration migration, Provider approvalsUtilProvider, ProjectCache projectCache, Provider dbProvider, GitRepositoryManager repoManager) { - this.migration = migration; this.approvalsUtilProvider = approvalsUtilProvider; this.projectCache = projectCache; this.dbProvider = dbProvider; this.repoManager = repoManager; } - public PatchSet current(ReviewDb db, ChangeNotes notes) throws OrmException { - return get(db, notes, notes.getChange().currentPatchSetId()); + public PatchSet current(ChangeNotes notes) throws OrmException { + return get(notes, notes.getChange().currentPatchSetId()); } - public PatchSet get(ReviewDb db, ChangeNotes notes, PatchSet.Id psId) throws OrmException { - if (!migration.readChanges()) { - return db.patchSets().get(psId); - } + public PatchSet get(ChangeNotes notes, PatchSet.Id psId) throws OrmException { return notes.load().getPatchSets().get(psId); } - public ImmutableCollection byChange(ReviewDb db, ChangeNotes notes) - throws OrmException { - if (!migration.readChanges()) { - return PS_ID_ORDER.immutableSortedCopy(db.patchSets().byChange(notes.getChangeId())); - } + public ImmutableCollection byChange(ChangeNotes notes) throws OrmException { return notes.load().getPatchSets().values(); } - public ImmutableMap byChangeAsMap(ReviewDb db, ChangeNotes notes) - throws OrmException { - if (!migration.readChanges()) { - ImmutableMap.Builder result = ImmutableMap.builder(); - for (PatchSet ps : PS_ID_ORDER.sortedCopy(db.patchSets().byChange(notes.getChangeId()))) { - result.put(ps.getId(), ps); - } - return result.build(); - } + public ImmutableMap byChangeAsMap(ChangeNotes notes) throws OrmException { return notes.load().getPatchSets(); } public ImmutableMap getAsMap( - ReviewDb db, ChangeNotes notes, Set patchSetIds) throws OrmException { - if (!migration.readChanges()) { - patchSetIds = Sets.filter(patchSetIds, p -> p.getParentKey().equals(notes.getChangeId())); - return Streams.stream(db.patchSets().get(patchSetIds)) - .sorted(PS_ID_ORDER) - .collect(toImmutableMap(PatchSet::getId, identity())); - } + ChangeNotes notes, Set patchSetIds) throws OrmException { return ImmutableMap.copyOf(Maps.filterKeys(notes.load().getPatchSets(), patchSetIds::contains)); } public PatchSet insert( - ReviewDb db, RevWalk rw, ChangeUpdate update, PatchSet.Id psId, @@ -128,10 +96,14 @@ public class PatchSetUtil { List groups, String pushCertificate, String description) - throws OrmException, IOException { + throws IOException { requireNonNull(groups, "groups may not be null"); ensurePatchSetMatches(psId, update); + update.setCommit(rw, commit, pushCertificate); + update.setPsDescription(description); + update.setGroups(groups); + PatchSet ps = new PatchSet(psId); ps.setRevision(new RevId(commit.name())); ps.setUploader(update.getAccountId()); @@ -139,12 +111,6 @@ public class PatchSetUtil { ps.setGroups(groups); ps.setPushCertificate(pushCertificate); ps.setDescription(description); - db.patchSets().insert(Collections.singleton(ps)); - - update.setCommit(rw, commit, pushCertificate); - update.setPsDescription(description); - update.setGroups(groups); - return ps; } @@ -166,11 +132,9 @@ public class PatchSetUtil { } } - public void setGroups(ReviewDb db, ChangeUpdate update, PatchSet ps, List groups) - throws OrmException { + public void setGroups(ChangeUpdate update, PatchSet ps, List groups) { ps.setGroups(groups); update.setGroups(groups); - db.patchSets().update(Collections.singleton(ps)); } /** Check if the current patch set of the change is locked. */ diff --git a/java/com/google/gerrit/server/PublishCommentUtil.java b/java/com/google/gerrit/server/PublishCommentUtil.java index 9d5ecb435d..25db8d9105 100644 --- a/java/com/google/gerrit/server/PublishCommentUtil.java +++ b/java/com/google/gerrit/server/PublishCommentUtil.java @@ -56,8 +56,7 @@ public class PublishCommentUtil { } Map patchSets = - psUtil.getAsMap( - ctx.getDb(), notes, drafts.stream().map(d -> psId(notes, d)).collect(toSet())); + psUtil.getAsMap(notes, drafts.stream().map(d -> psId(notes, d)).collect(toSet())); for (Comment d : drafts) { PatchSet ps = patchSets.get(psId(notes, d)); if (ps == null) { diff --git a/java/com/google/gerrit/server/change/AbandonOp.java b/java/com/google/gerrit/server/change/AbandonOp.java index 874f5e4f4c..3999955de7 100644 --- a/java/com/google/gerrit/server/change/AbandonOp.java +++ b/java/com/google/gerrit/server/change/AbandonOp.java @@ -99,7 +99,7 @@ public class AbandonOp implements BatchUpdateOp { if (!change.getStatus().isOpen()) { throw new ResourceConflictException("change is " + ChangeUtil.status(change)); } - patchSet = psUtil.get(ctx.getDb(), ctx.getNotes(), psId); + patchSet = psUtil.get(ctx.getNotes(), psId); change.setStatus(Change.Status.ABANDONED); change.setLastUpdatedOn(ctx.getWhen()); diff --git a/java/com/google/gerrit/server/change/AddReviewersOp.java b/java/com/google/gerrit/server/change/AddReviewersOp.java index 947deadc74..cba6954ed4 100644 --- a/java/com/google/gerrit/server/change/AddReviewersOp.java +++ b/java/com/google/gerrit/server/change/AddReviewersOp.java @@ -213,7 +213,7 @@ public class AddReviewersOp implements BatchUpdateOp { checkAdded(); if (patchSet == null) { - patchSet = requireNonNull(psUtil.current(ctx.getDb(), ctx.getNotes())); + patchSet = requireNonNull(psUtil.current(ctx.getNotes())); } return true; } diff --git a/java/com/google/gerrit/server/change/ChangeInserter.java b/java/com/google/gerrit/server/change/ChangeInserter.java index 1eb1dc399a..d967a46915 100644 --- a/java/com/google/gerrit/server/change/ChangeInserter.java +++ b/java/com/google/gerrit/server/change/ChangeInserter.java @@ -412,14 +412,7 @@ public class ChangeInserter implements InsertChangeOp { } patchSet = psUtil.insert( - ctx.getDb(), - ctx.getRevWalk(), - update, - psId, - commitId, - newGroups, - pushCert, - patchSetDescription); + ctx.getRevWalk(), update, psId, commitId, newGroups, pushCert, patchSetDescription); /* TODO: fixStatus is used here because the tests * (byStatusClosed() in AbstractQueryChangesTest) diff --git a/java/com/google/gerrit/server/change/ChangeResource.java b/java/com/google/gerrit/server/change/ChangeResource.java index 1131e94589..55dbe87383 100644 --- a/java/com/google/gerrit/server/change/ChangeResource.java +++ b/java/com/google/gerrit/server/change/ChangeResource.java @@ -154,11 +154,7 @@ public class ChangeResource implements RestResource, HasETag { accounts.add(getChange().getAssignee()); } try { - patchSetUtil - .byChange(db.get(), notes) - .stream() - .map(PatchSet::getUploader) - .forEach(accounts::add); + patchSetUtil.byChange(notes).stream().map(PatchSet::getUploader).forEach(accounts::add); // It's intentional to include the states for *all* reviewers into the ETag computation. // We need the states of all current reviewers and CCs because they are part of ChangeInfo. diff --git a/java/com/google/gerrit/server/change/ConsistencyChecker.java b/java/com/google/gerrit/server/change/ConsistencyChecker.java index 6e5158be7a..b29f42a4e7 100644 --- a/java/com/google/gerrit/server/change/ConsistencyChecker.java +++ b/java/com/google/gerrit/server/change/ConsistencyChecker.java @@ -230,7 +230,7 @@ public class ConsistencyChecker { private void checkCurrentPatchSetEntity() { try { - currPs = psUtil.current(db.get(), notes); + currPs = psUtil.current(notes); if (currPs == null) { problem( String.format("Current patch set %d not found", change().currentPatchSetId().get())); @@ -258,7 +258,7 @@ public class ConsistencyChecker { List all; try { // Iterate in descending order. - all = PS_ID_ORDER.sortedCopy(psUtil.byChange(db.get(), notes)); + all = PS_ID_ORDER.sortedCopy(psUtil.byChange(notes)); } catch (OrmException e) { return error("Failed to look up patch sets", e); } @@ -705,7 +705,7 @@ public class ConsistencyChecker { // Doesn't make any assumptions about the order in which deletes happen // and whether they are seen by this op; we are already given the full set // of patch sets that will eventually be deleted in this update. - for (PatchSet ps : psUtil.byChange(ctx.getDb(), ctx.getNotes())) { + for (PatchSet ps : psUtil.byChange(ctx.getNotes())) { if (!toDelete.contains(ps.getId())) { all.add(ps.getId()); } @@ -714,8 +714,7 @@ public class ConsistencyChecker { throw new NoPatchSetsWouldRemainException(); } PatchSet.Id latest = ReviewDbUtil.intKeyOrdering().max(all); - ctx.getChange() - .setCurrentPatchSet(patchSetInfoFactory.get(ctx.getDb(), ctx.getNotes(), latest)); + ctx.getChange().setCurrentPatchSet(patchSetInfoFactory.get(ctx.getNotes(), latest)); return true; } } diff --git a/java/com/google/gerrit/server/change/PatchSetInserter.java b/java/com/google/gerrit/server/change/PatchSetInserter.java index a906d6a59b..ca2f6a23b3 100644 --- a/java/com/google/gerrit/server/change/PatchSetInserter.java +++ b/java/com/google/gerrit/server/change/PatchSetInserter.java @@ -233,21 +233,14 @@ public class PatchSetInserter implements BatchUpdateOp { List newGroups = groups; if (newGroups.isEmpty()) { - PatchSet prevPs = psUtil.current(db, ctx.getNotes()); + PatchSet prevPs = psUtil.current(ctx.getNotes()); if (prevPs != null) { newGroups = prevPs.getGroups(); } } patchSet = psUtil.insert( - db, - ctx.getRevWalk(), - ctx.getUpdate(psId), - psId, - commitId, - newGroups, - null, - description); + ctx.getRevWalk(), ctx.getUpdate(psId), psId, commitId, newGroups, null, description); if (notify != NotifyHandling.NONE) { oldReviewers = approvalsUtil.getReviewers(ctx.getNotes()); diff --git a/java/com/google/gerrit/server/change/PureRevert.java b/java/com/google/gerrit/server/change/PureRevert.java index ddc9661cc2..14829ea011 100644 --- a/java/com/google/gerrit/server/change/PureRevert.java +++ b/java/com/google/gerrit/server/change/PureRevert.java @@ -70,7 +70,7 @@ public class PureRevert { public PureRevertInfo get(ChangeNotes notes, @Nullable String claimedOriginal) throws OrmException, IOException, BadRequestException, ResourceConflictException { - PatchSet currentPatchSet = psUtil.current(dbProvider.get(), notes); + PatchSet currentPatchSet = psUtil.current(notes); if (currentPatchSet == null) { throw new ResourceConflictException("current revision is missing"); } @@ -81,7 +81,6 @@ public class PureRevert { } PatchSet ps = psUtil.current( - dbProvider.get(), notesFactory.createChecked( dbProvider.get(), notes.getProjectName(), notes.getChange().getRevertOf())); claimedOriginal = ps.getRevision().get(); diff --git a/java/com/google/gerrit/server/change/RebaseUtil.java b/java/com/google/gerrit/server/change/RebaseUtil.java index 22f98b87df..8b7c36e1a4 100644 --- a/java/com/google/gerrit/server/change/RebaseUtil.java +++ b/java/com/google/gerrit/server/change/RebaseUtil.java @@ -89,8 +89,6 @@ public class RebaseUtil { } public Base parseBase(RevisionResource rsrc, String base) throws OrmException { - ReviewDb db = dbProvider.get(); - // Try parsing the base as a ref string. PatchSet.Id basePatchSetId = PatchSet.Id.fromRef(base); if (basePatchSetId != null) { @@ -98,8 +96,7 @@ public class RebaseUtil { ChangeNotes baseNotes = notesFor(rsrc, baseChangeId); if (baseNotes != null) { return Base.create( - notesFor(rsrc, basePatchSetId.getParentKey()), - psUtil.get(db, baseNotes, basePatchSetId)); + notesFor(rsrc, basePatchSetId.getParentKey()), psUtil.get(baseNotes, basePatchSetId)); } } @@ -108,7 +105,7 @@ public class RebaseUtil { if (baseChangeId != null) { ChangeNotes baseNotes = notesFor(rsrc, new Change.Id(baseChangeId)); if (baseNotes != null) { - return Base.create(baseNotes, psUtil.current(db, baseNotes)); + return Base.create(baseNotes, psUtil.current(baseNotes)); } } diff --git a/java/com/google/gerrit/server/change/WorkInProgressOp.java b/java/com/google/gerrit/server/change/WorkInProgressOp.java index bc3be5146b..1da6d16347 100644 --- a/java/com/google/gerrit/server/change/WorkInProgressOp.java +++ b/java/com/google/gerrit/server/change/WorkInProgressOp.java @@ -123,7 +123,7 @@ public class WorkInProgressOp implements BatchUpdateOp { public boolean updateChange(ChangeContext ctx) throws OrmException { change = ctx.getChange(); notes = ctx.getNotes(); - ps = psUtil.get(ctx.getDb(), ctx.getNotes(), change.currentPatchSetId()); + ps = psUtil.get(ctx.getNotes(), change.currentPatchSetId()); ChangeUpdate update = ctx.getUpdate(change.currentPatchSetId()); change.setWorkInProgress(workInProgress); if (!change.hasReviewStarted() && !workInProgress) { diff --git a/java/com/google/gerrit/server/edit/ChangeEditModifier.java b/java/com/google/gerrit/server/edit/ChangeEditModifier.java index ce359a9b14..a1f654c8f4 100644 --- a/java/com/google/gerrit/server/edit/ChangeEditModifier.java +++ b/java/com/google/gerrit/server/edit/ChangeEditModifier.java @@ -457,7 +457,7 @@ public class ChangeEditModifier { } private PatchSet lookupCurrentPatchSet(ChangeNotes notes) throws OrmException { - return patchSetUtil.current(reviewDb.get(), notes); + return patchSetUtil.current(notes); } private static boolean isBasedOn(ChangeEdit changeEdit, PatchSet patchSet) { diff --git a/java/com/google/gerrit/server/edit/ChangeEditUtil.java b/java/com/google/gerrit/server/edit/ChangeEditUtil.java index d5add76be1..9e267ac9c8 100644 --- a/java/com/google/gerrit/server/edit/ChangeEditUtil.java +++ b/java/com/google/gerrit/server/edit/ChangeEditUtil.java @@ -238,8 +238,7 @@ public class ChangeEditUtil { int pos = ref.getName().lastIndexOf('/'); checkArgument(pos > 0, "invalid edit ref: %s", ref.getName()); String psId = ref.getName().substring(pos + 1); - return psUtil.get( - db.get(), notes, new PatchSet.Id(notes.getChange().getId(), Integer.parseInt(psId))); + return psUtil.get(notes, new PatchSet.Id(notes.getChange().getId(), Integer.parseInt(psId))); } catch (OrmException | NumberFormatException e) { throw new IOException(e); } diff --git a/java/com/google/gerrit/server/events/StreamEventsApiListener.java b/java/com/google/gerrit/server/events/StreamEventsApiListener.java index 972266ac2f..04abb9657c 100644 --- a/java/com/google/gerrit/server/events/StreamEventsApiListener.java +++ b/java/com/google/gerrit/server/events/StreamEventsApiListener.java @@ -45,7 +45,6 @@ import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Branch; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.PatchSet; -import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.PatchSetUtil; import com.google.gerrit.server.data.AccountAttribute; import com.google.gerrit.server.data.ApprovalAttribute; @@ -60,7 +59,6 @@ import com.google.gerrit.server.project.ProjectCache; import com.google.gwtorm.server.OrmException; import com.google.inject.AbstractModule; import com.google.inject.Inject; -import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; import java.util.Collection; @@ -117,7 +115,6 @@ public class StreamEventsApiListener } private final PluginItemContext dispatcher; - private final Provider db; private final EventFactory eventFactory; private final ProjectCache projectCache; private final GitRepositoryManager repoManager; @@ -127,14 +124,12 @@ public class StreamEventsApiListener @Inject StreamEventsApiListener( PluginItemContext dispatcher, - Provider db, EventFactory eventFactory, ProjectCache projectCache, GitRepositoryManager repoManager, PatchSetUtil psUtil, ChangeNotes.Factory changeNotesFactory) { this.dispatcher = dispatcher; - this.db = db; this.eventFactory = eventFactory; this.projectCache = projectCache; this.repoManager = repoManager; @@ -151,7 +146,7 @@ public class StreamEventsApiListener } private PatchSet getPatchSet(ChangeNotes notes, RevisionInfo info) throws OrmException { - return psUtil.get(db.get(), notes, PatchSet.Id.fromRef(info.ref)); + return psUtil.get(notes, PatchSet.Id.fromRef(info.ref)); } private Supplier changeAttributeSupplier(Change change, ChangeNotes notes) { @@ -311,7 +306,7 @@ public class StreamEventsApiListener Change change = notes.getChange(); ReviewerDeletedEvent event = new ReviewerDeletedEvent(change); event.change = changeAttributeSupplier(change, notes); - event.patchSet = patchSetAttributeSupplier(change, psUtil.current(db.get(), notes)); + event.patchSet = patchSetAttributeSupplier(change, psUtil.current(notes)); event.reviewer = accountAttributeSupplier(ev.getReviewer()); event.remover = accountAttributeSupplier(ev.getWho()); event.comment = ev.getComment(); @@ -332,7 +327,7 @@ public class StreamEventsApiListener ReviewerAddedEvent event = new ReviewerAddedEvent(change); event.change = changeAttributeSupplier(change, notes); - event.patchSet = patchSetAttributeSupplier(change, psUtil.current(db.get(), notes)); + event.patchSet = patchSetAttributeSupplier(change, psUtil.current(notes)); for (AccountInfo reviewer : ev.getReviewers()) { event.reviewer = accountAttributeSupplier(reviewer); dispatcher.run(d -> d.postEvent(event)); @@ -420,7 +415,7 @@ public class StreamEventsApiListener event.change = changeAttributeSupplier(change, notes); event.restorer = accountAttributeSupplier(ev.getWho()); - event.patchSet = patchSetAttributeSupplier(change, psUtil.current(db.get(), notes)); + event.patchSet = patchSetAttributeSupplier(change, psUtil.current(notes)); event.reason = ev.getReason(); dispatcher.run(d -> d.postEvent(change, event)); @@ -438,7 +433,7 @@ public class StreamEventsApiListener event.change = changeAttributeSupplier(change, notes); event.submitter = accountAttributeSupplier(ev.getWho()); - event.patchSet = patchSetAttributeSupplier(change, psUtil.current(db.get(), notes)); + event.patchSet = patchSetAttributeSupplier(change, psUtil.current(notes)); event.newRev = ev.getNewRevisionId(); dispatcher.run(d -> d.postEvent(change, event)); @@ -456,7 +451,7 @@ public class StreamEventsApiListener event.change = changeAttributeSupplier(change, notes); event.abandoner = accountAttributeSupplier(ev.getWho()); - event.patchSet = patchSetAttributeSupplier(change, psUtil.current(db.get(), notes)); + event.patchSet = patchSetAttributeSupplier(change, psUtil.current(notes)); event.reason = ev.getReason(); dispatcher.run(d -> d.postEvent(change, event)); @@ -509,7 +504,7 @@ public class StreamEventsApiListener VoteDeletedEvent event = new VoteDeletedEvent(change); event.change = changeAttributeSupplier(change, notes); - event.patchSet = patchSetAttributeSupplier(change, psUtil.current(db.get(), notes)); + event.patchSet = patchSetAttributeSupplier(change, psUtil.current(notes)); event.comment = ev.getMessage(); event.reviewer = accountAttributeSupplier(ev.getReviewer()); event.remover = accountAttributeSupplier(ev.getWho()); diff --git a/java/com/google/gerrit/server/git/GroupCollector.java b/java/com/google/gerrit/server/git/GroupCollector.java index bb65fa8c95..88632e67b3 100644 --- a/java/com/google/gerrit/server/git/GroupCollector.java +++ b/java/com/google/gerrit/server/git/GroupCollector.java @@ -117,7 +117,7 @@ public class GroupCollector { public List lookup(PatchSet.Id psId) throws OrmException { // TODO(dborowitz): Reuse open repository from caller. ChangeNotes notes = notesFactory.createChecked(db, project, psId.getParentKey()); - PatchSet ps = psUtil.get(db, notes, psId); + PatchSet ps = psUtil.get(notes, psId); return ps != null ? ps.getGroups() : null; } }); diff --git a/java/com/google/gerrit/server/git/MergedByPushOp.java b/java/com/google/gerrit/server/git/MergedByPushOp.java index 03a93f1fa2..06d4e8251b 100644 --- a/java/com/google/gerrit/server/git/MergedByPushOp.java +++ b/java/com/google/gerrit/server/git/MergedByPushOp.java @@ -120,7 +120,7 @@ public class MergedByPushOp implements BatchUpdateOp { } else { patchSet = requireNonNull( - psUtil.get(ctx.getDb(), ctx.getNotes(), psId), + psUtil.get(ctx.getNotes(), psId), () -> String.format("patch set %s not found", psId)); } info = getPatchSetInfo(ctx); diff --git a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java index 85a938af1e..32fbd369d4 100644 --- a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java +++ b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java @@ -2881,7 +2881,7 @@ class ReceiveCommits { new BatchUpdateOp() { @Override public boolean updateChange(ChangeContext ctx) throws OrmException { - PatchSet ps = psUtil.get(ctx.getDb(), ctx.getNotes(), psId); + PatchSet ps = psUtil.get(ctx.getNotes(), psId); List oldGroups = ps.getGroups(); if (oldGroups == null) { if (groups == null) { @@ -2890,7 +2890,7 @@ class ReceiveCommits { } else if (sameGroups(oldGroups, groups)) { return false; } - psUtil.setGroups(ctx.getDb(), ctx.getUpdate(psId), ps, groups); + psUtil.setGroups(ctx.getUpdate(psId), ps, groups); return true; } }); diff --git a/java/com/google/gerrit/server/git/receive/ReplaceOp.java b/java/com/google/gerrit/server/git/receive/ReplaceOp.java index cedc1671a9..d2ef12c4b9 100644 --- a/java/com/google/gerrit/server/git/receive/ReplaceOp.java +++ b/java/com/google/gerrit/server/git/receive/ReplaceOp.java @@ -255,7 +255,7 @@ public class ReplaceOp implements BatchUpdateOp { return false; } if (groups.isEmpty()) { - PatchSet prevPs = psUtil.current(ctx.getDb(), notes); + PatchSet prevPs = psUtil.current(notes); groups = prevPs != null ? prevPs.getGroups() : ImmutableList.of(); } @@ -305,7 +305,6 @@ public class ReplaceOp implements BatchUpdateOp { newPatchSet = psUtil.insert( - ctx.getDb(), ctx.getRevWalk(), update, patchSetId, diff --git a/java/com/google/gerrit/server/mail/receive/MailProcessor.java b/java/com/google/gerrit/server/mail/receive/MailProcessor.java index 6d6f043d7a..b39f4e31c5 100644 --- a/java/com/google/gerrit/server/mail/receive/MailProcessor.java +++ b/java/com/google/gerrit/server/mail/receive/MailProcessor.java @@ -283,7 +283,7 @@ public class MailProcessor { @Override public boolean updateChange(ChangeContext ctx) throws OrmException, UnprocessableEntityException, PatchListNotAvailableException { - patchSet = psUtil.get(ctx.getDb(), ctx.getNotes(), psId); + patchSet = psUtil.get(ctx.getNotes(), psId); notes = ctx.getNotes(); if (patchSet == null) { throw new OrmException("patch set not found: " + psId); @@ -366,7 +366,6 @@ public class MailProcessor { ChangeContext ctx, MailComment mailComment, PatchSet current) throws OrmException { if (mailComment.getInReplyTo() != null) { return psUtil.get( - ctx.getDb(), ctx.getNotes(), new PatchSet.Id(ctx.getChange().getId(), mailComment.getInReplyTo().key.patchSetId)); } diff --git a/java/com/google/gerrit/server/mail/send/ChangeEmail.java b/java/com/google/gerrit/server/mail/send/ChangeEmail.java index 0b8a3c1192..84576f6ac4 100644 --- a/java/com/google/gerrit/server/mail/send/ChangeEmail.java +++ b/java/com/google/gerrit/server/mail/send/ChangeEmail.java @@ -159,8 +159,7 @@ public abstract class ChangeEmail extends NotificationEmail { setHeader(MailHeader.PATCH_SET.fieldName(), patchSet.getPatchSetId() + ""); if (patchSetInfo == null) { try { - patchSetInfo = - args.patchSetInfoFactory.get(args.db.get(), changeData.notes(), patchSet.getId()); + patchSetInfo = args.patchSetInfoFactory.get(changeData.notes(), patchSet.getId()); } catch (PatchSetInfoNotAvailableException | OrmException err) { patchSetInfo = null; } diff --git a/java/com/google/gerrit/server/patch/PatchScriptFactory.java b/java/com/google/gerrit/server/patch/PatchScriptFactory.java index dca5098c58..c583729c2c 100644 --- a/java/com/google/gerrit/server/patch/PatchScriptFactory.java +++ b/java/com/google/gerrit/server/patch/PatchScriptFactory.java @@ -200,8 +200,8 @@ public class PatchScriptFactory implements Callable { } validatePatchSetId(psb); - PatchSet psEntityA = psa != null ? psUtil.get(db, notes, psa) : null; - PatchSet psEntityB = psb.get() == 0 ? new PatchSet(psb) : psUtil.get(db, notes, psb); + PatchSet psEntityA = psa != null ? psUtil.get(notes, psa) : null; + PatchSet psEntityB = psb.get() == 0 ? new PatchSet(psb) : psUtil.get(notes, psb); if (psEntityA != null || psEntityB != null) { try { permissionBackend.currentUser().change(notes).database(db).check(ChangePermission.READ); @@ -308,7 +308,7 @@ public class PatchScriptFactory implements Callable { // proper rename detection between the patch sets. // history = new ArrayList<>(); - for (PatchSet ps : psUtil.byChange(db, notes)) { + for (PatchSet ps : psUtil.byChange(notes)) { String name = fileName; if (psa != null) { switch (changeType) { diff --git a/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java b/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java index 41bade6218..f11f116c49 100644 --- a/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java +++ b/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java @@ -20,7 +20,6 @@ import com.google.gerrit.reviewdb.client.PatchSetInfo; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.RevId; import com.google.gerrit.reviewdb.client.UserIdentity; -import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.PatchSetUtil; import com.google.gerrit.server.account.Emails; import com.google.gerrit.server.git.GitRepositoryManager; @@ -66,10 +65,10 @@ public class PatchSetInfoFactory { return info; } - public PatchSetInfo get(ReviewDb db, ChangeNotes notes, PatchSet.Id psId) + public PatchSetInfo get(ChangeNotes notes, PatchSet.Id psId) throws PatchSetInfoNotAvailableException { try { - PatchSet patchSet = psUtil.get(db, notes, psId); + PatchSet patchSet = psUtil.get(notes, psId); return get(notes.getProjectName(), patchSet); } catch (OrmException e) { throw new PatchSetInfoNotAvailableException(e); diff --git a/java/com/google/gerrit/server/query/change/ChangeData.java b/java/com/google/gerrit/server/query/change/ChangeData.java index 8864de1925..4df953ec90 100644 --- a/java/com/google/gerrit/server/query/change/ChangeData.java +++ b/java/com/google/gerrit/server/query/change/ChangeData.java @@ -714,7 +714,7 @@ public class ChangeData { */ public Collection patchSets() throws OrmException { if (patchSets == null) { - patchSets = psUtil.byChange(db, notes()); + patchSets = psUtil.byChange(notes()); } return patchSets; } diff --git a/java/com/google/gerrit/server/restapi/account/DeleteDraftComments.java b/java/com/google/gerrit/server/restapi/account/DeleteDraftComments.java index 3c553a1075..16ab8122f5 100644 --- a/java/com/google/gerrit/server/restapi/account/DeleteDraftComments.java +++ b/java/com/google/gerrit/server/restapi/account/DeleteDraftComments.java @@ -187,8 +187,7 @@ public class DeleteDraftComments for (Comment c : commentsUtil.draftByChangeAuthor(ctx.getNotes(), accountId)) { dirty = true; PatchSet.Id psId = new PatchSet.Id(ctx.getChange().getId(), c.key.patchSetId); - setCommentRevId( - c, patchListCache, ctx.getChange(), psUtil.get(ctx.getDb(), ctx.getNotes(), psId)); + setCommentRevId(c, patchListCache, ctx.getChange(), psUtil.get(ctx.getNotes(), psId)); commentsUtil.deleteComments(ctx.getUpdate(psId), Collections.singleton(c)); comments.add(commentFormatter.format(c)); } diff --git a/java/com/google/gerrit/server/restapi/change/ChangeIncludedIn.java b/java/com/google/gerrit/server/restapi/change/ChangeIncludedIn.java index 12b3797c4e..59b311148e 100644 --- a/java/com/google/gerrit/server/restapi/change/ChangeIncludedIn.java +++ b/java/com/google/gerrit/server/restapi/change/ChangeIncludedIn.java @@ -18,25 +18,21 @@ import com.google.gerrit.extensions.api.changes.IncludedInInfo; import com.google.gerrit.extensions.restapi.RestApiException; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.reviewdb.client.PatchSet; -import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.PatchSetUtil; import com.google.gerrit.server.change.ChangeResource; import com.google.gerrit.server.change.IncludedIn; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; -import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; @Singleton public class ChangeIncludedIn implements RestReadView { - private Provider db; private PatchSetUtil psUtil; private IncludedIn includedIn; @Inject - ChangeIncludedIn(Provider db, PatchSetUtil psUtil, IncludedIn includedIn) { - this.db = db; + ChangeIncludedIn(PatchSetUtil psUtil, IncludedIn includedIn) { this.psUtil = psUtil; this.includedIn = includedIn; } @@ -44,7 +40,7 @@ public class ChangeIncludedIn implements RestReadView { @Override public IncludedInInfo apply(ChangeResource rsrc) throws RestApiException, OrmException, IOException { - PatchSet ps = psUtil.current(db.get(), rsrc.getNotes()); + PatchSet ps = psUtil.current(rsrc.getNotes()); return includedIn.apply(rsrc.getProject(), ps.getRevision().get()); } } diff --git a/java/com/google/gerrit/server/restapi/change/CreateChange.java b/java/com/google/gerrit/server/restapi/change/CreateChange.java index fd25658cdd..319a647aa9 100644 --- a/java/com/google/gerrit/server/restapi/change/CreateChange.java +++ b/java/com/google/gerrit/server/restapi/change/CreateChange.java @@ -225,7 +225,7 @@ public class CreateChange } catch (AuthException e) { throw new UnprocessableEntityException("Read not permitted for " + input.baseChange); } - PatchSet ps = psUtil.current(db.get(), change); + PatchSet ps = psUtil.current(change); parentCommit = ObjectId.fromString(ps.getRevision().get()); groups = ps.getGroups(); } else if (input.baseCommit != null) { diff --git a/java/com/google/gerrit/server/restapi/change/CreateDraftComment.java b/java/com/google/gerrit/server/restapi/change/CreateDraftComment.java index 773b914aec..bab7fb0fe0 100644 --- a/java/com/google/gerrit/server/restapi/change/CreateDraftComment.java +++ b/java/com/google/gerrit/server/restapi/change/CreateDraftComment.java @@ -112,7 +112,7 @@ public class CreateDraftComment public boolean updateChange(ChangeContext ctx) throws ResourceNotFoundException, OrmException, UnprocessableEntityException, PatchListNotAvailableException { - PatchSet ps = psUtil.get(ctx.getDb(), ctx.getNotes(), psId); + PatchSet ps = psUtil.get(ctx.getNotes(), psId); if (ps == null) { throw new ResourceNotFoundException("patch set not found: " + psId); } diff --git a/java/com/google/gerrit/server/restapi/change/CreateMergePatchSet.java b/java/com/google/gerrit/server/restapi/change/CreateMergePatchSet.java index 1b85d0be36..34b43830e6 100644 --- a/java/com/google/gerrit/server/restapi/change/CreateMergePatchSet.java +++ b/java/com/google/gerrit/server/restapi/change/CreateMergePatchSet.java @@ -141,7 +141,7 @@ public class CreateMergePatchSet } in.baseChange = Strings.nullToEmpty(in.baseChange).trim(); - PatchSet ps = psUtil.current(db.get(), rsrc.getNotes()); + PatchSet ps = psUtil.current(rsrc.getNotes()); Change change = rsrc.getChange(); Project.NameKey project = change.getProject(); Branch.NameKey dest = change.getDest(); @@ -216,7 +216,7 @@ public class CreateMergePatchSet } catch (AuthException e) { throw new UnprocessableEntityException("Read not permitted for " + baseChange); } - return psUtil.current(db.get(), change); + return psUtil.current(change); } private RevCommit createMergeCommit( diff --git a/java/com/google/gerrit/server/restapi/change/DeleteChangeOp.java b/java/com/google/gerrit/server/restapi/change/DeleteChangeOp.java index ae2d2ebcf7..be7b0f72e2 100644 --- a/java/com/google/gerrit/server/restapi/change/DeleteChangeOp.java +++ b/java/com/google/gerrit/server/restapi/change/DeleteChangeOp.java @@ -70,7 +70,7 @@ class DeleteChangeOp implements BatchUpdateOp { checkState(id == null, "cannot reuse DeleteChangeOp"); id = ctx.getChange().getId(); - Collection patchSets = psUtil.byChange(ctx.getDb(), ctx.getNotes()); + Collection patchSets = psUtil.byChange(ctx.getNotes()); ensureDeletable(ctx, id, patchSets); // Cleaning up is only possible as long as the change and its elements are diff --git a/java/com/google/gerrit/server/restapi/change/DeleteDraftComment.java b/java/com/google/gerrit/server/restapi/change/DeleteDraftComment.java index 0d9629fa04..0e62273ffa 100644 --- a/java/com/google/gerrit/server/restapi/change/DeleteDraftComment.java +++ b/java/com/google/gerrit/server/restapi/change/DeleteDraftComment.java @@ -96,7 +96,7 @@ public class DeleteDraftComment return false; // Nothing to do. } PatchSet.Id psId = new PatchSet.Id(ctx.getChange().getId(), key.patchSetId); - PatchSet ps = psUtil.get(ctx.getDb(), ctx.getNotes(), psId); + PatchSet ps = psUtil.get(ctx.getNotes(), psId); if (ps == null) { throw new ResourceNotFoundException("patch set not found: " + psId); } diff --git a/java/com/google/gerrit/server/restapi/change/DeleteReviewerOp.java b/java/com/google/gerrit/server/restapi/change/DeleteReviewerOp.java index b130e626af..81ba1a0ec1 100644 --- a/java/com/google/gerrit/server/restapi/change/DeleteReviewerOp.java +++ b/java/com/google/gerrit/server/restapi/change/DeleteReviewerOp.java @@ -129,7 +129,7 @@ public class DeleteReviewerOp implements BatchUpdateOp { throw new ResourceNotFoundException(); } currChange = ctx.getChange(); - currPs = psUtil.current(ctx.getDb(), ctx.getNotes()); + currPs = psUtil.current(ctx.getNotes()); LabelTypes labelTypes = projectCache.checkedGet(ctx.getProject()).getLabelTypes(ctx.getNotes()); // removing a reviewer will remove all her votes diff --git a/java/com/google/gerrit/server/restapi/change/DeleteVote.java b/java/com/google/gerrit/server/restapi/change/DeleteVote.java index e4d067b093..1f770e67b6 100644 --- a/java/com/google/gerrit/server/restapi/change/DeleteVote.java +++ b/java/com/google/gerrit/server/restapi/change/DeleteVote.java @@ -169,7 +169,7 @@ public class DeleteVote extends RetryingRestModifyView { @Option(name = "-q") String query; - private final Provider db; private final Provider self; private final FileInfoJson fileInfoJson; private final Revisions revisions; @@ -125,7 +123,6 @@ public class Files implements ChildCollection { @Inject ListFiles( - Provider db, Provider self, FileInfoJson fileInfoJson, Revisions revisions, @@ -133,7 +130,6 @@ public class Files implements ChildCollection { PatchListCache patchListCache, PatchSetUtil psUtil, PluginItemContext accountPatchReviewStore) { - this.db = db; this.self = self; this.fileInfoJson = fileInfoJson; this.revisions = revisions; @@ -268,7 +264,7 @@ public class Files implements ChildCollection { RevWalk rw = new RevWalk(reader); TreeWalk tw = new TreeWalk(reader)) { Change change = resource.getChange(); - PatchSet patchSet = psUtil.get(db.get(), resource.getNotes(), old); + PatchSet patchSet = psUtil.get(resource.getNotes(), old); if (patchSet == null) { throw new PatchListNotAvailableException( String.format( diff --git a/java/com/google/gerrit/server/restapi/change/GetContent.java b/java/com/google/gerrit/server/restapi/change/GetContent.java index 6b9bf17fbb..c133581bb3 100644 --- a/java/com/google/gerrit/server/restapi/change/GetContent.java +++ b/java/com/google/gerrit/server/restapi/change/GetContent.java @@ -21,7 +21,6 @@ import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Patch; import com.google.gerrit.reviewdb.client.PatchSet; -import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.PatchSetUtil; import com.google.gerrit.server.change.FileContentUtil; import com.google.gerrit.server.change.FileResource; @@ -33,7 +32,6 @@ import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gerrit.server.project.ProjectCache; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; -import com.google.inject.Provider; import java.io.IOException; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.lib.ObjectId; @@ -43,7 +41,6 @@ import org.eclipse.jgit.revwalk.RevWalk; import org.kohsuke.args4j.Option; public class GetContent implements RestReadView { - private final Provider db; private final GitRepositoryManager gitManager; private final PatchSetUtil psUtil; private final FileContentUtil fileContentUtil; @@ -54,12 +51,10 @@ public class GetContent implements RestReadView { @Inject GetContent( - Provider db, GitRepositoryManager gitManager, PatchSetUtil psUtil, FileContentUtil fileContentUtil, ProjectCache projectCache) { - this.db = db; this.gitManager = gitManager; this.psUtil = psUtil; this.fileContentUtil = fileContentUtil; @@ -90,7 +85,7 @@ public class GetContent implements RestReadView { private String getMessage(ChangeNotes notes) throws OrmException, IOException { Change.Id changeId = notes.getChangeId(); - PatchSet ps = psUtil.current(db.get(), notes); + PatchSet ps = psUtil.current(notes); if (ps == null) { throw new NoSuchChangeException(changeId); } @@ -106,7 +101,7 @@ public class GetContent implements RestReadView { private byte[] getMergeList(ChangeNotes notes) throws OrmException, IOException { Change.Id changeId = notes.getChangeId(); - PatchSet ps = psUtil.current(db.get(), notes); + PatchSet ps = psUtil.current(notes); if (ps == null) { throw new NoSuchChangeException(changeId); } diff --git a/java/com/google/gerrit/server/restapi/change/GetRelated.java b/java/com/google/gerrit/server/restapi/change/GetRelated.java index 30fbf39386..9a65165280 100644 --- a/java/com/google/gerrit/server/restapi/change/GetRelated.java +++ b/java/com/google/gerrit/server/restapi/change/GetRelated.java @@ -27,7 +27,6 @@ import com.google.gerrit.index.IndexConfig; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.reviewdb.client.Project; -import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.CommonConverters; import com.google.gerrit.server.PatchSetUtil; import com.google.gerrit.server.change.RevisionResource; @@ -50,7 +49,6 @@ import org.eclipse.jgit.revwalk.RevCommit; @Singleton public class GetRelated implements RestReadView { - private final Provider db; private final Provider queryProvider; private final PatchSetUtil psUtil; private final RelatedChangesSorter sorter; @@ -58,12 +56,10 @@ public class GetRelated implements RestReadView { @Inject GetRelated( - Provider db, Provider queryProvider, PatchSetUtil psUtil, RelatedChangesSorter sorter, IndexConfig indexConfig) { - this.db = db; this.queryProvider = queryProvider; this.psUtil = psUtil; this.sorter = sorter; @@ -81,7 +77,7 @@ public class GetRelated implements RestReadView { private List getRelated(RevisionResource rsrc) throws OrmException, IOException, PermissionBackendException { - Set groups = getAllGroups(rsrc.getNotes(), db.get(), psUtil); + Set groups = getAllGroups(rsrc.getNotes(), psUtil); if (groups.isEmpty()) { return Collections.emptyList(); } @@ -125,13 +121,9 @@ public class GetRelated implements RestReadView { } @VisibleForTesting - public static Set getAllGroups(ChangeNotes notes, ReviewDb db, PatchSetUtil psUtil) + public static Set getAllGroups(ChangeNotes notes, PatchSetUtil psUtil) throws OrmException { - return psUtil - .byChange(db, notes) - .stream() - .flatMap(ps -> ps.getGroups().stream()) - .collect(toSet()); + return psUtil.byChange(notes).stream().flatMap(ps -> ps.getGroups().stream()).collect(toSet()); } private void reloadChangeIfStale(List cds, PatchSet wantedPs) throws OrmException { diff --git a/java/com/google/gerrit/server/restapi/change/Move.java b/java/com/google/gerrit/server/restapi/change/Move.java index 0f650dd1c5..d781370a20 100644 --- a/java/com/google/gerrit/server/restapi/change/Move.java +++ b/java/com/google/gerrit/server/restapi/change/Move.java @@ -202,8 +202,7 @@ public class Move extends RetryingRestModifyView 1) { throw new ResourceConflictException("Merge commit cannot be moved"); } diff --git a/java/com/google/gerrit/server/restapi/change/PostReview.java b/java/com/google/gerrit/server/restapi/change/PostReview.java index ac19cce6f3..c2868fd02b 100644 --- a/java/com/google/gerrit/server/restapi/change/PostReview.java +++ b/java/com/google/gerrit/server/restapi/change/PostReview.java @@ -896,7 +896,7 @@ public class PostReview PatchListNotAvailableException { user = ctx.getIdentifiedUser(); notes = ctx.getNotes(); - ps = psUtil.get(ctx.getDb(), ctx.getNotes(), psId); + ps = psUtil.get(ctx.getNotes(), psId); boolean dirty = false; dirty |= insertComments(ctx); dirty |= insertRobotComments(ctx); diff --git a/java/com/google/gerrit/server/restapi/change/PutDescription.java b/java/com/google/gerrit/server/restapi/change/PutDescription.java index a116fc15b6..e04a314913 100644 --- a/java/com/google/gerrit/server/restapi/change/PutDescription.java +++ b/java/com/google/gerrit/server/restapi/change/PutDescription.java @@ -93,7 +93,7 @@ public class PutDescription @Override public boolean updateChange(ChangeContext ctx) throws OrmException { - PatchSet ps = psUtil.get(ctx.getDb(), ctx.getNotes(), psId); + PatchSet ps = psUtil.get(ctx.getNotes(), psId); ChangeUpdate update = ctx.getUpdate(psId); newDescription = Strings.nullToEmpty(input.description); oldDescription = Strings.nullToEmpty(ps.getDescription()); diff --git a/java/com/google/gerrit/server/restapi/change/PutDraftComment.java b/java/com/google/gerrit/server/restapi/change/PutDraftComment.java index dfa32bfcbe..76fb889ea3 100644 --- a/java/com/google/gerrit/server/restapi/change/PutDraftComment.java +++ b/java/com/google/gerrit/server/restapi/change/PutDraftComment.java @@ -133,7 +133,7 @@ public class PutDraftComment PatchSet.Id psId = new PatchSet.Id(ctx.getChange().getId(), origComment.key.patchSetId); ChangeUpdate update = ctx.getUpdate(psId); - PatchSet ps = psUtil.get(ctx.getDb(), ctx.getNotes(), psId); + PatchSet ps = psUtil.get(ctx.getNotes(), psId); if (ps == null) { throw new ResourceNotFoundException("patch set not found: " + psId); } diff --git a/java/com/google/gerrit/server/restapi/change/PutMessage.java b/java/com/google/gerrit/server/restapi/change/PutMessage.java index bcd0e9e455..756d3d52d7 100644 --- a/java/com/google/gerrit/server/restapi/change/PutMessage.java +++ b/java/com/google/gerrit/server/restapi/change/PutMessage.java @@ -105,7 +105,7 @@ public class PutMessage BatchUpdate.Factory updateFactory, ChangeResource resource, CommitMessageInput input) throws IOException, RestApiException, UpdateException, PermissionBackendException, OrmException, ConfigInvalidException { - PatchSet ps = psUtil.current(db.get(), resource.getNotes()); + PatchSet ps = psUtil.current(resource.getNotes()); if (ps == null) { throw new ResourceConflictException("current revision is missing"); } diff --git a/java/com/google/gerrit/server/restapi/change/Rebase.java b/java/com/google/gerrit/server/restapi/change/Rebase.java index eed089636e..7671fd4007 100644 --- a/java/com/google/gerrit/server/restapi/change/Rebase.java +++ b/java/com/google/gerrit/server/restapi/change/Rebase.java @@ -273,7 +273,7 @@ public class Rebase extends RetryingRestModifyView out = new ArrayList<>(); - for (PatchSet ps : psUtil.byChange(dbProvider.get(), change.getNotes())) { + for (PatchSet ps : psUtil.byChange(change.getNotes())) { if (ps.getRevision() != null && ps.getRevision().get().startsWith(id)) { out.add(new RevisionResource(change, ps)); } @@ -151,10 +151,7 @@ public class Revisions implements ChildCollection byLegacyPatchSetId(ChangeResource change, String id) throws OrmException { PatchSet ps = - psUtil.get( - dbProvider.get(), - change.getNotes(), - new PatchSet.Id(change.getId(), Integer.parseInt(id))); + psUtil.get(change.getNotes(), new PatchSet.Id(change.getId(), Integer.parseInt(id))); if (ps != null) { return Collections.singletonList(new RevisionResource(change, ps)); } diff --git a/java/com/google/gerrit/server/restapi/change/SetPrivateOp.java b/java/com/google/gerrit/server/restapi/change/SetPrivateOp.java index 47427ddde7..04c94be61a 100644 --- a/java/com/google/gerrit/server/restapi/change/SetPrivateOp.java +++ b/java/com/google/gerrit/server/restapi/change/SetPrivateOp.java @@ -73,7 +73,7 @@ public class SetPrivateOp implements BatchUpdateOp { public boolean updateChange(ChangeContext ctx) throws ResourceConflictException, OrmException { change = ctx.getChange(); ChangeNotes notes = ctx.getNotes(); - ps = psUtil.get(ctx.getDb(), notes, change.currentPatchSetId()); + ps = psUtil.get(notes, change.currentPatchSetId()); ChangeUpdate update = ctx.getUpdate(change.currentPatchSetId()); change.setPrivate(isPrivate); change.setLastUpdatedOn(ctx.getWhen()); diff --git a/java/com/google/gerrit/server/restapi/change/Submit.java b/java/com/google/gerrit/server/restapi/change/Submit.java index 773d12d463..d426df342d 100644 --- a/java/com/google/gerrit/server/restapi/change/Submit.java +++ b/java/com/google/gerrit/server/restapi/change/Submit.java @@ -456,8 +456,7 @@ public class Submit for (ChangeData change : changes) { RevCommit commit = walk.parseCommit( - ObjectId.fromString( - psUtil.current(dbProvider.get(), change.notes()).getRevision().get())); + ObjectId.fromString(psUtil.current(change.notes()).getRevision().get())); commits.put(change.getId(), commit); } } @@ -495,18 +494,12 @@ public class Submit } public static class CurrentRevision implements RestModifyView { - private final Provider dbProvider; private final Submit submit; private final ChangeJson.Factory json; private final PatchSetUtil psUtil; @Inject - CurrentRevision( - Provider dbProvider, - Submit submit, - ChangeJson.Factory json, - PatchSetUtil psUtil) { - this.dbProvider = dbProvider; + CurrentRevision(Submit submit, ChangeJson.Factory json, PatchSetUtil psUtil) { this.submit = submit; this.json = json; this.psUtil = psUtil; @@ -516,7 +509,7 @@ public class Submit public ChangeInfo apply(ChangeResource rsrc, SubmitInput input) throws RestApiException, RepositoryNotFoundException, IOException, OrmException, PermissionBackendException, UpdateException, ConfigInvalidException { - PatchSet ps = psUtil.current(dbProvider.get(), rsrc.getNotes()); + PatchSet ps = psUtil.current(rsrc.getNotes()); if (ps == null) { throw new ResourceConflictException("current revision is missing"); } diff --git a/java/com/google/gerrit/server/submit/CherryPick.java b/java/com/google/gerrit/server/submit/CherryPick.java index 182c22aa68..844b3d4162 100644 --- a/java/com/google/gerrit/server/submit/CherryPick.java +++ b/java/com/google/gerrit/server/submit/CherryPick.java @@ -157,10 +157,9 @@ public class CherryPick extends SubmitStrategy { String.format( "no new commit produced by CherryPick of %s, expected to fail fast", toMerge.change().getId())); - PatchSet prevPs = args.psUtil.current(ctx.getDb(), ctx.getNotes()); + PatchSet prevPs = args.psUtil.current(ctx.getNotes()); PatchSet newPs = args.psUtil.insert( - ctx.getDb(), ctx.getRevWalk(), ctx.getUpdate(psId), psId, diff --git a/java/com/google/gerrit/server/submit/RebaseSubmitStrategy.java b/java/com/google/gerrit/server/submit/RebaseSubmitStrategy.java index cf3a44e0d8..144b5b1292 100644 --- a/java/com/google/gerrit/server/submit/RebaseSubmitStrategy.java +++ b/java/com/google/gerrit/server/submit/RebaseSubmitStrategy.java @@ -170,7 +170,7 @@ public class RebaseSubmitStrategy extends SubmitStrategy { ctx.addRefUpdate(ObjectId.zeroId(), newCommit, newPatchSetId.toRefName()); } else { // Stale read of patch set is ok; see comments in RebaseChangeOp. - PatchSet origPs = args.psUtil.get(ctx.getDb(), toMerge.getNotes(), toMerge.getPatchsetId()); + PatchSet origPs = args.psUtil.get(toMerge.getNotes(), toMerge.getPatchsetId()); rebaseOp = args.rebaseFactory .create(toMerge.notes(), origPs, args.mergeTip.getCurrentTip()) @@ -227,10 +227,9 @@ public class RebaseSubmitStrategy extends SubmitStrategy { newPs = rebaseOp.getPatchSet(); } else { // CherryPick - PatchSet prevPs = args.psUtil.current(ctx.getDb(), ctx.getNotes()); + PatchSet prevPs = args.psUtil.current(ctx.getNotes()); newPs = args.psUtil.insert( - ctx.getDb(), ctx.getRevWalk(), ctx.getUpdate(newPatchSetId), newPatchSetId, diff --git a/java/com/google/gerrit/server/submit/SubmitStrategyOp.java b/java/com/google/gerrit/server/submit/SubmitStrategyOp.java index fd490424bb..9cd30db085 100644 --- a/java/com/google/gerrit/server/submit/SubmitStrategyOp.java +++ b/java/com/google/gerrit/server/submit/SubmitStrategyOp.java @@ -250,7 +250,7 @@ abstract class SubmitStrategyOp implements BatchUpdateOp { // during the submit strategy. mergedPatchSet = requireNonNull( - args.psUtil.get(ctx.getDb(), ctx.getNotes(), oldPsId), + args.psUtil.get(ctx.getNotes(), oldPsId), () -> String.format("missing old patch set %s", oldPsId)); } else { PatchSet.Id n = newPatchSet.getId(); @@ -300,12 +300,12 @@ abstract class SubmitStrategyOp implements BatchUpdateOp { throws IOException, OrmException { PatchSet.Id psId = alreadyMergedCommit.getPatchsetId(); logger.atFine().log("Fixing up already-merged patch set %s", psId); - PatchSet prevPs = args.psUtil.current(ctx.getDb(), ctx.getNotes()); + PatchSet prevPs = args.psUtil.current(ctx.getNotes()); ctx.getRevWalk().parseBody(alreadyMergedCommit); ctx.getChange() .setCurrentPatchSet( psId, alreadyMergedCommit.getShortMessage(), ctx.getChange().getOriginalSubject()); - PatchSet existing = args.psUtil.get(ctx.getDb(), ctx.getNotes(), psId); + PatchSet existing = args.psUtil.get(ctx.getNotes(), psId); if (existing != null) { logger.atFine().log("Patch set row exists, only updating change"); return existing; @@ -316,14 +316,7 @@ abstract class SubmitStrategyOp implements BatchUpdateOp { List groups = prevPs != null ? prevPs.getGroups() : GroupCollector.getDefaultGroups(alreadyMergedCommit); return args.psUtil.insert( - ctx.getDb(), - ctx.getRevWalk(), - ctx.getUpdate(psId), - psId, - alreadyMergedCommit, - groups, - null, - null); + ctx.getRevWalk(), ctx.getUpdate(psId), psId, alreadyMergedCommit, groups, null, null); } private void setApproval(ChangeContext ctx, IdentifiedUser user) diff --git a/java/com/google/gerrit/sshd/commands/PatchSetParser.java b/java/com/google/gerrit/sshd/commands/PatchSetParser.java index 8dee69ee02..a1e8f0751f 100644 --- a/java/com/google/gerrit/sshd/commands/PatchSetParser.java +++ b/java/com/google/gerrit/sshd/commands/PatchSetParser.java @@ -107,7 +107,7 @@ public class PatchSetParser { throw error("\"" + token + "\" is not a valid patch set"); } ChangeNotes notes = getNotes(projectState, patchSetId.getParentKey()); - PatchSet patchSet = psUtil.get(db.get(), notes, patchSetId); + PatchSet patchSet = psUtil.get(notes, patchSetId); if (patchSet == null) { throw error("\"" + token + "\" no such patch set"); } diff --git a/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java b/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java index e377a86177..9b6083f436 100644 --- a/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java +++ b/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java @@ -160,7 +160,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { public void patchSetRefMissing() throws Exception { ChangeNotes notes = insertChange(); serverSideTestRepo.update( - "refs/other/foo", ObjectId.fromString(psUtil.current(db, notes).getRevision().get())); + "refs/other/foo", ObjectId.fromString(psUtil.current(notes).getRevision().get())); String refName = notes.getChange().currentPatchSetId().toRefName(); deleteRef(refName); @@ -170,7 +170,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { @Test public void patchSetRefMissingWithFix() throws Exception { ChangeNotes notes = insertChange(); - String rev = psUtil.current(db, notes).getRevision().get(); + String rev = psUtil.current(notes).getRevision().get(); serverSideTestRepo.update("refs/other/foo", ObjectId.fromString(rev)); String refName = notes.getChange().currentPatchSetId().toRefName(); deleteRef(refName); @@ -184,7 +184,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { @Test public void patchSetObjectAndRefMissingWithDeletingPatchSet() throws Exception { ChangeNotes notes = insertChange(); - PatchSet ps1 = psUtil.current(db, notes); + PatchSet ps1 = psUtil.current(notes); String rev2 = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"; PatchSet ps2 = insertMissingPatchSet(notes, rev2); @@ -200,20 +200,20 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { notes = reload(notes); assertThat(notes.getChange().currentPatchSetId().get()).isEqualTo(1); - assertThat(psUtil.get(db, notes, ps1.getId())).isNotNull(); - assertThat(psUtil.get(db, notes, ps2.getId())).isNull(); + assertThat(psUtil.get(notes, ps1.getId())).isNotNull(); + assertThat(psUtil.get(notes, ps2.getId())).isNull(); } @Test public void patchSetMultipleObjectsMissingWithDeletingPatchSets() throws Exception { ChangeNotes notes = insertChange(); - PatchSet ps1 = psUtil.current(db, notes); + PatchSet ps1 = psUtil.current(notes); String rev2 = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"; PatchSet ps2 = insertMissingPatchSet(notes, rev2); notes = incrementPatchSet(reload(notes)); - PatchSet ps3 = psUtil.current(db, notes); + PatchSet ps3 = psUtil.current(notes); String rev4 = "c0ffeeeec0ffeeeec0ffeeeec0ffeeeec0ffeeee"; PatchSet ps4 = insertMissingPatchSet(notes, rev4); @@ -231,10 +231,10 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { notes = reload(notes); assertThat(notes.getChange().currentPatchSetId().get()).isEqualTo(3); - assertThat(psUtil.get(db, notes, ps1.getId())).isNotNull(); - assertThat(psUtil.get(db, notes, ps2.getId())).isNull(); - assertThat(psUtil.get(db, notes, ps3.getId())).isNotNull(); - assertThat(psUtil.get(db, notes, ps4.getId())).isNull(); + assertThat(psUtil.get(notes, ps1.getId())).isNotNull(); + assertThat(psUtil.get(notes, ps2.getId())).isNull(); + assertThat(psUtil.get(notes, ps3.getId())).isNotNull(); + assertThat(psUtil.get(notes, ps4.getId())).isNull(); } @Test @@ -279,13 +279,13 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { notes = reload(notes); assertThat(notes.getChange().currentPatchSetId().get()).isEqualTo(1); - assertThat(psUtil.current(db, notes)).isNotNull(); + assertThat(psUtil.current(notes)).isNotNull(); } @Test public void duplicatePatchSetRevisions() throws Exception { ChangeNotes notes = insertChange(); - PatchSet ps1 = psUtil.current(db, notes); + PatchSet ps1 = psUtil.current(notes); String rev = ps1.getRevision().get(); notes = @@ -328,7 +328,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { } notes = reload(notes); - String rev = psUtil.current(db, notes).getRevision().get(); + String rev = psUtil.current(notes).getRevision().get(); ObjectId tip = getDestRef(notes); assertProblems( notes, @@ -345,7 +345,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { @Test public void newChangeIsMerged() throws Exception { ChangeNotes notes = insertChange(); - String rev = psUtil.current(db, notes).getRevision().get(); + String rev = psUtil.current(notes).getRevision().get(); serverSideTestRepo .branch(notes.getChange().getDest().get()) .update(serverSideTestRepo.getRevWalk().parseCommit(ObjectId.fromString(rev))); @@ -365,7 +365,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { @Test public void newChangeIsMergedWithFix() throws Exception { ChangeNotes notes = insertChange(); - String rev = psUtil.current(db, notes).getRevision().get(); + String rev = psUtil.current(notes).getRevision().get(); serverSideTestRepo .branch(notes.getChange().getDest().get()) .update(serverSideTestRepo.getRevWalk().parseCommit(ObjectId.fromString(rev))); @@ -391,7 +391,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { @Test public void extensionApiReturnsUpdatedValueAfterFix() throws Exception { ChangeNotes notes = insertChange(); - String rev = psUtil.current(db, notes).getRevision().get(); + String rev = psUtil.current(notes).getRevision().get(); serverSideTestRepo .branch(notes.getChange().getDest().get()) .update(serverSideTestRepo.getRevWalk().parseCommit(ObjectId.fromString(rev))); @@ -406,7 +406,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { @Test public void expectedMergedCommitIsLatestPatchSet() throws Exception { ChangeNotes notes = insertChange(); - String rev = psUtil.current(db, notes).getRevision().get(); + String rev = psUtil.current(notes).getRevision().get(); serverSideTestRepo .branch(notes.getChange().getDest().get()) .update(serverSideTestRepo.getRevWalk().parseCommit(ObjectId.fromString(rev))); @@ -434,7 +434,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { @Test public void expectedMergedCommitNotMergedIntoDestination() throws Exception { ChangeNotes notes = insertChange(); - String rev = psUtil.current(db, notes).getRevision().get(); + String rev = psUtil.current(notes).getRevision().get(); RevCommit commit = serverSideTestRepo.getRevWalk().parseCommit(ObjectId.fromString(rev)); serverSideTestRepo.branch(notes.getChange().getDest().get()).update(commit); @@ -457,7 +457,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { public void createNewPatchSetForExpectedMergeCommitWithNoChangeId() throws Exception { ChangeNotes notes = insertChange(); String dest = notes.getChange().getDest().get(); - String rev = psUtil.current(db, notes).getRevision().get(); + String rev = psUtil.current(notes).getRevision().get(); RevCommit commit = serverSideTestRepo.getRevWalk().parseCommit(ObjectId.fromString(rev)); RevCommit mergedAs = @@ -489,7 +489,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { notes = reload(notes); PatchSet.Id psId2 = new PatchSet.Id(notes.getChangeId(), 2); assertThat(notes.getChange().currentPatchSetId()).isEqualTo(psId2); - assertThat(psUtil.get(db, notes, psId2).getRevision().get()).isEqualTo(mergedAs.name()); + assertThat(psUtil.get(notes, psId2).getRevision().get()).isEqualTo(mergedAs.name()); assertNoProblems(notes, null); } @@ -498,7 +498,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { public void createNewPatchSetForExpectedMergeCommitWithChangeId() throws Exception { ChangeNotes notes = insertChange(); String dest = notes.getChange().getDest().get(); - String rev = psUtil.current(db, notes).getRevision().get(); + String rev = psUtil.current(notes).getRevision().get(); RevCommit commit = serverSideTestRepo.getRevWalk().parseCommit(ObjectId.fromString(rev)); RevCommit mergedAs = @@ -537,7 +537,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { notes = reload(notes); PatchSet.Id psId2 = new PatchSet.Id(notes.getChangeId(), 2); assertThat(notes.getChange().currentPatchSetId()).isEqualTo(psId2); - assertThat(psUtil.get(db, notes, psId2).getRevision().get()).isEqualTo(mergedAs.name()); + assertThat(psUtil.get(notes, psId2).getRevision().get()).isEqualTo(mergedAs.name()); assertNoProblems(notes, null); } @@ -545,10 +545,10 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { @Test public void expectedMergedCommitIsOldPatchSetOfSameChange() throws Exception { ChangeNotes notes = insertChange(); - PatchSet ps1 = psUtil.current(db, notes); + PatchSet ps1 = psUtil.current(notes); String rev1 = ps1.getRevision().get(); notes = incrementPatchSet(notes); - PatchSet ps2 = psUtil.current(db, notes); + PatchSet ps2 = psUtil.current(notes); serverSideTestRepo .branch(notes.getChange().getDest().get()) .update(serverSideTestRepo.getRevWalk().parseCommit(ObjectId.fromString(rev1))); @@ -578,14 +578,14 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { PatchSet.Id psId3 = new PatchSet.Id(notes.getChangeId(), 3); assertThat(notes.getChange().currentPatchSetId()).isEqualTo(psId3); assertThat(notes.getChange().getStatus()).isEqualTo(Change.Status.MERGED); - assertThat(psUtil.byChangeAsMap(db, notes).keySet()).containsExactly(ps2.getId(), psId3); - assertThat(psUtil.get(db, notes, psId3).getRevision().get()).isEqualTo(rev1); + assertThat(psUtil.byChangeAsMap(notes).keySet()).containsExactly(ps2.getId(), psId3); + assertThat(psUtil.get(notes, psId3).getRevision().get()).isEqualTo(rev1); } @Test public void expectedMergedCommitIsDanglingPatchSetOlderThanCurrent() throws Exception { ChangeNotes notes = insertChange(); - PatchSet ps1 = psUtil.current(db, notes); + PatchSet ps1 = psUtil.current(notes); // Create dangling ref so next ID in the database becomes 3. PatchSet.Id psId2 = new PatchSet.Id(notes.getChangeId(), 2); @@ -594,7 +594,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { serverSideTestRepo.branch(psId2.toRefName()).update(commit2); notes = incrementPatchSet(notes); - PatchSet ps3 = psUtil.current(db, notes); + PatchSet ps3 = psUtil.current(notes); assertThat(ps3.getId().get()).isEqualTo(3); serverSideTestRepo @@ -626,15 +626,15 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { PatchSet.Id psId4 = new PatchSet.Id(notes.getChangeId(), 4); assertThat(notes.getChange().currentPatchSetId()).isEqualTo(psId4); assertThat(notes.getChange().getStatus()).isEqualTo(Change.Status.MERGED); - assertThat(psUtil.byChangeAsMap(db, notes).keySet()) + assertThat(psUtil.byChangeAsMap(notes).keySet()) .containsExactly(ps1.getId(), ps3.getId(), psId4); - assertThat(psUtil.get(db, notes, psId4).getRevision().get()).isEqualTo(rev2); + assertThat(psUtil.get(notes, psId4).getRevision().get()).isEqualTo(rev2); } @Test public void expectedMergedCommitIsDanglingPatchSetNewerThanCurrent() throws Exception { ChangeNotes notes = insertChange(); - PatchSet ps1 = psUtil.current(db, notes); + PatchSet ps1 = psUtil.current(notes); // Create dangling ref with no patch set. PatchSet.Id psId2 = new PatchSet.Id(notes.getChangeId(), 2); @@ -663,8 +663,8 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { notes = reload(notes); assertThat(notes.getChange().currentPatchSetId()).isEqualTo(psId2); assertThat(notes.getChange().getStatus()).isEqualTo(Change.Status.MERGED); - assertThat(psUtil.byChangeAsMap(db, notes).keySet()).containsExactly(ps1.getId(), psId2); - assertThat(psUtil.get(db, notes, psId2).getRevision().get()).isEqualTo(rev2); + assertThat(psUtil.byChangeAsMap(notes).keySet()).containsExactly(ps1.getId(), psId2); + assertThat(psUtil.get(notes, psId2).getRevision().get()).isEqualTo(rev2); } @Test @@ -672,7 +672,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { ChangeNotes notes = insertChange(); String dest = notes.getChange().getDest().get(); RevCommit parent = serverSideTestRepo.branch(dest).commit().message("parent").create(); - String rev = psUtil.current(db, notes).getRevision().get(); + String rev = psUtil.current(notes).getRevision().get(); RevCommit commit = serverSideTestRepo.getRevWalk().parseCommit(ObjectId.fromString(rev)); serverSideTestRepo.branch(dest).update(commit); @@ -706,19 +706,19 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { @Test public void expectedMergedCommitMatchesMultiplePatchSets() throws Exception { ChangeNotes notes1 = insertChange(); - PatchSet.Id psId1 = psUtil.current(db, notes1).getId(); + PatchSet.Id psId1 = psUtil.current(notes1).getId(); String dest = notes1.getChange().getDest().get(); - String rev = psUtil.current(db, notes1).getRevision().get(); + String rev = psUtil.current(notes1).getRevision().get(); RevCommit commit = serverSideTestRepo.getRevWalk().parseCommit(ObjectId.fromString(rev)); serverSideTestRepo.branch(dest).update(commit); ChangeNotes notes2 = insertChange(); notes2 = incrementPatchSet(notes2, commit); - PatchSet.Id psId2 = psUtil.current(db, notes2).getId(); + PatchSet.Id psId2 = psUtil.current(notes2).getId(); ChangeNotes notes3 = insertChange(); notes3 = incrementPatchSet(notes3, commit); - PatchSet.Id psId3 = psUtil.current(db, notes3).getId(); + PatchSet.Id psId3 = psUtil.current(notes3).getId(); FixInput fix = new FixInput(); fix.expectMergedAs = commit.name(); @@ -863,7 +863,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { private ChangeNotes mergeChange(ChangeNotes notes) throws Exception { final ObjectId oldId = getDestRef(notes); - final ObjectId newId = ObjectId.fromString(psUtil.current(db, notes).getRevision().get()); + final ObjectId newId = ObjectId.fromString(psUtil.current(notes).getRevision().get()); final String dest = notes.getChange().getDest().get(); try (BatchUpdate bu = newUpdate(adminId)) { diff --git a/javatests/com/google/gerrit/acceptance/server/change/GetRelatedIT.java b/javatests/com/google/gerrit/acceptance/server/change/GetRelatedIT.java index fd5afefaa2..40afa8a616 100644 --- a/javatests/com/google/gerrit/acceptance/server/change/GetRelatedIT.java +++ b/javatests/com/google/gerrit/acceptance/server/change/GetRelatedIT.java @@ -572,7 +572,7 @@ public class GetRelatedIT extends AbstractDaemonTest { ChangeData cd = getChange(last); assertThat(cd.patchSets()).hasSize(n); - assertThat(GetRelated.getAllGroups(cd.notes(), db, psUtil)).hasSize(n); + assertThat(GetRelated.getAllGroups(cd.notes(), psUtil)).hasSize(n); assertRelated(cd.change().currentPatchSetId()); } @@ -610,8 +610,8 @@ public class GetRelatedIT extends AbstractDaemonTest { new BatchUpdateOp() { @Override public boolean updateChange(ChangeContext ctx) throws OrmException { - PatchSet ps = psUtil.get(ctx.getDb(), ctx.getNotes(), psId); - psUtil.setGroups(ctx.getDb(), ctx.getUpdate(psId), ps, ImmutableList.of()); + PatchSet ps = psUtil.get(ctx.getNotes(), psId); + psUtil.setGroups(ctx.getUpdate(psId), ps, ImmutableList.of()); ctx.dontBumpLastUpdatedOn(); return true; } diff --git a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java index e87942c104..e207068484 100644 --- a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java +++ b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java @@ -2280,7 +2280,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { Change change = insert(repo, newChange(repo)); String changeId = change.getKey().get(); ChangeNotes notes = notesFactory.create(db, change.getProject(), change.getId()); - PatchSet ps = psUtil.get(db, notes, change.currentPatchSetId()); + PatchSet ps = psUtil.get(notes, change.currentPatchSetId()); requestContext.setContext(newRequestContext(user)); gApi.changes().id(changeId).edit().create();