r/m unused IMeasureableMemory implementation now that CLHC is no longer an option for row cache
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91fa4672 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91fa4672 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91fa4672 Branch: refs/heads/trunk Commit: 91fa4672248e4f5c3e829d312564d1cd5e1750bc Parents: 5537921 Author: Jonathan Ellis <[email protected]> Authored: Fri Nov 1 11:34:29 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Nov 1 11:34:29 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cache/IRowCacheEntry.java | 2 +- src/java/org/apache/cassandra/db/ColumnFamily.java | 5 ----- test/unit/org/apache/cassandra/cache/CacheProviderTest.java | 9 --------- 3 files changed, 1 insertion(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/91fa4672/src/java/org/apache/cassandra/cache/IRowCacheEntry.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cache/IRowCacheEntry.java b/src/java/org/apache/cassandra/cache/IRowCacheEntry.java index 0a4ac02..2c9dffd 100644 --- a/src/java/org/apache/cassandra/cache/IRowCacheEntry.java +++ b/src/java/org/apache/cassandra/cache/IRowCacheEntry.java @@ -17,6 +17,6 @@ */ package org.apache.cassandra.cache; -public interface IRowCacheEntry extends IMeasurableMemory +public interface IRowCacheEntry { } http://git-wip-us.apache.org/repos/asf/cassandra/blob/91fa4672/src/java/org/apache/cassandra/db/ColumnFamily.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ColumnFamily.java b/src/java/org/apache/cassandra/db/ColumnFamily.java index 7b5642a..b2c5ac4 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamily.java +++ b/src/java/org/apache/cassandra/db/ColumnFamily.java @@ -314,11 +314,6 @@ public abstract class ColumnFamily implements Iterable<Column>, IRowCacheEntry return null; } - public long memorySize() - { - return ObjectSizes.measureDeep(this); - } - public long dataSize() { long size = 0; http://git-wip-us.apache.org/repos/asf/cassandra/blob/91fa4672/test/unit/org/apache/cassandra/cache/CacheProviderTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cache/CacheProviderTest.java b/test/unit/org/apache/cassandra/cache/CacheProviderTest.java index ce36e48..189e888 100644 --- a/test/unit/org/apache/cassandra/cache/CacheProviderTest.java +++ b/test/unit/org/apache/cassandra/cache/CacheProviderTest.java @@ -107,15 +107,6 @@ public class CacheProviderTest extends SchemaLoader } @Test - public void testHeapCache() throws InterruptedException - { - ICache<MeasureableString, IRowCacheEntry> cache = ConcurrentLinkedHashCache.create(CAPACITY, Weighers.<MeasureableString, IRowCacheEntry>entrySingleton()); - ColumnFamily cf = createCF(); - simpleCase(cf, cache); - concurrentCase(cf, cache); - } - - @Test public void testSerializingCache() throws InterruptedException { ICache<MeasureableString, IRowCacheEntry> cache = SerializingCache.create(CAPACITY, Weighers.<RefCountedMemory>singleton(), new SerializingCacheProvider.RowCacheSerializer());
