opendev/gerrit
Code Issues Proposed changes

Make the GroupCache available to client side code

Browse Source 
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2009-01-05 17:15:53 -08:00
parent 5089d3175d
commit 800cad53c9
7 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
appjar/src/main/java/com/google/gerrit/server/ChangeDetailServiceSrv.java
View File

@@ -20,6 +20,7 @@ import com.google.gerrit.client.changes.ChangeDetailServiceImpl;
public class ChangeDetailServiceSrv extends GerritJsonServlet {
@Override
protected Object createServiceHandle() throws Exception {
return new ChangeDetailServiceImpl(GerritServer.getInstance().getDatabase());
final GerritServer gs = GerritServer.getInstance();
return new ChangeDetailServiceImpl(gs.getDatabase(), gs.getGroupCache());
}
}

1
appjar/src/main/java/com/google/gerrit/server/GerritServer.java
View File

@@ -17,6 +17,7 @@ package com.google.gerrit.server;
import com.google.gerrit.client.data.ApprovalType;
import com.google.gerrit.client.data.GerritConfig;
import com.google.gerrit.client.data.GitwebLink;
import com.google.gerrit.client.data.GroupCache;
import com.google.gerrit.client.reviewdb.AccountGroup;
import com.google.gerrit.client.reviewdb.ApprovalCategory;
import com.google.gerrit.client.reviewdb.ApprovalCategoryValue;

1
appjar/src/main/java/com/google/gerrit/server/GroupAdminServiceImpl.java
View File

@@ -17,6 +17,7 @@ package com.google.gerrit.server;
import com.google.gerrit.client.admin.AccountGroupDetail;
import com.google.gerrit.client.admin.GroupAdminService;
import com.google.gerrit.client.data.AccountInfoCacheFactory;
import com.google.gerrit.client.data.GroupCache;
import com.google.gerrit.client.reviewdb.Account;
import com.google.gerrit.client.reviewdb.AccountGroup;
import com.google.gerrit.client.reviewdb.AccountGroupMember;

203
appjar/src/main/java/com/google/gerrit/server/GroupCache.java
View File

