[hbase] branch branch-2 updated: HBASE-23374 ExclusiveMemHFileBlock’s allocator should not be hardcoded as ByteBuffAllocator.HEAP

[janh]

This is an automated email from the ASF dual-hosted git repository.

janh pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new da4f756  HBASE-23374 ExclusiveMemHFileBlock’s allocator should not be 
hardcoded as ByteBuffAllocator.HEAP
da4f756 is described below

commit da4f756e6a5556aa440bf13dccee2ef634f2a67a
Author: chenxu14 <47170471+chenx...@users.noreply.github.com>
AuthorDate: Thu Dec 26 04:38:02 2019 +0800

    HBASE-23374 ExclusiveMemHFileBlock’s allocator should not be hardcoded as 
ByteBuffAllocator.HEAP
    
    Signed-off-by: stack <st...@apache.org>
    Signed-off-by: Jan Hentschel <j...@apache.org>
---
 .../org/apache/hadoop/hbase/io/hfile/ExclusiveMemHFileBlock.java     | 5 ++---
 .../java/org/apache/hadoop/hbase/io/hfile/HFileBlockBuilder.java     | 2 +-
 2 files changed, 3 insertions(+), 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
index 73c0db4..7f7cc3e 100644
--- 
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
index 4ed50e1..dc37a92 100644
--- 
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 class HFileBlockBuilder {
     } else {
       return new ExclusiveMemHFileBlock(blockType, onDiskSizeWithoutHeader,
           uncompressedSizeWithoutHeader, prevBlockOffset, buf, fillHeader, 
offset,
-          nextBlockOnDiskSize, onDiskDataSizeWithHeader, fileContext);
+          nextBlockOnDiskSize, onDiskDataSizeWithHeader, fileContext, 
allocator);
     }
   }
 }