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

This makes the lookup cache for the AVM have a transaction isolation level of

Browse Source 
read committed, more or less.  It was read uncommitted before, and so this 
makes me more comfortable.  I hope it will also reduce optimistic locking failures
under concurrent load.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4600 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-12-14 03:23:20 +00:00
parent cc94478e72
commit e70798e59f
2 changed files with 69 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/repo/avm/AVMLookupCacheListener.java
View File

@@ -41,4 +41,13 @@ public class AVMLookupCacheListener extends TransactionListenerAdapter
{
fLookupCache.onRollback();
}
/* (non-Javadoc)
* @see org.alfresco.repo.transaction.TransactionListenerAdapter#afterCommit()
*/
@Override
public void afterCommit()
{
fLookupCache.commitLookups();
}
}

46
source/java/org/alfresco/repo/avm/LookupCache.java
View File

@@ -21,6 +21,12 @@ public class LookupCache
{
private static Logger fgLogger = Logger.getLogger(LookupCache.class);
/**
* Per transaction lookup results to be added to the cache on successful
* commit.
*/
private ThreadLocal<Map<LookupKey, Lookup>> fToBeAdded;
/**
* The Map of of keys to lookups.
*/
@@ -64,6 +70,7 @@ public class LookupCache
fCache = new HashMap<LookupKey, Lookup>();
fTimeStamps = new TreeMap<Long, LookupKey>();
fInverseTimeStamps = new HashMap<LookupKey, Long>();
fToBeAdded = new ThreadLocal<Map<LookupKey, Lookup>>();
fTimeStamp = 0L;
fMaxSize = 100;
}
@@ -179,7 +186,12 @@ public class LookupCache
*/
private synchronized Lookup findInCache(LookupKey key)
{
Lookup found = fCache.get(key);
Map<LookupKey, Lookup> map = fToBeAdded.get();
Lookup found = (map != null) ? map.get(key) : null;
if (found == null)
{
found = fCache.get(key);
}
if (found != null)
{
Lookup result = new Lookup(found, fAVMNodeDAO, fAVMStoreDAO);
@@ -197,7 +209,11 @@ public class LookupCache
{
LookupKey newKey = new LookupKey(key);
newKey.setWrite(true);
found = (map != null) ? map.get(newKey) : null;
if (found == null)
{
found = fCache.get(newKey);
}
if (found != null)
{
Lookup result = new Lookup(found, fAVMNodeDAO, fAVMStoreDAO);
@@ -219,8 +235,31 @@ public class LookupCache
* @param key
* @param lookup
*/
private synchronized void updateCache(LookupKey key, Lookup lookup)
private void updateCache(LookupKey key, Lookup lookup)
{
Map<LookupKey, Lookup> map = fToBeAdded.get();
if (map == null)
{
map = new HashMap<LookupKey, Lookup>();
}
map.put(key, lookup);
}
/**
* Called when a transaction has successfully committed,
* to make lookups from the transaction available to other transactions.
*/
public synchronized void commitLookups()
{
Map<LookupKey, Lookup> map = fToBeAdded.get();
if (map == null)
{
return;
}
for (Map.Entry<LookupKey, Lookup> entry : map.entrySet())
{
LookupKey key = entry.getKey();
Lookup lookup = entry.getValue();
if (fCache.containsKey(key))
{
fCache.remove(key);
@@ -241,6 +280,8 @@ public class LookupCache
fCache.remove(old);
}
}
fToBeAdded.set(null);
}
/**
* Remove a List of entries.
@@ -323,5 +364,6 @@ public class LookupCache
fCache.clear();
fTimeStamps.clear();
fInverseTimeStamps.clear();
fToBeAdded.set(null);
}
}