opendev/gerrit
Code Issues Proposed changes

Replace calls of ChangeNotes#getChange()

Browse Source 
In future a change from ChangeNotes is only available after the notes
have been loaded, but project and change ID are known before. Avoid
calling getChange() when only project and change ID are required so
that loading the notes is not required in this case.

Change-Id: I172d94e9550c28797f0a7a6b20c4b4bc64e9dbfc
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2016-01-29 14:59:33 +01:00
parent 416dd77400
commit 0c133c550d
7 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java
View File

@@ -903,7 +903,7 @@ public class ChangeHookRunner implements ChangeHooks, EventDispatcher,
@Override
public PatchSetAttribute get() {
try (Repository repo =
repoManager.openRepository(notes.getChange().getProject());
repoManager.openRepository(notes.getProjectName());
RevWalk revWalk = new RevWalk(repo)) {
return eventFactory.asPatchSetAttribute(
revWalk, notes, patchSet);

4
gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java
View File

@@ -213,7 +213,7 @@ public class ChangeUtil {
}
Change changeToRevert = db.get().changes().get(changeIdToRevert);
Project.NameKey project = ctl.getChange().getProject();
Project.NameKey project = ctl.getProject().getNameKey();
try (Repository git = gitManager.openRepository(project);
RevWalk revWalk = new RevWalk(git)) {
RevCommit commitToRevert =
@@ -309,7 +309,7 @@ public class ChangeUtil {
}
try (Repository git =
gitManager.openRepository(notes.getChange().getProject());
gitManager.openRepository(notes.getProjectName());
RevWalk revWalk = new RevWalk(git)) {
RevCommit commit = revWalk.parseCommit(
ObjectId.fromString(ps.getRevision().get()));

6
gerrit-server/src/main/java/com/google/gerrit/server/change/Abandon.java
View File

@@ -96,10 +96,10 @@ public class Abandon implements RestModifyView<ChangeResource, AbandonInput>,
final String msgTxt, final Account account)
throws RestApiException, UpdateException {
Op op = new Op(msgTxt, account);
Change c = control.getChange();
try (BatchUpdate u = batchUpdateFactory.create(dbProvider.get(),
c.getProject(), control.getUser(), TimeUtil.nowTs())) {
u.addOp(c.getId(), op).execute();
control.getProject().getNameKey(), control.getUser(),
TimeUtil.nowTs())) {
u.addOp(control.getId(), op).execute();
}
return op.change;
}

2
gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
View File

@@ -967,7 +967,7 @@ public class ChangeJson {
CommitInfo toCommit(ChangeControl ctl, RevWalk rw, RevCommit commit,
boolean addLinks) throws IOException {
Project.NameKey project = ctl.getChange().getProject();
Project.NameKey project = ctl.getProject().getNameKey();
CommitInfo info = new CommitInfo();
info.parents = new ArrayList<>(commit.getParentCount());
info.author = toGitPerson(commit.getAuthorIdent());

2
gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeUpdate.java
View File

@@ -160,7 +160,7 @@ public class ChangeUpdate extends AbstractChangeUpdate {
}
private static Project.NameKey getProjectName(ChangeControl ctl) {
return ctl.getChange().getDest().getParentKey();
return ctl.getProject().getNameKey();
}
@AssistedInject

1
gerrit-server/src/test/java/com/google/gerrit/testutil/TestChanges.java
View File

@@ -137,6 +137,7 @@ public class TestChanges {
IdentifiedUser user) throws OrmException {
ChangeControl ctl = EasyMock.createMock(ChangeControl.class);
expect(ctl.getChange()).andStubReturn(c);
expect(ctl.getProject()).andStubReturn(new Project(c.getProject()));
expect(ctl.getUser()).andStubReturn(user);
ChangeNotes notes = new ChangeNotes(repoManager, migration, allUsers, c)
.load();

8
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetReviewersCommand.java
View File

@@ -18,6 +18,7 @@ import com.google.gerrit.extensions.api.changes.AddReviewerInput;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.ChangeUtil;
import com.google.gerrit.server.CurrentUser;
@@ -167,8 +168,7 @@ public class SetReviewersCommand extends SshCommand {
changeUtil.findChanges(id, userProvider.get());
List<ChangeControl> toAdd = new ArrayList<>(changes.size());
for (ChangeControl ctl : matched) {
Change c = ctl.getChange();
if (!changes.containsKey(c.getId()) && inProject(c)
if (!changes.containsKey(ctl.getId()) && inProject(ctl.getProject())
&& ctl.isVisible(db)) {
toAdd.add(ctl);
}
@@ -187,9 +187,9 @@ public class SetReviewersCommand extends SshCommand {
}
}
private boolean inProject(Change change) {
private boolean inProject(Project project) {
if (projectControl != null) {
return projectControl.getProject().getNameKey().equals(change.getProject());
return projectControl.getProject().getNameKey().equals(project.getNameKey());
} else {
// No --project option, so they want every project.
return true;