geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dschnei...@apache.org
Subject [22/38] incubator-geode git commit: renamed ObjectChunk to ObjectStoredInMemory
Date Sat, 05 Mar 2016 00:51:22 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b75d0400/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OldValueImporterTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OldValueImporterTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OldValueImporterTestBase.java
index c9eec45..0838812 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OldValueImporterTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OldValueImporterTestBase.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 
 import com.gemstone.gemfire.internal.HeapDataOutputStream;
 import com.gemstone.gemfire.internal.cache.EntryEventImpl.OldValueImporter;
-import com.gemstone.gemfire.internal.offheap.ObjectChunk;
+import com.gemstone.gemfire.internal.offheap.ObjectStoredInMemory;
 import com.gemstone.gemfire.internal.offheap.ObjectStoredAsAddress;
 import com.gemstone.gemfire.internal.offheap.NullOffHeapMemoryStats;
 import com.gemstone.gemfire.internal.offheap.NullOutOfOffHeapMemoryListener;
@@ -130,7 +130,7 @@ public abstract class OldValueImporterTestBase {
           SimpleMemoryAllocatorImpl.createForUnitTest(new NullOutOfOffHeapMemoryListener(), new NullOffHeapMemoryStats(), new SlabImpl[]{new SlabImpl(1024*1024)});
       try {
         byte[] baValue = new byte[] {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17};
-        ObjectChunk baValueSO = (ObjectChunk) sma.allocateAndInitialize(baValue, false, false);
+        ObjectStoredInMemory baValueSO = (ObjectStoredInMemory) sma.allocateAndInitialize(baValue, false, false);
         OldValueImporter omsg = createImporter();
         omsg.importOldObject(baValueSO, false);
         hdos = new HeapDataOutputStream(bytes);
@@ -166,7 +166,7 @@ public abstract class OldValueImporterTestBase {
       try {
         String baValue = "12345678";
         byte[] baValueBlob = BlobHelper.serializeToBlob(baValue);
-        ObjectChunk baValueSO = (ObjectChunk) sma.allocateAndInitialize(baValueBlob, true, false);
+        ObjectStoredInMemory baValueSO = (ObjectStoredInMemory) sma.allocateAndInitialize(baValueBlob, true, false);
         OldValueImporter omsg = createImporter();
         omsg.importOldObject(baValueSO, true);
         hdos = new HeapDataOutputStream(bytes);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b75d0400/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/FragmentJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/FragmentJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/FragmentJUnitTest.java
index 8ef7ee7..dc59474 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/FragmentJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/FragmentJUnitTest.java
@@ -211,7 +211,7 @@ public class FragmentJUnitTest {
     Long fragmentAddress = fragment.getMemoryAddress();
     byte[] bytes = new byte[(int)OffHeapStorage.MIN_SLAB_SIZE];
     byte[] expectedBytes = new byte[(int)OffHeapStorage.MIN_SLAB_SIZE];
-    Arrays.fill(expectedBytes, ObjectChunk.FILL_BYTE);;
+    Arrays.fill(expectedBytes, ObjectStoredInMemory.FILL_BYTE);;
     fragment.fill();
     AddressableMemoryManager.readBytes(fragmentAddress, bytes, 0, (int)OffHeapStorage.MIN_SLAB_SIZE);
     assertThat(bytes, is(equalTo(expectedBytes)));

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b75d0400/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/FreeListManagerTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/FreeListManagerTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/FreeListManagerTest.java
index 442adaf..b7151e8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/FreeListManagerTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/FreeListManagerTest.java
@@ -104,12 +104,12 @@ public class FreeListManagerTest {
     setUpSingleSlabManager();
     int tinySize = 10;
 
-    ObjectChunk c = this.freeListManager.allocate(tinySize);
+    ObjectStoredInMemory c = this.freeListManager.allocate(tinySize);
     
     validateChunkSizes(c, tinySize);
   }
   
-  private void validateChunkSizes(ObjectChunk c, int dataSize) {
+  private void validateChunkSizes(ObjectStoredInMemory c, int dataSize) {
     assertThat(c).isNotNull();
     assertThat(c.getDataSize()).isEqualTo(dataSize);
     assertThat(c.getSize()).isEqualTo(computeExpectedSize(dataSize));
@@ -120,8 +120,8 @@ public class FreeListManagerTest {
     setUpSingleSlabManager();
     int tinySize = 10;
     
-    ObjectChunk c = this.freeListManager.allocate(tinySize);
-    ObjectChunk.release(c.getMemoryAddress(), this.freeListManager);
+    ObjectStoredInMemory c = this.freeListManager.allocate(tinySize);
+    ObjectStoredInMemory.release(c.getMemoryAddress(), this.freeListManager);
     c = this.freeListManager.allocate(tinySize);
 
     validateChunkSizes(c, tinySize);
@@ -132,8 +132,8 @@ public class FreeListManagerTest {
     setUpSingleSlabManager();
     int dataSize = 10;
     
-    ObjectChunk c = this.freeListManager.allocate(dataSize);
-    ObjectChunk.release(c.getMemoryAddress(), this.freeListManager);
+    ObjectStoredInMemory c = this.freeListManager.allocate(dataSize);
+    ObjectStoredInMemory.release(c.getMemoryAddress(), this.freeListManager);
     this.freeListManager.allocate(dataSize);
     // free list will now be empty
     c = this.freeListManager.allocate(dataSize);
@@ -146,7 +146,7 @@ public class FreeListManagerTest {
     setUpSingleSlabManager();
     int hugeSize = FreeListManager.MAX_TINY+1;
 
-    ObjectChunk c = this.freeListManager.allocate(hugeSize);
+    ObjectStoredInMemory c = this.freeListManager.allocate(hugeSize);
 
     validateChunkSizes(c, hugeSize);
   }
@@ -156,8 +156,8 @@ public class FreeListManagerTest {
     setUpSingleSlabManager();
     int dataSize = FreeListManager.MAX_TINY+1;
     
-    ObjectChunk c = this.freeListManager.allocate(dataSize);
-    ObjectChunk.release(c.getMemoryAddress(), this.freeListManager);
+    ObjectStoredInMemory c = this.freeListManager.allocate(dataSize);
+    ObjectStoredInMemory.release(c.getMemoryAddress(), this.freeListManager);
     this.freeListManager.allocate(dataSize);
     // free list will now be empty
     c = this.freeListManager.allocate(dataSize);
@@ -170,8 +170,8 @@ public class FreeListManagerTest {
     setUpSingleSlabManager();
     int dataSize = FreeListManager.MAX_TINY+1+1024;
     
-    ObjectChunk c = this.freeListManager.allocate(dataSize);
-    ObjectChunk.release(c.getMemoryAddress(), this.freeListManager);
+    ObjectStoredInMemory c = this.freeListManager.allocate(dataSize);
+    ObjectStoredInMemory.release(c.getMemoryAddress(), this.freeListManager);
     dataSize = FreeListManager.MAX_TINY+1;
     c = this.freeListManager.allocate(dataSize);
     
@@ -188,8 +188,8 @@ public class FreeListManagerTest {
     setUpSingleSlabManager();
     int dataSize = 10;
     
-    ObjectChunk c = this.freeListManager.allocate(dataSize);
-    ObjectChunk.release(c.getMemoryAddress(), this.freeListManager);
+    ObjectStoredInMemory c = this.freeListManager.allocate(dataSize);
+    ObjectStoredInMemory.release(c.getMemoryAddress(), this.freeListManager);
     
     assertThat(this.freeListManager.getFreeTinyMemory()).isEqualTo(computeExpectedSize(dataSize));
   }
@@ -199,13 +199,13 @@ public class FreeListManagerTest {
     setUpSingleSlabManager();
     int dataSize = 10;
     
-    ObjectChunk c = this.freeListManager.allocate(dataSize);
-    ObjectChunk.release(c.getMemoryAddress(), this.freeListManager);
+    ObjectStoredInMemory c = this.freeListManager.allocate(dataSize);
+    ObjectStoredInMemory.release(c.getMemoryAddress(), this.freeListManager);
     
     int dataSize2 = 100;
     
-    ObjectChunk c2 = this.freeListManager.allocate(dataSize2);
-    ObjectChunk.release(c2.getMemoryAddress(), this.freeListManager);
+    ObjectStoredInMemory c2 = this.freeListManager.allocate(dataSize2);
+    ObjectStoredInMemory.release(c2.getMemoryAddress(), this.freeListManager);
     
     assertThat(this.freeListManager.getFreeTinyMemory()).isEqualTo(computeExpectedSize(dataSize)+computeExpectedSize(dataSize2));
   }
@@ -221,8 +221,8 @@ public class FreeListManagerTest {
     setUpSingleSlabManager();
     int dataSize = FreeListManager.MAX_TINY+1+1024;
     
-    ObjectChunk c = this.freeListManager.allocate(dataSize);
-    ObjectChunk.release(c.getMemoryAddress(), this.freeListManager);
+    ObjectStoredInMemory c = this.freeListManager.allocate(dataSize);
+    ObjectStoredInMemory.release(c.getMemoryAddress(), this.freeListManager);
     
     assertThat(this.freeListManager.getFreeHugeMemory()).isEqualTo(computeExpectedSize(dataSize));
   }
@@ -237,7 +237,7 @@ public class FreeListManagerTest {
   @Test
   public void freeFragmentMemorySomeOfFragmentAllocated() {
     setUpSingleSlabManager();
-    ObjectChunk c = this.freeListManager.allocate(DEFAULT_SLAB_SIZE/4-8);
+    ObjectStoredInMemory c = this.freeListManager.allocate(DEFAULT_SLAB_SIZE/4-8);
     
     assertThat(this.freeListManager.getFreeFragmentMemory()).isEqualTo((DEFAULT_SLAB_SIZE/4)*3);
   }
@@ -245,13 +245,13 @@ public class FreeListManagerTest {
   @Test
   public void freeFragmentMemoryMostOfFragmentAllocated() {
     setUpSingleSlabManager();
-    ObjectChunk c = this.freeListManager.allocate(DEFAULT_SLAB_SIZE-8-8);
+    ObjectStoredInMemory c = this.freeListManager.allocate(DEFAULT_SLAB_SIZE-8-8);
     
     assertThat(this.freeListManager.getFreeFragmentMemory()).isZero();
   }
   
   private int computeExpectedSize(int dataSize) {
-    return ((dataSize + ObjectChunk.OFF_HEAP_HEADER_SIZE + 7) / 8) * 8;
+    return ((dataSize + ObjectStoredInMemory.OFF_HEAP_HEADER_SIZE + 7) / 8) * 8;
   }
 
   @Test(expected = AssertionError.class)
@@ -288,13 +288,13 @@ public class FreeListManagerTest {
         new SlabImpl(SMALL_SLAB), 
         new SlabImpl(MEDIUM_SLAB), 
         slab});
-    ArrayList<ObjectChunk> chunks = new ArrayList<>();
+    ArrayList<ObjectStoredInMemory> chunks = new ArrayList<>();
     chunks.add(this.freeListManager.allocate(SMALL_SLAB-8+1));
     chunks.add(this.freeListManager.allocate(DEFAULT_SLAB_SIZE/2-8));
     chunks.add(this.freeListManager.allocate(DEFAULT_SLAB_SIZE/2-8));
     chunks.add(this.freeListManager.allocate(SMALL_SLAB-8+1));
-    for (ObjectChunk c: chunks) {
-      ObjectChunk.release(c.getMemoryAddress(), this.freeListManager);
+    for (ObjectStoredInMemory c: chunks) {
+      ObjectStoredInMemory.release(c.getMemoryAddress(), this.freeListManager);
     }
     this.freeListManager.firstCompact = false;
     assertThat(this.freeListManager.compact(DEFAULT_SLAB_SIZE+1)).isFalse();
@@ -310,13 +310,13 @@ public class FreeListManagerTest {
         new SlabImpl(SMALL_SLAB), 
         new SlabImpl(MEDIUM_SLAB), 
         slab});
-    ArrayList<ObjectChunk> chunks = new ArrayList<>();
+    ArrayList<ObjectStoredInMemory> chunks = new ArrayList<>();
     chunks.add(this.freeListManager.allocate(SMALL_SLAB-8+1));
     chunks.add(this.freeListManager.allocate(DEFAULT_SLAB_SIZE/2-8));
     chunks.add(this.freeListManager.allocate(DEFAULT_SLAB_SIZE/2-8));
     chunks.add(this.freeListManager.allocate(SMALL_SLAB-8+1));
-    for (ObjectChunk c: chunks) {
-      ObjectChunk.release(c.getMemoryAddress(), this.freeListManager);
+    for (ObjectStoredInMemory c: chunks) {
+      ObjectStoredInMemory.release(c.getMemoryAddress(), this.freeListManager);
     }
     
     assertThat(this.freeListManager.compact(DEFAULT_SLAB_SIZE)).isTrue();
@@ -333,13 +333,13 @@ public class FreeListManagerTest {
         new SlabImpl(SMALL_SLAB), 
         new SlabImpl(MEDIUM_SLAB), 
         slab});
-    ArrayList<ObjectChunk> chunks = new ArrayList<>();
+    ArrayList<ObjectStoredInMemory> chunks = new ArrayList<>();
     chunks.add(this.freeListManager.allocate(SMALL_SLAB-8+1));
     this.freeListManager.allocate(DEFAULT_SLAB_SIZE/2-8);
     chunks.add(this.freeListManager.allocate(DEFAULT_SLAB_SIZE/2-8));
     this.freeListManager.allocate(SMALL_SLAB-8+1);
-    for (ObjectChunk c: chunks) {
-      ObjectChunk.release(c.getMemoryAddress(), this.freeListManager);
+    for (ObjectStoredInMemory c: chunks) {
+      ObjectStoredInMemory.release(c.getMemoryAddress(), this.freeListManager);
     }
     
     assertThat(this.freeListManager.compact(DEFAULT_SLAB_SIZE/2)).isTrue();
@@ -348,7 +348,7 @@ public class FreeListManagerTest {
   @Test
   public void compactAfterAllocatingAll() {
     setUpSingleSlabManager();
-    ObjectChunk c = freeListManager.allocate(DEFAULT_SLAB_SIZE-8);
+    ObjectStoredInMemory c = freeListManager.allocate(DEFAULT_SLAB_SIZE-8);
     this.freeListManager.firstCompact = false;
     assertThat(this.freeListManager.compact(1)).isFalse();
     // call compact twice for extra code coverage
@@ -359,46 +359,46 @@ public class FreeListManagerTest {
   @Test
   public void afterAllocatingAllOneSizeCompactToAllocateDifferentSize() {
     setUpSingleSlabManager();
-    ArrayList<ObjectChunk> chunksToFree = new ArrayList<>();
-    ArrayList<ObjectChunk> chunksToFreeLater = new ArrayList<>();
+    ArrayList<ObjectStoredInMemory> chunksToFree = new ArrayList<>();
+    ArrayList<ObjectStoredInMemory> chunksToFreeLater = new ArrayList<>();
     int ALLOCATE_COUNT = 1000;
-    ObjectChunk bigChunk = freeListManager.allocate(DEFAULT_SLAB_SIZE-8-(ALLOCATE_COUNT*32)-256-256);
+    ObjectStoredInMemory bigChunk = freeListManager.allocate(DEFAULT_SLAB_SIZE-8-(ALLOCATE_COUNT*32)-256-256);
     for (int i=0; i < ALLOCATE_COUNT; i++) {
-      ObjectChunk c = freeListManager.allocate(24);
+      ObjectStoredInMemory c = freeListManager.allocate(24);
       if (i%3 != 2) {
         chunksToFree.add(c);
       } else {
         chunksToFreeLater.add(c);
       }
     }
-    ObjectChunk c1 = freeListManager.allocate(64-8);
-    ObjectChunk c2 = freeListManager.allocate(64-8);
-    ObjectChunk c3 = freeListManager.allocate(64-8);
-    ObjectChunk c4 = freeListManager.allocate(64-8);
+    ObjectStoredInMemory c1 = freeListManager.allocate(64-8);
+    ObjectStoredInMemory c2 = freeListManager.allocate(64-8);
+    ObjectStoredInMemory c3 = freeListManager.allocate(64-8);
+    ObjectStoredInMemory c4 = freeListManager.allocate(64-8);
 
-    ObjectChunk mediumChunk1 = freeListManager.allocate(128-8);
-    ObjectChunk mediumChunk2 = freeListManager.allocate(128-8);
+    ObjectStoredInMemory mediumChunk1 = freeListManager.allocate(128-8);
+    ObjectStoredInMemory mediumChunk2 = freeListManager.allocate(128-8);
 
-    ObjectChunk.release(bigChunk.getMemoryAddress(), freeListManager);
+    ObjectStoredInMemory.release(bigChunk.getMemoryAddress(), freeListManager);
     int s = chunksToFree.size();
     for (int i=s/2; i >=0; i--) {
-      ObjectChunk c = chunksToFree.get(i);
-      ObjectChunk.release(c.getMemoryAddress(), freeListManager);
+      ObjectStoredInMemory c = chunksToFree.get(i);
+      ObjectStoredInMemory.release(c.getMemoryAddress(), freeListManager);
     }
     for (int i=(s/2)+1; i < s; i++) {
-      ObjectChunk c = chunksToFree.get(i);
-      ObjectChunk.release(c.getMemoryAddress(), freeListManager);
+      ObjectStoredInMemory c = chunksToFree.get(i);
+      ObjectStoredInMemory.release(c.getMemoryAddress(), freeListManager);
     }
-    ObjectChunk.release(c3.getMemoryAddress(), freeListManager);
-    ObjectChunk.release(c1.getMemoryAddress(), freeListManager);
-    ObjectChunk.release(c2.getMemoryAddress(), freeListManager);
-    ObjectChunk.release(c4.getMemoryAddress(), freeListManager);
-    ObjectChunk.release(mediumChunk1.getMemoryAddress(), freeListManager);
-    ObjectChunk.release(mediumChunk2.getMemoryAddress(), freeListManager);
+    ObjectStoredInMemory.release(c3.getMemoryAddress(), freeListManager);
+    ObjectStoredInMemory.release(c1.getMemoryAddress(), freeListManager);
+    ObjectStoredInMemory.release(c2.getMemoryAddress(), freeListManager);
+    ObjectStoredInMemory.release(c4.getMemoryAddress(), freeListManager);
+    ObjectStoredInMemory.release(mediumChunk1.getMemoryAddress(), freeListManager);
+    ObjectStoredInMemory.release(mediumChunk2.getMemoryAddress(), freeListManager);
     this.freeListManager.firstCompact = false;
     assertThat(freeListManager.compact(DEFAULT_SLAB_SIZE-(ALLOCATE_COUNT*32))).isFalse();
     for (int i=0; i < ((256*2)/96); i++) {
-      ObjectChunk.release(chunksToFreeLater.get(i).getMemoryAddress(), freeListManager);
+      ObjectStoredInMemory.release(chunksToFreeLater.get(i).getMemoryAddress(), freeListManager);
     }
     assertThat(freeListManager.compact(DEFAULT_SLAB_SIZE-(ALLOCATE_COUNT*32))).isTrue();
   }
@@ -407,14 +407,14 @@ public class FreeListManagerTest {
   public void afterAllocatingAndFreeingCompact() {
     int slabSize = 1024*3;
     setUpSingleSlabManager(slabSize);
-    ObjectChunk bigChunk1 = freeListManager.allocate(slabSize/3-8);
-    ObjectChunk bigChunk2 = freeListManager.allocate(slabSize/3-8);
-    ObjectChunk bigChunk3 = freeListManager.allocate(slabSize/3-8);
+    ObjectStoredInMemory bigChunk1 = freeListManager.allocate(slabSize/3-8);
+    ObjectStoredInMemory bigChunk2 = freeListManager.allocate(slabSize/3-8);
+    ObjectStoredInMemory bigChunk3 = freeListManager.allocate(slabSize/3-8);
     this.freeListManager.firstCompact = false;
     assertThat(freeListManager.compact(1)).isFalse();
-    ObjectChunk.release(bigChunk3.getMemoryAddress(), freeListManager);
-    ObjectChunk.release(bigChunk2.getMemoryAddress(), freeListManager);
-    ObjectChunk.release(bigChunk1.getMemoryAddress(), freeListManager);
+    ObjectStoredInMemory.release(bigChunk3.getMemoryAddress(), freeListManager);
+    ObjectStoredInMemory.release(bigChunk2.getMemoryAddress(), freeListManager);
+    ObjectStoredInMemory.release(bigChunk1.getMemoryAddress(), freeListManager);
     assertThat(freeListManager.compact(slabSize)).isTrue();
   }
   
@@ -422,8 +422,8 @@ public class FreeListManagerTest {
   public void compactWithEmptyTinyFreeList() {
     setUpSingleSlabManager();
     Fragment originalFragment = this.freeListManager.getFragmentList().get(0);
-    ObjectChunk c = freeListManager.allocate(16);
-    ObjectChunk.release(c.getMemoryAddress(), this.freeListManager);
+    ObjectStoredInMemory c = freeListManager.allocate(16);
+    ObjectStoredInMemory.release(c.getMemoryAddress(), this.freeListManager);
     c = freeListManager.allocate(16);
     this.freeListManager.firstCompact = false;
     assertThat(this.freeListManager.compact(1)).isTrue();
@@ -443,8 +443,8 @@ public class FreeListManagerTest {
         new SlabImpl(SMALL_SLAB), 
         new SlabImpl(MEDIUM_SLAB), 
         slab});
-    this.freeListManager.allocate(DEFAULT_SLAB_SIZE-8-(ObjectChunk.MIN_CHUNK_SIZE-1));
-    this.freeListManager.allocate(MEDIUM_SLAB-8-(ObjectChunk.MIN_CHUNK_SIZE-1));
+    this.freeListManager.allocate(DEFAULT_SLAB_SIZE-8-(ObjectStoredInMemory.MIN_CHUNK_SIZE-1));
+    this.freeListManager.allocate(MEDIUM_SLAB-8-(ObjectStoredInMemory.MIN_CHUNK_SIZE-1));
     
     assertThat(this.freeListManager.compact(SMALL_SLAB)).isTrue();
   }
@@ -672,9 +672,9 @@ public class FreeListManagerTest {
     Slab chunk = new SlabImpl(96);
     long address = chunk.getMemoryAddress();
     this.freeListManager = createFreeListManager(ma, new Slab[] {chunk});
-    ObjectChunk c = this.freeListManager.allocate(24);
-    ObjectChunk c2 = this.freeListManager.allocate(24);
-    ObjectChunk.release(c.getMemoryAddress(), this.freeListManager);
+    ObjectStoredInMemory c = this.freeListManager.allocate(24);
+    ObjectStoredInMemory c2 = this.freeListManager.allocate(24);
+    ObjectStoredInMemory.release(c.getMemoryAddress(), this.freeListManager);
 
     List<MemoryBlock> ob = this.freeListManager.getOrderedBlocks();
     assertThat(ob).hasSize(3);
@@ -692,8 +692,8 @@ public class FreeListManagerTest {
   public void allocatedBlocksEmptyAfterFree() {
     Slab chunk = new SlabImpl(96);
     this.freeListManager = createFreeListManager(ma, new Slab[] {chunk});
-    ObjectChunk c = this.freeListManager.allocate(24);
-    ObjectChunk.release(c.getMemoryAddress(), this.freeListManager);
+    ObjectStoredInMemory c = this.freeListManager.allocate(24);
+    ObjectStoredInMemory.release(c.getMemoryAddress(), this.freeListManager);
     List<MemoryBlock> ob = this.freeListManager.getAllocatedBlocks();
     assertThat(ob).hasSize(0);
   }
@@ -702,7 +702,7 @@ public class FreeListManagerTest {
   public void allocatedBlocksHasAllocatedChunk() {
     Slab chunk = new SlabImpl(96);
     this.freeListManager = createFreeListManager(ma, new Slab[] {chunk});
-    ObjectChunk c = this.freeListManager.allocate(24);
+    ObjectStoredInMemory c = this.freeListManager.allocate(24);
     List<MemoryBlock> ob = this.freeListManager.getAllocatedBlocks();
     assertThat(ob).hasSize(1);
     assertThat(ob.get(0).getMemoryAddress()).isEqualTo(c.getMemoryAddress());
@@ -712,8 +712,8 @@ public class FreeListManagerTest {
   public void allocatedBlocksHasBothAllocatedChunks() {
     Slab chunk = new SlabImpl(96);
     this.freeListManager = createFreeListManager(ma, new Slab[] {chunk});
-    ObjectChunk c = this.freeListManager.allocate(24);
-    ObjectChunk c2 = this.freeListManager.allocate(33);
+    ObjectStoredInMemory c = this.freeListManager.allocate(24);
+    ObjectStoredInMemory c2 = this.freeListManager.allocate(33);
     List<MemoryBlock> ob = this.freeListManager.getAllocatedBlocks();
     assertThat(ob).hasSize(2);
   }
@@ -731,10 +731,10 @@ public class FreeListManagerTest {
     Slab chunk = new SlabImpl(32);
     Slab chunk2 = new SlabImpl(1024*1024*5);
     this.freeListManager = createFreeListManager(ma, new Slab[] {chunk, chunk2});
-    ObjectChunk c = this.freeListManager.allocate(24);
-    ObjectChunk c2 = this.freeListManager.allocate(1024*1024);
-    ObjectChunk.release(c.getMemoryAddress(), this.freeListManager);
-    ObjectChunk.release(c2.getMemoryAddress(), this.freeListManager);
+    ObjectStoredInMemory c = this.freeListManager.allocate(24);
+    ObjectStoredInMemory c2 = this.freeListManager.allocate(1024*1024);
+    ObjectStoredInMemory.release(c.getMemoryAddress(), this.freeListManager);
+    ObjectStoredInMemory.release(c2.getMemoryAddress(), this.freeListManager);
     
     LogWriter lw = mock(LogWriter.class);
     this.freeListManager.logOffHeapState(lw, 1024);
@@ -785,7 +785,7 @@ public class FreeListManagerTest {
     
     when(spy.getUsedMemory()).thenReturn(1L);
     when(spy.getFragmentCount()).thenReturn(2);
-    when(spy.getFreeMemory()).thenReturn((long)ObjectChunk.MIN_CHUNK_SIZE * 2);
+    when(spy.getFreeMemory()).thenReturn((long)ObjectStoredInMemory.MIN_CHUNK_SIZE * 2);
     
     assertThat(spy.getFragmentation()).isEqualTo(100);
   }
@@ -799,25 +799,25 @@ public class FreeListManagerTest {
     
     when(spy.getUsedMemory()).thenReturn(1L);
     when(spy.getFragmentCount()).thenReturn(4);
-    when(spy.getFreeMemory()).thenReturn((long)ObjectChunk.MIN_CHUNK_SIZE * 8);
+    when(spy.getFreeMemory()).thenReturn((long)ObjectStoredInMemory.MIN_CHUNK_SIZE * 8);
     
     assertThat(spy.getFragmentation()).isEqualTo(50); //Math.rint(50.0)
     
     when(spy.getUsedMemory()).thenReturn(1L);
     when(spy.getFragmentCount()).thenReturn(3);
-    when(spy.getFreeMemory()).thenReturn((long)ObjectChunk.MIN_CHUNK_SIZE * 8);
+    when(spy.getFreeMemory()).thenReturn((long)ObjectStoredInMemory.MIN_CHUNK_SIZE * 8);
     
     assertThat(spy.getFragmentation()).isEqualTo(38); //Math.rint(37.5)
     
     when(spy.getUsedMemory()).thenReturn(1L);
     when(spy.getFragmentCount()).thenReturn(6);
-    when(spy.getFreeMemory()).thenReturn((long)ObjectChunk.MIN_CHUNK_SIZE * 17);
+    when(spy.getFreeMemory()).thenReturn((long)ObjectStoredInMemory.MIN_CHUNK_SIZE * 17);
     
     assertThat(spy.getFragmentation()).isEqualTo(35); //Math.rint(35.29)
     
     when(spy.getUsedMemory()).thenReturn(1L);
     when(spy.getFragmentCount()).thenReturn(6);
-    when(spy.getFreeMemory()).thenReturn((long)ObjectChunk.MIN_CHUNK_SIZE * 9);
+    when(spy.getFreeMemory()).thenReturn((long)ObjectStoredInMemory.MIN_CHUNK_SIZE * 9);
     
     assertThat(spy.getFragmentation()).isEqualTo(67); //Math.rint(66.66)
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b75d0400/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/FreeListOffHeapRegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/FreeListOffHeapRegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/FreeListOffHeapRegionJUnitTest.java
index 6790f6a..5f80939 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/FreeListOffHeapRegionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/FreeListOffHeapRegionJUnitTest.java
@@ -40,7 +40,7 @@ public class FreeListOffHeapRegionJUnitTest extends OffHeapRegionBase {
 
   @Override
   public int perObjectOverhead() {
-    return ObjectChunk.OFF_HEAP_HEADER_SIZE;
+    return ObjectStoredInMemory.OFF_HEAP_HEADER_SIZE;
   }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b75d0400/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/MemoryBlockNodeJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/MemoryBlockNodeJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/MemoryBlockNodeJUnitTest.java
index 1b164db..1bc3d1c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/MemoryBlockNodeJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/MemoryBlockNodeJUnitTest.java
@@ -352,7 +352,7 @@ public class MemoryBlockNodeJUnitTest {
     storedObject = createValueAsSerializedStoredObject(obj);
     StoredObject spyStoredObject = spy(storedObject);
     MemoryBlock mb = new MemoryBlockNode(ma, (MemoryBlock) spyStoredObject);
-    when(((ObjectChunk)spyStoredObject).getRawBytes()).thenCallRealMethod().thenThrow(new CacheClosedException("Unit test forced exception"));
+    when(((ObjectStoredInMemory)spyStoredObject).getRawBytes()).thenCallRealMethod().thenThrow(new CacheClosedException("Unit test forced exception"));
     ByteArrayOutputStream errContent = new ByteArrayOutputStream();
     System.setErr(new PrintStream(errContent));
     softly.assertThat(mb.getDataValue()).isEqualTo("CacheClosedException:Unit test forced exception");
@@ -365,7 +365,7 @@ public class MemoryBlockNodeJUnitTest {
     storedObject = createValueAsSerializedStoredObject(obj);
     StoredObject spyStoredObject = spy(storedObject);
     MemoryBlock mb = new MemoryBlockNode(ma, (MemoryBlock) spyStoredObject);
-    when(((ObjectChunk)spyStoredObject).getRawBytes()).thenCallRealMethod().thenThrow(ClassNotFoundException.class);
+    when(((ObjectStoredInMemory)spyStoredObject).getRawBytes()).thenCallRealMethod().thenThrow(ClassNotFoundException.class);
     ByteArrayOutputStream errContent = new ByteArrayOutputStream();
     System.setErr(new PrintStream(errContent));
     softly.assertThat(mb.getDataValue()).isEqualTo("ClassNotFoundException:null");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b75d0400/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/ObjectChunkJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/ObjectChunkJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/ObjectChunkJUnitTest.java
index 09fed2a..e7cd408 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/ObjectChunkJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/ObjectChunkJUnitTest.java
@@ -98,7 +98,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
   }
 
   @Override
-  public ObjectChunk createValueAsUnserializedStoredObject(Object value) {
+  public ObjectStoredInMemory createValueAsUnserializedStoredObject(Object value) {
     byte[] valueInByteArray;
     if (value instanceof Long) {
       valueInByteArray = convertValueToByteArray(value);
@@ -113,7 +113,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
   }
 
   @Override
-  public ObjectChunk createValueAsSerializedStoredObject(Object value) {
+  public ObjectStoredInMemory createValueAsSerializedStoredObject(Object value) {
     byte[] valueInSerializedByteArray = EntryEventImpl.serialize(value);
 
     boolean isSerialized = true;
@@ -122,16 +122,16 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
     return createChunk(valueInSerializedByteArray, isSerialized, isCompressed);
   }
 
-  private ObjectChunk createChunk(byte[] v, boolean isSerialized, boolean isCompressed) {
-    ObjectChunk chunk = (ObjectChunk) ma.allocateAndInitialize(v, isSerialized, isCompressed);
+  private ObjectStoredInMemory createChunk(byte[] v, boolean isSerialized, boolean isCompressed) {
+    ObjectStoredInMemory chunk = (ObjectStoredInMemory) ma.allocateAndInitialize(v, isSerialized, isCompressed);
     return chunk;
   }
 
   @Test
   public void chunkCanBeCreatedFromAnotherChunk() {
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
 
-    ObjectChunk newChunk = new ObjectChunk(chunk);
+    ObjectStoredInMemory newChunk = new ObjectStoredInMemory(chunk);
 
     assertNotNull(newChunk);
     assertThat(newChunk.getMemoryAddress()).isEqualTo(chunk.getMemoryAddress());
@@ -141,9 +141,9 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void chunkCanBeCreatedWithOnlyMemoryAddress() {
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
 
-    ObjectChunk newChunk = new ObjectChunk(chunk.getMemoryAddress());
+    ObjectStoredInMemory newChunk = new ObjectStoredInMemory(chunk.getMemoryAddress());
 
     assertNotNull(newChunk);
     assertThat(newChunk.getMemoryAddress()).isEqualTo(chunk.getMemoryAddress());
@@ -153,12 +153,12 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void chunkSliceCanBeCreatedFromAnotherChunk() {
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
 
     int position = 1;
     int end = 2;
 
-    ObjectChunk newChunk = (ObjectChunk) chunk.slice(position, end);
+    ObjectStoredInMemory newChunk = (ObjectStoredInMemory) chunk.slice(position, end);
 
     assertNotNull(newChunk);
     assertThat(newChunk.getClass()).isEqualTo(ObjectChunkSlice.class);
@@ -169,7 +169,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void fillSerializedValueShouldFillWrapperWithSerializedValueIfValueIsSerialized() {
-    ObjectChunk chunk = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsSerializedStoredObject(getValue());
 
     // mock the things
     BytesAndBitsForCompactor wrapper = mock(BytesAndBitsForCompactor.class);
@@ -185,7 +185,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void fillSerializedValueShouldFillWrapperWithDeserializedValueIfValueIsNotSerialized() {
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
 
     // mock the things
     BytesAndBitsForCompactor wrapper = mock(BytesAndBitsForCompactor.class);
@@ -200,7 +200,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void getShortClassNameShouldReturnShortClassName() {
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
     assertThat(chunk.getShortClassName()).isEqualTo("ObjectChunk");
 
     chunk.release();
@@ -208,12 +208,12 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void chunksAreEqualsOnlyByAddress() {
-    ObjectChunk chunk = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsSerializedStoredObject(getValue());
 
-    ObjectChunk newChunk = new ObjectChunk(chunk.getMemoryAddress());
+    ObjectStoredInMemory newChunk = new ObjectStoredInMemory(chunk.getMemoryAddress());
     assertThat(chunk.equals(newChunk)).isTrue();
 
-    ObjectChunk chunkWithSameValue = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunkWithSameValue = createValueAsUnserializedStoredObject(getValue());
     assertThat(chunk.equals(chunkWithSameValue)).isFalse();
 
     Object someObject = getValue();
@@ -225,16 +225,16 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void chunksShouldBeComparedBySize() {
-    ObjectChunk chunk1 = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory chunk1 = createValueAsSerializedStoredObject(getValue());
 
-    ObjectChunk chunk2 = chunk1;
+    ObjectStoredInMemory chunk2 = chunk1;
     assertThat(chunk1.compareTo(chunk2)).isEqualTo(0);
 
-    ObjectChunk chunkWithSameValue = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory chunkWithSameValue = createValueAsSerializedStoredObject(getValue());
     assertThat(chunk1.compareTo(chunkWithSameValue)).isEqualTo(Long.signum(chunk1.getMemoryAddress() - chunkWithSameValue.getMemoryAddress()));
 
-    ObjectChunk chunk3 = createValueAsSerializedStoredObject(Long.MAX_VALUE);
-    ObjectChunk chunk4 = createValueAsSerializedStoredObject(Long.MAX_VALUE);
+    ObjectStoredInMemory chunk3 = createValueAsSerializedStoredObject(Long.MAX_VALUE);
+    ObjectStoredInMemory chunk4 = createValueAsSerializedStoredObject(Long.MAX_VALUE);
 
     int newSizeForChunk3 = 2;
     int newSizeForChunk4 = 3;
@@ -253,9 +253,9 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
     boolean isSerialized = false;
     boolean isCompressed = false;
 
-    ObjectChunk chunk = (ObjectChunk) ma.allocateAndInitialize(regionEntryValueAsBytes, isSerialized, isCompressed);
+    ObjectStoredInMemory chunk = (ObjectStoredInMemory) ma.allocateAndInitialize(regionEntryValueAsBytes, isSerialized, isCompressed);
 
-    int headerBeforeSerializedBitSet = AddressableMemoryManager.readIntVolatile(chunk.getMemoryAddress() + ObjectChunk.REF_COUNT_OFFSET);
+    int headerBeforeSerializedBitSet = AddressableMemoryManager.readIntVolatile(chunk.getMemoryAddress() + ObjectStoredInMemory.REF_COUNT_OFFSET);
 
     assertThat(chunk.isSerialized()).isFalse();
 
@@ -263,16 +263,16 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
     assertThat(chunk.isSerialized()).isTrue();
 
-    int headerAfterSerializedBitSet = AddressableMemoryManager.readIntVolatile(chunk.getMemoryAddress() + ObjectChunk.REF_COUNT_OFFSET);
+    int headerAfterSerializedBitSet = AddressableMemoryManager.readIntVolatile(chunk.getMemoryAddress() + ObjectStoredInMemory.REF_COUNT_OFFSET);
 
-    assertThat(headerAfterSerializedBitSet).isEqualTo(headerBeforeSerializedBitSet | ObjectChunk.IS_SERIALIZED_BIT);
+    assertThat(headerAfterSerializedBitSet).isEqualTo(headerBeforeSerializedBitSet | ObjectStoredInMemory.IS_SERIALIZED_BIT);
 
     chunk.release();
   }
 
   @Test(expected = IllegalStateException.class)
   public void setSerialziedShouldThrowExceptionIfChunkIsAlreadyReleased() {
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
     chunk.release();
     chunk.setSerialized(true);
 
@@ -287,9 +287,9 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
     boolean isSerialized = false;
     boolean isCompressed = false;
 
-    ObjectChunk chunk = (ObjectChunk) ma.allocateAndInitialize(regionEntryValueAsBytes, isSerialized, isCompressed);
+    ObjectStoredInMemory chunk = (ObjectStoredInMemory) ma.allocateAndInitialize(regionEntryValueAsBytes, isSerialized, isCompressed);
 
-    int headerBeforeCompressedBitSet = AddressableMemoryManager.readIntVolatile(chunk.getMemoryAddress() + ObjectChunk.REF_COUNT_OFFSET);
+    int headerBeforeCompressedBitSet = AddressableMemoryManager.readIntVolatile(chunk.getMemoryAddress() + ObjectStoredInMemory.REF_COUNT_OFFSET);
 
     assertThat(chunk.isCompressed()).isFalse();
 
@@ -297,16 +297,16 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
     assertThat(chunk.isCompressed()).isTrue();
 
-    int headerAfterCompressedBitSet = AddressableMemoryManager.readIntVolatile(chunk.getMemoryAddress() + ObjectChunk.REF_COUNT_OFFSET);
+    int headerAfterCompressedBitSet = AddressableMemoryManager.readIntVolatile(chunk.getMemoryAddress() + ObjectStoredInMemory.REF_COUNT_OFFSET);
 
-    assertThat(headerAfterCompressedBitSet).isEqualTo(headerBeforeCompressedBitSet | ObjectChunk.IS_COMPRESSED_BIT);
+    assertThat(headerAfterCompressedBitSet).isEqualTo(headerBeforeCompressedBitSet | ObjectStoredInMemory.IS_COMPRESSED_BIT);
 
     chunk.release();
   }
 
   @Test(expected = IllegalStateException.class)
   public void setCompressedShouldThrowExceptionIfChunkIsAlreadyReleased() {
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
     chunk.release();
     chunk.setCompressed(true);
 
@@ -315,7 +315,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void setDataSizeShouldSetTheDataSizeBits() {
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
 
     int beforeSize = chunk.getDataSize();
 
@@ -331,7 +331,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test(expected = IllegalStateException.class)
   public void setDataSizeShouldThrowExceptionIfChunkIsAlreadyReleased() {
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
     chunk.release();
     chunk.setDataSize(1);
 
@@ -340,7 +340,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test(expected = IllegalStateException.class)
   public void initializeUseCountShouldThrowIllegalStateExceptionIfChunkIsAlreadyRetained() {
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
     chunk.retain();
     chunk.initializeUseCount();
 
@@ -349,7 +349,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test(expected = IllegalStateException.class)
   public void initializeUseCountShouldThrowIllegalStateExceptionIfChunkIsAlreadyReleased() {
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
     chunk.release();
     chunk.initializeUseCount();
 
@@ -358,7 +358,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void isSerializedPdxInstanceShouldReturnTrueIfItsPDXInstance() {
-    ObjectChunk chunk = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsSerializedStoredObject(getValue());
 
     byte[] serailizedValue = chunk.getSerializedValue();
     serailizedValue[0] = DSCODE.PDX;
@@ -383,7 +383,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void isSerializedPdxInstanceShouldReturnFalseIfItsNotPDXInstance() {
-    ObjectChunk chunk = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsSerializedStoredObject(getValue());
     assertThat(chunk.isSerializedPdxInstance()).isFalse();
 
     chunk.release();
@@ -391,22 +391,22 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void checkDataEqualsByChunk() {
-    ObjectChunk chunk1 = createValueAsSerializedStoredObject(getValue());
-    ObjectChunk sameAsChunk1 = chunk1;
+    ObjectStoredInMemory chunk1 = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory sameAsChunk1 = chunk1;
 
     assertThat(chunk1.checkDataEquals(sameAsChunk1)).isTrue();
 
-    ObjectChunk unserializedChunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory unserializedChunk = createValueAsUnserializedStoredObject(getValue());
     assertThat(chunk1.checkDataEquals(unserializedChunk)).isFalse();
 
-    ObjectChunk chunkDifferBySize = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory chunkDifferBySize = createValueAsSerializedStoredObject(getValue());
     chunkDifferBySize.setSize(0);
     assertThat(chunk1.checkDataEquals(chunkDifferBySize)).isFalse();
 
-    ObjectChunk chunkDifferByValue = createValueAsSerializedStoredObject(Long.MAX_VALUE - 1);
+    ObjectStoredInMemory chunkDifferByValue = createValueAsSerializedStoredObject(Long.MAX_VALUE - 1);
     assertThat(chunk1.checkDataEquals(chunkDifferByValue)).isFalse();
 
-    ObjectChunk newChunk1 = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory newChunk1 = createValueAsSerializedStoredObject(getValue());
     assertThat(chunk1.checkDataEquals(newChunk1)).isTrue();
 
     chunk1.release();
@@ -418,13 +418,13 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void checkDataEqualsBySerializedValue() {
-    ObjectChunk chunk = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsSerializedStoredObject(getValue());
     assertThat(chunk.checkDataEquals(new byte[1])).isFalse();
 
-    ObjectChunk chunkDifferByValue = createValueAsSerializedStoredObject(Long.MAX_VALUE - 1);
+    ObjectStoredInMemory chunkDifferByValue = createValueAsSerializedStoredObject(Long.MAX_VALUE - 1);
     assertThat(chunk.checkDataEquals(chunkDifferByValue.getSerializedValue())).isFalse();
 
-    ObjectChunk newChunk = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory newChunk = createValueAsSerializedStoredObject(getValue());
     assertThat(chunk.checkDataEquals(newChunk.getSerializedValue())).isTrue();
 
     chunk.release();
@@ -440,7 +440,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
     boolean isSerialized = true;
     boolean isCompressed = true;
 
-    ObjectChunk chunk = (ObjectChunk) ma.allocateAndInitialize(regionEntryValueAsBytes, isSerialized, isCompressed);
+    ObjectStoredInMemory chunk = (ObjectStoredInMemory) ma.allocateAndInitialize(regionEntryValueAsBytes, isSerialized, isCompressed);
 
     RegionEntryContext regionContext = mock(RegionEntryContext.class);
     CachePerfStats cacheStats = mock(CachePerfStats.class);
@@ -469,7 +469,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void incSizeShouldIncrementSize() {
-    ObjectChunk chunk = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsSerializedStoredObject(getValue());
 
     int beforeSize = chunk.getSize();
 
@@ -484,7 +484,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void readyForFreeShouldResetTheRefCount() {
-    ObjectChunk chunk = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsSerializedStoredObject(getValue());
 
     int refCountBeforeFreeing = chunk.getRefCount();
     assertThat(refCountBeforeFreeing).isEqualTo(1);
@@ -497,7 +497,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test(expected = IllegalStateException.class)
   public void readyForAllocationShouldThrowExceptionIfAlreadyAllocated() {
-    ObjectChunk chunk = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsSerializedStoredObject(getValue());
 
     // chunk is already allocated when we created it, so calling readyForAllocation should throw exception.
     chunk.readyForAllocation();
@@ -507,7 +507,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void checkIsAllocatedShouldReturnIfAllocated() {
-    ObjectChunk chunk = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsSerializedStoredObject(getValue());
     chunk.checkIsAllocated();
 
     chunk.release();
@@ -515,7 +515,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test(expected = IllegalStateException.class)
   public void checkIsAllocatedShouldThrowExceptionIfNotAllocated() {
-    ObjectChunk chunk = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsSerializedStoredObject(getValue());
     chunk.release();
     chunk.checkIsAllocated();
 
@@ -524,8 +524,8 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void sendToShouldWriteSerializedValueToDataOutputIfValueIsSerialized() throws IOException {
-    ObjectChunk chunk = createValueAsSerializedStoredObject(getValue());
-    ObjectChunk spyChunk = spy(chunk);
+    ObjectStoredInMemory chunk = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory spyChunk = spy(chunk);
 
     HeapDataOutputStream dataOutput = mock(HeapDataOutputStream.class);
     ByteBuffer directByteBuffer = ByteBuffer.allocate(1024);
@@ -543,7 +543,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
   @Test
   public void sendToShouldWriteUnserializedValueToDataOutputIfValueIsUnserialized() throws IOException {
     byte[] regionEntryValue = getValueAsByteArray();
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(regionEntryValue);
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(regionEntryValue);
 
     // writeByte is a final method and cannot be mocked, so creating a real one
     HeapDataOutputStream dataOutput = new HeapDataOutputStream(Version.CURRENT);
@@ -566,7 +566,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
   @Test
   public void sendAsByteArrayShouldWriteValueToDataOutput() throws IOException {
     byte[] regionEntryValue = getValueAsByteArray();
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(regionEntryValue);
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(regionEntryValue);
 
     // writeByte is a final method and cannot be mocked, so creating a real one
     HeapDataOutputStream dataOutput = new HeapDataOutputStream(Version.CURRENT);
@@ -589,7 +589,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
   public void createDirectByteBufferShouldCreateAByteBuffer() {
     byte[] regionEntryValue = getValueAsByteArray();
 
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(regionEntryValue);
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(regionEntryValue);
 
     ByteBuffer buffer = chunk.createDirectByteBuffer();
 
@@ -604,20 +604,20 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
   @Test
   public void getDirectByteBufferShouldCreateAByteBuffer() {
     byte[] regionEntryValue = getValueAsByteArray();
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(regionEntryValue);
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(regionEntryValue);
 
     ByteBuffer buffer = chunk.createDirectByteBuffer();
-    long bufferAddress = ObjectChunk.getDirectByteBufferAddress(buffer);
+    long bufferAddress = ObjectStoredInMemory.getDirectByteBufferAddress(buffer);
 
     // returned address should be starting of the value (after skipping HEADER_SIZE bytes)
-    assertEquals(chunk.getMemoryAddress() + ObjectChunk.OFF_HEAP_HEADER_SIZE, bufferAddress);
+    assertEquals(chunk.getMemoryAddress() + ObjectStoredInMemory.OFF_HEAP_HEADER_SIZE, bufferAddress);
 
     chunk.release();
   }
 
   @Test(expected = AssertionError.class)
   public void getAddressForReadingShouldFailIfItsOutsideOfChunk() {
-    ObjectChunk chunk = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsSerializedStoredObject(getValue());
     chunk.getAddressForReading(0, chunk.getDataSize() + 1);
 
     chunk.release();
@@ -625,7 +625,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void getAddressForReadingShouldReturnDataAddressFromGivenOffset() {
-    ObjectChunk chunk = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsSerializedStoredObject(getValue());
 
     int offset = 1;
     long requestedAddress = chunk.getAddressForReading(offset, 1);
@@ -637,7 +637,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void getSizeInBytesShouldReturnSize() {
-    ObjectChunk chunk = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsSerializedStoredObject(getValue());
     assertThat(chunk.getSizeInBytes()).isEqualTo(chunk.getSize());
 
     chunk.release();
@@ -645,7 +645,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test(expected = AssertionError.class)
   public void getUnsafeAddressShouldFailIfOffsetIsNegative() {
-    ObjectChunk chunk = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsSerializedStoredObject(getValue());
     chunk.getUnsafeAddress(-1, 1);
 
     chunk.release();
@@ -653,7 +653,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test(expected = AssertionError.class)
   public void getUnsafeAddressShouldFailIfSizeIsNegative() {
-    ObjectChunk chunk = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsSerializedStoredObject(getValue());
     chunk.getUnsafeAddress(1, -1);
 
     chunk.release();
@@ -661,7 +661,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test(expected = AssertionError.class)
   public void getUnsafeAddressShouldFailIfItsOutsideOfChunk() {
-    ObjectChunk chunk = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsSerializedStoredObject(getValue());
     chunk.getUnsafeAddress(0, chunk.getDataSize() + 1);
 
     chunk.release();
@@ -669,7 +669,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void getUnsafeAddressShouldReturnUnsafeAddress() {
-    ObjectChunk chunk = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsSerializedStoredObject(getValue());
 
     int offset = 1;
     long unsafeAddress = chunk.getUnsafeAddress(offset, 1);
@@ -681,7 +681,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test(expected = AssertionError.class)
   public void readByteAndWriteByteShouldFailIfOffsetIsOutside() {
-    ObjectChunk chunk = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsSerializedStoredObject(getValue());
 
     chunk.readDataByte(chunk.getDataSize() + 1);
 
@@ -692,7 +692,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void writeByteShouldWriteAtCorrectLocation() {
-    ObjectChunk chunk = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsSerializedStoredObject(getValue());
 
     byte valueBeforeWrite = chunk.readDataByte(2);
 
@@ -709,7 +709,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void retainShouldIncrementRefCount() {
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
     assertThat(chunk.getRefCount()).isEqualTo(1);
 
     chunk.retain();
@@ -728,10 +728,10 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test(expected = IllegalStateException.class)
   public void retainShouldThrowExceptionAfterMaxNumberOfTimesRetained() {
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
 
     // loop though and invoke retain for MAX_REF_COUNT-1 times, as create chunk above counted as one reference
-    for (int i = 0; i < ObjectChunk.MAX_REF_COUNT - 1; i++)
+    for (int i = 0; i < ObjectStoredInMemory.MAX_REF_COUNT - 1; i++)
       chunk.retain();
 
     // invoke for the one more time should throw exception
@@ -740,7 +740,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void releaseShouldDecrementRefCount() {
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
     assertThat(chunk.getRefCount()).isEqualTo(1);
 
     chunk.retain();
@@ -763,20 +763,20 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test(expected = IllegalStateException.class)
   public void releaseShouldThrowExceptionIfChunkIsAlreadyReleased() {
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
     chunk.release();
     chunk.release();
   }
 
   @Test
   public void testToStringForOffHeapByteSource() {
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
 
     String expected = ":<dataSize=" + chunk.getDataSize() + " refCount=" + chunk.getRefCount() + " addr=" + Long.toHexString(chunk.getMemoryAddress()) + ">";
     assertThat(chunk.toStringForOffHeapByteSource()).endsWith(expected);
 
     // test toString
-    ObjectChunk spy = spy(chunk);
+    ObjectStoredInMemory spy = spy(chunk);
     spy.toString();
     verify(spy, times(1)).toStringForOffHeapByteSource();
 
@@ -785,7 +785,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void getStateShouldReturnAllocatedIfRefCountIsGreaterThanZero() {
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
     assertEquals(State.ALLOCATED, chunk.getState());
 
     chunk.release();
@@ -793,14 +793,14 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void getStateShouldReturnDeallocatedIfRefCountIsZero() {
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
     chunk.release();
     assertEquals(State.DEALLOCATED, chunk.getState());
   }
 
   @Test(expected = UnsupportedOperationException.class)
   public void getNextBlockShouldThrowUnSupportedOperationException() {
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
     chunk.getNextBlock();
 
     chunk.release();
@@ -808,7 +808,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void getBlockSizeShouldBeSameSameGetSize() {
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
     assertEquals(chunk.getSize(), chunk.getBlockSize());
 
     chunk.release();
@@ -816,7 +816,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test(expected = UnsupportedOperationException.class)
   public void getSlabIdShouldThrowUnSupportedOperationException() {
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
     chunk.getSlabId();
 
     chunk.release();
@@ -824,7 +824,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void getFreeListIdShouldReturnMinusOne() {
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
     assertThat(chunk.getFreeListId()).isEqualTo(-1);
 
     chunk.release();
@@ -832,7 +832,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void getDataTypeShouldReturnNull() {
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
     assertThat(chunk.getDataType()).isNull();
 
     chunk.release();
@@ -840,7 +840,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
 
   @Test
   public void getDataDataShouldReturnNull() {
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
     assertThat(chunk.getDataValue()).isNull();
   }
 
@@ -852,7 +852,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
     boolean isSerialized = true;
     boolean isCompressed = true;
 
-    ObjectChunk chunk = (ObjectChunk) ma.allocateAndInitialize(regionEntryValueAsBytes, isSerialized, isCompressed);
+    ObjectStoredInMemory chunk = (ObjectStoredInMemory) ma.allocateAndInitialize(regionEntryValueAsBytes, isSerialized, isCompressed);
 
     chunk.getRawBytes();
 
@@ -867,7 +867,7 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
     boolean isSerialized = false;
     boolean isCompressed = false;
 
-    ObjectChunk chunk = (ObjectChunk) ma.allocateAndInitialize(regionEntryValueAsBytes, isSerialized, isCompressed);
+    ObjectStoredInMemory chunk = (ObjectStoredInMemory) ma.allocateAndInitialize(regionEntryValueAsBytes, isSerialized, isCompressed);
 
     byte[] serializedValue = chunk.getSerializedValue();
 
@@ -881,10 +881,10 @@ public class ObjectChunkJUnitTest extends AbstractStoredObjectTestBase {
     boolean isSerialized = false;
     boolean isCompressed = false;
 
-    ObjectChunk chunk = (ObjectChunk) ma.allocateAndInitialize(new byte[100], isSerialized, isCompressed);
+    ObjectStoredInMemory chunk = (ObjectStoredInMemory) ma.allocateAndInitialize(new byte[100], isSerialized, isCompressed);
 
     // first fill the unused part with FILL_PATTERN
-    ObjectChunk.fill(chunk.getMemoryAddress());
+    ObjectStoredInMemory.fill(chunk.getMemoryAddress());
 
     // Validate that it is filled
     chunk.validateFill();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b75d0400/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/ObjectChunkSliceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/ObjectChunkSliceJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/ObjectChunkSliceJUnitTest.java
index fe55910..627769d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/ObjectChunkSliceJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/ObjectChunkSliceJUnitTest.java
@@ -33,7 +33,7 @@ public class ObjectChunkSliceJUnitTest extends ObjectChunkJUnitTest {
     int position = 1;
     int end = 2;
 
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
     ObjectChunkSlice slice = (ObjectChunkSlice) chunk.slice(position, end);
 
     assertNotNull(slice);
@@ -47,7 +47,7 @@ public class ObjectChunkSliceJUnitTest extends ObjectChunkJUnitTest {
     int position = 1;
     int end = 2;
 
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
     ObjectChunkSlice slice = (ObjectChunkSlice) chunk.slice(position, end);
 
     assertNotNull(slice);
@@ -61,7 +61,7 @@ public class ObjectChunkSliceJUnitTest extends ObjectChunkJUnitTest {
     int position = 1;
     int end = 2;
 
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
     ObjectChunkSlice slice = (ObjectChunkSlice) chunk.slice(position, end);
 
     assertNotNull(slice);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b75d0400/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/ObjectChunkWithHeapFormJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/ObjectChunkWithHeapFormJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/ObjectChunkWithHeapFormJUnitTest.java
index 4486845..c6693d1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/ObjectChunkWithHeapFormJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/ObjectChunkWithHeapFormJUnitTest.java
@@ -33,7 +33,7 @@ public class ObjectChunkWithHeapFormJUnitTest extends ObjectChunkJUnitTest {
 
   @Test
   public void getRawBytesShouldReturnCachedHeapForm() {
-    ObjectChunk chunk = createValueAsUnserializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsUnserializedStoredObject(getValue());
 
     byte[] valueInBytes = getValueAsByteArray();
     ObjectChunkWithHeapForm heapForm = new ObjectChunkWithHeapForm(chunk, valueInBytes);
@@ -45,15 +45,15 @@ public class ObjectChunkWithHeapFormJUnitTest extends ObjectChunkJUnitTest {
 
   @Test
   public void getChunkWithoutHeapFormShouldReturnGemFireChunk() {
-    ObjectChunk chunk = createValueAsSerializedStoredObject(getValue());
+    ObjectStoredInMemory chunk = createValueAsSerializedStoredObject(getValue());
 
     byte[] valueInBytes = getValueAsByteArray();
     ObjectChunkWithHeapForm heapForm = new ObjectChunkWithHeapForm(chunk, valueInBytes);
 
-    ObjectChunk chunkWithOutHeapForm = heapForm.getChunkWithoutHeapForm();
+    ObjectStoredInMemory chunkWithOutHeapForm = heapForm.getChunkWithoutHeapForm();
 
     assertNotNull(chunkWithOutHeapForm);
-    assertEquals(ObjectChunk.class, chunkWithOutHeapForm.getClass());
+    assertEquals(ObjectStoredInMemory.class, chunkWithOutHeapForm.getClass());
 
     assertEquals(chunk, heapForm.getChunkWithoutHeapForm());
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b75d0400/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapHelperJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapHelperJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapHelperJUnitTest.java
index 6510ed4..8af255a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapHelperJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapHelperJUnitTest.java
@@ -128,8 +128,8 @@ public class OffHeapHelperJUnitTest extends AbstractStoredObjectTestBase {
     return createdObject;
   }
 
-  private ObjectChunk createChunk(byte[] v, boolean isSerialized, boolean isCompressed) {
-    ObjectChunk chunk = (ObjectChunk) ma.allocateAndInitialize(v, isSerialized, isCompressed);
+  private ObjectStoredInMemory createChunk(byte[] v, boolean isSerialized, boolean isCompressed) {
+    ObjectStoredInMemory chunk = (ObjectStoredInMemory) ma.allocateAndInitialize(v, isSerialized, isCompressed);
     return chunk;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b75d0400/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionBase.java
index 55bacdb..57f770a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionBase.java
@@ -540,11 +540,11 @@ public abstract class OffHeapRegionBase {
     @Released(OffHeapIdentifier.TEST_OFF_HEAP_REGION_BASE_LISTENER)
     @Override
     public void close() {
-      if (this.ohOldValue instanceof ObjectChunk) {
-        ((ObjectChunk)this.ohOldValue).release();
+      if (this.ohOldValue instanceof ObjectStoredInMemory) {
+        ((ObjectStoredInMemory)this.ohOldValue).release();
       }
-      if (this.ohNewValue instanceof ObjectChunk) {
-        ((ObjectChunk)this.ohNewValue).release();
+      if (this.ohNewValue instanceof ObjectStoredInMemory) {
+        ((ObjectStoredInMemory)this.ohNewValue).release();
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b75d0400/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java
index 34e418e..4ed2d41 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java
@@ -54,7 +54,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 @Category(UnitTest.class)
 @RunWith(PowerMockRunner.class)
 @PowerMockIgnore("*.UnitTest")
-@PrepareForTest({ ObjectChunk.class, OffHeapRegionEntryHelper.class })
+@PrepareForTest({ ObjectStoredInMemory.class, OffHeapRegionEntryHelper.class })
 public class OffHeapRegionEntryHelperJUnitTest {
 
   private static final Long VALUE_IS_NOT_ENCODABLE = 0L;
@@ -75,13 +75,13 @@ public class OffHeapRegionEntryHelperJUnitTest {
     SimpleMemoryAllocatorImpl.freeOffHeapMemory();
   }
 
-  private ObjectChunk createChunk(Object value) {
+  private ObjectStoredInMemory createChunk(Object value) {
     byte[] v = EntryEventImpl.serialize(value);
 
     boolean isSerialized = true;
     boolean isCompressed = false;
 
-    ObjectChunk chunk = (ObjectChunk) ma.allocateAndInitialize(v, isSerialized, isCompressed);
+    ObjectStoredInMemory chunk = (ObjectStoredInMemory) ma.allocateAndInitialize(v, isSerialized, isCompressed);
 
     return chunk;
   }
@@ -294,7 +294,7 @@ public class OffHeapRegionEntryHelperJUnitTest {
 
   @Test
   public void isOffHeapShouldReturnTrueIfAddressIsOnOffHeap() {
-    ObjectChunk value = createChunk(Long.MAX_VALUE);
+    ObjectStoredInMemory value = createChunk(Long.MAX_VALUE);
     assertThat(OffHeapRegionEntryHelper.isOffHeap(value.getMemoryAddress())).isTrue();
   }
 
@@ -327,7 +327,7 @@ public class OffHeapRegionEntryHelperJUnitTest {
     long oldAddress = 1L;
 
     // testing when the newValue is a chunk
-    ObjectChunk newValue = createChunk(Long.MAX_VALUE);
+    ObjectStoredInMemory newValue = createChunk(Long.MAX_VALUE);
     // mock region entry methods required for test
     when(re.getAddress()).thenReturn(oldAddress);
     when(re.setAddress(oldAddress, newValue.getMemoryAddress())).thenReturn(Boolean.TRUE);
@@ -440,13 +440,13 @@ public class OffHeapRegionEntryHelperJUnitTest {
     // mock region entry
     OffHeapRegionEntry re = mock(OffHeapRegionEntry.class);
 
-    ObjectChunk oldValue = createChunk(Long.MAX_VALUE);
-    ObjectChunk newValue = createChunk(Long.MAX_VALUE - 1);
+    ObjectStoredInMemory oldValue = createChunk(Long.MAX_VALUE);
+    ObjectStoredInMemory newValue = createChunk(Long.MAX_VALUE - 1);
 
     // mock Chunk static methods - in-order to verify that release is called
-    PowerMockito.spy(ObjectChunk.class);
-    PowerMockito.doNothing().when(ObjectChunk.class);
-    ObjectChunk.release(oldValue.getMemoryAddress());
+    PowerMockito.spy(ObjectStoredInMemory.class);
+    PowerMockito.doNothing().when(ObjectStoredInMemory.class);
+    ObjectStoredInMemory.release(oldValue.getMemoryAddress());
 
     // mock region entry methods required for test
     when(re.getAddress()).thenReturn(oldValue.getMemoryAddress());
@@ -460,7 +460,7 @@ public class OffHeapRegionEntryHelperJUnitTest {
 
     // verify oldAddress is released
     PowerMockito.verifyStatic();
-    ObjectChunk.release(oldValue.getMemoryAddress());
+    ObjectStoredInMemory.release(oldValue.getMemoryAddress());
   }
 
   @Test
@@ -475,9 +475,9 @@ public class OffHeapRegionEntryHelperJUnitTest {
     ObjectStoredAsAddress newAddress = new ObjectStoredAsAddress(OffHeapRegionEntryHelper.encodeDataAsAddress(newData, false, false));
 
     // mock Chunk static methods - in-order to verify that release is never called
-    PowerMockito.spy(ObjectChunk.class);
-    PowerMockito.doNothing().when(ObjectChunk.class);
-    ObjectChunk.release(oldAddress);
+    PowerMockito.spy(ObjectStoredInMemory.class);
+    PowerMockito.doNothing().when(ObjectStoredInMemory.class);
+    ObjectStoredInMemory.release(oldAddress);
 
     // mock region entry methods required for test
     when(re.getAddress()).thenReturn(oldAddress);
@@ -491,7 +491,7 @@ public class OffHeapRegionEntryHelperJUnitTest {
 
     // verify that release is never called as the old address is not on offheap
     PowerMockito.verifyStatic(never());
-    ObjectChunk.release(oldAddress);
+    ObjectStoredInMemory.release(oldAddress);
   }
 
   @Test
@@ -505,9 +505,9 @@ public class OffHeapRegionEntryHelperJUnitTest {
     long newAddress = OffHeapRegionEntryHelper.REMOVED_PHASE2_ADDRESS;
 
     // mock Chunk static methods - in-order to verify that release is never called
-    PowerMockito.spy(ObjectChunk.class);
-    PowerMockito.doNothing().when(ObjectChunk.class);
-    ObjectChunk.release(oldAddress);
+    PowerMockito.spy(ObjectStoredInMemory.class);
+    PowerMockito.doNothing().when(ObjectStoredInMemory.class);
+    ObjectStoredInMemory.release(oldAddress);
 
     // mock region entry methods required for test
     when(re.getAddress()).thenReturn(oldAddress);
@@ -521,7 +521,7 @@ public class OffHeapRegionEntryHelperJUnitTest {
 
     // verify that release is never called as the old address is not on offheap
     PowerMockito.verifyStatic(never());
-    ObjectChunk.release(oldAddress);
+    ObjectStoredInMemory.release(oldAddress);
   }
 
   @Test(expected = IllegalStateException.class)
@@ -541,7 +541,7 @@ public class OffHeapRegionEntryHelperJUnitTest {
     // mock region entry
     OffHeapRegionEntry re = mock(OffHeapRegionEntry.class);
 
-    ObjectChunk chunk = createChunk(Long.MAX_VALUE);
+    ObjectStoredInMemory chunk = createChunk(Long.MAX_VALUE);
 
     // mock region entry methods required for test
     when(re.getAddress()).thenReturn(chunk.getMemoryAddress());
@@ -627,10 +627,10 @@ public class OffHeapRegionEntryHelperJUnitTest {
 
   @Test
   public void addressToObjectShouldReturnValueFromChunk() {
-    ObjectChunk expected = createChunk(Long.MAX_VALUE);
+    ObjectStoredInMemory expected = createChunk(Long.MAX_VALUE);
     Object actual = OffHeapRegionEntryHelper.addressToObject(expected.getMemoryAddress(), false, null);
 
-    assertThat(actual).isInstanceOf(ObjectChunk.class);
+    assertThat(actual).isInstanceOf(ObjectStoredInMemory.class);
     assertThat(actual).isEqualTo(expected);
   }
 
@@ -640,7 +640,7 @@ public class OffHeapRegionEntryHelperJUnitTest {
     boolean isSerialized = true;
     boolean isCompressed = true;
 
-    ObjectChunk chunk = (ObjectChunk) ma.allocateAndInitialize(data, isSerialized, isCompressed);
+    ObjectStoredInMemory chunk = (ObjectStoredInMemory) ma.allocateAndInitialize(data, isSerialized, isCompressed);
 
     // create the mock context
     RegionEntryContext regionContext = mock(RegionEntryContext.class);
@@ -669,7 +669,7 @@ public class OffHeapRegionEntryHelperJUnitTest {
     boolean isSerialized = false;
     boolean isCompressed = true;
 
-    ObjectChunk chunk = (ObjectChunk) ma.allocateAndInitialize(data, isSerialized, isCompressed);
+    ObjectStoredInMemory chunk = (ObjectStoredInMemory) ma.allocateAndInitialize(data, isSerialized, isCompressed);
 
     // create the mock context
     RegionEntryContext regionContext = mock(RegionEntryContext.class);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b75d0400/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapValidationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapValidationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapValidationJUnitTest.java
index 630ae22..a9e8e5f 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapValidationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapValidationJUnitTest.java
@@ -296,8 +296,8 @@ public class OffHeapValidationJUnitTest {
   
   private long getMemoryAddress(Region region, String key) {
     Object entry = ((LocalRegion) region).getRegionEntry(key)._getValue();
-    assertTrue(entry instanceof ObjectChunk);
-    long memoryAddress = ((ObjectChunk)entry).getMemoryAddress();
+    assertTrue(entry instanceof ObjectStoredInMemory);
+    long memoryAddress = ((ObjectStoredInMemory)entry).getMemoryAddress();
     assertTrue(memoryAddress > 0);
     return memoryAddress;
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b75d0400/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapWriteObjectAsByteArrayJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapWriteObjectAsByteArrayJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapWriteObjectAsByteArrayJUnitTest.java
index e93b5a1..1bc028b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapWriteObjectAsByteArrayJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapWriteObjectAsByteArrayJUnitTest.java
@@ -64,7 +64,7 @@ public class OffHeapWriteObjectAsByteArrayJUnitTest {
   public void testByteArrayChunk() throws IOException, ClassNotFoundException {
     byte[] expected = new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
     StoredObject so = createStoredObject(expected, false, false);
-    assertTrue(so instanceof ObjectChunk);
+    assertTrue(so instanceof ObjectStoredInMemory);
     HeapDataOutputStream hdos = new HeapDataOutputStream(new byte[1024]);
     DataSerializer.writeObjectAsByteArray(so, hdos);
     DataInputStream in = createInput(hdos);
@@ -88,7 +88,7 @@ public class OffHeapWriteObjectAsByteArrayJUnitTest {
   public void testStringChunk() throws IOException, ClassNotFoundException {
     byte[] expected = EntryEventImpl.serialize("1234567890");
     StoredObject so = createStoredObject(expected, true, false);
-    assertTrue(so instanceof ObjectChunk);
+    assertTrue(so instanceof ObjectStoredInMemory);
     HeapDataOutputStream hdos = new HeapDataOutputStream(new byte[1024]);
     DataSerializer.writeObjectAsByteArray(so, hdos);
     DataInputStream in = createInput(hdos);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b75d0400/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OldFreeListOffHeapRegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OldFreeListOffHeapRegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OldFreeListOffHeapRegionJUnitTest.java
index d8c35b8..a58a421 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OldFreeListOffHeapRegionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OldFreeListOffHeapRegionJUnitTest.java
@@ -41,7 +41,7 @@ public class OldFreeListOffHeapRegionJUnitTest extends OffHeapRegionBase {
 
   @Override
   public int perObjectOverhead() {
-    return ObjectChunk.OFF_HEAP_HEADER_SIZE;
+    return ObjectStoredInMemory.OFF_HEAP_HEADER_SIZE;
   }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b75d0400/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/SimpleMemoryAllocatorFillPatternIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/SimpleMemoryAllocatorFillPatternIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/SimpleMemoryAllocatorFillPatternIntegrationTest.java
index 2763ed0..c9415c6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/SimpleMemoryAllocatorFillPatternIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/SimpleMemoryAllocatorFillPatternIntegrationTest.java
@@ -163,7 +163,7 @@ public class SimpleMemoryAllocatorFillPatternIntegrationTest {
         private int totalAllocation = 0;
         
         // List of Chunks allocated by this thread
-        private List<ObjectChunk> chunks = new LinkedList<ObjectChunk>();
+        private List<ObjectStoredInMemory> chunks = new LinkedList<ObjectStoredInMemory>();
         
         // Time to end thread execution
         private long endTime = System.currentTimeMillis() + RUN_TIME_IN_MILLIS;
@@ -173,7 +173,7 @@ public class SimpleMemoryAllocatorFillPatternIntegrationTest {
          */
         private void allocate() {          
           int allocation = chunkSizer.allocationSize();
-          ObjectChunk chunk = (ObjectChunk) allocator.allocate(allocation);
+          ObjectStoredInMemory chunk = (ObjectStoredInMemory) allocator.allocate(allocation);
           
           // This should always work just after allocation
           chunk.validateFill();
@@ -186,7 +186,7 @@ public class SimpleMemoryAllocatorFillPatternIntegrationTest {
          * Frees a random chunk from the Chunk list.
          */
         private void free() {
-          ObjectChunk chunk = chunks.remove(random.nextInt(chunks.size()));
+          ObjectStoredInMemory chunk = chunks.remove(random.nextInt(chunks.size()));
           totalAllocation -= chunk.getSize();
           
           /*
@@ -200,7 +200,7 @@ public class SimpleMemoryAllocatorFillPatternIntegrationTest {
          * Writes canned data to a random Chunk from the Chunk list.
          */
         private void write() {
-          ObjectChunk chunk = chunks.get(random.nextInt(chunks.size()));
+          ObjectStoredInMemory chunk = chunks.get(random.nextInt(chunks.size()));
           chunk.writeDataBytes(0, WRITE_BYTES);
         }
         

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b75d0400/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/SimpleMemoryAllocatorFillPatternJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/SimpleMemoryAllocatorFillPatternJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/SimpleMemoryAllocatorFillPatternJUnitTest.java
index 4362170..9d89d6d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/SimpleMemoryAllocatorFillPatternJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/SimpleMemoryAllocatorFillPatternJUnitTest.java
@@ -101,7 +101,7 @@ public class SimpleMemoryAllocatorFillPatternJUnitTest {
      * Pull a chunk off the fragment.  This will have no fill because
      * it is a "fresh" chunk.
      */
-    ObjectChunk chunk = (ObjectChunk) this.allocator.allocate(chunkSize);
+    ObjectStoredInMemory chunk = (ObjectStoredInMemory) this.allocator.allocate(chunkSize);
 
     /*
      * Chunk should have valid fill from initial fragment allocation.
@@ -109,7 +109,7 @@ public class SimpleMemoryAllocatorFillPatternJUnitTest {
     chunk.validateFill();
          
     // "Dirty" the chunk so the release has something to fill over
-    chunk.writeDataBytes(ObjectChunk.MIN_CHUNK_SIZE + 1, WRITE_BYTES);
+    chunk.writeDataBytes(ObjectStoredInMemory.MIN_CHUNK_SIZE + 1, WRITE_BYTES);
 
     // This should free the Chunk (ref count == 1)
     chunk.release();
@@ -118,20 +118,20 @@ public class SimpleMemoryAllocatorFillPatternJUnitTest {
      * This chunk should have a fill because it was reused from the
      * free list (assuming no fragmentation at this point...)
      */
-    chunk = (ObjectChunk) this.allocator.allocate(chunkSize);
+    chunk = (ObjectStoredInMemory) this.allocator.allocate(chunkSize);
     
     // Make sure we have a fill this time
     chunk.validateFill();
     
     // Give the fill code something to write over during the release
-    chunk.writeDataBytes(ObjectChunk.MIN_CHUNK_SIZE + 1, WRITE_BYTES);
+    chunk.writeDataBytes(ObjectStoredInMemory.MIN_CHUNK_SIZE + 1, WRITE_BYTES);
     chunk.release();
 
     // Again, make sure the release implemented the fill
     chunk.validateFill();
 
     // "Dirty up" the free chunk
-    chunk.writeDataBytes(ObjectChunk.MIN_CHUNK_SIZE + 1, WRITE_BYTES);
+    chunk.writeDataBytes(ObjectStoredInMemory.MIN_CHUNK_SIZE + 1, WRITE_BYTES);
     
     catchException(chunk).validateFill();
     assertTrue(caughtException() instanceof IllegalStateException);
@@ -149,14 +149,14 @@ public class SimpleMemoryAllocatorFillPatternJUnitTest {
     /*
      * Stores our allocated memory.
      */
-    ObjectChunk[] allocatedChunks = new ObjectChunk[COMPACTION_CHUNKS];
+    ObjectStoredInMemory[] allocatedChunks = new ObjectStoredInMemory[COMPACTION_CHUNKS];
     
     /*
      * Use up most of our memory
      * Our memory looks like [      ][      ][      ]
      */
     for(int i =0;i < allocatedChunks.length;++i) {
-      allocatedChunks[i] = (ObjectChunk) this.allocator.allocate(COMPACTION_CHUNK_SIZE);
+      allocatedChunks[i] = (ObjectStoredInMemory) this.allocator.allocate(COMPACTION_CHUNK_SIZE);
       allocatedChunks[i].validateFill();
     }
 
@@ -173,7 +173,7 @@ public class SimpleMemoryAllocatorFillPatternJUnitTest {
      * our initial chunks.  This should force a compaction causing our
      * memory to look like [            ][      ].
      */
-    ObjectChunk slightlyLargerChunk = (ObjectChunk) this.allocator.allocate(FORCE_COMPACTION_CHUNK_SIZE);
+    ObjectStoredInMemory slightlyLargerChunk = (ObjectStoredInMemory) this.allocator.allocate(FORCE_COMPACTION_CHUNK_SIZE);
     
     /*
      * Make sure the compacted memory has the fill validation.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b75d0400/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/SimpleMemoryAllocatorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/SimpleMemoryAllocatorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/SimpleMemoryAllocatorJUnitTest.java
index e7385e9..d5a7fe8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/SimpleMemoryAllocatorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/SimpleMemoryAllocatorJUnitTest.java
@@ -191,7 +191,7 @@ public class SimpleMemoryAllocatorJUnitTest {
     int BATCH_SIZE = 1;
     int TINY_MULTIPLE = com.gemstone.gemfire.internal.offheap.FreeListManager.TINY_MULTIPLE;
     int HUGE_MULTIPLE = com.gemstone.gemfire.internal.offheap.FreeListManager.HUGE_MULTIPLE;
-    int perObjectOverhead = com.gemstone.gemfire.internal.offheap.ObjectChunk.OFF_HEAP_HEADER_SIZE;
+    int perObjectOverhead = com.gemstone.gemfire.internal.offheap.ObjectStoredInMemory.OFF_HEAP_HEADER_SIZE;
     int maxTiny = com.gemstone.gemfire.internal.offheap.FreeListManager.MAX_TINY-perObjectOverhead;
     int minHuge = maxTiny+1;
     int TOTAL_MEM = (maxTiny+perObjectOverhead)*BATCH_SIZE /*+ (maxBig+perObjectOverhead)*BATCH_SIZE*/ + round(TINY_MULTIPLE, minHuge+1+perObjectOverhead)*BATCH_SIZE + (TINY_MULTIPLE+perObjectOverhead)*BATCH_SIZE /*+ (MIN_BIG_SIZE+perObjectOverhead)*BATCH_SIZE*/ + round(TINY_MULTIPLE, minHuge+perObjectOverhead+1);
@@ -273,7 +273,7 @@ public class SimpleMemoryAllocatorJUnitTest {
         bb.put((byte) i);
       }
       bb.position(0);
-      ObjectChunk c = (ObjectChunk) ma.allocateAndInitialize(bb.array(), false, false);
+      ObjectStoredInMemory c = (ObjectStoredInMemory) ma.allocateAndInitialize(bb.array(), false, false);
       assertEquals(1024, c.getDataSize());
       if (!Arrays.equals(bb.array(), c.getRawBytes())) {
         fail("arrays are not equal. Expected " + Arrays.toString(bb.array()) + " but found: " + Arrays.toString(c.getRawBytes()));
@@ -427,7 +427,7 @@ public class SimpleMemoryAllocatorJUnitTest {
   
   @Test
   public void testCompaction() {
-    final int perObjectOverhead = com.gemstone.gemfire.internal.offheap.ObjectChunk.OFF_HEAP_HEADER_SIZE;
+    final int perObjectOverhead = com.gemstone.gemfire.internal.offheap.ObjectStoredInMemory.OFF_HEAP_HEADER_SIZE;
     final int BIG_ALLOC_SIZE = 150000;
     final int SMALL_ALLOC_SIZE = BIG_ALLOC_SIZE/2;
     final int TOTAL_MEM = BIG_ALLOC_SIZE;
@@ -543,7 +543,7 @@ public class SimpleMemoryAllocatorJUnitTest {
   boolean memoryUsageEventReceived;
   @Test
   public void testUsageEventListener() {
-    final int perObjectOverhead = com.gemstone.gemfire.internal.offheap.ObjectChunk.OFF_HEAP_HEADER_SIZE;
+    final int perObjectOverhead = com.gemstone.gemfire.internal.offheap.ObjectStoredInMemory.OFF_HEAP_HEADER_SIZE;
     final int SMALL_ALLOC_SIZE = 1000;
     SlabImpl slab = new SlabImpl(3000);
     try {
@@ -596,7 +596,7 @@ public class SimpleMemoryAllocatorJUnitTest {
   
   @Test
   public void testOutOfOffHeapMemory() {
-    final int perObjectOverhead = com.gemstone.gemfire.internal.offheap.ObjectChunk.OFF_HEAP_HEADER_SIZE;
+    final int perObjectOverhead = com.gemstone.gemfire.internal.offheap.ObjectStoredInMemory.OFF_HEAP_HEADER_SIZE;
     final int BIG_ALLOC_SIZE = 150000;
     final int SMALL_ALLOC_SIZE = BIG_ALLOC_SIZE/2;
     final int TOTAL_MEM = BIG_ALLOC_SIZE;


Mime
View raw message