opendev/gerrit
Code Issues Proposed changes

ChangeBundle: Be more lenient about reviewers

Browse Source 
The computation in ReviewerSet#fromApprovals doesn't really do the
right thing when there are multiple zero and non-zero labels and the
input list isn't sorted. This is a different thing from what
ChangeNotesParser does, which always takes the latest state for a user
regardless of whether there are other states earlier in the series.

We don't distinguish REVIEWER/CC in the UI, so being slightly lossy is
not likely to be noticeable.

Change-Id: I8b8409742a01f53f4d10a363e36bd4d5bb724ed2
This commit is contained in:
Dave Borowitz
2016-05-27 20:55:58 -04:00
parent 8b98f0c651
commit 71f8f8dbb4
2 changed files with 22 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeBundleTest.java
View File

@@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
import static com.google.gerrit.common.TimeUtil.roundToSecond;
import static com.google.gerrit.server.notedb.ChangeBundle.Source.NOTE_DB;
import static com.google.gerrit.server.notedb.ChangeBundle.Source.REVIEW_DB;
import static com.google.gerrit.server.notedb.ReviewerStateInternal.CC;
import static com.google.gerrit.server.notedb.ReviewerStateInternal.REVIEWER;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
@@ -1055,7 +1056,7 @@ public class ChangeBundleTest {
}
@Test
public void diffReviewerKeySets() throws Exception {
public void diffReviewers() throws Exception {
Change c = TestChanges.newChange(project, accountId);
Timestamp now = TimeUtil.nowTs();
ReviewerSet r1 = reviewers(REVIEWER, new Account.Id(1), now);
@@ -1068,67 +1069,23 @@ public class ChangeBundleTest {
assertNoDiffs(b1, b1);
assertNoDiffs(b2, b2);
assertDiffs(b1, b2,
"ReviewerKey sets differ:"
+ " [REVIEWER,1] only in A;"
+ " [REVIEWER,2] only in B");
"reviewer sets differ:"
+ " [1] only in A;"
+ " [2] only in B");
}
@Test
public void diffReviewerTimestamps() throws Exception {
public void diffReviewersIgnoresStateAndTimestamp() throws Exception {
Change c = TestChanges.newChange(project, accountId);
ReviewerSet r1 = reviewers(REVIEWER, new Account.Id(1), TimeUtil.nowTs());
ReviewerSet r2 = reviewers(REVIEWER, new Account.Id(1), TimeUtil.nowTs());
ReviewerSet r2 = reviewers(CC, new Account.Id(1), TimeUtil.nowTs());
ChangeBundle b1 = new ChangeBundle(c, messages(), latest(c), approvals(),
comments(), r1, REVIEW_DB);
ChangeBundle b2 = new ChangeBundle(c, messages(), latest(c), approvals(),
comments(), r2, REVIEW_DB);
assertDiffs(b1, b2,
"timestamp differs for ReviewerKey REVIEWER,1:"
+ " {2009-09-30 17:00:06.0} != {2009-09-30 17:00:12.0}");
b1 = new ChangeBundle(c, messages(), latest(c), approvals(), comments(), r1,
REVIEW_DB);
b2 = new ChangeBundle(c, messages(), latest(c), approvals(), comments(), r2,
NOTE_DB);
assertDiffs(b1, b2,
"timestamp differs for ReviewerKey REVIEWER,1 in NoteDb vs. ReviewDb:"
+ " {2009-09-30 17:00:12.0} != {2009-09-30 17:00:06.0}");
}
@Test
public void diffReviewerTimestampsAllowsSlop() throws Exception {
subWindowResolution();
Change c = TestChanges.newChange(project, accountId);
ReviewerSet r1 = reviewers(REVIEWER, new Account.Id(1), TimeUtil.nowTs());
ReviewerSet r2 = reviewers(REVIEWER, new Account.Id(1), TimeUtil.nowTs());
// Both are ReviewDb, exact timestamp match is required.
ChangeBundle b1 = new ChangeBundle(c, messages(), latest(c), approvals(),
comments(), r1, REVIEW_DB);
ChangeBundle b2 = new ChangeBundle(c, messages(), latest(c), approvals(),
comments(), r2, REVIEW_DB);
assertDiffs(b1, b2,
"timestamp differs for ReviewerKey REVIEWER,1:"
+ " {2009-09-30 17:00:02.0} != {2009-09-30 17:00:03.0}");
// One NoteDb, slop is allowed
b1 = new ChangeBundle(c, messages(), latest(c), approvals(), comments(), r1,
NOTE_DB);
b2 = new ChangeBundle(c, messages(), latest(c), approvals(), comments(), r2,
REVIEW_DB);
assertNoDiffs(b1, b2);
// But not too much slop.
superWindowResolution();
ReviewerSet r3 = reviewers(REVIEWER, new Account.Id(1), TimeUtil.nowTs());
b1 = new ChangeBundle(c, messages(), latest(c), approvals(), comments(), r1,
NOTE_DB);
ChangeBundle b3 = new ChangeBundle(c, messages(), latest(c), approvals(),
comments(), r3, REVIEW_DB);
assertDiffs(b1, b3,
"timestamp differs for ReviewerKey REVIEWER,1 in NoteDb vs. ReviewDb:"
+ " {2009-09-30 17:00:02.0} != {2009-09-30 17:00:10.0}");
assertNoDiffs(b1, b1);
assertNoDiffs(b2, b2);
}
@Test