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

Dictionary Cache improvements - ensure CMIS Dictionary Registry is MT-aware

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14057 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2009-04-22 16:30:51 +00:00
parent 4b98b6c0d8
commit 200a8c3843
6 changed files with 82 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/alfresco/cmis-api-context.xml
View File

@@ -31,6 +31,9 @@
<property name="CMISMapping">
<ref bean="CMISMapping" />
</property>
<property name="tenantService">
<ref bean="tenantService" />
</property>
</bean>
<bean id="CMIS.DictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">

58
source/java/org/alfresco/cmis/dictionary/CMISAbstractDictionaryService.java
View File

@@ -31,6 +31,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;
import org.alfresco.cmis.CMISDataTypeEnum;
import org.alfresco.cmis.CMISDictionaryService;
@@ -43,6 +44,7 @@ import org.alfresco.cmis.mapping.CMISMapping;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.dictionary.DictionaryDAO;
import org.alfresco.repo.dictionary.DictionaryListener;
import org.alfresco.repo.tenant.TenantService;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.AbstractLifecycleBean;
@@ -65,6 +67,7 @@ public abstract class CMISAbstractDictionaryService extends AbstractLifecycleBea
private DictionaryDAO dictionaryDAO;
protected CMISMapping cmisMapping;
protected DictionaryService dictionaryService;
protected TenantService tenantService;
/**
* Set the mapping service
@@ -95,11 +98,21 @@ public abstract class CMISAbstractDictionaryService extends AbstractLifecycleBea
{
this.dictionaryDAO = dictionaryDAO;
}
/**
* Set the tenant Service
*
* @param tenantService
*/
public void setTenantService(TenantService tenantService)
{
this.tenantService = tenantService;
}
// TODO: Handle tenants
// TODO: read / write locks
private DictionaryRegistry registry;
/** CMIS Dictionary Registry (tenant-aware) */
private Map<String, DictionaryRegistry> registryMap = new ConcurrentHashMap<String, DictionaryRegistry>(4);
/**
@@ -205,14 +218,26 @@ public abstract class CMISAbstractDictionaryService extends AbstractLifecycleBea
return builder.toString();
}
}
private DictionaryRegistry getRegistry()
{
String tenantDomain = tenantService.getCurrentUserDomain();
DictionaryRegistry registry = registryMap.get(tenantDomain);
if (registry == null)
{
init();
registry = registryMap.get(tenantDomain);
}
return registry;
}
/*
* (non-Javadoc)
* @see org.alfresco.cmis.dictionary.CMISDictionaryService#findType(org.alfresco.cmis.dictionary.CMISTypeId)
*/
public CMISTypeDefinition findType(CMISTypeId typeId)
{
return registry.objectDefsByTypeId.get(typeId);
return getRegistry().objectDefsByTypeId.get(typeId);
}
/*
@@ -246,11 +271,11 @@ public abstract class CMISAbstractDictionaryService extends AbstractLifecycleBea
CMISTypeDefinition typeDef = null;
if (scopeByRelationship)
{
typeDef = registry.assocDefsByQName.get(clazz);
typeDef = getRegistry().assocDefsByQName.get(clazz);
}
else
{
typeDef = registry.typeDefsByQName.get(clazz);
typeDef = getRegistry().typeDefsByQName.get(clazz);
}
// ensure matches one of provided matching scopes
@@ -276,7 +301,7 @@ public abstract class CMISAbstractDictionaryService extends AbstractLifecycleBea
*/
public CMISTypeDefinition findTypeForTable(String tableName)
{
CMISTypeDefinition typeDef = registry.typeDefsByTable.get(tableName.toLowerCase());
CMISTypeDefinition typeDef = getRegistry().typeDefsByTable.get(tableName.toLowerCase());
return typeDef;
}
@@ -286,7 +311,7 @@ public abstract class CMISAbstractDictionaryService extends AbstractLifecycleBea
*/
public Collection<CMISTypeDefinition> getAllTypes()
{
return Collections.unmodifiableCollection(registry.typeDefsByTypeId.values());
return Collections.unmodifiableCollection(getRegistry().typeDefsByTypeId.values());
}
/*
@@ -295,7 +320,7 @@ public abstract class CMISAbstractDictionaryService extends AbstractLifecycleBea
*/
public CMISPropertyDefinition findProperty(QName property, CMISTypeDefinition matchingType)
{
CMISPropertyDefinition propDef = registry.propDefsByQName.get(property);
CMISPropertyDefinition propDef = getRegistry().propDefsByQName.get(property);
return getProperty(propDef, matchingType);
}
@@ -305,7 +330,7 @@ public abstract class CMISAbstractDictionaryService extends AbstractLifecycleBea
*/
public CMISPropertyDefinition findProperty(String property, CMISTypeDefinition matchingType)
{
CMISPropertyDefinition propDef = registry.propDefsByName.get(property.toLowerCase());
CMISPropertyDefinition propDef = getRegistry().propDefsByName.get(property.toLowerCase());
return getProperty(propDef, matchingType);
}
@@ -413,7 +438,7 @@ public abstract class CMISAbstractDictionaryService extends AbstractLifecycleBea
}
// publish new registry
this.registry = registry;
registryMap.put(tenantService.getCurrentUserDomain(), registry);
if (logger.isInfoEnabled())
logger.info("Initialized CMIS Dictionary. Types:" + registry.typeDefsByTypeId.size() + ", Properties:" + registry.propDefsByPropId.size());
@@ -435,7 +460,16 @@ public abstract class CMISAbstractDictionaryService extends AbstractLifecycleBea
{
init();
}
/*
* (non-Javadoc)
* @see org.alfresco.repo.dictionary.DictionaryListener#afterDictionaryDestroy()
*/
public void afterDictionaryDestroy()
{
registryMap.remove(tenantService.getCurrentUserDomain());
}
/*
* (non-Javadoc)
* @see org.alfresco.util.AbstractLifecycleBean#onBootstrap(org.springframework.context.ApplicationEvent)

12
source/java/org/alfresco/repo/dictionary/DictionaryBootstrap.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
* Copyright (C) 2005-2009 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -150,7 +150,7 @@ public class DictionaryBootstrap implements DictionaryListener
}
}
}
/*
* (non-Javadoc)
* @see org.alfresco.repo.dictionary.DictionaryListener#afterInit()
@@ -159,6 +159,14 @@ public class DictionaryBootstrap implements DictionaryListener
{
}
/*
* (non-Javadoc)
* @see org.alfresco.repo.dictionary.DictionaryListener#onDictionaryDestroy()
*/
public void afterDictionaryDestroy()
{
}
/**
* Register the static resource bundles
*/

