HBASE-27654 IndexBlockEncoding is missing in HFileContextBuilder copy…

… constructor (#5039) Signed-off-by: Bryan Beaudreault <[email protected]>
apache · Feb 20, 2023 · cf179d3 · cf179d3
1 parent 5f0dcdd
commit cf179d3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileContextBuilder.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileContextBuilder.java
@@ -84,6 +84,7 @@ public HFileContextBuilder(final HFileContext hfc) {
     this.columnFamily = hfc.getColumnFamily();
     this.tableName = hfc.getTableName();
     this.cellComparator = hfc.getCellComparator();
+    this.indexBlockEncoding = hfc.getIndexBlockEncoding();
   }
 
   public HFileContextBuilder withHBaseCheckSum(boolean useHBaseCheckSum) {

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java
@@ -70,6 +70,7 @@
 import org.apache.hadoop.hbase.io.compress.Compression;
 import org.apache.hadoop.hbase.io.encoding.DataBlockEncoder;
 import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
+import org.apache.hadoop.hbase.io.encoding.IndexBlockEncoding;
 import org.apache.hadoop.hbase.io.hfile.HFile.Reader;
 import org.apache.hadoop.hbase.io.hfile.HFile.Writer;
 import org.apache.hadoop.hbase.io.hfile.ReaderContext.ReaderType;
@@ -1061,4 +1062,11 @@ private void testReaderCombinedCache(final String l1CachePolicy) throws Exceptio
     alloc.clean();
   }
 
+  @Test
+  public void testHFileContextBuilderWithIndexEncoding() throws IOException {
+    HFileContext context =
+      new HFileContextBuilder().withIndexBlockEncoding(IndexBlockEncoding.PREFIX_TREE).build();
+    HFileContext newContext = new HFileContextBuilder(context).build();
+    assertTrue(newContext.getIndexBlockEncoding() == IndexBlockEncoding.PREFIX_TREE);
+  }
 }