HBASE-23374 ExclusiveMemHFileBlock’s allocator should not be hardcode…

…d as ByteBuffAllocator.HEAP Signed-off-by: stack <stack@apache.org> Signed-off-by: Jan Hentschel <janh@apache.org>
apache · Dec 25, 2019 · 56f9db9 · 56f9db9
1 parent 1b049a2
commit 56f9db9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/ExclusiveMemHFileBlock.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/ExclusiveMemHFileBlock.java
@@ -39,10 +39,9 @@ public class ExclusiveMemHFileBlock extends HFileBlock {
   ExclusiveMemHFileBlock(BlockType blockType, int onDiskSizeWithoutHeader,
       int uncompressedSizeWithoutHeader, long prevBlockOffset, ByteBuff buf, boolean fillHeader,
       long offset, int nextBlockOnDiskSize, int onDiskDataSizeWithHeader,
-      HFileContext fileContext) {
+      HFileContext fileContext, ByteBuffAllocator alloc) {
     super(blockType, onDiskSizeWithoutHeader, uncompressedSizeWithoutHeader, prevBlockOffset, buf,
-        fillHeader, offset, nextBlockOnDiskSize, onDiskDataSizeWithHeader, fileContext,
-        ByteBuffAllocator.HEAP);
+        fillHeader, offset, nextBlockOnDiskSize, onDiskDataSizeWithHeader, fileContext, alloc);
   }
 
   @Override

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlockBuilder.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlockBuilder.java
@@ -108,7 +108,7 @@ public HFileBlock build() {
     } else {
       return new ExclusiveMemHFileBlock(blockType, onDiskSizeWithoutHeader,
           uncompressedSizeWithoutHeader, prevBlockOffset, buf, fillHeader, offset,
-          nextBlockOnDiskSize, onDiskDataSizeWithHeader, fileContext);
+          nextBlockOnDiskSize, onDiskDataSizeWithHeader, fileContext, allocator);
     }
   }
 }