opendev/gerrit
Code Issues Proposed changes

Fix PUBLISH_ALL_REVISIONS in NoteDb

Browse Source 
There was a bug in the PUBLISH_ALL_REVISIONS case where we passed the
wrong PatchSet to PatchLineCommentsUtil.setCommentRevId, resulting in
saving comments on the wrong side. Add a checkArgument to
setCommentRevId that exposes this error, and fix it by passing the
right PatchSet object. This means we may have to look up additional
PatchSets for the change when writing to NoteDb. There is no way
around this: if we publish a comment for PS1 when posting a review
for PS2, we have not previously loaded PS1 to get the RevId, so we
need to do that now.

Test in CommentsIT for publishing comments on both sides
simultaneously.

Change-Id: Idbbc8d905a9e37ca6be9d45f8bddd0ca1fe0b248
This commit is contained in:
Dave Borowitz
2016-03-15 13:13:57 +01:00
parent 273ca99db0
commit dc86ab526e
6 changed files with 86 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java
View File

@@ -23,6 +23,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.auto.value.AutoValue;
import com.google.common.base.MoreObjects;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Ordering;
@@ -469,18 +470,15 @@ public class PostReview implements RestModifyView<RevisionResource, ReviewInput>
del.addAll(drafts.values());
break;
case PUBLISH:
case PUBLISH_ALL_REVISIONS:
for (PatchLineComment e : drafts.values()) {
e.setStatus(PatchLineComment.Status.PUBLISHED);
e.setWrittenOn(ctx.getWhen());
setCommentRevId(e, patchListCache, ctx.getChange(), ps);
ups.add(e);
ups.add(publishComment(ctx, e, ps));
}
break;
case PUBLISH_ALL_REVISIONS:
publishAllRevisions(ctx, drafts, ups);
break;
}
ChangeUpdate u = ctx.getUpdate(psId);
// TODO(dborowitz): Currently doesn't work for PUBLISH_ALL_REVISIONS with
// NoteDb.
plcUtil.deleteComments(ctx.getDb(), u, del);
plcUtil.putComments(ctx.getDb(), u, ups);
comments.addAll(ups);
@@ -526,6 +524,32 @@ public class PostReview implements RestModifyView<RevisionResource, ReviewInput>
return labels;
}
private PatchLineComment publishComment(ChangeContext ctx,
PatchLineComment c, PatchSet ps) throws OrmException {
c.setStatus(PatchLineComment.Status.PUBLISHED);
c.setWrittenOn(ctx.getWhen());
setCommentRevId(c, patchListCache, ctx.getChange(), checkNotNull(ps));
return c;
}
private void publishAllRevisions(ChangeContext ctx,
Map<String, PatchLineComment> drafts, List<PatchLineComment> ups)
throws OrmException {
boolean needOtherPatchSets = false;
for (PatchLineComment c : drafts.values()) {
if (!c.getPatchSetId().equals(psId)) {
needOtherPatchSets = true;
break;
}
}
Map<PatchSet.Id, PatchSet> patchSets = needOtherPatchSets
? psUtil.byChangeAsMap(ctx.getDb(), ctx.getNotes())
: ImmutableMap.of(psId, ps);
for (PatchLineComment e : drafts.values()) {
ups.add(publishComment(ctx, e, patchSets.get(e.getPatchSetId())));
}
}
private boolean updateLabels(ChangeContext ctx)
throws OrmException, ResourceConflictException {
Map<String, Short> inLabels = MoreObjects.firstNonNull(in.labels,