opendev/gerrit
Code Issues Proposed changes

Remove StoredValues.PATCH_SET

Browse Source 
Like the change, this can be inferred from the CHANGE_DATA. This
allows for lazy loading when the patch set is not needed by the submit
rules.

Change-Id: I8ca79803763d3ba6ed3344220f1df1e61758a3e3
This commit is contained in:
Dave Borowitz
2015-05-07 11:53:51 -07:00
parent a3ce3d212b
commit 3502456e3b
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gerrit-server/src/main/java/com/google/gerrit/rules/StoredValues.java
View File

@@ -50,7 +50,6 @@ import java.util.Map;
public final class StoredValues { public final class StoredValues {
public static final StoredValue<ReviewDb> REVIEW_DB = create(ReviewDb.class); public static final StoredValue<ReviewDb> REVIEW_DB = create(ReviewDb.class);
public static final StoredValue<ChangeData> CHANGE_DATA = create(ChangeData.class); public static final StoredValue<ChangeData> CHANGE_DATA = create(ChangeData.class);
public static final StoredValue<PatchSet> PATCH_SET = create(PatchSet.class);
// Note: no guarantees are made about the user passed in the ChangeControl; do // Note: no guarantees are made about the user passed in the ChangeControl; do
// not depend on this directly. Either use .forUser(otherUser) to get a // not depend on this directly. Either use .forUser(otherUser) to get a
@@ -68,11 +67,20 @@ public final class StoredValues {
} }
} }
public static PatchSet getPatchSet(Prolog engine) throws SystemException {
ChangeData cd = CHANGE_DATA.get(engine);
try {
return cd.currentPatchSet();
} catch (OrmException e) {
throw new SystemException(e.getMessage());
}
}
public static final StoredValue<PatchSetInfo> PATCH_SET_INFO = new StoredValue<PatchSetInfo>() { public static final StoredValue<PatchSetInfo> PATCH_SET_INFO = new StoredValue<PatchSetInfo>() {
@Override @Override
public PatchSetInfo createValue(Prolog engine) { public PatchSetInfo createValue(Prolog engine) {
Change change = getChange(engine); Change change = getChange(engine);
PatchSet ps = StoredValues.PATCH_SET.get(engine); PatchSet ps = getPatchSet(engine);
PrologEnvironment env = (PrologEnvironment) engine.control; PrologEnvironment env = (PrologEnvironment) engine.control;
PatchSetInfoFactory patchInfoFactory = PatchSetInfoFactory patchInfoFactory =
env.getArgs().getPatchSetInfoFactory(); env.getArgs().getPatchSetInfoFactory();
@@ -88,7 +96,7 @@ public final class StoredValues {
@Override @Override
public PatchList createValue(Prolog engine) { public PatchList createValue(Prolog engine) {
PrologEnvironment env = (PrologEnvironment) engine.control; PrologEnvironment env = (PrologEnvironment) engine.control;
PatchSet ps = StoredValues.PATCH_SET.get(engine); PatchSet ps = getPatchSet(engine);
PatchListCache plCache = env.getArgs().getPatchListCache(); PatchListCache plCache = env.getArgs().getPatchListCache();
Change change = getChange(engine); Change change = getChange(engine);
Project.NameKey projectKey = change.getProject(); Project.NameKey projectKey = change.getProject();

1
gerrit-server/src/main/java/com/google/gerrit/server/project/SubmitRuleEvaluator.java
View File

@@ -526,7 +526,6 @@ public class SubmitRuleEvaluator {
} }
env.set(StoredValues.REVIEW_DB, cd.db()); env.set(StoredValues.REVIEW_DB, cd.db());
env.set(StoredValues.CHANGE_DATA, cd); env.set(StoredValues.CHANGE_DATA, cd);
env.set(StoredValues.PATCH_SET, patchSet);
env.set(StoredValues.CHANGE_CONTROL, control); env.set(StoredValues.CHANGE_CONTROL, control);
if (user != null) { if (user != null) {
env.set(StoredValues.CURRENT_USER, user); env.set(StoredValues.CURRENT_USER, user);