opendev/gerrit
Code Issues Proposed changes

Merge changes from topic "add-members-subgroups-to-group-index"

Browse Source 
* changes:
  Add fields for members and subgroups to the group index
  Use the term 'subgroup' instead of 'includes' where possible
  Avoid unnecessary loading of members and subgroups
  Cache instances of type InternalGroup instead of AccountGroup by UUID
  Base group index on new class InternalGroup
This commit is contained in:
Alice Kober-Sotzek
2017-09-14 08:48:43 +00:00
committed by Gerrit Code Review
parent 7f98ad6c63 498e592c3e
commit 766781b0d0
58 changed files with 910 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
View File

@@ -92,6 +92,7 @@ import com.google.gerrit.server.config.PluginConfigFactory;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.git.MetaDataUpdate;
import com.google.gerrit.server.git.ProjectConfig;
import com.google.gerrit.server.group.InternalGroup;
import com.google.gerrit.server.group.SystemGroupBackend;
import com.google.gerrit.server.index.change.ChangeIndex;
import com.google.gerrit.server.index.change.ChangeIndexCollection;
@@ -352,7 +353,7 @@ public abstract class AbstractDaemonTest {
// removes all indexed data.
// As a workaround, we simply reindex all available groups here.
for (AccountGroup group : groupCache.all()) {
groupCache.evict(group);
groupCache.evict(group.getGroupUUID(), group.getId(), group.getNameKey());
}
admin = accountCreator.admin();
@@ -1178,8 +1179,9 @@ public abstract class AbstractDaemonTest {
String g = createGroup("cla-test-group");
GroupApi groupApi = gApi.groups().id(g);
groupApi.description("CLA test group");
AccountGroup caGroup = groupCache.get(new AccountGroup.UUID(groupApi.detail().id));
GroupReference groupRef = GroupReference.forGroup(caGroup);
InternalGroup caGroup =
groupCache.get(new AccountGroup.UUID(groupApi.detail().id)).orElse(null);
GroupReference groupRef = new GroupReference(caGroup.getGroupUUID(), caGroup.getName());
PermissionRule rule = new PermissionRule(groupRef);
rule.setAction(PermissionRule.Action.ALLOW);
ca = new ContributorAgreement("cla-test");