@@ -1,203 +0,0 @@
// Copyright 2008 Google Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.server;
import com.google.gerrit.client.reviewdb.Account;
import com.google.gerrit.client.reviewdb.AccountGroup;
import com.google.gerrit.client.reviewdb.AccountGroupMember;
import com.google.gerrit.client.reviewdb.ReviewDb;
import com.google.gerrit.client.reviewdb.SystemConfig;
import com.google.gwtorm.client.OrmException;
import com.google.gwtorm.client.SchemaFactory;
import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
/** Cache of group information, including account memberships. */
public class GroupCache {
private final SchemaFactory<ReviewDb> schema;
private AccountGroup.Id adminGroupId;
private AccountGroup.Id anonymousGroupId;
private AccountGroup.Id registeredGroupId;
private final LinkedHashMap<Account.Id, Set<AccountGroup.Id>> byAccount =
new LinkedHashMap<Account.Id, Set<AccountGroup.Id>>(16, 0.75f, true) {
@Override
protected boolean removeEldestEntry(
final Map.Entry<Account.Id, Set<AccountGroup.Id>> eldest) {
return 4096 <= size();
}
};
protected GroupCache(final SchemaFactory<ReviewDb> rdf, final SystemConfig cfg) {
schema = rdf;
adminGroupId = cfg.adminGroupId;
anonymousGroupId = cfg.anonymousGroupId;
registeredGroupId = cfg.registeredGroupId;
}
/**
* Is this group membership managed automatically by Gerrit?
*
* @param groupId the group to test.
* @return true if Gerrit handles this group membership automatically; false
* if it can be manually managed.
*/
public boolean isAutoGroup(final AccountGroup.Id groupId) {
return isAnonymousUsers(groupId) || isRegisteredUsers(groupId);
}
/**
* Does this group designate the magical 'Anonymous Users' group?
*
* @param groupId the group to test.
* @return true if this is the magical 'Anonymous' group; false otherwise.
*/
public boolean isAnonymousUsers(final AccountGroup.Id groupId) {
return anonymousGroupId.equals(groupId);
}
/**
* Does this group designate the magical 'Registered Users' group?
*
* @param groupId the group to test.
* @return true if this is the magical 'Registered' group; false otherwise.
*/
public boolean isRegisteredUsers(final AccountGroup.Id groupId) {
return registeredGroupId.equals(groupId);
}
/**
* Determine if the user is a member of the blessed administrator group.
*
* @param accountId the account to test for membership.
* @return true if the account is in the special blessed administration group;
* false otherwise.
*/
public boolean isAdministrator(final Account.Id accountId) {
return isInGroup(accountId, adminGroupId);
}
/**
* Determine if the user is a member of a specific group.
*
* @param accountId the account to test for membership.
* @param groupId the group to test for membership within.
* @return true if the account is in the group; false otherwise.
*/
public boolean isInGroup(final Account.Id accountId,
final AccountGroup.Id groupId) {
if (isAnonymousUsers(groupId) || isRegisteredUsers(groupId)) {
return true;
}
return getGroups(accountId).contains(groupId);
}
/**
* Invalidate all cached information about a single user account.
*
* @param accountId the account to invalidate from the cache.
*/
public void invalidate(final Account.Id accountId) {
synchronized (byAccount) {
byAccount.remove(accountId);
}
}
/**
* Notify the cache that an account has become a member of a group.
*
* @param m the account-group pairing that was just inserted.
*/
public void notifyGroupAdd(final AccountGroupMember m) {
if (isAutoGroup(m.getAccountGroupId())) {
return;
}
synchronized (byAccount) {
final Set<AccountGroup.Id> e = byAccount.get(m.getAccountId());
if (e != null) {
final Set<AccountGroup.Id> n = new HashSet<AccountGroup.Id>(e);
n.add(m.getAccountGroupId());
byAccount.put(m.getAccountId(), Collections.unmodifiableSet(n));
}
}
}
/**
* Notify the cache that an account has been removed from a group.
*
* @param m the account-group pairing that was just deleted.
*/
public void notifyGroupDelete(final AccountGroupMember m) {
if (isAutoGroup(m.getAccountGroupId())) {
return;
}
synchronized (byAccount) {
final Set<AccountGroup.Id> e = byAccount.get(m.getAccountId());
if (e != null) {
final Set<AccountGroup.Id> n = new HashSet<AccountGroup.Id>(e);
n.remove(m.getAccountGroupId());
byAccount.put(m.getAccountId(), Collections.unmodifiableSet(n));
}
}
}
/**
* Get the groups a specific account is a member of.
*
* @param accountId the account to obtain the group list for.
* @return unmodifiable set listing the groups the account is a member of.
*/
public Set<AccountGroup.Id> getGroups(final Account.Id accountId) {
Set<AccountGroup.Id> m;
synchronized (byAccount) {
m = byAccount.get(accountId);
}
if (m != null) {
return m;
}
m = new HashSet<AccountGroup.Id>();
try {
final ReviewDb db = schema.open();
try {
for (final AccountGroupMember g : db.accountGroupMembers().byAccount(
accountId)) {
m.add(g.getAccountGroupId());
}
} finally {
db.close();
}
} catch (OrmException e) {
m.clear();
}
m.add(anonymousGroupId);
m.add(registeredGroupId);
synchronized (byAccount) {
byAccount.put(accountId, Collections.unmodifiableSet(m));
}
return m;
}
/** Force the entire group cache to flush from memory and recompute. */
public void flush() {
synchronized (byAccount) {
byAccount.clear();
}
}
}

1
appjar/src/main/java/com/google/gerrit/server/ProjectAdminServiceImpl.java
View File

@@ -16,6 +16,7 @@ package com.google.gerrit.server;
import com.google.gerrit.client.admin.ProjectAdminService;
import com.google.gerrit.client.admin.ProjectDetail;
import com.google.gerrit.client.data.GroupCache;
import com.google.gerrit.client.reviewdb.Account;
import com.google.gerrit.client.reviewdb.AccountGroup;
import com.google.gerrit.client.reviewdb.ApprovalCategory;

2
appjar/src/main/java/com/google/gerrit/server/ssh/AdminFlushGroupCache.java
View File

@@ -14,7 +14,7 @@
package com.google.gerrit.server.ssh;
import com.google.gerrit.server.GroupCache;
import com.google.gerrit.client.data.GroupCache;
/** Causes the {@link GroupCache} to purge all entries and reload. */
class AdminFlushGroupCache extends AbstractCommand {