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

ALF-15888: change implementation of DefaultSimpleCache to use Google's ConcurrentLinkedHashMap.

Browse Source 
After much deliberation I decided not to offer an unbounded cache size, i.e. maxItems MUST be at least one. This simplifies the implementation (marginally) and means that tests do not have to be duplicated for both underlying data structure types (better coverage). Would we really want a cache to grow indefinitely?

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42223 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2012-10-01 16:47:43 +00:00
parent 511af90d5c
commit 99b47ce435
2 changed files with 70 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
source/java/org/alfresco/repo/cache/DefaultSimpleCacheTest.java vendored
View File

@@ -23,7 +23,10 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import org.junit.Before;
import org.junit.Test;
@@ -38,32 +41,19 @@ public class DefaultSimpleCacheTest
private DefaultSimpleCache<Integer, String> cache;
@Before
public void setUp()
public void setUp() throws Exception
{
cache = new DefaultSimpleCache<Integer, String>();
cache.setMaxItems(100);
cache.afterPropertiesSet();
}
@Test
public void unboundedSizeCache()
{
cache.put(1, "1");
cache.put(2, "2");
cache.put(3, "3");
cache.put(4, "4");
cache.put(5, "5");
assertEquals("1", cache.get(1));
assertEquals("2", cache.get(2));
assertEquals("3", cache.get(3));
assertEquals("4", cache.get(4));
assertEquals("5", cache.get(5));
}
@Test
public void boundedSizeCache()
public void boundedSizeCache() throws Exception
{
// We'll only keep the LAST 3 items
cache.setMaxItems(3);
cache.afterPropertiesSet();
cache.put(1, "1");
cache.put(2, "2");
@@ -136,7 +126,10 @@ public class DefaultSimpleCacheTest
cache.put(12, "red");
cache.put(43, "olive");
Iterator<Integer> it = cache.getKeys().iterator();
List<Integer> keys = new ArrayList<Integer>(cache.getKeys());
Collections.sort(keys);
Iterator<Integer> it = keys.iterator();
assertEquals(3, it.next().intValue());
assertEquals(12, it.next().intValue());
assertEquals(43, it.next().intValue());
@@ -144,14 +137,20 @@ public class DefaultSimpleCacheTest
}
@Test
public void clearUponSetMaxItems()
public void noConcurrentModificationException()
{
cache.put(1, "1");
assertTrue(cache.contains(1));
cache.put(2, "2");
cache.put(3, "3");
cache.put(4, "4");
Iterator<Integer> i = cache.getKeys().iterator();
i.next();
i.next();
cache.setMaxItems(10);
cache.put(5, "5");
// The item should have gone.
assertFalse(cache.contains(1));
// Causes a ConcurrentModificationException with a java.util.LinkedHashMap
i.next();
}
}