http://git-wip-us.apache.org/repos/asf/hbase-site/blob/713132a3/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.BlockReaderThread.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.BlockReaderThread.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.BlockReaderThread.html
index da0a780..a09b4ea 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.BlockReaderThread.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.BlockReaderThread.html
@@ -384,512 +384,513 @@
 <span class="sourceLineNo">376</span>    for (Compression.Algorithm algo : 
COMPRESSION_ALGORITHMS) {<a name="line.376"></a>
 <span class="sourceLineNo">377</span>      for (boolean pread : new boolean[] 
{ false, true }) {<a name="line.377"></a>
 <span class="sourceLineNo">378</span>        for (DataBlockEncoding encoding : 
DataBlockEncoding.values()) {<a name="line.378"></a>
-<span class="sourceLineNo">379</span>          Path path = new 
Path(TEST_UTIL.getDataTestDir(), "blocks_v2_"<a name="line.379"></a>
-<span class="sourceLineNo">380</span>              + algo + "_" + 
encoding.toString());<a name="line.380"></a>
-<span class="sourceLineNo">381</span>          FSDataOutputStream os = 
fs.create(path);<a name="line.381"></a>
-<span class="sourceLineNo">382</span>          HFileDataBlockEncoder 
dataBlockEncoder = (encoding != DataBlockEncoding.NONE) ?<a name="line.382"></a>
-<span class="sourceLineNo">383</span>              new 
HFileDataBlockEncoderImpl(encoding) : NoOpDataBlockEncoder.INSTANCE;<a 
name="line.383"></a>
-<span class="sourceLineNo">384</span>          HFileContext meta = new 
HFileContextBuilder()<a name="line.384"></a>
-<span class="sourceLineNo">385</span>                              
.withCompression(algo)<a name="line.385"></a>
-<span class="sourceLineNo">386</span>                              
.withIncludesMvcc(includesMemstoreTS)<a name="line.386"></a>
-<span class="sourceLineNo">387</span>                              
.withIncludesTags(includesTag)<a name="line.387"></a>
-<span class="sourceLineNo">388</span>                              
.withBytesPerCheckSum(HFile.DEFAULT_BYTES_PER_CHECKSUM)<a name="line.388"></a>
-<span class="sourceLineNo">389</span>                              .build();<a 
name="line.389"></a>
-<span class="sourceLineNo">390</span>          HFileBlock.Writer hbw = new 
HFileBlock.Writer(dataBlockEncoder, meta);<a name="line.390"></a>
-<span class="sourceLineNo">391</span>          long totalSize = 0;<a 
name="line.391"></a>
-<span class="sourceLineNo">392</span>          final List&lt;Integer&gt; 
encodedSizes = new ArrayList&lt;&gt;();<a name="line.392"></a>
-<span class="sourceLineNo">393</span>          final List&lt;ByteBuffer&gt; 
encodedBlocks = new ArrayList&lt;&gt;();<a name="line.393"></a>
-<span class="sourceLineNo">394</span>          for (int blockId = 0; blockId 
&lt; numBlocks; ++blockId) {<a name="line.394"></a>
-<span class="sourceLineNo">395</span>            
hbw.startWriting(BlockType.DATA);<a name="line.395"></a>
-<span class="sourceLineNo">396</span>            writeTestKeyValues(hbw, 
blockId, includesMemstoreTS, includesTag);<a name="line.396"></a>
-<span class="sourceLineNo">397</span>            hbw.writeHeaderAndData(os);<a 
name="line.397"></a>
-<span class="sourceLineNo">398</span>            int headerLen = 
HConstants.HFILEBLOCK_HEADER_SIZE;<a name="line.398"></a>
-<span class="sourceLineNo">399</span>            byte[] 
encodedResultWithHeader = hbw.cloneUncompressedBufferWithHeader().array();<a 
name="line.399"></a>
-<span class="sourceLineNo">400</span>            final int encodedSize = 
encodedResultWithHeader.length - headerLen;<a name="line.400"></a>
-<span class="sourceLineNo">401</span>            if (encoding != 
DataBlockEncoding.NONE) {<a name="line.401"></a>
-<span class="sourceLineNo">402</span>              // We need to account for 
the two-byte encoding algorithm ID that<a name="line.402"></a>
-<span class="sourceLineNo">403</span>              // comes after the 24-byte 
block header but before encoded KVs.<a name="line.403"></a>
-<span class="sourceLineNo">404</span>              headerLen += 
DataBlockEncoding.ID_SIZE;<a name="line.404"></a>
-<span class="sourceLineNo">405</span>            }<a name="line.405"></a>
-<span class="sourceLineNo">406</span>            byte[] encodedDataSection =<a 
name="line.406"></a>
-<span class="sourceLineNo">407</span>                new 
byte[encodedResultWithHeader.length - headerLen];<a name="line.407"></a>
-<span class="sourceLineNo">408</span>            
System.arraycopy(encodedResultWithHeader, headerLen,<a name="line.408"></a>
-<span class="sourceLineNo">409</span>                encodedDataSection, 0, 
encodedDataSection.length);<a name="line.409"></a>
-<span class="sourceLineNo">410</span>            final ByteBuffer encodedBuf 
=<a name="line.410"></a>
-<span class="sourceLineNo">411</span>                
ByteBuffer.wrap(encodedDataSection);<a name="line.411"></a>
-<span class="sourceLineNo">412</span>            
encodedSizes.add(encodedSize);<a name="line.412"></a>
-<span class="sourceLineNo">413</span>            
encodedBlocks.add(encodedBuf);<a name="line.413"></a>
-<span class="sourceLineNo">414</span>            totalSize += 
hbw.getOnDiskSizeWithHeader();<a name="line.414"></a>
-<span class="sourceLineNo">415</span>          }<a name="line.415"></a>
-<span class="sourceLineNo">416</span>          os.close();<a 
name="line.416"></a>
-<span class="sourceLineNo">417</span><a name="line.417"></a>
-<span class="sourceLineNo">418</span>          FSDataInputStream is = 
fs.open(path);<a name="line.418"></a>
-<span class="sourceLineNo">419</span>          meta = new 
HFileContextBuilder()<a name="line.419"></a>
-<span class="sourceLineNo">420</span>                
.withHBaseCheckSum(true)<a name="line.420"></a>
-<span class="sourceLineNo">421</span>                .withCompression(algo)<a 
name="line.421"></a>
-<span class="sourceLineNo">422</span>                
.withIncludesMvcc(includesMemstoreTS)<a name="line.422"></a>
-<span class="sourceLineNo">423</span>                
.withIncludesTags(includesTag)<a name="line.423"></a>
-<span class="sourceLineNo">424</span>                .build();<a 
name="line.424"></a>
-<span class="sourceLineNo">425</span>          HFileBlock.FSReaderImpl hbr = 
new HFileBlock.FSReaderImpl(is, totalSize, meta);<a name="line.425"></a>
-<span class="sourceLineNo">426</span>          
hbr.setDataBlockEncoder(dataBlockEncoder);<a name="line.426"></a>
-<span class="sourceLineNo">427</span>          
hbr.setIncludesMemStoreTS(includesMemstoreTS);<a name="line.427"></a>
-<span class="sourceLineNo">428</span>          HFileBlock blockFromHFile, 
blockUnpacked;<a name="line.428"></a>
-<span class="sourceLineNo">429</span>          int pos = 0;<a 
name="line.429"></a>
-<span class="sourceLineNo">430</span>          for (int blockId = 0; blockId 
&lt; numBlocks; ++blockId) {<a name="line.430"></a>
-<span class="sourceLineNo">431</span>            blockFromHFile = 
hbr.readBlockData(pos, -1, pread, false);<a name="line.431"></a>
-<span class="sourceLineNo">432</span>            assertEquals(0, 
HFile.getAndResetChecksumFailuresCount());<a name="line.432"></a>
-<span class="sourceLineNo">433</span>            
blockFromHFile.sanityCheck();<a name="line.433"></a>
-<span class="sourceLineNo">434</span>            pos += 
blockFromHFile.getOnDiskSizeWithHeader();<a name="line.434"></a>
-<span class="sourceLineNo">435</span>            assertEquals((int) 
encodedSizes.get(blockId),<a name="line.435"></a>
-<span class="sourceLineNo">436</span>              
blockFromHFile.getUncompressedSizeWithoutHeader());<a name="line.436"></a>
-<span class="sourceLineNo">437</span>            
assertEquals(meta.isCompressedOrEncrypted(), !blockFromHFile.isUnpacked());<a 
name="line.437"></a>
-<span class="sourceLineNo">438</span>            long packedHeapsize = 
blockFromHFile.heapSize();<a name="line.438"></a>
-<span class="sourceLineNo">439</span>            blockUnpacked = 
blockFromHFile.unpack(meta, hbr);<a name="line.439"></a>
-<span class="sourceLineNo">440</span>            
assertTrue(blockUnpacked.isUnpacked());<a name="line.440"></a>
-<span class="sourceLineNo">441</span>            if 
(meta.isCompressedOrEncrypted()) {<a name="line.441"></a>
-<span class="sourceLineNo">442</span>              LOG.info("packedHeapsize=" 
+ packedHeapsize + ", unpackedHeadsize=" + blockUnpacked<a name="line.442"></a>
-<span class="sourceLineNo">443</span>                .heapSize());<a 
name="line.443"></a>
-<span class="sourceLineNo">444</span>              assertFalse(packedHeapsize 
== blockUnpacked.heapSize());<a name="line.444"></a>
-<span class="sourceLineNo">445</span>              assertTrue("Packed heapSize 
should be &lt; unpacked heapSize",<a name="line.445"></a>
-<span class="sourceLineNo">446</span>                packedHeapsize &lt; 
blockUnpacked.heapSize());<a name="line.446"></a>
-<span class="sourceLineNo">447</span>            }<a name="line.447"></a>
-<span class="sourceLineNo">448</span>            ByteBuff actualBuffer = 
blockUnpacked.getBufferWithoutHeader();<a name="line.448"></a>
-<span class="sourceLineNo">449</span>            if (encoding != 
DataBlockEncoding.NONE) {<a name="line.449"></a>
-<span class="sourceLineNo">450</span>              // We expect a two-byte 
big-endian encoding id.<a name="line.450"></a>
-<span class="sourceLineNo">451</span>              assertEquals(<a 
name="line.451"></a>
-<span class="sourceLineNo">452</span>                "Unexpected first byte 
with " + buildMessageDetails(algo, encoding, pread),<a name="line.452"></a>
-<span class="sourceLineNo">453</span>                Long.toHexString(0), 
Long.toHexString(actualBuffer.get(0)));<a name="line.453"></a>
-<span class="sourceLineNo">454</span>              assertEquals(<a 
name="line.454"></a>
-<span class="sourceLineNo">455</span>                "Unexpected second byte 
with " + buildMessageDetails(algo, encoding, pread),<a name="line.455"></a>
-<span class="sourceLineNo">456</span>                
Long.toHexString(encoding.getId()), Long.toHexString(actualBuffer.get(1)));<a 
name="line.456"></a>
-<span class="sourceLineNo">457</span>              actualBuffer.position(2);<a 
name="line.457"></a>
-<span class="sourceLineNo">458</span>              actualBuffer = 
actualBuffer.slice();<a name="line.458"></a>
-<span class="sourceLineNo">459</span>            }<a name="line.459"></a>
-<span class="sourceLineNo">460</span><a name="line.460"></a>
-<span class="sourceLineNo">461</span>            ByteBuffer expectedBuffer = 
encodedBlocks.get(blockId);<a name="line.461"></a>
-<span class="sourceLineNo">462</span>            expectedBuffer.rewind();<a 
name="line.462"></a>
-<span class="sourceLineNo">463</span><a name="line.463"></a>
-<span class="sourceLineNo">464</span>            // test if content matches, 
produce nice message<a name="line.464"></a>
-<span class="sourceLineNo">465</span>            assertBuffersEqual(new 
SingleByteBuff(expectedBuffer), actualBuffer, algo, encoding,<a 
name="line.465"></a>
-<span class="sourceLineNo">466</span>                pread);<a 
name="line.466"></a>
-<span class="sourceLineNo">467</span><a name="line.467"></a>
-<span class="sourceLineNo">468</span>            // test serialized blocks<a 
name="line.468"></a>
-<span class="sourceLineNo">469</span>            for (boolean reuseBuffer : 
new boolean[] { false, true }) {<a name="line.469"></a>
-<span class="sourceLineNo">470</span>              ByteBuffer serialized = 
ByteBuffer.allocate(blockFromHFile.getSerializedLength());<a 
name="line.470"></a>
-<span class="sourceLineNo">471</span>              
blockFromHFile.serialize(serialized, true);<a name="line.471"></a>
-<span class="sourceLineNo">472</span>              HFileBlock deserialized =<a 
name="line.472"></a>
-<span class="sourceLineNo">473</span>                  (HFileBlock) 
blockFromHFile.getDeserializer().deserialize(<a name="line.473"></a>
-<span class="sourceLineNo">474</span>                    new 
SingleByteBuff(serialized), reuseBuffer, MemoryType.EXCLUSIVE);<a 
name="line.474"></a>
-<span class="sourceLineNo">475</span>              assertEquals(<a 
name="line.475"></a>
-<span class="sourceLineNo">476</span>                "Serialization did not 
preserve block state. reuseBuffer=" + reuseBuffer,<a name="line.476"></a>
-<span class="sourceLineNo">477</span>                blockFromHFile, 
deserialized);<a name="line.477"></a>
-<span class="sourceLineNo">478</span>              // intentional reference 
comparison<a name="line.478"></a>
-<span class="sourceLineNo">479</span>              if (blockFromHFile != 
blockUnpacked) {<a name="line.479"></a>
-<span class="sourceLineNo">480</span>                
assertEquals("Deserializaed block cannot be unpacked correctly.",<a 
name="line.480"></a>
-<span class="sourceLineNo">481</span>                  blockUnpacked, 
deserialized.unpack(meta, hbr));<a name="line.481"></a>
-<span class="sourceLineNo">482</span>              }<a name="line.482"></a>
-<span class="sourceLineNo">483</span>            }<a name="line.483"></a>
-<span class="sourceLineNo">484</span>          }<a name="line.484"></a>
-<span class="sourceLineNo">485</span>          is.close();<a 
name="line.485"></a>
-<span class="sourceLineNo">486</span>        }<a name="line.486"></a>
-<span class="sourceLineNo">487</span>      }<a name="line.487"></a>
-<span class="sourceLineNo">488</span>    }<a name="line.488"></a>
-<span class="sourceLineNo">489</span>  }<a name="line.489"></a>
-<span class="sourceLineNo">490</span><a name="line.490"></a>
-<span class="sourceLineNo">491</span>  static String 
buildMessageDetails(Algorithm compression, DataBlockEncoding encoding,<a 
name="line.491"></a>
-<span class="sourceLineNo">492</span>      boolean pread) {<a 
name="line.492"></a>
-<span class="sourceLineNo">493</span>    return String.format("compression %s, 
encoding %s, pread %s", compression, encoding, pread);<a name="line.493"></a>
-<span class="sourceLineNo">494</span>  }<a name="line.494"></a>
-<span class="sourceLineNo">495</span><a name="line.495"></a>
-<span class="sourceLineNo">496</span>  static void assertBuffersEqual(ByteBuff 
expectedBuffer,<a name="line.496"></a>
-<span class="sourceLineNo">497</span>      ByteBuff actualBuffer, 
Compression.Algorithm compression,<a name="line.497"></a>
-<span class="sourceLineNo">498</span>      DataBlockEncoding encoding, boolean 
pread) {<a name="line.498"></a>
-<span class="sourceLineNo">499</span>    if 
(!actualBuffer.equals(expectedBuffer)) {<a name="line.499"></a>
-<span class="sourceLineNo">500</span>      int prefix = 0;<a 
name="line.500"></a>
-<span class="sourceLineNo">501</span>      int minLimit = 
Math.min(expectedBuffer.limit(), actualBuffer.limit());<a name="line.501"></a>
-<span class="sourceLineNo">502</span>      while (prefix &lt; minLimit 
&amp;&amp;<a name="line.502"></a>
-<span class="sourceLineNo">503</span>          expectedBuffer.get(prefix) == 
actualBuffer.get(prefix)) {<a name="line.503"></a>
-<span class="sourceLineNo">504</span>        prefix++;<a name="line.504"></a>
-<span class="sourceLineNo">505</span>      }<a name="line.505"></a>
-<span class="sourceLineNo">506</span><a name="line.506"></a>
-<span class="sourceLineNo">507</span>      fail(String.format(<a 
name="line.507"></a>
-<span class="sourceLineNo">508</span>          "Content mismatch for %s, 
commonPrefix %d, expected %s, got %s",<a name="line.508"></a>
-<span class="sourceLineNo">509</span>          
buildMessageDetails(compression, encoding, pread), prefix,<a 
name="line.509"></a>
-<span class="sourceLineNo">510</span>          nextBytesToStr(expectedBuffer, 
prefix),<a name="line.510"></a>
-<span class="sourceLineNo">511</span>          nextBytesToStr(actualBuffer, 
prefix)));<a name="line.511"></a>
-<span class="sourceLineNo">512</span>    }<a name="line.512"></a>
-<span class="sourceLineNo">513</span>  }<a name="line.513"></a>
-<span class="sourceLineNo">514</span><a name="line.514"></a>
-<span class="sourceLineNo">515</span>  /**<a name="line.515"></a>
-<span class="sourceLineNo">516</span>   * Convert a few next bytes in the 
given buffer at the given position to<a name="line.516"></a>
-<span class="sourceLineNo">517</span>   * string. Used for error messages.<a 
name="line.517"></a>
-<span class="sourceLineNo">518</span>   */<a name="line.518"></a>
-<span class="sourceLineNo">519</span>  private static String 
nextBytesToStr(ByteBuff buf, int pos) {<a name="line.519"></a>
-<span class="sourceLineNo">520</span>    int maxBytes = buf.limit() - pos;<a 
name="line.520"></a>
-<span class="sourceLineNo">521</span>    int numBytes = Math.min(16, 
maxBytes);<a name="line.521"></a>
-<span class="sourceLineNo">522</span>    return 
Bytes.toStringBinary(buf.array(), buf.arrayOffset() + pos,<a 
name="line.522"></a>
-<span class="sourceLineNo">523</span>        numBytes) + (numBytes &lt; 
maxBytes ? "..." : "");<a name="line.523"></a>
-<span class="sourceLineNo">524</span>  }<a name="line.524"></a>
-<span class="sourceLineNo">525</span><a name="line.525"></a>
-<span class="sourceLineNo">526</span>  @Test<a name="line.526"></a>
-<span class="sourceLineNo">527</span>  public void testPreviousOffset() throws 
IOException {<a name="line.527"></a>
-<span class="sourceLineNo">528</span>    testPreviousOffsetInternals();<a 
name="line.528"></a>
-<span class="sourceLineNo">529</span>  }<a name="line.529"></a>
-<span class="sourceLineNo">530</span><a name="line.530"></a>
-<span class="sourceLineNo">531</span>  protected void 
testPreviousOffsetInternals() throws IOException {<a name="line.531"></a>
-<span class="sourceLineNo">532</span>    // TODO: parameterize these nested 
loops.<a name="line.532"></a>
-<span class="sourceLineNo">533</span>    for (Compression.Algorithm algo : 
COMPRESSION_ALGORITHMS) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span>      for (boolean pread : 
BOOLEAN_VALUES) {<a name="line.534"></a>
-<span class="sourceLineNo">535</span>        for (boolean cacheOnWrite : 
BOOLEAN_VALUES) {<a name="line.535"></a>
-<span class="sourceLineNo">536</span>          Random rand = 
defaultRandom();<a name="line.536"></a>
-<span class="sourceLineNo">537</span>          
LOG.info("testPreviousOffset:Compression algorithm: " + algo +<a 
name="line.537"></a>
-<span class="sourceLineNo">538</span>                   ", pread=" + pread +<a 
name="line.538"></a>
-<span class="sourceLineNo">539</span>                   ", cacheOnWrite=" + 
cacheOnWrite);<a name="line.539"></a>
-<span class="sourceLineNo">540</span>          Path path = new 
Path(TEST_UTIL.getDataTestDir(), "prev_offset");<a name="line.540"></a>
-<span class="sourceLineNo">541</span>          List&lt;Long&gt; 
expectedOffsets = new ArrayList&lt;&gt;();<a name="line.541"></a>
-<span class="sourceLineNo">542</span>          List&lt;Long&gt; 
expectedPrevOffsets = new ArrayList&lt;&gt;();<a name="line.542"></a>
-<span class="sourceLineNo">543</span>          List&lt;BlockType&gt; 
expectedTypes = new ArrayList&lt;&gt;();<a name="line.543"></a>
-<span class="sourceLineNo">544</span>          List&lt;ByteBuffer&gt; 
expectedContents = cacheOnWrite ? new ArrayList&lt;&gt;() : null;<a 
name="line.544"></a>
-<span class="sourceLineNo">545</span>          long totalSize = 
writeBlocks(rand, algo, path, expectedOffsets,<a name="line.545"></a>
-<span class="sourceLineNo">546</span>              expectedPrevOffsets, 
expectedTypes, expectedContents);<a name="line.546"></a>
-<span class="sourceLineNo">547</span><a name="line.547"></a>
-<span class="sourceLineNo">548</span>          FSDataInputStream is = 
fs.open(path);<a name="line.548"></a>
-<span class="sourceLineNo">549</span>          HFileContext meta = new 
HFileContextBuilder()<a name="line.549"></a>
-<span class="sourceLineNo">550</span>                              
.withHBaseCheckSum(true)<a name="line.550"></a>
-<span class="sourceLineNo">551</span>                              
.withIncludesMvcc(includesMemstoreTS)<a name="line.551"></a>
-<span class="sourceLineNo">552</span>                              
.withIncludesTags(includesTag)<a name="line.552"></a>
-<span class="sourceLineNo">553</span>                              
.withCompression(algo).build();<a name="line.553"></a>
-<span class="sourceLineNo">554</span>          HFileBlock.FSReader hbr = new 
HFileBlock.FSReaderImpl(is, totalSize, meta);<a name="line.554"></a>
-<span class="sourceLineNo">555</span>          long curOffset = 0;<a 
name="line.555"></a>
-<span class="sourceLineNo">556</span>          for (int i = 0; i &lt; 
NUM_TEST_BLOCKS; ++i) {<a name="line.556"></a>
-<span class="sourceLineNo">557</span>            if (!pread) {<a 
name="line.557"></a>
-<span class="sourceLineNo">558</span>              assertEquals(is.getPos(), 
curOffset + (i == 0 ? 0 :<a name="line.558"></a>
-<span class="sourceLineNo">559</span>                
HConstants.HFILEBLOCK_HEADER_SIZE));<a name="line.559"></a>
-<span class="sourceLineNo">560</span>            }<a name="line.560"></a>
-<span class="sourceLineNo">561</span><a name="line.561"></a>
-<span class="sourceLineNo">562</span>            
assertEquals(expectedOffsets.get(i).longValue(), curOffset);<a 
name="line.562"></a>
-<span class="sourceLineNo">563</span>            if (detailedLogging) {<a 
name="line.563"></a>
-<span class="sourceLineNo">564</span>              LOG.info("Reading block #" 
+ i + " at offset " + curOffset);<a name="line.564"></a>
-<span class="sourceLineNo">565</span>            }<a name="line.565"></a>
-<span class="sourceLineNo">566</span>            HFileBlock b = 
hbr.readBlockData(curOffset, -1, pread, false);<a name="line.566"></a>
-<span class="sourceLineNo">567</span>            if (detailedLogging) {<a 
name="line.567"></a>
-<span class="sourceLineNo">568</span>              LOG.info("Block #" + i + ": 
" + b);<a name="line.568"></a>
-<span class="sourceLineNo">569</span>            }<a name="line.569"></a>
-<span class="sourceLineNo">570</span>            assertEquals("Invalid block 
#" + i + "'s type:",<a name="line.570"></a>
-<span class="sourceLineNo">571</span>                expectedTypes.get(i), 
b.getBlockType());<a name="line.571"></a>
-<span class="sourceLineNo">572</span>            assertEquals("Invalid 
previous block offset for block " + i<a name="line.572"></a>
-<span class="sourceLineNo">573</span>                + " of " + "type " + 
b.getBlockType() + ":",<a name="line.573"></a>
-<span class="sourceLineNo">574</span>                (long) 
expectedPrevOffsets.get(i), b.getPrevBlockOffset());<a name="line.574"></a>
-<span class="sourceLineNo">575</span>            b.sanityCheck();<a 
name="line.575"></a>
-<span class="sourceLineNo">576</span>            assertEquals(curOffset, 
b.getOffset());<a name="line.576"></a>
-<span class="sourceLineNo">577</span><a name="line.577"></a>
-<span class="sourceLineNo">578</span>            // Now re-load this block 
knowing the on-disk size. This tests a<a name="line.578"></a>
-<span class="sourceLineNo">579</span>            // different branch in the 
loader.<a name="line.579"></a>
-<span class="sourceLineNo">580</span>            HFileBlock b2 = 
hbr.readBlockData(curOffset, b.getOnDiskSizeWithHeader(), pread, false);<a 
name="line.580"></a>
-<span class="sourceLineNo">581</span>            b2.sanityCheck();<a 
name="line.581"></a>
-<span class="sourceLineNo">582</span><a name="line.582"></a>
-<span class="sourceLineNo">583</span>            
assertEquals(b.getBlockType(), b2.getBlockType());<a name="line.583"></a>
-<span class="sourceLineNo">584</span>            
assertEquals(b.getOnDiskSizeWithoutHeader(),<a name="line.584"></a>
-<span class="sourceLineNo">585</span>                
b2.getOnDiskSizeWithoutHeader());<a name="line.585"></a>
-<span class="sourceLineNo">586</span>            
assertEquals(b.getOnDiskSizeWithHeader(),<a name="line.586"></a>
-<span class="sourceLineNo">587</span>                
b2.getOnDiskSizeWithHeader());<a name="line.587"></a>
-<span class="sourceLineNo">588</span>            
assertEquals(b.getUncompressedSizeWithoutHeader(),<a name="line.588"></a>
-<span class="sourceLineNo">589</span>                
b2.getUncompressedSizeWithoutHeader());<a name="line.589"></a>
-<span class="sourceLineNo">590</span>            
assertEquals(b.getPrevBlockOffset(), b2.getPrevBlockOffset());<a 
name="line.590"></a>
-<span class="sourceLineNo">591</span>            assertEquals(curOffset, 
b2.getOffset());<a name="line.591"></a>
-<span class="sourceLineNo">592</span>            
assertEquals(b.getBytesPerChecksum(), b2.getBytesPerChecksum());<a 
name="line.592"></a>
-<span class="sourceLineNo">593</span>            
assertEquals(b.getOnDiskDataSizeWithHeader(),<a name="line.593"></a>
-<span class="sourceLineNo">594</span>                         
b2.getOnDiskDataSizeWithHeader());<a name="line.594"></a>
-<span class="sourceLineNo">595</span>            assertEquals(0, 
HFile.getAndResetChecksumFailuresCount());<a name="line.595"></a>
-<span class="sourceLineNo">596</span><a name="line.596"></a>
-<span class="sourceLineNo">597</span>            curOffset += 
b.getOnDiskSizeWithHeader();<a name="line.597"></a>
-<span class="sourceLineNo">598</span><a name="line.598"></a>
-<span class="sourceLineNo">599</span>            if (cacheOnWrite) {<a 
name="line.599"></a>
-<span class="sourceLineNo">600</span>              // NOTE: cache-on-write 
testing doesn't actually involve a BlockCache. It simply<a name="line.600"></a>
-<span class="sourceLineNo">601</span>              // verifies that the 
unpacked value read back off disk matches the unpacked value<a 
name="line.601"></a>
-<span class="sourceLineNo">602</span>              // generated before writing 
to disk.<a name="line.602"></a>
-<span class="sourceLineNo">603</span>              b = b.unpack(meta, hbr);<a 
name="line.603"></a>
-<span class="sourceLineNo">604</span>              // b's buffer has header + 
data + checksum while<a name="line.604"></a>
-<span class="sourceLineNo">605</span>              // expectedContents have 
header + data only<a name="line.605"></a>
-<span class="sourceLineNo">606</span>              ByteBuff bufRead = 
b.getBufferReadOnly();<a name="line.606"></a>
-<span class="sourceLineNo">607</span>              ByteBuffer bufExpected = 
expectedContents.get(i);<a name="line.607"></a>
-<span class="sourceLineNo">608</span>              boolean bytesAreCorrect = 
Bytes.compareTo(bufRead.array(),<a name="line.608"></a>
-<span class="sourceLineNo">609</span>                  
bufRead.arrayOffset(),<a name="line.609"></a>
-<span class="sourceLineNo">610</span>                  bufRead.limit() - 
b.totalChecksumBytes(),<a name="line.610"></a>
-<span class="sourceLineNo">611</span>                  bufExpected.array(), 
bufExpected.arrayOffset(),<a name="line.611"></a>
-<span class="sourceLineNo">612</span>                  bufExpected.limit()) == 
0;<a name="line.612"></a>
-<span class="sourceLineNo">613</span>              String wrongBytesMsg = 
"";<a name="line.613"></a>
-<span class="sourceLineNo">614</span><a name="line.614"></a>
-<span class="sourceLineNo">615</span>              if (!bytesAreCorrect) {<a 
name="line.615"></a>
-<span class="sourceLineNo">616</span>                // Optimization: only 
construct an error message in case we<a name="line.616"></a>
-<span class="sourceLineNo">617</span>                // will need it.<a 
name="line.617"></a>
-<span class="sourceLineNo">618</span>                wrongBytesMsg = "Expected 
bytes in block #" + i + " (algo="<a name="line.618"></a>
-<span class="sourceLineNo">619</span>                    + algo + ", pread=" + 
pread<a name="line.619"></a>
-<span class="sourceLineNo">620</span>                    + ", cacheOnWrite=" + 
cacheOnWrite + "):\n";<a name="line.620"></a>
-<span class="sourceLineNo">621</span>                wrongBytesMsg += 
Bytes.toStringBinary(bufExpected.array(),<a name="line.621"></a>
-<span class="sourceLineNo">622</span>                  
bufExpected.arrayOffset(), Math.min(32 + 10, bufExpected.limit()))<a 
name="line.622"></a>
-<span class="sourceLineNo">623</span>                    + ", actual:\n"<a 
name="line.623"></a>
-<span class="sourceLineNo">624</span>                    + 
Bytes.toStringBinary(bufRead.array(),<a name="line.624"></a>
-<span class="sourceLineNo">625</span>                  bufRead.arrayOffset(), 
Math.min(32 + 10, bufRead.limit()));<a name="line.625"></a>
-<span class="sourceLineNo">626</span>                if (detailedLogging) {<a 
name="line.626"></a>
-<span class="sourceLineNo">627</span>                  LOG.warn("expected 
header" +<a name="line.627"></a>
-<span class="sourceLineNo">628</span>                           
HFileBlock.toStringHeader(new SingleByteBuff(bufExpected)) +<a 
name="line.628"></a>
-<span class="sourceLineNo">629</span>                           "\nfound    
header" +<a name="line.629"></a>
-<span class="sourceLineNo">630</span>                           
HFileBlock.toStringHeader(bufRead));<a name="line.630"></a>
-<span class="sourceLineNo">631</span>                  LOG.warn("bufread 
offset " + bufRead.arrayOffset() +<a name="line.631"></a>
-<span class="sourceLineNo">632</span>                           " limit " + 
bufRead.limit() +<a name="line.632"></a>
-<span class="sourceLineNo">633</span>                           " expected 
offset " + bufExpected.arrayOffset() +<a name="line.633"></a>
-<span class="sourceLineNo">634</span>                           " limit " + 
bufExpected.limit());<a name="line.634"></a>
-<span class="sourceLineNo">635</span>                  
LOG.warn(wrongBytesMsg);<a name="line.635"></a>
-<span class="sourceLineNo">636</span>                }<a name="line.636"></a>
-<span class="sourceLineNo">637</span>              }<a name="line.637"></a>
-<span class="sourceLineNo">638</span>              assertTrue(wrongBytesMsg, 
bytesAreCorrect);<a name="line.638"></a>
-<span class="sourceLineNo">639</span>            }<a name="line.639"></a>
-<span class="sourceLineNo">640</span>          }<a name="line.640"></a>
-<span class="sourceLineNo">641</span><a name="line.641"></a>
-<span class="sourceLineNo">642</span>          assertEquals(curOffset, 
fs.getFileStatus(path).getLen());<a name="line.642"></a>
-<span class="sourceLineNo">643</span>          is.close();<a 
name="line.643"></a>
-<span class="sourceLineNo">644</span>        }<a name="line.644"></a>
-<span class="sourceLineNo">645</span>      }<a name="line.645"></a>
-<span class="sourceLineNo">646</span>    }<a name="line.646"></a>
-<span class="sourceLineNo">647</span>  }<a name="line.647"></a>
-<span class="sourceLineNo">648</span><a name="line.648"></a>
-<span class="sourceLineNo">649</span>  private Random defaultRandom() {<a 
name="line.649"></a>
-<span class="sourceLineNo">650</span>    return new Random(189237);<a 
name="line.650"></a>
-<span class="sourceLineNo">651</span>  }<a name="line.651"></a>
-<span class="sourceLineNo">652</span><a name="line.652"></a>
-<span class="sourceLineNo">653</span>  private class BlockReaderThread 
implements Callable&lt;Boolean&gt; {<a name="line.653"></a>
-<span class="sourceLineNo">654</span>    private final String clientId;<a 
name="line.654"></a>
-<span class="sourceLineNo">655</span>    private final HFileBlock.FSReader 
hbr;<a name="line.655"></a>
-<span class="sourceLineNo">656</span>    private final List&lt;Long&gt; 
offsets;<a name="line.656"></a>
-<span class="sourceLineNo">657</span>    private final List&lt;BlockType&gt; 
types;<a name="line.657"></a>
-<span class="sourceLineNo">658</span>    private final long fileSize;<a 
name="line.658"></a>
-<span class="sourceLineNo">659</span><a name="line.659"></a>
-<span class="sourceLineNo">660</span>    public BlockReaderThread(String 
clientId,<a name="line.660"></a>
-<span class="sourceLineNo">661</span>        HFileBlock.FSReader hbr, 
List&lt;Long&gt; offsets, List&lt;BlockType&gt; types,<a name="line.661"></a>
-<span class="sourceLineNo">662</span>        long fileSize) {<a 
name="line.662"></a>
-<span class="sourceLineNo">663</span>      this.clientId = clientId;<a 
name="line.663"></a>
-<span class="sourceLineNo">664</span>      this.offsets = offsets;<a 
name="line.664"></a>
-<span class="sourceLineNo">665</span>      this.hbr = hbr;<a 
name="line.665"></a>
-<span class="sourceLineNo">666</span>      this.types = types;<a 
name="line.666"></a>
-<span class="sourceLineNo">667</span>      this.fileSize = fileSize;<a 
name="line.667"></a>
-<span class="sourceLineNo">668</span>    }<a name="line.668"></a>
-<span class="sourceLineNo">669</span><a name="line.669"></a>
-<span class="sourceLineNo">670</span>    @Override<a name="line.670"></a>
-<span class="sourceLineNo">671</span>    public Boolean call() throws 
Exception {<a name="line.671"></a>
-<span class="sourceLineNo">672</span>      Random rand = new 
Random(clientId.hashCode());<a name="line.672"></a>
-<span class="sourceLineNo">673</span>      long endTime = 
System.currentTimeMillis() + 10000;<a name="line.673"></a>
-<span class="sourceLineNo">674</span>      int numBlocksRead = 0;<a 
name="line.674"></a>
-<span class="sourceLineNo">675</span>      int numPositionalRead = 0;<a 
name="line.675"></a>
-<span class="sourceLineNo">676</span>      int numWithOnDiskSize = 0;<a 
name="line.676"></a>
-<span class="sourceLineNo">677</span>      while (System.currentTimeMillis() 
&lt; endTime) {<a name="line.677"></a>
-<span class="sourceLineNo">678</span>        int blockId = 
rand.nextInt(NUM_TEST_BLOCKS);<a name="line.678"></a>
-<span class="sourceLineNo">679</span>        long offset = 
offsets.get(blockId);<a name="line.679"></a>
-<span class="sourceLineNo">680</span>        // now we only support concurrent 
read with pread = true<a name="line.680"></a>
-<span class="sourceLineNo">681</span>        boolean pread = true;<a 
name="line.681"></a>
-<span class="sourceLineNo">682</span>        boolean withOnDiskSize = 
rand.nextBoolean();<a name="line.682"></a>
-<span class="sourceLineNo">683</span>        long expectedSize =<a 
name="line.683"></a>
-<span class="sourceLineNo">684</span>          (blockId == NUM_TEST_BLOCKS - 1 
? fileSize<a name="line.684"></a>
-<span class="sourceLineNo">685</span>              : offsets.get(blockId + 1)) 
- offset;<a name="line.685"></a>
-<span class="sourceLineNo">686</span><a name="line.686"></a>
-<span class="sourceLineNo">687</span>        HFileBlock b;<a 
name="line.687"></a>
-<span class="sourceLineNo">688</span>        try {<a name="line.688"></a>
-<span class="sourceLineNo">689</span>          long onDiskSizeArg = 
withOnDiskSize ? expectedSize : -1;<a name="line.689"></a>
-<span class="sourceLineNo">690</span>          b = hbr.readBlockData(offset, 
onDiskSizeArg, pread, false);<a name="line.690"></a>
-<span class="sourceLineNo">691</span>        } catch (IOException ex) {<a 
name="line.691"></a>
-<span class="sourceLineNo">692</span>          LOG.error("Error in client " + 
clientId + " trying to read block at "<a name="line.692"></a>
-<span class="sourceLineNo">693</span>              + offset + ", pread=" + 
pread + ", withOnDiskSize=" +<a name="line.693"></a>
-<span class="sourceLineNo">694</span>              withOnDiskSize, ex);<a 
name="line.694"></a>
-<span class="sourceLineNo">695</span>          return false;<a 
name="line.695"></a>
-<span class="sourceLineNo">696</span>        }<a name="line.696"></a>
-<span class="sourceLineNo">697</span><a name="line.697"></a>
-<span class="sourceLineNo">698</span>        assertEquals(types.get(blockId), 
b.getBlockType());<a name="line.698"></a>
-<span class="sourceLineNo">699</span>        assertEquals(expectedSize, 
b.getOnDiskSizeWithHeader());<a name="line.699"></a>
-<span class="sourceLineNo">700</span>        assertEquals(offset, 
b.getOffset());<a name="line.700"></a>
-<span class="sourceLineNo">701</span><a name="line.701"></a>
-<span class="sourceLineNo">702</span>        ++numBlocksRead;<a 
name="line.702"></a>
-<span class="sourceLineNo">703</span>        if (pread)<a name="line.703"></a>
-<span class="sourceLineNo">704</span>          ++numPositionalRead;<a 
name="line.704"></a>
-<span class="sourceLineNo">705</span>        if (withOnDiskSize)<a 
name="line.705"></a>
-<span class="sourceLineNo">706</span>          ++numWithOnDiskSize;<a 
name="line.706"></a>
-<span class="sourceLineNo">707</span>      }<a name="line.707"></a>
-<span class="sourceLineNo">708</span>      LOG.info("Client " + clientId + " 
successfully read " + numBlocksRead +<a name="line.708"></a>
-<span class="sourceLineNo">709</span>        " blocks (with pread: " + 
numPositionalRead + ", with onDiskSize " +<a name="line.709"></a>
-<span class="sourceLineNo">710</span>        "specified: " + numWithOnDiskSize 
+ ")");<a name="line.710"></a>
-<span class="sourceLineNo">711</span><a name="line.711"></a>
-<span class="sourceLineNo">712</span>      return true;<a name="line.712"></a>
-<span class="sourceLineNo">713</span>    }<a name="line.713"></a>
-<span class="sourceLineNo">714</span><a name="line.714"></a>
-<span class="sourceLineNo">715</span>  }<a name="line.715"></a>
-<span class="sourceLineNo">716</span><a name="line.716"></a>
-<span class="sourceLineNo">717</span>  @Test<a name="line.717"></a>
-<span class="sourceLineNo">718</span>  public void testConcurrentReading() 
throws Exception {<a name="line.718"></a>
-<span class="sourceLineNo">719</span>    testConcurrentReadingInternals();<a 
name="line.719"></a>
-<span class="sourceLineNo">720</span>  }<a name="line.720"></a>
-<span class="sourceLineNo">721</span><a name="line.721"></a>
-<span class="sourceLineNo">722</span>  protected void 
testConcurrentReadingInternals() throws IOException,<a name="line.722"></a>
-<span class="sourceLineNo">723</span>      InterruptedException, 
ExecutionException {<a name="line.723"></a>
-<span class="sourceLineNo">724</span>    for (Compression.Algorithm 
compressAlgo : COMPRESSION_ALGORITHMS) {<a name="line.724"></a>
-<span class="sourceLineNo">725</span>      Path path = new 
Path(TEST_UTIL.getDataTestDir(), "concurrent_reading");<a name="line.725"></a>
-<span class="sourceLineNo">726</span>      Random rand = defaultRandom();<a 
name="line.726"></a>
-<span class="sourceLineNo">727</span>      List&lt;Long&gt; offsets = new 
ArrayList&lt;&gt;();<a name="line.727"></a>
-<span class="sourceLineNo">728</span>      List&lt;BlockType&gt; types = new 
ArrayList&lt;&gt;();<a name="line.728"></a>
-<span class="sourceLineNo">729</span>      writeBlocks(rand, compressAlgo, 
path, offsets, null, types, null);<a name="line.729"></a>
-<span class="sourceLineNo">730</span>      FSDataInputStream is = 
fs.open(path);<a name="line.730"></a>
-<span class="sourceLineNo">731</span>      long fileSize = 
fs.getFileStatus(path).getLen();<a name="line.731"></a>
-<span class="sourceLineNo">732</span>      HFileContext meta = new 
HFileContextBuilder()<a name="line.732"></a>
-<span class="sourceLineNo">733</span>                          
.withHBaseCheckSum(true)<a name="line.733"></a>
-<span class="sourceLineNo">734</span>                          
.withIncludesMvcc(includesMemstoreTS)<a name="line.734"></a>
-<span class="sourceLineNo">735</span>                          
.withIncludesTags(includesTag)<a name="line.735"></a>
-<span class="sourceLineNo">736</span>                          
.withCompression(compressAlgo)<a name="line.736"></a>
-<span class="sourceLineNo">737</span>                          .build();<a 
name="line.737"></a>
-<span class="sourceLineNo">738</span>      HFileBlock.FSReader hbr = new 
HFileBlock.FSReaderImpl(is, fileSize, meta);<a name="line.738"></a>
-<span class="sourceLineNo">739</span><a name="line.739"></a>
-<span class="sourceLineNo">740</span>      Executor exec = 
Executors.newFixedThreadPool(NUM_READER_THREADS);<a name="line.740"></a>
-<span class="sourceLineNo">741</span>      
ExecutorCompletionService&lt;Boolean&gt; ecs = new 
ExecutorCompletionService&lt;&gt;(exec);<a name="line.741"></a>
-<span class="sourceLineNo">742</span><a name="line.742"></a>
-<span class="sourceLineNo">743</span>      for (int i = 0; i &lt; 
NUM_READER_THREADS; ++i) {<a name="line.743"></a>
-<span class="sourceLineNo">744</span>        ecs.submit(new 
BlockReaderThread("reader_" + (char) ('A' + i), hbr,<a name="line.744"></a>
-<span class="sourceLineNo">745</span>            offsets, types, fileSize));<a 
name="line.745"></a>
-<span class="sourceLineNo">746</span>      }<a name="line.746"></a>
-<span class="sourceLineNo">747</span><a name="line.747"></a>
-<span class="sourceLineNo">748</span>      for (int i = 0; i &lt; 
NUM_READER_THREADS; ++i) {<a name="line.748"></a>
-<span class="sourceLineNo">749</span>        Future&lt;Boolean&gt; result = 
ecs.take();<a name="line.749"></a>
-<span class="sourceLineNo">750</span>        assertTrue(result.get());<a 
name="line.750"></a>
-<span class="sourceLineNo">751</span>        if (detailedLogging) {<a 
name="line.751"></a>
-<span class="sourceLineNo">752</span>          LOG.info(String.valueOf(i + 
1)<a name="line.752"></a>
-<span class="sourceLineNo">753</span>            + " reader threads finished 
successfully (algo=" + compressAlgo<a name="line.753"></a>
-<span class="sourceLineNo">754</span>            + ")");<a name="line.754"></a>
-<span class="sourceLineNo">755</span>        }<a name="line.755"></a>
-<span class="sourceLineNo">756</span>      }<a name="line.756"></a>
-<span class="sourceLineNo">757</span><a name="line.757"></a>
-<span class="sourceLineNo">758</span>      is.close();<a name="line.758"></a>
-<span class="sourceLineNo">759</span>    }<a name="line.759"></a>
-<span class="sourceLineNo">760</span>  }<a name="line.760"></a>
-<span class="sourceLineNo">761</span><a name="line.761"></a>
-<span class="sourceLineNo">762</span>  private long writeBlocks(Random rand, 
Compression.Algorithm compressAlgo,<a name="line.762"></a>
-<span class="sourceLineNo">763</span>      Path path, List&lt;Long&gt; 
expectedOffsets, List&lt;Long&gt; expectedPrevOffsets,<a name="line.763"></a>
-<span class="sourceLineNo">764</span>      List&lt;BlockType&gt; 
expectedTypes, List&lt;ByteBuffer&gt; expectedContents<a name="line.764"></a>
-<span class="sourceLineNo">765</span>  ) throws IOException {<a 
name="line.765"></a>
-<span class="sourceLineNo">766</span>    boolean cacheOnWrite = 
expectedContents != null;<a name="line.766"></a>
-<span class="sourceLineNo">767</span>    FSDataOutputStream os = 
fs.create(path);<a name="line.767"></a>
-<span class="sourceLineNo">768</span>    HFileContext meta = new 
HFileContextBuilder()<a name="line.768"></a>
-<span class="sourceLineNo">769</span>                        
.withHBaseCheckSum(true)<a name="line.769"></a>
-<span class="sourceLineNo">770</span>                        
.withIncludesMvcc(includesMemstoreTS)<a name="line.770"></a>
-<span class="sourceLineNo">771</span>                        
.withIncludesTags(includesTag)<a name="line.771"></a>
-<span class="sourceLineNo">772</span>                        
.withCompression(compressAlgo)<a name="line.772"></a>
-<span class="sourceLineNo">773</span>                        
.withBytesPerCheckSum(HFile.DEFAULT_BYTES_PER_CHECKSUM)<a name="line.773"></a>
-<span class="sourceLineNo">774</span>                        .build();<a 
name="line.774"></a>
-<span class="sourceLineNo">775</span>    HFileBlock.Writer hbw = new 
HFileBlock.Writer(null, meta);<a name="line.775"></a>
-<span class="sourceLineNo">776</span>    Map&lt;BlockType, Long&gt; 
prevOffsetByType = new HashMap&lt;&gt;();<a name="line.776"></a>
-<span class="sourceLineNo">777</span>    long totalSize = 0;<a 
name="line.777"></a>
-<span class="sourceLineNo">778</span>    for (int i = 0; i &lt; 
NUM_TEST_BLOCKS; ++i) {<a name="line.778"></a>
-<span class="sourceLineNo">779</span>      long pos = os.getPos();<a 
name="line.779"></a>
-<span class="sourceLineNo">780</span>      int blockTypeOrdinal = 
rand.nextInt(BlockType.values().length);<a name="line.780"></a>
-<span class="sourceLineNo">781</span>      if (blockTypeOrdinal == 
BlockType.ENCODED_DATA.ordinal()) {<a name="line.781"></a>
-<span class="sourceLineNo">782</span>        blockTypeOrdinal = 
BlockType.DATA.ordinal();<a name="line.782"></a>
-<span class="sourceLineNo">783</span>      }<a name="line.783"></a>
-<span class="sourceLineNo">784</span>      BlockType bt = 
BlockType.values()[blockTypeOrdinal];<a name="line.784"></a>
-<span class="sourceLineNo">785</span>      DataOutputStream dos = 
hbw.startWriting(bt);<a name="line.785"></a>
-<span class="sourceLineNo">786</span>      int size = rand.nextInt(500);<a 
name="line.786"></a>
-<span class="sourceLineNo">787</span>      for (int j = 0; j &lt; size; ++j) 
{<a name="line.787"></a>
-<span class="sourceLineNo">788</span>        // This might compress well.<a 
name="line.788"></a>
-<span class="sourceLineNo">789</span>        dos.writeShort(i + 1);<a 
name="line.789"></a>
-<span class="sourceLineNo">790</span>        dos.writeInt(j + 1);<a 
name="line.790"></a>
-<span class="sourceLineNo">791</span>      }<a name="line.791"></a>
-<span class="sourceLineNo">792</span><a name="line.792"></a>
-<span class="sourceLineNo">793</span>      if (expectedOffsets != null)<a 
name="line.793"></a>
-<span class="sourceLineNo">794</span>        
expectedOffsets.add(os.getPos());<a name="line.794"></a>
-<span class="sourceLineNo">795</span><a name="line.795"></a>
-<span class="sourceLineNo">796</span>      if (expectedPrevOffsets != null) 
{<a name="line.796"></a>
-<span class="sourceLineNo">797</span>        Long prevOffset = 
prevOffsetByType.get(bt);<a name="line.797"></a>
-<span class="sourceLineNo">798</span>        
expectedPrevOffsets.add(prevOffset != null ? prevOffset : -1);<a 
name="line.798"></a>
-<span class="sourceLineNo">799</span>        prevOffsetByType.put(bt, 
os.getPos());<a name="line.799"></a>
-<span class="sourceLineNo">800</span>      }<a name="line.800"></a>
-<span class="sourceLineNo">801</span><a name="line.801"></a>
-<span class="sourceLineNo">802</span>      expectedTypes.add(bt);<a 
name="line.802"></a>
-<span class="sourceLineNo">803</span><a name="line.803"></a>
-<span class="sourceLineNo">804</span>      hbw.writeHeaderAndData(os);<a 
name="line.804"></a>
-<span class="sourceLineNo">805</span>      totalSize += 
hbw.getOnDiskSizeWithHeader();<a name="line.805"></a>
-<span class="sourceLineNo">806</span><a name="line.806"></a>
-<span class="sourceLineNo">807</span>      if (cacheOnWrite)<a 
name="line.807"></a>
-<span class="sourceLineNo">808</span>        
expectedContents.add(hbw.cloneUncompressedBufferWithHeader());<a 
name="line.808"></a>
-<span class="sourceLineNo">809</span><a name="line.809"></a>
-<span class="sourceLineNo">810</span>      if (detailedLogging) {<a 
name="line.810"></a>
-<span class="sourceLineNo">811</span>        LOG.info("Written block #" + i + 
" of type " + bt<a name="line.811"></a>
-<span class="sourceLineNo">812</span>            + ", uncompressed size " + 
hbw.getUncompressedSizeWithoutHeader()<a name="line.812"></a>
-<span class="sourceLineNo">813</span>            + ", packed size " + 
hbw.getOnDiskSizeWithoutHeader()<a name="line.813"></a>
-<span class="sourceLineNo">814</span>            + " at offset " + pos);<a 
name="line.814"></a>
-<span class="sourceLineNo">815</span>      }<a name="line.815"></a>
-<span class="sourceLineNo">816</span>    }<a name="line.816"></a>
-<span class="sourceLineNo">817</span>    os.close();<a name="line.817"></a>
-<span class="sourceLineNo">818</span>    LOG.info("Created a temporary file at 
" + path + ", "<a name="line.818"></a>
-<span class="sourceLineNo">819</span>        + fs.getFileStatus(path).getLen() 
+ " byte, compression=" +<a name="line.819"></a>
-<span class="sourceLineNo">820</span>        compressAlgo);<a 
name="line.820"></a>
-<span class="sourceLineNo">821</span>    return totalSize;<a 
name="line.821"></a>
-<span class="sourceLineNo">822</span>  }<a name="line.822"></a>
-<span class="sourceLineNo">823</span><a name="line.823"></a>
-<span class="sourceLineNo">824</span>  @Test<a name="line.824"></a>
-<span class="sourceLineNo">825</span>  public void testBlockHeapSize() {<a 
name="line.825"></a>
-<span class="sourceLineNo">826</span>    testBlockHeapSizeInternals();<a 
name="line.826"></a>
-<span class="sourceLineNo">827</span>  }<a name="line.827"></a>
-<span class="sourceLineNo">828</span><a name="line.828"></a>
-<span class="sourceLineNo">829</span>  protected void 
testBlockHeapSizeInternals() {<a name="line.829"></a>
-<span class="sourceLineNo">830</span>    if (ClassSize.is32BitJVM()) {<a 
name="line.830"></a>
-<span class="sourceLineNo">831</span>      assertEquals(64, 
HFileBlock.MULTI_BYTE_BUFFER_HEAP_SIZE);<a name="line.831"></a>
-<span class="sourceLineNo">832</span>    } else {<a name="line.832"></a>
-<span class="sourceLineNo">833</span>      assertEquals(72, 
HFileBlock.MULTI_BYTE_BUFFER_HEAP_SIZE);<a name="line.833"></a>
-<span class="sourceLineNo">834</span>    }<a name="line.834"></a>
-<span class="sourceLineNo">835</span><a name="line.835"></a>
-<span class="sourceLineNo">836</span>    for (int size : new int[] { 100, 256, 
12345 }) {<a name="line.836"></a>
-<span class="sourceLineNo">837</span>      byte[] byteArr = new 
byte[HConstants.HFILEBLOCK_HEADER_SIZE + size];<a name="line.837"></a>
-<span class="sourceLineNo">838</span>      ByteBuffer buf = 
ByteBuffer.wrap(byteArr, 0, size);<a name="line.838"></a>
-<span class="sourceLineNo">839</span>      HFileContext meta = new 
HFileContextBuilder()<a name="line.839"></a>
-<span class="sourceLineNo">840</span>                          
.withIncludesMvcc(includesMemstoreTS)<a name="line.840"></a>
-<span class="sourceLineNo">841</span>                          
.withIncludesTags(includesTag)<a name="line.841"></a>
-<span class="sourceLineNo">842</span>                          
.withHBaseCheckSum(false)<a name="line.842"></a>
-<span class="sourceLineNo">843</span>                          
.withCompression(Algorithm.NONE)<a name="line.843"></a>
-<span class="sourceLineNo">844</span>                          
.withBytesPerCheckSum(HFile.DEFAULT_BYTES_PER_CHECKSUM)<a name="line.844"></a>
-<span class="sourceLineNo">845</span>                          
.withChecksumType(ChecksumType.NULL).build();<a name="line.845"></a>
-<span class="sourceLineNo">846</span>      HFileBlock block = new 
HFileBlock(BlockType.DATA, size, size, -1, buf,<a name="line.846"></a>
-<span class="sourceLineNo">847</span>          HFileBlock.FILL_HEADER, -1, 0, 
-1, meta);<a name="line.847"></a>
-<span class="sourceLineNo">848</span>      long byteBufferExpectedSize = 
ClassSize.align(ClassSize.estimateBase(<a name="line.848"></a>
-<span class="sourceLineNo">849</span>          new 
MultiByteBuff(buf).getClass(), true)<a name="line.849"></a>
-<span class="sourceLineNo">850</span>          + 
HConstants.HFILEBLOCK_HEADER_SIZE + size);<a name="line.850"></a>
-<span class="sourceLineNo">851</span>      long hfileMetaSize =  
ClassSize.align(ClassSize.estimateBase(HFileContext.class, true));<a 
name="line.851"></a>
-<span class="sourceLineNo">852</span>      long hfileBlockExpectedSize =<a 
name="line.852"></a>
-<span class="sourceLineNo">853</span>          
ClassSize.align(ClassSize.estimateBase(HFileBlock.class, true));<a 
name="line.853"></a>
-<span class="sourceLineNo">854</span>      long expected = 
hfileBlockExpectedSize + byteBufferExpectedSize + hfileMetaSize;<a 
name="line.854"></a>
-<span class="sourceLineNo">855</span>      assertEquals("Block data size: " + 
size + ", byte buffer expected " +<a name="line.855"></a>
-<span class="sourceLineNo">856</span>          "size: " + 
byteBufferExpectedSize + ", HFileBlock class expected " +<a name="line.856"></a>
-<span class="sourceLineNo">857</span>          "size: " + 
hfileBlockExpectedSize + ";", expected,<a name="line.857"></a>
-<span class="sourceLineNo">858</span>          block.heapSize());<a 
name="line.858"></a>
-<span class="sourceLineNo">859</span>    }<a name="line.859"></a>
-<span class="sourceLineNo">860</span>  }<a name="line.860"></a>
-<span class="sourceLineNo">861</span><a name="line.861"></a>
-<span class="sourceLineNo">862</span>  @Test<a name="line.862"></a>
-<span class="sourceLineNo">863</span>  public void 
testSerializeWithoutNextBlockMetadata() {<a name="line.863"></a>
-<span class="sourceLineNo">864</span>    int size = 100;<a name="line.864"></a>
-<span class="sourceLineNo">865</span>    int length = 
HConstants.HFILEBLOCK_HEADER_SIZE + size;<a name="line.865"></a>
-<span class="sourceLineNo">866</span>    byte[] byteArr = new byte[length];<a 
name="line.866"></a>
-<span class="sourceLineNo">867</span>    ByteBuffer buf = 
ByteBuffer.wrap(byteArr, 0, size);<a name="line.867"></a>
-<span class="sourceLineNo">868</span>    HFileContext meta = new 
HFileContextBuilder().build();<a name="line.868"></a>
-<span class="sourceLineNo">869</span>    HFileBlock blockWithNextBlockMetadata 
= new HFileBlock(BlockType.DATA, size, size, -1, buf,<a name="line.869"></a>
-<span class="sourceLineNo">870</span>        HFileBlock.FILL_HEADER, -1, 52, 
-1, meta);<a name="line.870"></a>
-<span class="sourceLineNo">871</span>    HFileBlock 
blockWithoutNextBlockMetadata = new HFileBlock(BlockType.DATA, size, size, -1, 
buf,<a name="line.871"></a>
-<span class="sourceLineNo">872</span>        HFileBlock.FILL_HEADER, -1, -1, 
-1, meta);<a name="line.872"></a>
-<span class="sourceLineNo">873</span>    ByteBuffer buff1 = 
ByteBuffer.allocate(length);<a name="line.873"></a>
-<span class="sourceLineNo">874</span>    ByteBuffer buff2 = 
ByteBuffer.allocate(length);<a name="line.874"></a>
-<span class="sourceLineNo">875</span>    
blockWithNextBlockMetadata.serialize(buff1, true);<a name="line.875"></a>
-<span class="sourceLineNo">876</span>    
blockWithoutNextBlockMetadata.serialize(buff2, true);<a name="line.876"></a>
-<span class="sourceLineNo">877</span>    assertNotEquals(buff1, buff2);<a 
name="line.877"></a>
-<span class="sourceLineNo">878</span>    buff1.clear();<a name="line.878"></a>
-<span class="sourceLineNo">879</span>    buff2.clear();<a name="line.879"></a>
-<span class="sourceLineNo">880</span>    
blockWithNextBlockMetadata.serialize(buff1, false);<a name="line.880"></a>
-<span class="sourceLineNo">881</span>    
blockWithoutNextBlockMetadata.serialize(buff2, false);<a name="line.881"></a>
-<span class="sourceLineNo">882</span>    assertEquals(buff1, buff2);<a 
name="line.882"></a>
-<span class="sourceLineNo">883</span>  }<a name="line.883"></a>
-<span class="sourceLineNo">884</span>}<a name="line.884"></a>
+<span class="sourceLineNo">379</span>          
LOG.info("testDataBlockEncoding: Compression algorithm={}, pread={}, 
dataBlockEncoder={}",<a name="line.379"></a>
+<span class="sourceLineNo">380</span>              algo.toString(), pread, 
encoding);<a name="line.380"></a>
+<span class="sourceLineNo">381</span>          Path path = new 
Path(TEST_UTIL.getDataTestDir(), "blocks_v2_"<a name="line.381"></a>
+<span class="sourceLineNo">382</span>              + algo + "_" + 
encoding.toString());<a name="line.382"></a>
+<span class="sourceLineNo">383</span>          FSDataOutputStream os = 
fs.create(path);<a name="line.383"></a>
+<span class="sourceLineNo">384</span>          HFileDataBlockEncoder 
dataBlockEncoder = (encoding != DataBlockEncoding.NONE) ?<a name="line.384"></a>
+<span class="sourceLineNo">385</span>              new 
HFileDataBlockEncoderImpl(encoding) : NoOpDataBlockEncoder.INSTANCE;<a 
name="line.385"></a>
+<span class="sourceLineNo">386</span>          HFileContext meta = new 
HFileContextBuilder()<a name="line.386"></a>
+<span class="sourceLineNo">387</span>                              
.withCompression(algo)<a name="line.387"></a>
+<span class="sourceLineNo">388</span>                              
.withIncludesMvcc(includesMemstoreTS)<a name="line.388"></a>
+<span class="sourceLineNo">389</span>                              
.withIncludesTags(includesTag)<a name="line.389"></a>
+<span class="sourceLineNo">390</span>                              
.withBytesPerCheckSum(HFile.DEFAULT_BYTES_PER_CHECKSUM)<a name="line.390"></a>
+<span class="sourceLineNo">391</span>                              .build();<a 
name="line.391"></a>
+<span class="sourceLineNo">392</span>          HFileBlock.Writer hbw = new 
HFileBlock.Writer(dataBlockEncoder, meta);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>          long totalSize = 0;<a 
name="line.393"></a>
+<span class="sourceLineNo">394</span>          final List&lt;Integer&gt; 
encodedSizes = new ArrayList&lt;&gt;();<a name="line.394"></a>
+<span class="sourceLineNo">395</span>          final List&lt;ByteBuffer&gt; 
encodedBlocks = new ArrayList&lt;&gt;();<a name="line.395"></a>
+<span class="sourceLineNo">396</span>          for (int blockId = 0; blockId 
&lt; numBlocks; ++blockId) {<a name="line.396"></a>
+<span class="sourceLineNo">397</span>            
hbw.startWriting(BlockType.DATA);<a name="line.397"></a>
+<span class="sourceLineNo">398</span>            writeTestKeyValues(hbw, 
blockId, includesMemstoreTS, includesTag);<a name="line.398"></a>
+<span class="sourceLineNo">399</span>            hbw.writeHeaderAndData(os);<a 
name="line.399"></a>
+<span class="sourceLineNo">400</span>            int headerLen = 
HConstants.HFILEBLOCK_HEADER_SIZE;<a name="line.400"></a>
+<span class="sourceLineNo">401</span>            byte[] 
encodedResultWithHeader = hbw.cloneUncompressedBufferWithHeader().array();<a 
name="line.401"></a>
+<span class="sourceLineNo">402</span>            final int encodedSize = 
encodedResultWithHeader.length - headerLen;<a name="line.402"></a>
+<span class="sourceLineNo">403</span>            if (encoding != 
DataBlockEncoding.NONE) {<a name="line.403"></a>
+<span class="sourceLineNo">404</span>              // We need to account for 
the two-byte encoding algorithm ID that<a name="line.404"></a>
+<span class="sourceLineNo">405</span>              // comes after the 24-byte 
block header but before encoded KVs.<a name="line.405"></a>
+<span class="sourceLineNo">406</span>              headerLen += 
DataBlockEncoding.ID_SIZE;<a name="line.406"></a>
+<span class="sourceLineNo">407</span>            }<a name="line.407"></a>
+<span class="sourceLineNo">408</span>            byte[] encodedDataSection =<a 
name="line.408"></a>
+<span class="sourceLineNo">409</span>                new 
byte[encodedResultWithHeader.length - headerLen];<a name="line.409"></a>
+<span class="sourceLineNo">410</span>            
System.arraycopy(encodedResultWithHeader, headerLen,<a name="line.410"></a>
+<span class="sourceLineNo">411</span>                encodedDataSection, 0, 
encodedDataSection.length);<a name="line.411"></a>
+<span class="sourceLineNo">412</span>            final ByteBuffer encodedBuf 
=<a name="line.412"></a>
+<span class="sourceLineNo">413</span>                
ByteBuffer.wrap(encodedDataSection);<a name="line.413"></a>
+<span class="sourceLineNo">414</span>            
encodedSizes.add(encodedSize);<a name="line.414"></a>
+<span class="sourceLineNo">415</span>            
encodedBlocks.add(encodedBuf);<a name="line.415"></a>
+<span class="sourceLineNo">416</span>            totalSize += 
hbw.getOnDiskSizeWithHeader();<a name="line.416"></a>
+<span class="sourceLineNo">417</span>          }<a name="line.417"></a>
+<span class="sourceLineNo">418</span>          os.close();<a 
name="line.418"></a>
+<span class="sourceLineNo">419</span><a name="line.419"></a>
+<span class="sourceLineNo">420</span>          FSDataInputStream is = 
fs.open(path);<a name="line.420"></a>
+<span class="sourceLineNo">421</span>          meta = new 
HFileContextBuilder()<a name="line.421"></a>
+<span class="sourceLineNo">422</span>                
.withHBaseCheckSum(true)<a name="line.422"></a>
+<span class="sourceLineNo">423</span>                .withCompression(algo)<a 
name="line.423"></a>
+<span class="sourceLineNo">424</span>                
.withIncludesMvcc(includesMemstoreTS)<a name="line.424"></a>
+<span class="sourceLineNo">425</span>                
.withIncludesTags(includesTag)<a name="line.425"></a>
+<span class="sourceLineNo">426</span>                .build();<a 
name="line.426"></a>
+<span class="sourceLineNo">427</span>          HFileBlock.FSReaderImpl hbr = 
new HFileBlock.FSReaderImpl(is, totalSize, meta);<a name="line.427"></a>
+<span class="sourceLineNo">428</span>          
hbr.setDataBlockEncoder(dataBlockEncoder);<a name="line.428"></a>
+<span class="sourceLineNo">429</span>          
hbr.setIncludesMemStoreTS(includesMemstoreTS);<a name="line.429"></a>
+<span class="sourceLineNo">430</span>          HFileBlock blockFromHFile, 
blockUnpacked;<a name="line.430"></a>
+<span class="sourceLineNo">431</span>          int pos = 0;<a 
name="line.431"></a>
+<span class="sourceLineNo">432</span>          for (int blockId = 0; blockId 
&lt; numBlocks; ++blockId) {<a name="line.432"></a>
+<span class="sourceLineNo">433</span>            blockFromHFile = 
hbr.readBlockData(pos, -1, pread, false);<a name="line.433"></a>
+<span class="sourceLineNo">434</span>            assertEquals(0, 
HFile.getAndResetChecksumFailuresCount());<a name="line.434"></a>
+<span class="sourceLineNo">435</span>            
blockFromHFile.sanityCheck();<a name="line.435"></a>
+<span class="sourceLineNo">436</span>            pos += 
blockFromHFile.getOnDiskSizeWithHeader();<a name="line.436"></a>
+<span class="sourceLineNo">437</span>            assertEquals((int) 
encodedSizes.get(blockId),<a name="line.437"></a>
+<span class="sourceLineNo">438</span>              
blockFromHFile.getUncompressedSizeWithoutHeader());<a name="line.438"></a>
+<span class="sourceLineNo">439</span>            
assertEquals(meta.isCompressedOrEncrypted(), !blockFromHFile.isUnpacked());<a 
name="line.439"></a>
+<span class="sourceLineNo">440</span>            long packedHeapsize = 
blockFromHFile.heapSize();<a name="line.440"></a>
+<span class="sourceLineNo">441</span>            blockUnpacked = 
blockFromHFile.unpack(meta, hbr);<a name="line.441"></a>
+<span class="sourceLineNo">442</span>            
assertTrue(blockUnpacked.isUnpacked());<a name="line.442"></a>
+<span class="sourceLineNo">443</span>            if 
(meta.isCompressedOrEncrypted()) {<a name="line.443"></a>
+<span class="sourceLineNo">444</span>              LOG.info("packedHeapsize=" 
+ packedHeapsize + ", unpackedHeadsize=" + blockUnpacked<a name="line.444"></a>
+<span class="sourceLineNo">445</span>                .heapSize());<a 
name="line.445"></a>
+<span class="sourceLineNo">446</span>              assertFalse(packedHeapsize 
== blockUnpacked.heapSize());<a name="line.446"></a>
+<span class="sourceLineNo">447</span>              assertTrue("Packed heapSize 
should be &lt; unpacked heapSize",<a name="line.447"></a>
+<span class="sourceLineNo">448</span>                packedHeapsize &lt; 
blockUnpacked.heapSize());<a name="line.448"></a>
+<span class="sourceLineNo">449</span>            }<a name="line.449"></a>
+<span class="sourceLineNo">450</span>            ByteBuff actualBuffer = 
blockUnpacked.getBufferWithoutHeader();<a name="line.450"></a>
+<span class="sourceLineNo">451</span>            if (encoding != 
DataBlockEncoding.NONE) {<a name="line.451"></a>
+<span class="sourceLineNo">452</span>              // We expect a two-byte 
big-endian encoding id.<a name="line.452"></a>
+<span class="sourceLineNo">453</span>              assertEquals(<a 
name="line.453"></a>
+<span class="sourceLineNo">454</span>                "Unexpected first byte 
with " + buildMessageDetails(algo, encoding, pread),<a name="line.454"></a>
+<span class="sourceLineNo">455</span>                Long.toHexString(0), 
Long.toHexString(actualBuffer.get(0)));<a name="line.455"></a>
+<span class="sourceLineNo">456</span>              assertEquals(<a 
name="line.456"></a>
+<span class="sourceLineNo">457</span>                "Unexpected second byte 
with " + buildMessageDetails(algo, encoding, pread),<a name="line.457"></a>
+<span class="sourceLineNo">458</span>                
Long.toHexString(encoding.getId()), Long.toHexString(actualBuffer.get(1)));<a 
name="line.458"></a>
+<span class="sourceLineNo">459</span>              actualBuffer.position(2);<a 
name="line.459"></a>
+<span class="sourceLineNo">460</span>              actualBuffer = 
actualBuffer.slice();<a name="line.460"></a>
+<span class="sourceLineNo">461</span>            }<a name="line.461"></a>
+<span class="sourceLineNo">462</span><a name="line.462"></a>
+<span class="sourceLineNo">463</span>            ByteBuffer expectedBuffer = 
encodedBlocks.get(blockId);<a name="line.463"></a>
+<span class="sourceLineNo">464</span>            expectedBuffer.rewind();<a 
name="line.464"></a>
+<span class="sourceLineNo">465</span><a name="line.465"></a>
+<span class="sourceLineNo">466</span>            // test if content matches, 
produce nice message<a name="line.466"></a>
+<span class="sourceLineNo">467</span>            assertBuffersEqual(new 
SingleByteBuff(expectedBuffer), actualBuffer, algo, encoding,<a 
name="line.467"></a>
+<span class="sourceLineNo">468</span>                pread);<a 
name="line.468"></a>
+<span class="sourceLineNo">469</span><a name="line.469"></a>
+<span class="sourceLineNo">470</span>            // test serialized blocks<a 
name="line.470"></a>
+<span class="sourceLineNo">471</span>            for (boolean reuseBuffer : 
new boolean[] { false, true }) {<a name="line.471"></a>
+<span class="sourceLineNo">472</span>              ByteBuffer serialized = 
ByteBuffer.allocate(blockFromHFile.getSerializedLength());<a 
name="line.472"></a>
+<span class="sourceLineNo">473</span>              
blockFromHFile.serialize(serialized, true);<a name="line.473"></a>
+<span class="sourceLineNo">474</span>              HFileBlock deserialized =<a 
name="line.474"></a>
+<span class="sourceLineNo">475</span>                  (HFileBlock) 
blockFromHFile.getDeserializer().deserialize(<a name="line.475"></a>
+<span class="sourceLineNo">476</span>                    new 
SingleByteBuff(serialized), reuseBuffer, MemoryType.EXCLUSIVE);<a 
name="line.476"></a>
+<span class="sourceLineNo">477</span>              assertEquals(<a 
name="line.477"></a>
+<span class="sourceLineNo">478</span>                "Serialization did not 
preserve block state. reuseBuffer=" + reuseBuffer,<a name="line.478"></a>
+<span class="sourceLineNo">479</span>                blockFromHFile, 
deserialized);<a name="line.479"></a>
+<span class="sourceLineNo">480</span>              // intentional reference 
comparison<a name="line.480"></a>
+<span class="sourceLineNo">481</span>              if (blockFromHFile != 
blockUnpacked) {<a name="line.481"></a>
+<span class="sourceLineNo">482</span>                
assertEquals("Deserializaed block cannot be unpacked correctly.",<a 
name="line.482"></a>
+<span class="sourceLineNo">483</span>                  blockUnpacked, 
deserialized.unpack(meta, hbr));<a name="line.483"></a>
+<span class="sourceLineNo">484</span>              }<a name="line.484"></a>
+<span class="sourceLineNo">485</span>            }<a name="line.485"></a>
+<span class="sourceLineNo">486</span>          }<a name="line.486"></a>
+<span class="sourceLineNo">487</span>          is.close();<a 
name="line.487"></a>
+<span class="sourceLineNo">488</span>        }<a name="line.488"></a>
+<span class="sourceLineNo">489</span>      }<a name="line.489"></a>
+<span class="sourceLineNo">490</span>    }<a name="line.490"></a>
+<span class="sourceLineNo">491</span>  }<a name="line.491"></a>
+<span class="sourceLineNo">492</span><a name="line.492"></a>
+<span class="sourceLineNo">493</span>  static String 
buildMessageDetails(Algorithm compression, DataBlockEncoding encoding,<a 
name="line.493"></a>
+<span class="sourceLineNo">494</span>      boolean pread) {<a 
name="line.494"></a>
+<span class="sourceLineNo">495</span>    return String.format("compression %s, 
encoding %s, pread %s", compression, encoding, pread);<a name="line.495"></a>
+<span class="sourceLineNo">496</span>  }<a name="line.496"></a>
+<span class="sourceLineNo">497</span><a name="line.497"></a>
+<span class="sourceLineNo">498</span>  static void assertBuffersEqual(ByteBuff 
expectedBuffer,<a name="line.498"></a>
+<span class="sourceLineNo">499</span>      ByteBuff actualBuffer, 
Compression.Algorithm compression,<a name="line.499"></a>
+<span class="sourceLineNo">500</span>      DataBlockEncoding encoding, boolean 
pread) {<a name="line.500"></a>
+<span class="sourceLineNo">501</span>    if 
(!actualBuffer.equals(expectedBuffer)) {<a name="line.501"></a>
+<span class="sourceLineNo">502</span>      int prefix = 0;<a 
name="line.502"></a>
+<span class="sourceLineNo">503</span>      int minLimit = 
Math.min(expectedBuffer.limit(), actualBuffer.limit());<a name="line.503"></a>
+<span class="sourceLineNo">504</span>      while (prefix &lt; minLimit 
&amp;&amp;<a name="line.504"></a>
+<span class="sourceLineNo">505</span>          expectedBuffer.get(prefix) == 
actualBuffer.get(prefix)) {<a name="line.505"></a>
+<span class="sourceLineNo">506</span>        prefix++;<a name="line.506"></a>
+<span class="sourceLineNo">507</span>      }<a name="line.507"></a>
+<span class="sourceLineNo">508</span><a name="line.508"></a>
+<span class="sourceLineNo">509</span>      fail(String.format(<a 
name="line.509"></a>
+<span class="sourceLineNo">510</span>          "Content mismatch for %s, 
commonPrefix %d, expected %s, got %s",<a name="line.510"></a>
+<span class="sourceLineNo">511</span>          
buildMessageDetails(compression, encoding, pread), prefix,<a 
name="line.511"></a>
+<span class="sourceLineNo">512</span>          nextBytesToStr(expectedBuffer, 
prefix),<a name="line.512"></a>
+<span class="sourceLineNo">513</span>          nextBytesToStr(actualBuffer, 
prefix)));<a name="line.513"></a>
+<span class="sourceLineNo">514</span>    }<a name="line.514"></a>
+<span class="sourceLineNo">515</span>  }<a name="line.515"></a>
+<span class="sourceLineNo">516</span><a name="line.516"></a>
+<span class="sourceLineNo">517</span>  /**<a name="line.517"></a>
+<span class="sourceLineNo">518</span>   * Convert a few next bytes in the 
given buffer at the given position to<a name="line.518"></a>
+<span class="sourceLineNo">519</span>   * string. Used for error messages.<a 
name="line.519"></a>
+<span class="sourceLineNo">520</span>   */<a name="line.520"></a>
+<span class="sourceLineNo">521</span>  private static String 
nextBytesToStr(ByteBuff buf, int pos) {<a name="line.521"></a>
+<span class="sourceLineNo">522</span>    int maxBytes = buf.limit() - pos;<a 
name="line.522"></a>
+<span class="sourceLineNo">523</span>    int numBytes = Math.min(16, 
maxBytes);<a name="line.523"></a>
+<span class="sourceLineNo">524</span>    return 
Bytes.toStringBinary(buf.array(), buf.arrayOffset() + pos,<a 
name="line.524"></a>
+<span class="sourceLineNo">525</span>        numBytes) + (numBytes &lt; 
maxBytes ? "..." : "");<a name="line.525"></a>
+<span class="sourceLineNo">526</span>  }<a name="line.526"></a>
+<span class="sourceLineNo">527</span><a name="line.527"></a>
+<span class="sourceLineNo">528</span>  @Test<a name="line.528"></a>
+<span class="sourceLineNo">529</span>  public void testPreviousOffset() throws 
IOException {<a name="line.529"></a>
+<span class="sourceLineNo">530</span>    testPreviousOffsetInternals();<a 
name="line.530"></a>
+<span class="sourceLineNo">531</span>  }<a name="line.531"></a>
+<span class="sourceLineNo">532</span><a name="line.532"></a>
+<span class="sourceLineNo">533</span>  protected void 
testPreviousOffsetInternals() throws IOException {<a name="line.533"></a>
+<span class="sourceLineNo">534</span>    // TODO: parameterize these nested 
loops.<a name="line.534"></a>
+<span class="sourceLineNo">535</span>    for (Compression.Algorithm algo : 
COMPRESSION_ALGORITHMS) {<a name="line.535"></a>
+<span class="sourceLineNo">536</span>      for (boolean pread : 
BOOLEAN_VALUES) {<a name="line.536"></a>
+<span class="sourceLineNo">537</span>        for (boolean cacheOnWrite : 
BOOLEAN_VALUES) {<a name="line.537"></a>
+<span class="sourceLineNo">538</span>          Random rand = 
defaultRandom();<a name="line.538"></a>
+<span class="sourceLineNo">539</span>          LOG.info("testPreviousOffset: 
Compression algorithm={}, pread={}, cacheOnWrite={}",<a name="line.539"></a>
+<span class="sourceLineNo">540</span>              algo.toString(), pread, 
cacheOnWrite);<a name="line.540"></a>
+<span class="sourceLineNo">541</span>          Path path = new 
Path(TEST_UTIL.getDataTestDir(), "prev_offset");<a name="line.541"></a>
+<span class="sourceLineNo">542</span>          List&lt;Long&gt; 
expectedOffsets = new ArrayList&lt;&gt;();<a name="line.542"></a>
+<span class="sourceLineNo">543</span>          List&lt;Long&gt; 
expectedPrevOffsets = new ArrayList&lt;&gt;();<a name="line.543"></a>
+<span class="sourceLineNo">544</span>          List&lt;BlockType&gt; 
expectedTypes = new ArrayList&lt;&gt;();<a name="line.544"></a>
+<span class="sourceLineNo">545</span>          List&lt;ByteBuffer&gt; 
expectedContents = cacheOnWrite ? new ArrayList&lt;&gt;() : null;<a 
name="line.545"></a>
+<span class="sourceLineNo">546</span>          long totalSize = 
writeBlocks(rand, algo, path, expectedOffsets,<a name="line.546"></a>
+<span class="sourceLineNo">547</span>              expectedPrevOffsets, 
expectedTypes, expectedContents);<a name="line.547"></a>
+<span class="sourceLineNo">548</span><a name="line.548"></a>
+<span class="sourceLineNo">549</span>          FSDataInputStream is = 
fs.open(path);<a name="line.549"></a>
+<span class="sourceLineNo">550</span>          HFileContext meta = new 
HFileContextBuilder()<a name="line.550"></a>
+<span class="sourceLineNo">551</span>                              
.withHBaseCheckSum(true)<a name="line.551"></a>
+<span class="sourceLineNo">552</span>                              
.withIncludesMvcc(includesMemstoreTS)<a name="line.552"></a>
+<span class="sourceLineNo">553</span>                              
.withIncludesTags(includesTag)<a name="line.553"></a>
+<span class="sourceLineNo">554</span>                              
.withCompression(algo).build();<a name="line.554"></a>
+<span class="sourceLineNo">555</span>          HFileBlock.FSReader hbr = new 
HFileBlock.FSReaderImpl(is, totalSize, meta);<a name="line.555"></a>
+<span class="sourceLineNo">556</span>          long curOffset = 0;<a 
name="line.556"></a>
+<span class="sourceLineNo">557</span>          for (int i = 0; i &lt; 
NUM_TEST_BLOCKS; ++i) {<a name="line.557"></a>
+<span class="sourceLineNo">558</span>            if (!pread) {<a 
name="line.558"></a>
+<span class="sourceLineNo">559</span>              assertEquals(is.getPos(), 
curOffset + (i == 0 ? 0 :<a name="line.559"></a>
+<span class="sourceLineNo">560</span>                
HConstants.HFILEBLOCK_HEADER_SIZE));<a name="line.560"></a>
+<span class="sourceLineNo">561</span>            }<a name="line.561"></a>
+<span class="sourceLineNo">562</span><a name="line.562"></a>
+<span class="sourceLineNo">563</span>            
assertEquals(expectedOffsets.get(i).longValue(), curOffset);<a 
name="line.563"></a>
+<span class="sourceLineNo">564</span>            if (detailedLogging) {<a 
name="line.564"></a>
+<span class="sourceLineNo">565</span>              LOG.info("Reading block #" 
+ i + " at offset " + curOffset);<a name="line.565"></a>
+<span class="sourceLineNo">566</span>            }<a name="line.566"></a>
+<span class="sourceLineNo">567</span>            HFileBlock b = 
hbr.readBlockData(curOffset, -1, pread, false);<a name="line.567"></a>
+<span class="sourceLineNo">568</span>            if (detailedLogging) {<a 
name="line.568"></a>
+<span class="sourceLineNo">569</span>              LOG.info("Block #" + i + ": 
" + b);<a name="line.569"></a>
+<span class="sourceLineNo">570</span>            }<a name="line.570"></a>
+<span class="sourceLineNo">571</span>            assertEquals("Invalid block 
#" + i + "'s type:",<a name="line.571"></a>
+<span class="sourceLineNo">572</span>                expectedTypes.get(i), 
b.getBlockType());<a name="line.572"></a>
+<span class="sourceLineNo">573</span>            assertEquals("Invalid 
previous block offset for block " + i<a name="line.573"></a>
+<span class="sourceLineNo">574</span>                + " of " + "type " + 
b.getBlockType() + ":",<a name="line.574"></a>
+<span class="sourceLineNo">575</span>                (long) 
expectedPrevOffsets.get(i), b.getPrevBlockOffset());<a name="line.575"></a>
+<span class="sourceLineNo">576</span>            b.sanityCheck();<a 
name="line.576"></a>
+<span class="sourceLineNo">577</span>            assertEquals(curOffset, 
b.getOffset());<a name="line.577"></a>
+<span class="sourceLineNo">578</span><a name="line.578"></a>
+<span class="sourceLineNo">579</span>            // Now re-load this block 
knowing the on-disk size. This tests a<a name="line.579"></a>
+<span class="sourceLineNo">580</span>            // different branch in the 
loader.<a name="line.580"></a>
+<span class="sourceLineNo">581</span>            HFileBlock b2 = 
hbr.readBlockData(curOffset, b.getOnDiskSizeWithHeader(), pread, false);<a 
name="line.581"></a>
+<span class="sourceLineNo">582</span>            b2.sanityCheck();<a 
name="line.582"></a>
+<span class="sourceLineNo">583</span><a name="line.583"></a>
+<span class="sourceLineNo">584</span>            
assertEquals(b.getBlockType(), b2.getBlockType());<a name="line.584"></a>
+<span class="sourceLineNo">585</span>            
assertEquals(b.getOnDiskSizeWithoutHeader(),<a name="line.585"></a>
+<span class="sourceLineNo">586</span>                
b2.getOnDiskSizeWithoutHeader());<a name="line.586"></a>
+<span class="sourceLineNo">587</span>            
assertEquals(b.getOnDiskSizeWithHeader(),<a name="line.587"></a>
+<span class="sourceLineNo">588</span>                
b2.getOnDiskSizeWithHeader());<a name="line.588"></a>
+<span class="sourceLineNo">589</span>            
assertEquals(b.getUncompressedSizeWithoutHeader(),<a name="line.589"></a>
+<span class="sourceLineNo">590</span>                
b2.getUncompressedSizeWithoutHeader());<a name="line.590"></a>
+<span class="sourceLineNo">591</span>            
assertEquals(b.getPrevBlockOffset(), b2.getPrevBlockOffset());<a 
name="line.591"></a>
+<span class="sourceLineNo">592</span>            assertEquals(curOffset, 
b2.getOffset());<a name="line.592"></a>
+<span class="sourceLineNo">593</span>            
assertEquals(b.getBytesPerChecksum(), b2.getBytesPerChecksum());<a 
name="line.593"></a>
+<span class="sourceLineNo">594</span>            
assertEquals(b.getOnDiskDataSizeWithHeader(),<a name="line.594"></a>
+<span class="sourceLineNo">595</span>                         
b2.getOnDiskDataSizeWithHeader());<a name="line.595"></a>
+<span class="sourceLineNo">596</span>            assertEquals(0, 
HFile.getAndResetChecksumFailuresCount());<a name="line.596"></a>
+<span class="sourceLineNo">597</span><a name="line.597"></a>
+<span class="sourceLineNo">598</span>            curOffset += 
b.getOnDiskSizeWithHeader();<a name="line.598"></a>
+<span class="sourceLineNo">599</span><a name="line.599"></a>
+<span class="sourceLineNo">600</span>            if (cacheOnWrite) {<a 
name="line.600"></a>
+<span class="sourceLineNo">601</span>              // NOTE: cache-on-write 
testing doesn't actually involve a BlockCache. It simply<a name="line.601"></a>
+<span class="sourceLineNo">602</span>              // verifies that the 
unpacked value read back off disk matches the unpacked value<a 
name="line.602"></a>
+<span class="sourceLineNo">603</span>              // generated before writing 
to disk.<a name="line.603"></a>
+<span class="sourceLineNo">604</span>              b = b.unpack(meta, hbr);<a 
name="line.604"></a>
+<span class="sourceLineNo">605</span>              // b's buffer has header + 
data + checksum while<a name="line.605"></a>
+<span class="sourceLineNo">606</span>              // expectedContents have 
header + data only<a name="line.606"></a>
+<span class="sourceLineNo">607</span>              ByteBuff bufRead = 
b.getBufferReadOnly();<a name="line.607"></a>
+<span class="sourceLineNo">608</span>              ByteBuffer bufExpected = 
expectedContents.get(i);<a name="line.608"></a>
+<span class="sourceLineNo">609</span>              boolean bytesAreCorrect = 
Bytes.compareTo(bufRead.array(),<a name="line.609"></a>
+<span class="sourceLineNo">610</span>                  
bufRead.arrayOffset(),<a name="line.610"></a>
+<span class="sourceLineNo">611</span>                  bufRead.limit() - 
b.totalChecksumBytes(),<a name="line.611"></a>
+<span class="sourceLineNo">612</span>                  bufExpected.array(), 
bufExpected.arrayOffset(),<a name="line.612"></a>
+<span class="sourceLineNo">613</span>                  bufExpected.limit()) == 
0;<a name="line.613"></a>
+<span class="sourceLineNo">614</span>              String wrongBytesMsg = 
"";<a name="line.614"></a>
+<span class="sourceLineNo">615</span><a name="line.615"></a>
+<span class="sourceLineNo">616</span>              if (!bytesAreCorrect) {<a 
name="line.616"></a>
+<span class="sourceLineNo">617</span>                // Optimization: only 
construct an error message in case we<a name="line.617"></a>
+<span class="sourceLineNo">618</span>                // will need it.<a 
name="line.618"></a>
+<span class="sourceLineNo">619</span>                wrongBytesMsg = "Expected 
bytes in block #" + i + " (algo="<a name="line.619"></a>
+<span class="sourceLineNo">620</span>                    + algo + ", pread=" + 
pread<a name="line.620"></a>
+<span class="sourceLineNo">621</span>                    + ", cacheOnWrite=" + 
cacheOnWrite + "):\n";<a name="line.621"></a>
+<span class="sourceLineNo">622</span>                wrongBytesMsg += 
Bytes.toStringBinary(bufExpected.array(),<a name="line.622"></a>
+<span class="sourceLineNo">623</span>                  
bufExpected.arrayOffset(), Math.min(32 + 10, bufExpected.limit()))<a 
name="line.623"></a>
+<span class="sourceLineNo">624</span>                    + ", actual:\n"<a 
name="line.624"></a>
+<span class="sourceLineNo">625</span>                    + 
Bytes.toStringBinary(bufRead.array(),<a name="line.625"></a>
+<span class="sourceLineNo">626</span>                  bufRead.arrayOffset(), 
Math.min(32 + 10, bufRead.limit()));<a name="line.626"></a>
+<span class="sourceLineNo">627</span>                if (detailedLogging) {<a 
name="line.627"></a>
+<span class="sourceLineNo">628</span>                  LOG.warn("expected 
header" +<a name="line.628"></a>
+<span class="sourceLineNo">629</span>                           
HFileBlock.toStringHeader(new SingleByteBuff(bufExpected)) +<a 
name="line.629"></a>
+<span class="sourceLineNo">630</span>                           "\nfound    
header" +<a name="line.630"></a>
+<span class="sourceLineNo">631</span>                           
HFileBlock.toStringHeader(bufRead));<a name="line.631"></a>
+<span class="sourceLineNo">632</span>                  LOG.warn("bufread 
offset " + bufRead.arrayOffset() +<a name="line.632"></a>
+<span class="sourceLineNo">633</span>                           " limit " + 
bufRead.limit() +<a name="line.633"></a>
+<span class="sourceLineNo">634</span>                           " expected 
offset " + bufExpected.arrayOffset() +<a name="line.634"></a>
+<span class="sourceLineNo">635</span>                           " limit " + 
bufExpected.limit());<a name="line.635"></a>
+<span class="sourceLineNo">636</span>                  
LOG.warn(wrongBytesMsg);<a name="line.636"></a>
+<span class="sourceLineNo">637</span>                }<a name="line.637"></a>
+<span class="sourceLineNo">638</span>              }<a name="line.638"></a>
+<span class="sourceLineNo">639</span>              assertTrue(wrongBytesMsg, 
bytesAreCorrect);<a name="line.639"></a>
+<span class="sourceLineNo">640</span>            }<a name="line.640"></a>
+<span class="sourceLineNo">641</span>          }<a name="line.641"></a>
+<span class="sourceLineNo">642</span><a name="line.642"></a>
+<span class="sourceLineNo">643</span>          assertEquals(curOffset, 
fs.getFileStatus(path).getLen());<a name="line.643"></a>
+<span class="sourceLineNo">644</span>          is.close();<a 
name="line.644"></a>
+<span class="sourceLineNo">645</span>        }<a name="line.645"></a>
+<span class="sourceLineNo">646</span>      }<a name="line.646"></a>
+<span class="sourceLineNo">647</span>    }<a name="line.647"></a>
+<span class="sourceLineNo">648</span>  }<a name="line.648"></a>
+<span class="sourceLineNo">649</span><a name="line.649"></a>
+<span class="sourceLineNo">650</span>  private Random defaultRandom() {<a 
name="line.650"></a>
+<span class="sourceLineNo">651</span>    return new Random(189237);<a 
name="line.651"></a>
+<span class="sourceLineNo">652</span>  }<a name="line.652"></a>
+<span class="sourceLineNo">653</span><a name="line.653"></a>
+<span class="sourceLineNo">654</span>  private class BlockReaderThread 
implements Callable&lt;Boolean&gt; {<a name="line.654"></a>
+<span class="sourceLineNo">655</span>    private final String clientId;<a 
name="line.655"></a>
+<span class="sourceLineNo">656</span>    private final HFileBlock.FSReader 
hbr;<a name="line.656"></a>
+<span class="sourceLineNo">657</span>    private final List&lt;Long&gt; 
offsets;<a name="line.657"></a>
+<span class="sourceLineNo">658</span>    private final List&lt;BlockType&gt; 
types;<a name="line.658"></a>
+<span class="sourceLineNo">659</span>    private final long fileSize;<a 
name="line.659"></a>
+<span class="sourceLineNo">660</span><a name="line.660"></a>
+<span class="sourceLineNo">661</span>    public BlockReaderThread(String 
clientId,<a name="line.661"></a>
+<span class="sourceLineNo">662</span>        HFileBlock.FSReader hbr, 
List&lt;Long&gt; offsets, List&lt;BlockType&gt; types,<a name="line.662"></a>
+<span class="sourceLineNo">663</span>        long fileSize) {<a 
name="line.663"></a>
+<span class="sourceLineNo">664</span>      this.clientId = clientId;<a 
name="line.664"></a>
+<span class="sourceLineNo">665</span>      this.offsets = offsets;<a 
name="line.665"></a>
+<span class="sourceLineNo">666</span>      this.hbr = hbr;<a 
name="line.666"></a>
+<span class="sourceLineNo">667</span>      this.types = types;<a 
name="line.667"></a>
+<span class="sourceLineNo">668</span>      this.fileSize = fileSize;<a 
name="line.668"></a>
+<span class="sourceLineNo">669</span>    }<a name="line.669"></a>
+<span class="sourceLineNo">670</span><a name="line.670"></a>
+<span class="sourceLineNo">671</span>    @Override<a name="line.671"></a>
+<span class="sourceLineNo">672</span>    public Boolean call() throws 
Exception {<a name="line.672"></a>
+<span class="sourceLineNo">673</span>      Random rand = new 
Random(clientId.hashCode());<a name="line.673"></a>
+<span class="sourceLineNo">674</span>      long endTime = 
System.currentTimeMillis() + 10000;<a name="line.674"></a>
+<span class="sourceLineNo">675</span>      int numBlocksRead = 0;<a 
name="line.675"></a>
+<span class="sourceLineNo">676</span>      int numPositionalRead = 0;<a 
name="line.676"></a>
+<span class="sourceLineNo">677</span>      int numWithOnDiskSize = 0;<a 
name="line.677"></a>
+<span class="sourceLineNo">678</span>      while (System.currentTimeMillis() 
&lt; endTime) {<a name="line.678"></a>
+<span class="sourceLineNo">679</span>        int blockId = 
rand.nextInt(NUM_TEST_BLOCKS);<a name="line.679"></a>
+<span class="sourceLineNo">680</span>        long offset = 
offsets.get(blockId);<a name="line.680"></a>
+<span class="sourceLineNo">681</span>        // now we only support concurrent 
read with pread = true<a name="line.681"></a>
+<span class="sourceLineNo">682</span>        boolean pread = true;<a 
name="line.682"></a>
+<span class="sourceLineNo">683</span>        boolean withOnDiskSize = 
rand.nextBoolean();<a name="line.683"></a>
+<span class="sourceLineNo">684</span>        long expectedSize =<a 
name="line.684"></a>
+<span class="sourceLineNo">685</span>          (blockId == NUM_TEST_BLOCKS - 1 
? fileSize<a name="line.685"></a>
+<span class="sourceLineNo">686</span>              : offsets.get(blockId + 1)) 
- offset;<a name="line.686"></a>
+<span class="sourceLineNo">687</span><a name="line.687"></a>
+<span class="sourceLineNo">688</span>        HFileBlock b;<a 
name="line.688"></a>
+<span class="sourceLineNo">689</span>        try {<a name="line.689"></a>
+<span class="sourceLineNo">690</span>          long onDiskSizeArg = 
withOnDiskSize ? expectedSize : -1;<a name="line.690"></a>
+<span class="sourceLineNo">691</span>          b = hbr.readBlockData(offset, 
onDiskSizeArg, pread, false);<a name="line.691"></a>
+<span class="sourceLineNo">692</span>        } catch (IOException ex) {<a 
name="line.692"></a>
+<span class="sourceLineNo">693</span>          LOG.error("Error in client " + 
clientId + " trying to read block at "<a name="line.693"></a>
+<span class="sourceLineNo">694</span>              + offset + ", pread=" + 
pread + ", withOnDiskSize=" +<a name="line.694"></a>
+<span class="sourceLineNo">695</span>              withOnDiskSize, ex);<a 
name="line.695"></a>
+<span class="sourceLineNo">696</span>          return false;<a 
name="line.696"></a>
+<span class="sourceLineNo">697</span>        }<a name="line.697"></a>
+<span class="sourceLineNo">698</span><a name="line.698"></a>
+<span class="sourceLineNo">6

<TRUNCATED>

Reply via email to