inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

SAIL-373 (SAIL-294): Enable shared cache for ACLEntity

Browse Source 
- Used by PermissionService.hasPermission
 - ACLCrudDAO cache names match bean names


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20931 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-07-05 11:46:40 +00:00
parent 5ad8b75240
commit a6426f716f
3 changed files with 38 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/alfresco/cache-context.xml
View File

@@ -728,9 +728,6 @@
<!-- The cross-transaction shared cache for ACL entities --> <!-- The cross-transaction shared cache for ACL entities -->
<bean name="aclEntitySharedCache" class="org.alfresco.repo.cache.NullCache"/>
<!--
<bean name="aclEntitySharedCache" class="org.alfresco.repo.cache.EhCacheAdapter"> <bean name="aclEntitySharedCache" class="org.alfresco.repo.cache.EhCacheAdapter">
<property name="cache"> <property name="cache">
<bean class="org.springframework.cache.ehcache.EhCacheFactoryBean" > <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean" >
@@ -743,7 +740,6 @@
</bean> </bean>
</property> </property>
</bean> </bean>
-->
<!-- The transactional cache for ACL entities --> <!-- The transactional cache for ACL entities -->

6
config/alfresco/dao/dao-context.xml
View File

@@ -225,9 +225,9 @@
<bean id="aclCrudDAO" class="org.alfresco.repo.domain.permissions.ibatis.AclCrudDAOImpl"> <bean id="aclCrudDAO" class="org.alfresco.repo.domain.permissions.ibatis.AclCrudDAOImpl">
<property name="sqlMapClientTemplate" ref="repoSqlMapClientTemplate"/> <property name="sqlMapClientTemplate" ref="repoSqlMapClientTemplate"/>
<property name="qnameDAO" ref="qnameDAO"/> <property name="qnameDAO" ref="qnameDAO"/>
<property name="aclCache" ref="aclEntityCache"/> <property name="aclEntityCache" ref="aclEntityCache"/>
<property name="authorityCache" ref="authorityEntityCache"/> <property name="authorityEntityCache" ref="authorityEntityCache"/>
<property name="permissionCache" ref="permissionEntityCache"/> <property name="permissionEntityCache" ref="permissionEntityCache"/>
</bean> </bean>
<bean id="aclDAO" class="org.alfresco.repo.domain.permissions.AclDAOImpl"> <bean id="aclDAO" class="org.alfresco.repo.domain.permissions.AclDAOImpl">

70
source/java/org/alfresco/repo/domain/permissions/AbstractAclCrudDAOImpl.java
View File

