You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directmemory.apache.org by bp...@apache.org on 2012/03/02 08:09:22 UTC

svn commit: r1296064 - in /incubator/directmemory/trunk: directmemory-cache/src/main/java/org/apache/directmemory/cache/ directmemory-cache/src/main/java/org/apache/directmemory/memory/ directmemory-cache/src/test/java/org/apache/directmemory/memory/ i...

Author: bperroud
Date: Fri Mar  2 07:09:21 2012
New Revision: 1296064

URL: http://svn.apache.org/viewvc?rev=1296064&view=rev
Log:
DIRECTMEMORY-78 : remove OffHeapMemoryBuffer

Removed:
    incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/AbstractOffHeapMemoryBuffer.java
    incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMemoryBuffer.java
    incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMemoryBufferImpl.java
    incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/AbstractOffHeapMemoryBufferTest.java
    incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/OffHeapMemoryBufferTest.java
Modified:
    incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/cache/Cache.java
    incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/cache/CacheService.java
    incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/cache/CacheServiceImpl.java
    incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java
    incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/BaseTest.java
    incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/ConcurrentTest.java
    incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/MallocTest.java
    incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/MemoryManagerTest.java
    incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/Starter.java
    incubator/directmemory/trunk/integrations/ehcache/src/main/java/org/apache/directmemory/ehcache/DirectMemoryCache.java

Modified: incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/cache/Cache.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/cache/Cache.java?rev=1296064&r1=1296063&r2=1296064&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/cache/Cache.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/cache/Cache.java Fri Mar  2 07:09:21 2012
@@ -23,7 +23,6 @@ import static org.apache.directmemory.Di
 
 import org.apache.directmemory.DirectMemory;
 import org.apache.directmemory.memory.MemoryManagerService;
-import org.apache.directmemory.memory.OffHeapMemoryBuffer;
 import org.apache.directmemory.memory.Pointer;
 import org.apache.directmemory.serialization.Serializer;
 
@@ -135,11 +134,6 @@ public class Cache
         return cacheService.entries();
     }
 
-    public static void dump( OffHeapMemoryBuffer<Object> mem )
-    {
-        cacheService.dump( mem );
-    }
-
     public static void dump()
     {
         cacheService.dump();

Modified: incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/cache/CacheService.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/cache/CacheService.java?rev=1296064&r1=1296063&r2=1296064&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/cache/CacheService.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/cache/CacheService.java Fri Mar  2 07:09:21 2012
@@ -21,7 +21,6 @@ package org.apache.directmemory.cache;
 
 
 import org.apache.directmemory.memory.MemoryManagerService;
-import org.apache.directmemory.memory.OffHeapMemoryBuffer;
 import org.apache.directmemory.memory.Pointer;
 import org.apache.directmemory.serialization.Serializer;
 
@@ -61,8 +60,6 @@ public interface CacheService<K, V>
 
     long entries();
 
-    void dump( OffHeapMemoryBuffer<V> mem );
-
     void dump();
 
     ConcurrentMap<K, Pointer<V>> getMap();

Modified: incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/cache/CacheServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/cache/CacheServiceImpl.java?rev=1296064&r1=1296063&r2=1296064&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/cache/CacheServiceImpl.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/cache/CacheServiceImpl.java Fri Mar  2 07:09:21 2012
@@ -30,7 +30,6 @@ import java.util.concurrent.ConcurrentMa
 
 import org.apache.directmemory.measures.Ram;
 import org.apache.directmemory.memory.MemoryManagerService;
-import org.apache.directmemory.memory.OffHeapMemoryBuffer;
 import org.apache.directmemory.memory.Pointer;
 import org.apache.directmemory.serialization.Serializer;
 import org.slf4j.Logger;
@@ -289,18 +288,6 @@ public class CacheServiceImpl<K, V>
         return map.size();
     }
 
