Author: mcucchiara
Date: Sat Dec 31 01:47:39 2011
New Revision: 1226018
URL: http://svn.apache.org/viewvc?rev=1226018&view=rev
Log:
DIRECTMEMORY-52 - hide some implementation details, removed a redundant cast,
renamed a local var which hided a field
Modified:
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMemoryBuffer.java
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=1226018&r1=1226017&r2=1226018&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
Sat Dec 31 01:47:39 2011
@@ -32,11 +32,11 @@ public class MemoryManagerServiceImpl
implements MemoryManagerService
{
- private static Logger logger = LoggerFactory.getLogger(
MemoryManager.class );
+ private static final Logger LOG = LoggerFactory.getLogger(
MemoryManager.class );
- public List<OffHeapMemoryBuffer> buffers = new
Vector<OffHeapMemoryBuffer>();
+ private List<OffHeapMemoryBuffer> buffers = new
Vector<OffHeapMemoryBuffer>();
- public OffHeapMemoryBuffer activeBuffer = null;
+ private OffHeapMemoryBuffer activeBuffer;
public MemoryManagerServiceImpl()
{
@@ -49,8 +49,7 @@ public class MemoryManagerServiceImpl
buffers.add( OffHeapMemoryBuffer.createNew( size, i ) );
}
activeBuffer = buffers.get( 0 );
- logger.info(
- Format.it( "MemoryManager initialized - %d buffers, %s each",
numberOfBuffers, Ram.inMb( size ) ) );
+ LOG.info( Format.it( "MemoryManager initialized - %d buffers, %s
each", numberOfBuffers, Ram.inMb( size ) ) );
}
public Pointer store( byte[] payload, int expiresIn )
Modified:
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMemoryBuffer.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMemoryBuffer.java?rev=1226018&r1=1226017&r2=1226018&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMemoryBuffer.java
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMemoryBuffer.java
Sat Dec 31 01:47:39 2011
@@ -19,15 +19,6 @@ package org.apache.directmemory.memory;
* under the License.
*/
-import java.nio.BufferOverflowException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.zip.CRC32;
-import java.util.zip.Checksum;
-
import org.apache.directmemory.measures.Ram;
import org.apache.directmemory.misc.Format;
import org.josql.Query;
@@ -37,16 +28,25 @@ import org.josql.QueryResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.nio.BufferOverflowException;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.zip.CRC32;
+import java.util.zip.Checksum;
+
public class OffHeapMemoryBuffer
{
private static Logger logger = LoggerFactory.getLogger(
OffHeapMemoryBuffer.class );
protected ByteBuffer buffer;
+ //TODO: Variable 'pointers' must be private and have accessor methods.
public List<Pointer> pointers = new ArrayList<Pointer>();
- // public List<Pointer> pointers = new CopyOnWriteArrayList<Pointer>();
- AtomicInteger used = new AtomicInteger();
+ private AtomicInteger used = new AtomicInteger();
public int bufferNumber;
@@ -128,7 +128,7 @@ public class OffHeapMemoryBuffer
pointer.lastHit = System.currentTimeMillis();
pointer.hits++;
- ByteBuffer buf = null;
+ ByteBuffer buf;
if ( pointer.clazz == ByteBuffer.class )
{
buf = pointer.directBuffer;
@@ -231,8 +231,7 @@ public class OffHeapMemoryBuffer
{
Query q = new Query();
q.parse( "SELECT * FROM " + Pointer.class.getCanonicalName() + "
WHERE " + whereClause );
- QueryResults qr = q.execute( pointers );
- return qr;
+ return q.execute( pointers );
}
private QueryResults selectOrderBy( String whereClause, String orderBy,
String limit )
@@ -241,8 +240,7 @@ public class OffHeapMemoryBuffer
Query q = new Query();
q.parse( "SELECT * FROM " + Pointer.class.getCanonicalName() + "
WHERE " + whereClause + " order by " + orderBy
+ " " + limit );
- QueryResults qr = q.execute( pointers );
- return qr;
+ return q.execute( pointers );
}
private boolean inShortage()
@@ -302,13 +300,13 @@ public class OffHeapMemoryBuffer
{
e.printStackTrace();
}
- return (List<Pointer>) new ArrayList<Pointer>();
+ return new ArrayList<Pointer>();
}
- private long free( List<Pointer> pointers )
+ private long free( List<Pointer> expiredPointers )
{
long howMuch = 0;
- for ( Pointer expired : pointers )
+ for ( Pointer expired : expiredPointers )
{
howMuch += free( expired );
}
