opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.6'

Browse Source 
* stable-2.6:
  Avoid validating valid commits two times in ReceiveCommits.
This commit is contained in:
Shawn Pearce
2013-04-23 09:39:52 -07:00
parent 756546f4fb 98c89249c5
commit b9a6880d92
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -276,6 +276,7 @@ public class ReceiveCommits {
new HashMap<Change.Id, ReplaceRequest>(); new HashMap<Change.Id, ReplaceRequest>();
private final Map<RevCommit, ReplaceRequest> replaceByCommit = private final Map<RevCommit, ReplaceRequest> replaceByCommit =
new HashMap<RevCommit, ReplaceRequest>(); new HashMap<RevCommit, ReplaceRequest>();
private final Set<RevCommit> validCommits = new HashSet<RevCommit>();
private Map<ObjectId, Ref> refsById; private Map<ObjectId, Ref> refsById;
private Map<String, Ref> allRefs; private Map<String, Ref> allRefs;
@@ -2037,6 +2038,10 @@ public class ReceiveCommits {
private boolean validCommit(final RefControl ctl, final ReceiveCommand cmd, private boolean validCommit(final RefControl ctl, final ReceiveCommand cmd,
final RevCommit c) throws MissingObjectException, IOException { final RevCommit c) throws MissingObjectException, IOException {
if (validCommits.contains(c)) {
return true;
}
CommitReceivedEvent receiveEvent = CommitReceivedEvent receiveEvent =
new CommitReceivedEvent(cmd, project, ctl.getRefName(), c, currentUser); new CommitReceivedEvent(cmd, project, ctl.getRefName(), c, currentUser);
CommitValidators commitValidators = CommitValidators commitValidators =
@@ -2049,6 +2054,7 @@ public class ReceiveCommits {
reject(cmd, e.getMessage()); reject(cmd, e.getMessage());
return false; return false;
} }
validCommits.add(c);
return true; return true;
} }