-    @Override
-    public void dump( OffHeapMemoryBuffer<V> mem )
-    {
-        logger.info( format( "off-heap - buffer: \t%1d", mem.getBufferNumber() ) );
-        logger.info( format( "off-heap - allocated: \t%1s", Ram.inMb( mem.capacity() ) ) );
-        logger.info( format( "off-heap - used:      \t%1s", Ram.inMb( mem.used() ) ) );
-        logger.info( format( "heap  - max: \t%1s", Ram.inMb( Runtime.getRuntime().maxMemory() ) ) );
-        logger.info( format( "heap     - allocated: \t%1s", Ram.inMb( Runtime.getRuntime().totalMemory() ) ) );
-        logger.info( format( "heap     - free : \t%1s", Ram.inMb( Runtime.getRuntime().freeMemory() ) ) );
-        logger.info( "************************************************" );
-    }
-
     public void dump( MemoryManagerService<V> mms )
     {
         logger.info( format( "off-heap - allocated: \t%1s", Ram.inMb( mms.capacity() ) ) );

Modified: incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java?rev=1296064&r1=1296063&r2=1296064&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java Fri Mar  2 07:09:21 2012
@@ -295,12 +295,6 @@ public class MemoryManagerServiceImpl<V>
     }
     
     @Deprecated
-    public List<OffHeapMemoryBuffer<V>> getBuffers()
-    {
-        return Collections.<OffHeapMemoryBuffer<V>>emptyList();
-    }
-
-    @Deprecated
     @Override
     public <T extends V> Pointer<V> allocate( final Class<T> type, final int size, final long expiresIn, final long expires )
     {
@@ -367,4 +361,8 @@ public class MemoryManagerServiceImpl<V>
         return returnNullWhenFull;
     }
 
+    public Set<Pointer<V>> getPointers()
+    {
+        return Collections.unmodifiableSet( pointers );
+    }
 }

Modified: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/BaseTest.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/BaseTest.java?rev=1296064&r1=1296063&r2=1296064&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/BaseTest.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/BaseTest.java Fri Mar  2 07:09:21 2012
@@ -22,17 +22,15 @@ package org.apache.directmemory.memory;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import java.util.Date;
 import java.util.Map;
 import java.util.Random;
 import java.util.zip.CRC32;
 import java.util.zip.Checksum;
 
 import org.apache.directmemory.measures.Ram;
-import org.apache.directmemory.memory.OffHeapMemoryBuffer;
-import org.apache.directmemory.memory.OffHeapMemoryBufferImpl;
 import org.apache.directmemory.memory.Pointer;
 import org.junit.AfterClass;
