opendev/gerrit
Code Issues Proposed changes

Merge changes from topics 'mergeop', 'mergeop-prep'

Browse Source 
* changes:
  Rewrite MergeOp to use BatchUpdate
  BatchUpdate: Eagerly load ChangeNotes
  MergeOp: Record when submit rules were bypassed
  BatchUpdate: Always bump lastUpdatedOn
  BatchUpdate: Don't update change if there was nothing to do
This commit is contained in:
Dave Borowitz
2016-01-21 18:45:43 +00:00
committed by Gerrit Code Review
parent 324fd5f3af 8fac6e1cbf
commit 1804db24f9
35 changed files with 1051 additions and 993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
View File

@@ -287,7 +287,7 @@ public class ChangeInserter extends BatchUpdate.InsertChangeOp {
}
@Override
public void updateChange(ChangeContext ctx) throws OrmException, IOException {
public boolean updateChange(ChangeContext ctx) throws OrmException, IOException {
change = ctx.getChange(); // Use defensive copy created by ChangeControl.
ReviewDb db = ctx.getDb();
ChangeControl ctl = ctx.getControl();
@@ -330,6 +330,7 @@ public class ChangeInserter extends BatchUpdate.InsertChangeOp {
changeMessage.setMessage(message);
cmUtil.addChangeMessage(db, update, changeMessage);
}
return true;
}
@Override