[SPARK-10399][SPARK-23879][FOLLOWUP][CORE] Free unused off-heap memory in MemoryBlockSuite

kiszk · cloud-fan · commit c3a86faa53c9 · 2018-04-23T10:45:25.000+08:00
## What changes were proposed in this pull request? As viirya pointed out [here](apache#19222 (comment)), this PR explicitly frees unused off-heap memory in `MemoryBlockSuite` ## How was this patch tested? Existing UTs Author: Kazuaki Ishizaki <ishizaki@jp.ibm.com> Closes apache#21117 from kiszk/SPARK-10399-free-offheap.
diff --git a/common/unsafe/src/test/java/org/apache/spark/unsafe/memory/MemoryBlockSuite.java b/common/unsafe/src/test/java/org/apache/spark/unsafe/memory/MemoryBlockSuite.java
@@ -120,6 +120,8 @@ private void check(MemoryBlock memory, Object obj, long offset, int length) {
     } catch (Exception expected) {
       Assert.assertThat(expected.getMessage(), containsString("should not be larger than"));
     }
+
+    memory.setPageNumber(MemoryBlock.NO_PAGE_NUMBER);
   }
 
   @Test
@@ -165,11 +167,13 @@ public void testOffHeapArrayMemoryBlock() {
     int length = 56;
 
     check(memory, obj, offset, length);
+    memoryAllocator.free(memory);
 
     long address = Platform.allocateMemory(112);
     memory = new OffHeapMemoryBlock(address, length);
     obj = memory.getBaseObject();
     offset = memory.getBaseOffset();
     check(memory, obj, offset, length);
+    Platform.freeMemory(address);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,8 @@ private void check(MemoryBlock memory, Object obj, long offset, int length) {`
`120`	`120`	`} catch (Exception expected) {`
`121`	`121`	`Assert.assertThat(expected.getMessage(), containsString("should not be larger than"));`
`122`	`122`	`}`
	`123`	`+`
	`124`	`+ memory.setPageNumber(MemoryBlock.NO_PAGE_NUMBER);`
`123`	`125`	`}`
`124`	`126`
`125`	`127`	`@Test`
`@@ -165,11 +167,13 @@ public void testOffHeapArrayMemoryBlock() {`
`165`	`167`	`int length = 56;`
`166`	`168`
`167`	`169`	`check(memory, obj, offset, length);`
	`170`	`+ memoryAllocator.free(memory);`
`168`	`171`
`169`	`172`	`long address = Platform.allocateMemory(112);`
`170`	`173`	`memory = new OffHeapMemoryBlock(address, length);`
`171`	`174`	`obj = memory.getBaseObject();`
`172`	`175`	`offset = memory.getBaseOffset();`
`173`	`176`	`check(memory, obj, offset, length);`
	`177`	`+ Platform.freeMemory(address);`
`174`	`178`	`}`
`175`	`179`	`}`