12
source/java/org/alfresco/repo/dictionary/DictionaryDAOImpl.java
View File

@@ -147,7 +147,7 @@ public class DictionaryDAOImpl implements DictionaryDAO
// initialise empty dictionary & namespaces
putCompiledModels(tenantDomain, new HashMap<QName,CompiledModel>());
putUriToModels(tenantDomain, new HashMap<String, List<CompiledModel>>());
namespaceDAO.init();
// populate the dictionary
@@ -155,8 +155,8 @@ public class DictionaryDAOImpl implements DictionaryDAO
{
dictionaryListener.onDictionaryInit();
}
// populate the dictionary
// notify registered listeners that dictionary has been initialised
for (DictionaryListener dictionaryListener : dictionaryListeners)
{
dictionaryListener.afterDictionaryInit();
@@ -177,6 +177,12 @@ public class DictionaryDAOImpl implements DictionaryDAO
namespaceDAO.destroy();
// notify registered listeners that dictionary has been destroyed
for (DictionaryListener dictionaryDeployer : dictionaryListeners)
{
dictionaryDeployer.afterDictionaryDestroy();
}
logger.info("Dictionary destroyed");
}

7
source/java/org/alfresco/repo/dictionary/DictionaryListener.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
* Copyright (C) 2005-2009 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -37,6 +37,9 @@ public interface DictionaryListener
// callback for (re-)initialising the Dictionary caches
public void onDictionaryInit();
// callback once initialisation is complete
// callback once dictionary destroy is complete
public void afterDictionaryDestroy();
// callback once dictionary initialisation is complete
public void afterDictionaryInit();
}

10
source/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrap.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2008 Alfresco Software Limited.
* Copyright (C) 2005-2009 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -293,6 +293,14 @@ public class DictionaryRepositoryBootstrap extends AbstractLifecycleBean impleme
{
}
/*
* (non-Javadoc)
* @see org.alfresco.repo.dictionary.DictionaryListener#onDictionaryDestroy()
*/
public void afterDictionaryDestroy()
{
}
public void initMessages()
{
if (this.repositoryMessagesLocations != null)