+import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -47,16 +45,24 @@ import com.google.common.collect.Maps;
 public class BaseTest
     extends AbstractBenchmark
 {
+    
+    MemoryManagerService<Object> mem;
+    
+    @Before
+    public void initMMS()
+    {
+        mem = new MemoryManagerServiceImpl<Object>();
+        mem.init( 1, 1 * 1024 * 1024 );
+    }
     @Test
     public void smokeTest()
     {
-        OffHeapMemoryBuffer<Object> mem = OffHeapMemoryBufferImpl.createNew( 1 * 1024 * 1024 );
         logger.info( "buffer size=" + mem.capacity() );
         assertNotNull( mem );
 
         Random rnd = new Random();
 
-        int size = rnd.nextInt( 10 ) * mem.capacity() / 100;
+        int size = rnd.nextInt( 10 ) * (int)mem.capacity() / 100;
 
         logger.info( "size=" + size );
 
@@ -117,7 +123,6 @@ public class BaseTest
     @Test
     public void aFewEntriesWithRead()
     {
-        OffHeapMemoryBuffer<Object> mem = OffHeapMemoryBufferImpl.createNew( 100 * 1024 * 1024 );
         logger.info( "total capacity=" + Ram.inMb( mem.capacity() ) );
         assertNotNull( mem );
         int howMany = 10000;
@@ -149,7 +154,6 @@ public class BaseTest
     @Test
     public void aFewEntriesWithCheck()
     {
-        OffHeapMemoryBuffer<Object> mem = OffHeapMemoryBufferImpl.createNew( 10 * 1024 * 1024 );
         logger.info( "total capacity=" + Ram.inMb( mem.capacity() ) );
         assertNotNull( mem );
         int howMany = 10;
@@ -179,7 +183,6 @@ public class BaseTest
     public void checkExpiration()
         throws InterruptedException
     {
-        OffHeapMemoryBuffer<Object> mem = OffHeapMemoryBufferImpl.createNew( 10 * 1024 * 1024 );
         assertNotNull( mem );
         int size = 400;
         int howMany = 5000;
@@ -206,27 +209,27 @@ public class BaseTest
         logger.info( "entries with absolute expiration=" + ( howMany / 2 ) );
         for ( int i = 0; i < howMany / 2; i++ )
         {
-            mem.store( payload, new Date() );
+            mem.store( payload, 1 );
         }
         assertEquals( size * howMany * 2, mem.used() );
         logger.info( "total used=" + Ram.inMb( mem.used() ) );
 
-        Thread.sleep( 500 );
+        Thread.sleep( 1000 );
 
         logger.info( "calling disposeExpiredAbsolute" );
-        mem.disposeExpiredAbsolute();
+        mem.collectExpired();
         logger.info( "total used=" + Ram.inMb( mem.used() ) );
         assertEquals( size * howMany + size * howMany / 2, mem.used() );
 
         logger.info( "calling disposeExpiredRelative" );
-        mem.disposeExpiredRelative();
+        mem.collectExpired();
         logger.info( "total used=" + Ram.inMb( mem.used() ) );
         assertEquals( size * howMany, mem.used() );
 
         Thread.sleep( 2000 );
 
         logger.info( "calling disposeExpiredRelative again" );
-        mem.disposeExpiredRelative();
+        mem.collectExpired();
         logger.info( "total used=" + Ram.inMb( mem.used() ) );
         assertEquals( 0, mem.used() );
 

Modified: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/ConcurrentTest.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/ConcurrentTest.java?rev=1296064&r1=1296063&r2=1296064&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/ConcurrentTest.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/ConcurrentTest.java Fri Mar  2 07:09:21 2012
@@ -27,10 +27,9 @@ import com.carrotsearch.junitbenchmarks.
 import com.carrotsearch.junitbenchmarks.annotation.LabelType;
 import com.google.common.collect.MapMaker;
 import org.apache.directmemory.measures.Ram;
-import org.apache.directmemory.memory.OffHeapMemoryBuffer;
-import org.apache.directmemory.memory.OffHeapMemoryBufferImpl;
 import org.apache.directmemory.memory.Pointer;
 import org.junit.AfterClass;
+import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -64,12 +63,18 @@ public class ConcurrentTest
 
     private static AtomicInteger read = new AtomicInteger();
 
-    public static OffHeapMemoryBuffer<Object> mem = OffHeapMemoryBufferImpl.createNew( 512 * 1024 * 1024 );
+    private static MemoryManagerService<Object> mem;
 
     public static ConcurrentMap<String, Pointer<Object>> map =
         new MapMaker().concurrencyLevel( 4 ).initialCapacity( 100000 ).makeMap();
 
-
+    @Before
+    public void initMMS()
+    {
+        mem = new MemoryManagerServiceImpl<Object>();
+        mem.init( 1, 512 * 1024 * 1024 );
+    }
+    
     @BenchmarkOptions( benchmarkRounds = 100000, warmupRounds = 0, concurrency = 100 )
     @Test
     public void store()

Modified: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/MallocTest.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/MallocTest.java?rev=1296064&r1=1296063&r2=1296064&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/MallocTest.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/MallocTest.java Fri Mar  2 07:09:21 2012
@@ -27,8 +27,6 @@ import com.carrotsearch.junitbenchmarks.
 import com.carrotsearch.junitbenchmarks.annotation.LabelType;
 import com.google.common.collect.MapMaker;
 import org.apache.directmemory.measures.Ram;
-import org.apache.directmemory.memory.OffHeapMemoryBuffer;
-import org.apache.directmemory.memory.OffHeapMemoryBufferImpl;
 import org.apache.directmemory.memory.Pointer;
 import org.junit.After;
 import org.junit.Before;
@@ -68,14 +66,21 @@ public class MallocTest
         logger.info( "************************************************" );
     }
 
-    OffHeapMemoryBuffer<Object> mem = OffHeapMemoryBufferImpl.createNew( 512 * 1024 * 1024 );
+    MemoryManagerService<Object> mem;
+    
+    @Before
+    public void initMMS()
+    {
+        mem = new MemoryManagerServiceImpl<Object>();
+        mem.init( 1, 512 * 1024 * 1024 );
+    }
 
     @Test
     public void oneMillionEntries()
     {
         assertNotNull( mem );
         int howMany = 1000000;
-        int size = mem.capacity() / ( howMany );
+        int size = (int)mem.capacity() / ( howMany );
         size -= size / 100 * 1;
         logger.info( "payload size=" + size );
         logger.info( "entries=" + howMany );
@@ -99,7 +104,7 @@ public class MallocTest
 
         assertNotNull( mem );
         int howMany = 2000000;
-        int size = mem.capacity() / ( howMany );
+        int size = (int)mem.capacity() / ( howMany );
         size -= size / 100 * 1;
         logger.info( "payload size=" + size );
         logger.info( "entries=" + howMany );
@@ -122,7 +127,7 @@ public class MallocTest
 
         assertNotNull( mem );
         int howMany = 5000000;
-        int size = mem.capacity() / ( howMany );
+        int size = (int)mem.capacity() / ( howMany );
         size -= size / 100 * 1;
         logger.info( "payload size=" + size );
         logger.info( "entries=" + howMany );

Modified: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/MemoryManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/MemoryManagerTest.java?rev=1296064&r1=1296063&r2=1296064&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/MemoryManagerTest.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/MemoryManagerTest.java Fri Mar  2 07:09:21 2012
@@ -23,8 +23,6 @@ import com.carrotsearch.junitbenchmarks.
 import com.google.common.collect.Maps;
 import org.apache.directmemory.measures.Ram;
 import org.apache.directmemory.memory.MemoryManager;
-import org.apache.directmemory.memory.OffHeapMemoryBuffer;
-import org.apache.directmemory.memory.OffHeapMemoryBufferImpl;
 import org.apache.directmemory.memory.Pointer;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -89,16 +87,13 @@ public class MemoryManagerTest
     @Test
     public void readTest()
     {
-        for ( OffHeapMemoryBuffer<Object> buffer : ((MemoryManagerServiceImpl<Object>)MemoryManager.getMemoryManager()).getBuffers() )
+        for ( Pointer<Object> ptr : ((MemoryManagerServiceImpl<Object>)MemoryManager.getMemoryManager()).getPointers() )
         {
-            for ( Pointer<Object> ptr : ((OffHeapMemoryBufferImpl<Object>) buffer).getPointers() )
+            if ( !ptr.isFree() )
             {
-                if ( !ptr.isFree() )
-                {
-                    byte[] res = MemoryManager.retrieve( ptr );
-                    assertNotNull( res );
-                    assertEquals( new String( payload ), new String( res ) );
-                }
+                byte[] res = MemoryManager.retrieve( ptr );
+                assertNotNull( res );
+                assertEquals( new String( payload ), new String( res ) );
             }
         }
     }

Modified: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/Starter.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/Starter.java?rev=1296064&r1=1296063&r2=1296064&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/Starter.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/Starter.java Fri Mar  2 07:09:21 2012
@@ -21,8 +21,8 @@ package org.apache.directmemory.memory;
 
 import org.apache.directmemory.measures.Ram;
 import org.apache.directmemory.memory.MemoryManager;
-import org.apache.directmemory.memory.OffHeapMemoryBuffer;
-import org.apache.directmemory.memory.OffHeapMemoryBufferImpl;
+import org.apache.directmemory.memory.allocator.ByteBufferAllocator;
+import org.apache.directmemory.memory.allocator.MergingByteBufferAllocatorImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -59,21 +59,21 @@ public class Starter
         starter.rawInsertMultipleBuffers( buffers, mb, entries );
     }
 
-    public void dump( OffHeapMemoryBuffer<Object> mem )
+    
+    private static void dump( MemoryManagerService<Object> mms )
     {
-        logger.info( "off-heap - buffer: " + mem.getBufferNumber() );
-        logger.info( "off-heap - allocated: " + Ram.inMb( mem.capacity() ) );
-        logger.info( "off-heap - used:      " + Ram.inMb( mem.used() ) );
-        logger.info( "heap 	  - max: " + Ram.inMb( Runtime.getRuntime().maxMemory() ) );
+        logger.info( "off-heap - allocated: " + Ram.inMb( mms.capacity() ) );
+        logger.info( "off-heap - used:      " + Ram.inMb( mms.used() ) );
+        logger.info( "heap    - max: " + Ram.inMb( Runtime.getRuntime().maxMemory() ) );
         logger.info( "heap     - allocated: " + Ram.inMb( Runtime.getRuntime().totalMemory() ) );
         logger.info( "heap     - free : " + Ram.inMb( Runtime.getRuntime().freeMemory() ) );
         logger.info( "************************************************" );
     }
-
-    private static void dump( MemoryManagerService<Object> mms )
+    
+    public void dump( ByteBufferAllocator mem )
     {
-        logger.info( "off-heap - allocated: " + Ram.inMb( mms.capacity() ) );
-        logger.info( "off-heap - used:      " + Ram.inMb( mms.used() ) );
+        logger.info( "off-heap - buffer: " + mem.getNumber() );
+        logger.info( "off-heap - allocated: " + Ram.inMb( mem.getCapacity() ) );
         logger.info( "heap    - max: " + Ram.inMb( Runtime.getRuntime().maxMemory() ) );
         logger.info( "heap     - allocated: " + Ram.inMb( Runtime.getRuntime().totalMemory() ) );
         logger.info( "heap     - free : " + Ram.inMb( Runtime.getRuntime().freeMemory() ) );
@@ -82,9 +82,9 @@ public class Starter
     
     public void rawInsert( int megabytes, int howMany )
     {
-        OffHeapMemoryBuffer<Object> mem = OffHeapMemoryBufferImpl.createNew( megabytes * 1024 * 1024 );
-        assertNotNull( mem );
-        int size = mem.capacity() / ( howMany );
+        ByteBufferAllocator allocator = new MergingByteBufferAllocatorImpl( 1, megabytes * 1024 * 1024 );
+        assertNotNull( allocator );
+        int size = allocator.getCapacity() / ( howMany );
         size -= size / 100 * 1;
         logger.info( "payload size=" + size );
         logger.info( "entries=" + howMany );
@@ -93,15 +93,14 @@ public class Starter
 
         long start = System.currentTimeMillis();
 
-        byte[] payload = new byte[size];
         for ( int i = 0; i < howMany; i++ )
         {
-            mem.store( payload );
+            allocator.allocate( size );
         }
 
         logger.info( "...done in " + ( System.currentTimeMillis() - start ) + " msecs." );
         logger.info( "---------------------------------" );
-        dump( mem );
+        dump( allocator );
     }
 
 

Modified: incubator/directmemory/trunk/integrations/ehcache/src/main/java/org/apache/directmemory/ehcache/DirectMemoryCache.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/integrations/ehcache/src/main/java/org/apache/directmemory/ehcache/DirectMemoryCache.java?rev=1296064&r1=1296063&r2=1296064&view=diff
==============================================================================
--- incubator/directmemory/trunk/integrations/ehcache/src/main/java/org/apache/directmemory/ehcache/DirectMemoryCache.java (original)
+++ incubator/directmemory/trunk/integrations/ehcache/src/main/java/org/apache/directmemory/ehcache/DirectMemoryCache.java Fri Mar  2 07:09:21 2012
@@ -28,7 +28,6 @@ import org.apache.directmemory.DirectMem
 import org.apache.directmemory.cache.CacheService;
 import org.apache.directmemory.memory.MemoryManagerService;
 import org.apache.directmemory.memory.MemoryManagerServiceWithAllocationPolicyImpl;
-import org.apache.directmemory.memory.OffHeapMemoryBuffer;
 import org.apache.directmemory.memory.Pointer;
 import org.apache.directmemory.memory.RoundRobinAllocationPolicy;
 import org.apache.directmemory.serialization.Serializer;
@@ -146,11 +145,6 @@ public class DirectMemoryCache<K, V>
         return getMemoryManager().capacity();
     }
 
-    public void dump( OffHeapMemoryBuffer<V> mem )
-    {
-        cacheService.dump( mem );
-    }
-
     public void dump()
     {
         cacheService.dump();