opendev/gerrit
Code Issues Proposed changes

Merge "NoteDbUpdateManager: Remove code/change repo distinction"

Browse Source
This commit is contained in:
Edwin Kempin
2016-04-12 06:11:43 +00:00
committed by Gerrit Code Review
parent 3ee6147d54 c2c6a0da44
commit 60b0982e85
2 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,7 +192,7 @@ public class ChangeRebuilderImpl extends ChangeRebuilder {
deleteRef(change, changeMetaRepo, manager.getChangeRepo().cmds); deleteRef(change, changeMetaRepo, manager.getChangeRepo().cmds);
for (PatchSet ps : bundle.getPatchSets()) { for (PatchSet ps : bundle.getPatchSets()) {
events.add(new PatchSetEvent(change, ps, manager.getCodeRepo().rw)); events.add(new PatchSetEvent(change, ps, manager.getChangeRepo().rw));
for (PatchLineComment c : getPatchLineComments(bundle, ps)) { for (PatchLineComment c : getPatchLineComments(bundle, ps)) {
PatchLineCommentEvent e = PatchLineCommentEvent e =
new PatchLineCommentEvent(c, change, ps, patchListCache); new PatchLineCommentEvent(c, change, ps, patchListCache);

18
gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java
View File

@@ -104,7 +104,6 @@ public class NoteDbUpdateManager {
private final ListMultimap<String, ChangeUpdate> changeUpdates; private final ListMultimap<String, ChangeUpdate> changeUpdates;
private final ListMultimap<String, ChangeDraftUpdate> draftUpdates; private final ListMultimap<String, ChangeDraftUpdate> draftUpdates;
private OpenRepo codeRepo;
private OpenRepo changeRepo; private OpenRepo changeRepo;
private OpenRepo allUsersRepo; private OpenRepo allUsersRepo;
private Map<Change.Id, NoteDbChangeState.Delta> staged; private Map<Change.Id, NoteDbChangeState.Delta> staged;
@@ -131,12 +130,6 @@ public class NoteDbUpdateManager {
return this; return this;
} }
public NoteDbUpdateManager setCodeRepo(Repository repo, RevWalk rw) {
checkState(codeRepo == null, "code repo already initialized");
codeRepo = new OpenRepo(repo, rw, null, null, false);
return this;
}
public NoteDbUpdateManager setAllUsersRepo(Repository repo, RevWalk rw, public NoteDbUpdateManager setAllUsersRepo(Repository repo, RevWalk rw,
ObjectInserter ins, ChainedReceiveCommands cmds) { ObjectInserter ins, ChainedReceiveCommands cmds) {
checkState(allUsersRepo == null, "All-Users repo already initialized"); checkState(allUsersRepo == null, "All-Users repo already initialized");
@@ -149,22 +142,11 @@ public class NoteDbUpdateManager {
return changeRepo; return changeRepo;
} }
OpenRepo getCodeRepo() throws IOException {
initCodeRepo();
return codeRepo;
}
OpenRepo getAllUsersRepo() throws IOException { OpenRepo getAllUsersRepo() throws IOException {
initAllUsersRepo(); initAllUsersRepo();
return allUsersRepo; return allUsersRepo;
} }
private void initCodeRepo() throws IOException {
if (codeRepo == null) {
codeRepo = openRepo(projectName);
}
}
private void initChangeRepo() throws IOException { private void initChangeRepo() throws IOException {
if (changeRepo == null) { if (changeRepo == null) {
changeRepo = openRepo(projectName); changeRepo = openRepo(projectName);