opendev/gerrit
Code Issues Proposed changes

Cache reused values in autoCloseChanges

Browse Source 
The tip commit and branch key are passed into the submodule update
helper. Hold them in varibles for reuse, to reduce redundant code.

It is not necessary to reset the RevWalk. The submodule updater is
only using the revision pool to parse commits. It doesn't perform a
traversal, so the reset is merely wasting CPU cycles here.

Change-Id: Id6545033291539b862291eb88d6e8e85a24cb34c
This commit is contained in:
Shawn Pearce
2014-10-15 17:51:12 -07:00
parent 511cb0d5c0
commit c2535f6aa8
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
View File

@@ -2375,15 +2375,18 @@ public class ReceiveCommits {
private void autoCloseChanges(final ReceiveCommand cmd) throws NoSuchChangeException { private void autoCloseChanges(final ReceiveCommand cmd) throws NoSuchChangeException {
final RevWalk rw = rp.getRevWalk(); final RevWalk rw = rp.getRevWalk();
try { try {
RevCommit newTip = rw.parseCommit(cmd.getNewId());
Branch.NameKey branch =
new Branch.NameKey(project.getNameKey(), cmd.getRefName());
rw.reset(); rw.reset();
rw.markStart(rw.parseCommit(cmd.getNewId())); rw.markStart(newTip);
if (!ObjectId.zeroId().equals(cmd.getOldId())) { if (!ObjectId.zeroId().equals(cmd.getOldId())) {
rw.markUninteresting(rw.parseCommit(cmd.getOldId())); rw.markUninteresting(rw.parseCommit(cmd.getOldId()));
} }
final SetMultimap<ObjectId, Ref> byCommit = changeRefsById(); final SetMultimap<ObjectId, Ref> byCommit = changeRefsById();
final Map<Change.Key, Change.Id> byKey = openChangesByKey( final Map<Change.Key, Change.Id> byKey = openChangesByKey(branch);
new Branch.NameKey(project.getNameKey(), cmd.getRefName()));
final List<ReplaceRequest> toClose = new ArrayList<>(); final List<ReplaceRequest> toClose = new ArrayList<>();
for (RevCommit c; (c = rw.next()) != null;) { for (RevCommit c; (c = rw.next()) != null;) {
rw.parseBody(c); rw.parseBody(c);
@@ -2421,18 +2424,12 @@ public class ReceiveCommits {
} }
} }
// It handles gitlinks if required. // Update superproject gitlinks if required.
subOpFactory.create(
rw.reset(); branch, newTip, rw, repo, project,
final RevCommit codeReviewCommit = rw.parseCommit(cmd.getNewId()); new ArrayList<Change>(),
new HashMap<Change.Id, CodeReviewCommit>(),
final SubmoduleOp subOp = currentUser.getAccount()).update();
subOpFactory.create(
new Branch.NameKey(project.getNameKey(), cmd.getRefName()),
codeReviewCommit, rw, repo, project, new ArrayList<Change>(),
new HashMap<Change.Id, CodeReviewCommit>(),
currentUser.getAccount());
subOp.update();
} catch (InsertException e) { } catch (InsertException e) {
log.error("Can't insert patchset", e); log.error("Can't insert patchset", e);
} catch (IOException e) { } catch (IOException e) {