opendev/gerrit
Code Issues Proposed changes

Include groups with duplicate UUIDs when listing all groups

Browse Source 
All code paths which eventually call GroupNameNotes#loadAllGroups don't
care whether groups with duplicated UUIDs are cleaned up in the list of
all groups or not. They are robust enough to work either way.

There are both arguments for cleaning them up and not doing so. As not
cleaning them up might be a bit more robust in the long term and also
helps to concentrate the logic regarding how to read the notes written
by GroupNameNotes more within GroupNameNotes, we now hand out all known
groups irrespective of their UUID.

Change-Id: Idd8e6d4420ad254a378388fdd66eedae0a51ffed
This commit is contained in:
Alice Kober-Sotzek
2018-01-12 10:12:08 +01:00
parent f62506f3fc
commit cbae08edf8
6 changed files with 27 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
javatests/com/google/gerrit/server/group/db/GroupNameNotesTest.java
View File

@@ -23,7 +23,6 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import static org.eclipse.jgit.lib.Constants.OBJ_BLOB;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.gerrit.common.TimeUtil;
import com.google.gerrit.common.data.GroupReference;
import com.google.gerrit.common.data.testing.GroupReferenceSubject;
@@ -364,7 +363,7 @@ public class GroupNameNotesTest {
@Test
public void nonExistentNotesRefIsEquivalentToNotAnyExistingGroups() throws Exception {
ImmutableSet<GroupReference> allGroups = GroupNameNotes.loadAllGroupReferences(repo);
ImmutableList<GroupReference> allGroups = GroupNameNotes.loadAllGroups(repo);
assertThat(allGroups).isEmpty();
}
@@ -378,7 +377,7 @@ public class GroupNameNotesTest {
AccountGroup.NameKey groupName2 = new AccountGroup.NameKey("admins");
createGroup(groupUuid2, groupName2);
ImmutableSet<GroupReference> allGroups = GroupNameNotes.loadAllGroupReferences(repo);
ImmutableList<GroupReference> allGroups = GroupNameNotes.loadAllGroups(repo);
GroupReference group1 = new GroupReference(groupUuid1, groupName1.get());
GroupReference group2 = new GroupReference(groupUuid2, groupName2.get());
@@ -386,16 +385,16 @@ public class GroupNameNotesTest {
}
@Test
public void loadedGroupsContainOnlyOneGroupPerUuid() throws Exception {
public void loadedGroupsContainGroupsWithDuplicateGroupUuids() throws Exception {
createGroup(groupUuid, groupName);
AccountGroup.NameKey anotherGroupName = new AccountGroup.NameKey("admins");
createGroup(groupUuid, anotherGroupName);
ImmutableSet<GroupReference> allGroups = GroupNameNotes.loadAllGroupReferences(repo);
ImmutableList<GroupReference> allGroups = GroupNameNotes.loadAllGroups(repo);
GroupReference group1 = new GroupReference(groupUuid, groupName.get());
GroupReference group2 = new GroupReference(groupUuid, anotherGroupName.get());
assertThat(allGroups).isAnyOf(ImmutableSet.of(group1), ImmutableSet.of(group2));
assertThat(allGroups).containsExactly(group1, group2);
}
@Test
@@ -413,7 +412,7 @@ public class GroupNameNotesTest {
assertThat(log.get(0)).author().matches(ident);
assertThat(log.get(0)).committer().matches(ident);
assertThat(GroupTestUtil.readNameToUuidMap(repo)).containsExactly("a", "a-1", "b", "b-2");
assertThat(GroupNameNotes.loadAllGroups(repo)).containsExactly(g1, g2);
// Updating the same set of names is a no-op.
String commit = log.get(0).commit;
@@ -448,7 +447,7 @@ public class GroupNameNotesTest {
ident = newPersonIdent();
updateGroupNames(ident, g1, g2);
assertThat(GroupTestUtil.readNameToUuidMap(repo)).containsExactly("a", "a-1", "b", "b-2");
assertThat(GroupNameNotes.loadAllGroups(repo)).containsExactly(g1, g2);
ImmutableList<CommitInfo> log = log();
assertThat(log).hasSize(2);
@@ -470,11 +469,11 @@ public class GroupNameNotesTest {
PersonIdent ident = newPersonIdent();
updateGroupNames(ident, g1, g2);
assertThat(GroupTestUtil.readNameToUuidMap(repo)).containsExactly("a", "a-1", "b", "b-2");
assertThat(GroupNameNotes.loadAllGroups(repo)).containsExactly(g1, g2);
updateGroupNames(ident);
assertThat(GroupTestUtil.readNameToUuidMap(repo)).isEmpty();
assertThat(GroupNameNotes.loadAllGroups(repo)).isEmpty();
ImmutableList<CommitInfo> log = log();
assertThat(log).hasSize(2);
@@ -499,7 +498,7 @@ public class GroupNameNotesTest {
GroupReference g = newGroup("");
updateGroupNames(newPersonIdent(), g);
assertThat(GroupTestUtil.readNameToUuidMap(repo)).containsExactly("", "-1");
assertThat(GroupNameNotes.loadAllGroups(repo)).containsExactly(g);
assertThat(readNameNote(g)).isEqualTo("[group]\n\tuuid = -1\n\tname = \n");
}

4
javatests/com/google/gerrit/server/group/db/GroupRebuilderTest.java
View File

@@ -552,7 +552,9 @@ public class GroupRebuilderTest extends AbstractGroupTest {
assertMigratedCleanly(reload(g1), b1);
assertMigratedCleanly(reload(g2), b2);
assertThat(GroupTestUtil.readNameToUuidMap(repo)).containsExactly("a", "a-1", "b", "b-2");
GroupReference group1 = GroupReference.forGroup(g1);
GroupReference group2 = GroupReference.forGroup(g2);
assertThat(GroupNameNotes.loadAllGroups(repo)).containsExactly(group1, group2);
}
@Test