Index: hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java (revision 1522476) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java (working copy) @@ -1066,6 +1066,14 @@ @Override protected ByteBuffer getFirstKeyInBlock(HFileBlock curBlock) { + short dataBlockEncoderId = curBlock.getDataBlockEncodingId(); + if (dataBlockEncoder == null || + !DataBlockEncoding.isCorrectEncoder(dataBlockEncoder, + dataBlockEncoderId)) { + DataBlockEncoder encoder = + DataBlockEncoding.getDataBlockEncoderById(dataBlockEncoderId); + setDataBlockEncoder(encoder); + } return dataBlockEncoder.getFirstKeyInBlock(getEncodedBuffer(curBlock)); }