opendev/gerrit
Code Issues Proposed changes

MergeOp: Get rid of ChangeData.Factory

Browse Source 
Now that the change is reloaded early on, we don't need to construct
any new ChangeDatas, just keep using the ones from MergeSuperSet.

Change-Id: Id883e86effc42c91f90b9d630d93ef57f7d6fa45
This commit is contained in:
Dave Borowitz 2015-12-18 17:11:20 -05:00
parent 3010cd370b
commit 7c7643bb64
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
View File

@ -197,7 +197,6 @@ public class MergeOp implements AutoCloseable {
private final AccountCache accountCache;
private final ApprovalsUtil approvalsUtil;
private final ChangeControl.GenericFactory changeControlFactory;
private final ChangeData.Factory changeDataFactory;
private final ChangeHooks hooks;
private final ChangeIndexer indexer;
private final ChangeMessagesUtil cmUtil;
@ -239,7 +238,6 @@ public class MergeOp implements AutoCloseable {
MergeOp(AccountCache accountCache,
ApprovalsUtil approvalsUtil,
ChangeControl.GenericFactory changeControlFactory,
ChangeData.Factory changeDataFactory,
ChangeHooks hooks,
ChangeIndexer indexer,
ChangeMessagesUtil cmUtil,
@ -261,7 +259,6 @@ public class MergeOp implements AutoCloseable {
this.accountCache = accountCache;
this.approvalsUtil = approvalsUtil;
this.changeControlFactory = changeControlFactory;
this.changeDataFactory = changeDataFactory;
this.hooks = hooks;
this.indexer = indexer;
this.cmUtil = cmUtil;
@ -681,7 +678,7 @@ public class MergeOp implements AutoCloseable {
continue;
}
SubmitType st = getSubmitType(commit.getControl(), ps);
SubmitType st = getSubmitType(cd, ps);
if (st == null) {
logError("No submit type for revision " + idstr + " of patch set "
+ ps.getId());
@ -727,18 +724,17 @@ public class MergeOp implements AutoCloseable {
}
}
private SubmitType getSubmitType(ChangeControl ctl, PatchSet ps) {
private SubmitType getSubmitType(ChangeData cd, PatchSet ps) {
try {
ChangeData cd = changeDataFactory.create(db, ctl);
SubmitTypeRecord r = new SubmitRuleEvaluator(cd).setPatchSet(ps)
.getSubmitType();
if (r.status != SubmitTypeRecord.Status.OK) {
logError("Failed to get submit type for " + ctl.getChange().getKey());
logError("Failed to get submit type for " + cd.getId());
return null;
}
return r.type;
} catch (OrmException e) {
logError("Failed to get submit type for " + ctl.getChange().getKey(), e);
logError("Failed to get submit type for " + cd.getId(), e);
return null;
}
}