natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upgrade to ConcurrentLinkedHashMap 1.1 

patch by mdennis; reviewed by jbellis for CASSANDRA-975

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1032815 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2010-11-09 02:17:44 +00:00
parent 7a98d7bd2c
commit 6879422aae
5 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -18,6 +18,7 @@ dev
* enable skipping bad rows on LazilyCompacted path (CASSANDRA-1702)
* r/m extra subcomparator line in cli keyspaces output (CASSANDRA-1712)
* add read repair chance to cli "show keyspaces"
* upgrade to ConcurrentLinkedHashMap 1.1 (CASSANDRA-975)
0.7.0-beta3

BIN
lib/clhm-production.jar
View File

Binary file not shown.

BIN
lib/concurrentlinkedhashmap-lru-1.1.jar Normal file
View File

Binary file not shown.

0
lib/licenses/clhm-production.txt → lib/licenses/concurrentlinkedhashmap-lru-1.1.txt
View File

22
src/java/org/apache/cassandra/cache/InstrumentedCache.java vendored
View File

@ -24,11 +24,13 @@ package org.apache.cassandra.cache;
import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
import com.reardencommerce.kernel.collections.shared.evictable.ConcurrentLinkedHashMap;
import com.googlecode.concurrentlinkedhashmap.Weighers;
import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
public class InstrumentedCache<K, V>
{
private int capacity;
public static final int DEFAULT_CONCURENCY_LEVEL = 64;
private final ConcurrentLinkedHashMap<K, V> map;
private final AtomicLong requests = new AtomicLong(0);
private final AtomicLong hits = new AtomicLong(0);
@ -38,8 +40,17 @@ public class InstrumentedCache<K, V>
public InstrumentedCache(int capacity)
{
this.capacity = capacity;
map = ConcurrentLinkedHashMap.create(ConcurrentLinkedHashMap.EvictionPolicy.SECOND_CHANCE, capacity);
this(capacity, DEFAULT_CONCURENCY_LEVEL);
}
public InstrumentedCache(int capacity, int concurency)
{
map = new ConcurrentLinkedHashMap.Builder<K, V>()
.weigher(Weighers.<V>singleton())
.initialCapacity(capacity)
.maximumWeightedCapacity(capacity)
.concurrencyLevel(concurency)
.build();
}
public void put(K key, V value)
@ -68,7 +79,7 @@ public class InstrumentedCache<K, V>
public int getCapacity()
{
return capacity;
return map.capacity();
}
public boolean isCapacitySetManually()
@ -79,7 +90,6 @@ public class InstrumentedCache<K, V>
public void updateCapacity(int capacity)
{
map.setCapacity(capacity);
this.capacity = capacity;
}
public void setCapacity(int capacity)