@@ -98,7 +98,7 @@ public abstract class AbstractAclCrudDAOImpl implements AclCrudDAO
* VALUE: AclEntity<br/> * VALUE: AclEntity<br/>
* VALUE KEY: None<br/> * VALUE KEY: None<br/>
*/ */
private EntityLookupCache<Long, AclEntity, Serializable> aclCache; private EntityLookupCache<Long, AclEntity, Serializable> aclEntityCache;
/** /**
* Cache for the Authority entity:<br/> * Cache for the Authority entity:<br/>
@@ -106,7 +106,7 @@ public abstract class AbstractAclCrudDAOImpl implements AclCrudDAO
* VALUE: AuthorityEntity<br/> * VALUE: AuthorityEntity<br/>
* VALUE KEY: Name<br/> * VALUE KEY: Name<br/>
*/ */
private EntityLookupCache<Long, AuthorityEntity, String> authorityCache; private EntityLookupCache<Long, AuthorityEntity, String> authorityEntityCache;
/** /**
* Cache for the Permission entity:<br/> * Cache for the Permission entity:<br/>
@@ -114,17 +114,17 @@ public abstract class AbstractAclCrudDAOImpl implements AclCrudDAO
* VALUE: PermissionEntity<br/> * VALUE: PermissionEntity<br/>
* VALUE KEY: PermissionEntity (compound key: qnameId + name)<br/> * VALUE KEY: PermissionEntity (compound key: qnameId + name)<br/>
*/ */
private EntityLookupCache<Long, PermissionEntity, PermissionEntity> permissionCache; private EntityLookupCache<Long, PermissionEntity, PermissionEntity> permissionEntityCache;
/** /**
* Set the cache to use for <b>alf_access_control_list</b> lookups (optional). * Set the cache to use for <b>alf_access_control_list</b> lookups (optional).
* *
* @param aclCache the cache of IDs to AclEntities * @param aclEntityCache the cache of IDs to AclEntities
*/ */
public void setAclCache(SimpleCache<Serializable, Object> aclCache) public void setAclEntityCache(SimpleCache<Serializable, Object> aclEntityCache)
{ {
this.aclCache = new EntityLookupCache<Long, AclEntity, Serializable>( this.aclEntityCache = new EntityLookupCache<Long, AclEntity, Serializable>(
aclCache, aclEntityCache,
CACHE_REGION_ACL, CACHE_REGION_ACL,
aclEntityDaoCallback); aclEntityDaoCallback);
} }
@@ -132,12 +132,12 @@ public abstract class AbstractAclCrudDAOImpl implements AclCrudDAO
/** /**
* Set the cache to use for <b>alf_authority</b> lookups (optional). * Set the cache to use for <b>alf_authority</b> lookups (optional).
* *
* @param authorityCache the cache of IDs to AclEntities * @param authorityEntityCache the cache of IDs to AclEntities
*/ */
public void setAuthorityCache(SimpleCache<Serializable, Object> authorityCache) public void setAuthorityEntityCache(SimpleCache<Serializable, Object> authorityEntityCache)
{ {
this.authorityCache = new EntityLookupCache<Long, AuthorityEntity, String>( this.authorityEntityCache = new EntityLookupCache<Long, AuthorityEntity, String>(
authorityCache, authorityEntityCache,
CACHE_REGION_AUTHORITY, CACHE_REGION_AUTHORITY,
authorityEntityDaoCallback); authorityEntityDaoCallback);
} }
@@ -145,12 +145,12 @@ public abstract class AbstractAclCrudDAOImpl implements AclCrudDAO
/** /**
* Set the cache to use for <b>alf_permission</b> lookups (optional). * Set the cache to use for <b>alf_permission</b> lookups (optional).
* *
* @param permissionCache the cache of IDs to PermissionEntities * @param permissionEntityCache the cache of IDs to PermissionEntities
*/ */
public void setPermissionCache(SimpleCache<Serializable, Object> permissionCache) public void setPermissionEntityCache(SimpleCache<Serializable, Object> permissionEntityCache)
{ {
this.permissionCache = new EntityLookupCache<Long, PermissionEntity, PermissionEntity>( this.permissionEntityCache = new EntityLookupCache<Long, PermissionEntity, PermissionEntity>(
permissionCache, permissionEntityCache,
CACHE_REGION_PERMISSION, CACHE_REGION_PERMISSION,
permissionEntityDaoCallback); permissionEntityDaoCallback);
} }
@@ -165,13 +165,13 @@ public abstract class AbstractAclCrudDAOImpl implements AclCrudDAO
public AbstractAclCrudDAOImpl() public AbstractAclCrudDAOImpl()
{ {
this.aclEntityDaoCallback = new AclEntityCallbackDAO(); this.aclEntityDaoCallback = new AclEntityCallbackDAO();
this.aclCache = new EntityLookupCache<Long, AclEntity, Serializable>(aclEntityDaoCallback); this.aclEntityCache = new EntityLookupCache<Long, AclEntity, Serializable>(aclEntityDaoCallback);
this.authorityEntityDaoCallback = new AuthorityEntityCallbackDAO(); this.authorityEntityDaoCallback = new AuthorityEntityCallbackDAO();
this.authorityCache = new EntityLookupCache<Long, AuthorityEntity, String>(authorityEntityDaoCallback); this.authorityEntityCache = new EntityLookupCache<Long, AuthorityEntity, String>(authorityEntityDaoCallback);
this.permissionEntityDaoCallback = new PermissionEntityCallbackDAO(); this.permissionEntityDaoCallback = new PermissionEntityCallbackDAO();
this.permissionCache = new EntityLookupCache<Long, PermissionEntity, PermissionEntity>(permissionEntityDaoCallback); this.permissionEntityCache = new EntityLookupCache<Long, PermissionEntity, PermissionEntity>(permissionEntityDaoCallback);
} }
// //
@@ -187,7 +187,7 @@ public abstract class AbstractAclCrudDAOImpl implements AclCrudDAO
entity.setVersion(0L); entity.setVersion(0L);
Pair<Long, AclEntity> entityPair = aclCache.getOrCreateByValue(entity); Pair<Long, AclEntity> entityPair = aclEntityCache.getOrCreateByValue(entity);
return entityPair.getSecond(); return entityPair.getSecond();
} }
@@ -198,7 +198,7 @@ public abstract class AbstractAclCrudDAOImpl implements AclCrudDAO
private AclEntity getAclImpl(long id) private AclEntity getAclImpl(long id)
{ {
Pair<Long, AclEntity> entityPair = aclCache.getByKey(id); Pair<Long, AclEntity> entityPair = aclEntityCache.getByKey(id);
if (entityPair == null) if (entityPair == null)
{ {
return null; return null;
@@ -261,7 +261,7 @@ public abstract class AbstractAclCrudDAOImpl implements AclCrudDAO
ParameterCheck.mandatory("entity.aclVersion", entity.getAclVersion()); ParameterCheck.mandatory("entity.aclVersion", entity.getAclVersion());
ParameterCheck.mandatory("entity.version", entity.getVersion()); ParameterCheck.mandatory("entity.version", entity.getVersion());
int updated = aclCache.updateValue(entity.getId(), entity); int updated = aclEntityCache.updateValue(entity.getId(), entity);
if (updated < 1) if (updated < 1)
{ {
throw new ConcurrencyFailureException("AclEntity with ID (" + entity.getId() + ") no longer exists or has been updated concurrently"); throw new ConcurrencyFailureException("AclEntity with ID (" + entity.getId() + ") no longer exists or has been updated concurrently");
@@ -270,13 +270,13 @@ public abstract class AbstractAclCrudDAOImpl implements AclCrudDAO
public void deleteAcl(long id) public void deleteAcl(long id)
{ {
Pair<Long, AclEntity> entityPair = aclCache.getByKey(id); Pair<Long, AclEntity> entityPair = aclEntityCache.getByKey(id);
if (entityPair == null) if (entityPair == null)
{ {
return; return;
} }
int deleted = aclCache.deleteByKey(id); int deleted = aclEntityCache.deleteByKey(id);
if (deleted < 1) if (deleted < 1)
{ {
throw new ConcurrencyFailureException("AclEntity with ID " + id + " no longer exists"); throw new ConcurrencyFailureException("AclEntity with ID " + id + " no longer exists");
@@ -640,7 +640,7 @@ public abstract class AbstractAclCrudDAOImpl implements AclCrudDAO
entity.setVersion(0L); entity.setVersion(0L);
Pair<Long, PermissionEntity> entityPair = permissionCache.getOrCreateByValue(entity); Pair<Long, PermissionEntity> entityPair = permissionEntityCache.getOrCreateByValue(entity);
entity = entityPair.getSecond(); entity = entityPair.getSecond();
} }
return entity; return entity;
@@ -648,7 +648,7 @@ public abstract class AbstractAclCrudDAOImpl implements AclCrudDAO
public Permission getPermission(long id) public Permission getPermission(long id)
{ {
Pair<Long, PermissionEntity> entityPair = permissionCache.getByKey(id); Pair<Long, PermissionEntity> entityPair = permissionEntityCache.getByKey(id);
if (entityPair == null) if (entityPair == null)
{ {
return null; return null;
@@ -674,7 +674,7 @@ public abstract class AbstractAclCrudDAOImpl implements AclCrudDAO
Long qnameId = qnamePair.getFirst(); Long qnameId = qnamePair.getFirst();
PermissionEntity permission = new PermissionEntity(qnameId, permissionReference.getName()); PermissionEntity permission = new PermissionEntity(qnameId, permissionReference.getName());
Pair<Long, PermissionEntity> entityPair = permissionCache.getByValue(permission); Pair<Long, PermissionEntity> entityPair = permissionEntityCache.getByValue(permission);
if (entityPair != null) if (entityPair != null)
{ {
entity = entityPair.getSecond(); entity = entityPair.getSecond();
@@ -727,7 +727,7 @@ public abstract class AbstractAclCrudDAOImpl implements AclCrudDAO
permission.setTypeQNameId(newTypeQNameId); permission.setTypeQNameId(newTypeQNameId);
permission.setName(newName); permission.setName(newName);
int updated = permissionCache.updateValue(permission.getId(), permission); int updated = permissionEntityCache.updateValue(permission.getId(), permission);
if (updated < 1) if (updated < 1)
{ {
throw new ConcurrencyFailureException("PermissionEntity with ID (" + permission.getId() + ") no longer exists or has been updated concurrently"); throw new ConcurrencyFailureException("PermissionEntity with ID (" + permission.getId() + ") no longer exists or has been updated concurrently");
@@ -737,13 +737,13 @@ public abstract class AbstractAclCrudDAOImpl implements AclCrudDAO
public void deletePermission(long id) public void deletePermission(long id)
{ {
Pair<Long, PermissionEntity> entityPair = permissionCache.getByKey(id); Pair<Long, PermissionEntity> entityPair = permissionEntityCache.getByKey(id);
if (entityPair == null) if (entityPair == null)
{ {
return; return;
} }
int deleted = permissionCache.deleteByKey(id); int deleted = permissionEntityCache.deleteByKey(id);
if (deleted < 1) if (deleted < 1)
{ {
throw new ConcurrencyFailureException("PermissionEntity with ID " + id + " no longer exists"); throw new ConcurrencyFailureException("PermissionEntity with ID " + id + " no longer exists");
@@ -829,13 +829,13 @@ public abstract class AbstractAclCrudDAOImpl implements AclCrudDAO
entity.setVersion(0L); entity.setVersion(0L);
Pair<Long, AuthorityEntity> entityPair = authorityCache.getOrCreateByValue(entity); Pair<Long, AuthorityEntity> entityPair = authorityEntityCache.getOrCreateByValue(entity);
return entityPair.getSecond(); return entityPair.getSecond();
} }
public Authority getAuthority(long id) public Authority getAuthority(long id)
{ {
Pair<Long, AuthorityEntity> entityPair = authorityCache.getByKey(id); Pair<Long, AuthorityEntity> entityPair = authorityEntityCache.getByKey(id);
if (entityPair == null) if (entityPair == null)
{ {
return null; return null;
@@ -855,7 +855,7 @@ public abstract class AbstractAclCrudDAOImpl implements AclCrudDAO
AuthorityEntity authority = new AuthorityEntity(); AuthorityEntity authority = new AuthorityEntity();
authority.setAuthority(authorityName); authority.setAuthority(authorityName);
Pair<Long, AuthorityEntity> entityPair = authorityCache.getByValue(authority); Pair<Long, AuthorityEntity> entityPair = authorityEntityCache.getByValue(authority);
if (entityPair == null) if (entityPair == null)
{ {
return null; return null;
@@ -904,7 +904,7 @@ public abstract class AbstractAclCrudDAOImpl implements AclCrudDAO
entity.setAuthority(after); entity.setAuthority(after);
entity.setCrc(CrcHelper.getStringCrcPair(after, 32, true, true).getSecond()); entity.setCrc(CrcHelper.getStringCrcPair(after, 32, true, true).getSecond());
int updated = authorityCache.updateValue(entity.getId(), entity); int updated = authorityEntityCache.updateValue(entity.getId(), entity);
if (updated < 1) if (updated < 1)
{ {
throw new ConcurrencyFailureException("AuthorityEntity with ID (" + entity.getId() + ") no longer exists or has been updated concurrently"); throw new ConcurrencyFailureException("AuthorityEntity with ID (" + entity.getId() + ") no longer exists or has been updated concurrently");
@@ -914,13 +914,13 @@ public abstract class AbstractAclCrudDAOImpl implements AclCrudDAO
public void deleteAuthority(long id) public void deleteAuthority(long id)
{ {
Pair<Long, AuthorityEntity> entityPair = authorityCache.getByKey(id); Pair<Long, AuthorityEntity> entityPair = authorityEntityCache.getByKey(id);
if (entityPair == null) if (entityPair == null)
{ {
return; return;
} }
int deleted = authorityCache.deleteByKey(id); int deleted = authorityEntityCache.deleteByKey(id);
if (deleted < 1) if (deleted < 1)
{ {
throw new ConcurrencyFailureException("AuthorityEntity with ID " + id + " no longer exists"); throw new ConcurrencyFailureException("AuthorityEntity with ID " + id + " no longer exists");