http://git-wip-us.apache.org/repos/asf/hbase-site/blob/45a663dd/devapidocs/src-html/org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.DiffSeekerState.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.DiffSeekerState.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.DiffSeekerState.html
index 54788f6..e372d03 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.DiffSeekerState.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.DiffSeekerState.html
@@ -375,167 +375,169 @@
 <span class="sourceLineNo">367</span>    private int rowLengthWithSize;<a 
name="line.367"></a>
 <span class="sourceLineNo">368</span>    private long timestamp;<a 
name="line.368"></a>
 <span class="sourceLineNo">369</span><a name="line.369"></a>
-<span class="sourceLineNo">370</span>    public 
DiffSeekerState(ObjectIntPair&lt;ByteBuffer&gt; tmpPair, boolean includeTags) 
{<a name="line.370"></a>
-<span class="sourceLineNo">371</span>      super(tmpPair, includeTags);<a 
name="line.371"></a>
-<span class="sourceLineNo">372</span>    }<a name="line.372"></a>
-<span class="sourceLineNo">373</span><a name="line.373"></a>
-<span class="sourceLineNo">374</span>    @Override<a name="line.374"></a>
-<span class="sourceLineNo">375</span>    protected void 
copyFromNext(SeekerState that) {<a name="line.375"></a>
-<span class="sourceLineNo">376</span>      super.copyFromNext(that);<a 
name="line.376"></a>
-<span class="sourceLineNo">377</span>      DiffSeekerState other = 
(DiffSeekerState) that;<a name="line.377"></a>
-<span class="sourceLineNo">378</span>      rowLengthWithSize = 
other.rowLengthWithSize;<a name="line.378"></a>
-<span class="sourceLineNo">379</span>      timestamp = other.timestamp;<a 
name="line.379"></a>
-<span class="sourceLineNo">380</span>    }<a name="line.380"></a>
-<span class="sourceLineNo">381</span>  }<a name="line.381"></a>
-<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span>  @Override<a name="line.383"></a>
-<span class="sourceLineNo">384</span>  public EncodedSeeker 
createSeeker(CellComparator comparator,<a name="line.384"></a>
-<span class="sourceLineNo">385</span>      HFileBlockDecodingContext 
decodingCtx) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span>    return new 
BufferedEncodedSeeker&lt;DiffSeekerState&gt;(comparator, decodingCtx) {<a 
name="line.386"></a>
-<span class="sourceLineNo">387</span>      private byte[] 
familyNameWithSize;<a name="line.387"></a>
-<span class="sourceLineNo">388</span>      private static final int 
TIMESTAMP_WITH_TYPE_LENGTH =<a name="line.388"></a>
-<span class="sourceLineNo">389</span>          Bytes.SIZEOF_LONG + 
Bytes.SIZEOF_BYTE;<a name="line.389"></a>
-<span class="sourceLineNo">390</span><a name="line.390"></a>
-<span class="sourceLineNo">391</span>      private void decode(boolean 
isFirst) {<a name="line.391"></a>
-<span class="sourceLineNo">392</span>        byte flag = 
currentBuffer.get();<a name="line.392"></a>
-<span class="sourceLineNo">393</span>        byte type = 0;<a 
name="line.393"></a>
-<span class="sourceLineNo">394</span>        if ((flag &amp; 
FLAG_SAME_KEY_LENGTH) == 0) {<a name="line.394"></a>
-<span class="sourceLineNo">395</span>          if (!isFirst) {<a 
name="line.395"></a>
-<span class="sourceLineNo">396</span>            type = 
current.keyBuffer[current.keyLength - Bytes.SIZEOF_BYTE];<a name="line.396"></a>
-<span class="sourceLineNo">397</span>          }<a name="line.397"></a>
-<span class="sourceLineNo">398</span>          current.keyLength = 
ByteBuff.readCompressedInt(currentBuffer);<a name="line.398"></a>
-<span class="sourceLineNo">399</span>        }<a name="line.399"></a>
-<span class="sourceLineNo">400</span>        if ((flag &amp; 
FLAG_SAME_VALUE_LENGTH) == 0) {<a name="line.400"></a>
-<span class="sourceLineNo">401</span>          current.valueLength = 
ByteBuff.readCompressedInt(currentBuffer);<a name="line.401"></a>
-<span class="sourceLineNo">402</span>        }<a name="line.402"></a>
-<span class="sourceLineNo">403</span>        current.lastCommonPrefix = 
ByteBuff.readCompressedInt(currentBuffer);<a name="line.403"></a>
-<span class="sourceLineNo">404</span><a name="line.404"></a>
-<span class="sourceLineNo">405</span>        current.ensureSpaceForKey();<a 
name="line.405"></a>
-<span class="sourceLineNo">406</span><a name="line.406"></a>
-<span class="sourceLineNo">407</span>        if (current.lastCommonPrefix &lt; 
Bytes.SIZEOF_SHORT) {<a name="line.407"></a>
-<span class="sourceLineNo">408</span>          // length of row is different, 
copy everything except family<a name="line.408"></a>
-<span class="sourceLineNo">409</span><a name="line.409"></a>
-<span class="sourceLineNo">410</span>          // copy the row size<a 
name="line.410"></a>
-<span class="sourceLineNo">411</span>          
currentBuffer.get(current.keyBuffer, current.lastCommonPrefix,<a 
name="line.411"></a>
-<span class="sourceLineNo">412</span>              Bytes.SIZEOF_SHORT - 
current.lastCommonPrefix);<a name="line.412"></a>
-<span class="sourceLineNo">413</span>          current.rowLengthWithSize = 
Bytes.toShort(current.keyBuffer, 0) +<a name="line.413"></a>
-<span class="sourceLineNo">414</span>              Bytes.SIZEOF_SHORT;<a 
name="line.414"></a>
-<span class="sourceLineNo">415</span><a name="line.415"></a>
-<span class="sourceLineNo">416</span>          // copy the rest of row<a 
name="line.416"></a>
-<span class="sourceLineNo">417</span>          
currentBuffer.get(current.keyBuffer, Bytes.SIZEOF_SHORT,<a name="line.417"></a>
-<span class="sourceLineNo">418</span>              current.rowLengthWithSize - 
Bytes.SIZEOF_SHORT);<a name="line.418"></a>
-<span class="sourceLineNo">419</span><a name="line.419"></a>
-<span class="sourceLineNo">420</span>          // copy the column family<a 
name="line.420"></a>
-<span class="sourceLineNo">421</span>          
System.arraycopy(familyNameWithSize, 0, current.keyBuffer,<a 
name="line.421"></a>
-<span class="sourceLineNo">422</span>              current.rowLengthWithSize, 
familyNameWithSize.length);<a name="line.422"></a>
-<span class="sourceLineNo">423</span><a name="line.423"></a>
-<span class="sourceLineNo">424</span>          // copy the qualifier<a 
name="line.424"></a>
-<span class="sourceLineNo">425</span>          
currentBuffer.get(current.keyBuffer,<a name="line.425"></a>
-<span class="sourceLineNo">426</span>              current.rowLengthWithSize + 
familyNameWithSize.length,<a name="line.426"></a>
-<span class="sourceLineNo">427</span>              current.keyLength - 
current.rowLengthWithSize -<a name="line.427"></a>
-<span class="sourceLineNo">428</span>              familyNameWithSize.length - 
TIMESTAMP_WITH_TYPE_LENGTH);<a name="line.428"></a>
-<span class="sourceLineNo">429</span>        } else if 
(current.lastCommonPrefix &lt; current.rowLengthWithSize) {<a 
name="line.429"></a>
-<span class="sourceLineNo">430</span>          // we have to copy part of row 
and qualifier,<a name="line.430"></a>
-<span class="sourceLineNo">431</span>          // but column family is in 
right place<a name="line.431"></a>
-<span class="sourceLineNo">432</span><a name="line.432"></a>
-<span class="sourceLineNo">433</span>          // before column family (rest 
of row)<a name="line.433"></a>
-<span class="sourceLineNo">434</span>          
currentBuffer.get(current.keyBuffer, current.lastCommonPrefix,<a 
name="line.434"></a>
-<span class="sourceLineNo">435</span>              current.rowLengthWithSize - 
current.lastCommonPrefix);<a name="line.435"></a>
-<span class="sourceLineNo">436</span><a name="line.436"></a>
-<span class="sourceLineNo">437</span>          // after column family 
(qualifier)<a name="line.437"></a>
-<span class="sourceLineNo">438</span>          
currentBuffer.get(current.keyBuffer,<a name="line.438"></a>
-<span class="sourceLineNo">439</span>              current.rowLengthWithSize + 
familyNameWithSize.length,<a name="line.439"></a>
-<span class="sourceLineNo">440</span>              current.keyLength - 
current.rowLengthWithSize -<a name="line.440"></a>
-<span class="sourceLineNo">441</span>              familyNameWithSize.length - 
TIMESTAMP_WITH_TYPE_LENGTH);<a name="line.441"></a>
-<span class="sourceLineNo">442</span>        } else {<a name="line.442"></a>
-<span class="sourceLineNo">443</span>          // copy just the ending<a 
name="line.443"></a>
-<span class="sourceLineNo">444</span>          
currentBuffer.get(current.keyBuffer, current.lastCommonPrefix,<a 
name="line.444"></a>
-<span class="sourceLineNo">445</span>              current.keyLength - 
TIMESTAMP_WITH_TYPE_LENGTH -<a name="line.445"></a>
-<span class="sourceLineNo">446</span>              
current.lastCommonPrefix);<a name="line.446"></a>
-<span class="sourceLineNo">447</span>        }<a name="line.447"></a>
-<span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span>        // timestamp<a 
name="line.449"></a>
-<span class="sourceLineNo">450</span>        int pos = current.keyLength - 
TIMESTAMP_WITH_TYPE_LENGTH;<a name="line.450"></a>
-<span class="sourceLineNo">451</span>        int timestampFitInBytes = 1 +<a 
name="line.451"></a>
-<span class="sourceLineNo">452</span>            ((flag &amp; 
MASK_TIMESTAMP_LENGTH) &gt;&gt;&gt; SHIFT_TIMESTAMP_LENGTH);<a 
name="line.452"></a>
-<span class="sourceLineNo">453</span>        long timestampOrDiff = 
ByteBuff.readLong(currentBuffer, timestampFitInBytes);<a name="line.453"></a>
-<span class="sourceLineNo">454</span>        if ((flag &amp; 
FLAG_TIMESTAMP_SIGN) != 0) {<a name="line.454"></a>
-<span class="sourceLineNo">455</span>          timestampOrDiff = 
-timestampOrDiff;<a name="line.455"></a>
-<span class="sourceLineNo">456</span>        }<a name="line.456"></a>
-<span class="sourceLineNo">457</span>        if ((flag &amp; 
FLAG_TIMESTAMP_IS_DIFF) == 0) { // it is timestamp<a name="line.457"></a>
-<span class="sourceLineNo">458</span>          current.timestamp = 
timestampOrDiff;<a name="line.458"></a>
-<span class="sourceLineNo">459</span>        } else { // it is diff<a 
name="line.459"></a>
-<span class="sourceLineNo">460</span>          current.timestamp = 
current.timestamp - timestampOrDiff;<a name="line.460"></a>
-<span class="sourceLineNo">461</span>        }<a name="line.461"></a>
-<span class="sourceLineNo">462</span>        Bytes.putLong(current.keyBuffer, 
pos, current.timestamp);<a name="line.462"></a>
-<span class="sourceLineNo">463</span>        pos += Bytes.SIZEOF_LONG;<a 
name="line.463"></a>
-<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span>        // type<a name="line.465"></a>
-<span class="sourceLineNo">466</span>        if ((flag &amp; FLAG_SAME_TYPE) 
== 0) {<a name="line.466"></a>
-<span class="sourceLineNo">467</span>          
currentBuffer.get(current.keyBuffer, pos, Bytes.SIZEOF_BYTE);<a 
name="line.467"></a>
-<span class="sourceLineNo">468</span>        } else if ((flag &amp; 
FLAG_SAME_KEY_LENGTH) == 0) {<a name="line.468"></a>
-<span class="sourceLineNo">469</span>          current.keyBuffer[pos] = 
type;<a name="line.469"></a>
-<span class="sourceLineNo">470</span>        }<a name="line.470"></a>
-<span class="sourceLineNo">471</span><a name="line.471"></a>
-<span class="sourceLineNo">472</span>        current.valueOffset = 
currentBuffer.position();<a name="line.472"></a>
-<span class="sourceLineNo">473</span>        
currentBuffer.skip(current.valueLength);<a name="line.473"></a>
-<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span>        if (includesTags()) {<a 
name="line.475"></a>
-<span class="sourceLineNo">476</span>          decodeTags();<a 
name="line.476"></a>
-<span class="sourceLineNo">477</span>        }<a name="line.477"></a>
-<span class="sourceLineNo">478</span>        if (includesMvcc()) {<a 
name="line.478"></a>
-<span class="sourceLineNo">479</span>          current.memstoreTS = 
ByteBuff.readVLong(currentBuffer);<a name="line.479"></a>
-<span class="sourceLineNo">480</span>        } else {<a name="line.480"></a>
-<span class="sourceLineNo">481</span>          current.memstoreTS = 0;<a 
name="line.481"></a>
-<span class="sourceLineNo">482</span>        }<a name="line.482"></a>
-<span class="sourceLineNo">483</span>        current.nextKvOffset = 
currentBuffer.position();<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>      @Override<a name="line.486"></a>
-<span class="sourceLineNo">487</span>      protected void decodeFirst() {<a 
name="line.487"></a>
-<span class="sourceLineNo">488</span>        
currentBuffer.skip(Bytes.SIZEOF_INT);<a name="line.488"></a>
-<span class="sourceLineNo">489</span><a name="line.489"></a>
-<span class="sourceLineNo">490</span>        // read column family<a 
name="line.490"></a>
-<span class="sourceLineNo">491</span>        byte familyNameLength = 
currentBuffer.get();<a name="line.491"></a>
-<span class="sourceLineNo">492</span>        familyNameWithSize = new 
byte[familyNameLength + Bytes.SIZEOF_BYTE];<a name="line.492"></a>
-<span class="sourceLineNo">493</span>        familyNameWithSize[0] = 
familyNameLength;<a name="line.493"></a>
-<span class="sourceLineNo">494</span>        
currentBuffer.get(familyNameWithSize, Bytes.SIZEOF_BYTE,<a name="line.494"></a>
-<span class="sourceLineNo">495</span>            familyNameLength);<a 
name="line.495"></a>
-<span class="sourceLineNo">496</span>        decode(true);<a 
name="line.496"></a>
-<span class="sourceLineNo">497</span>      }<a name="line.497"></a>
-<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span>      @Override<a name="line.499"></a>
-<span class="sourceLineNo">500</span>      protected void decodeNext() {<a 
name="line.500"></a>
-<span class="sourceLineNo">501</span>        decode(false);<a 
name="line.501"></a>
-<span class="sourceLineNo">502</span>      }<a name="line.502"></a>
-<span class="sourceLineNo">503</span><a name="line.503"></a>
-<span class="sourceLineNo">504</span>      @Override<a name="line.504"></a>
-<span class="sourceLineNo">505</span>      protected DiffSeekerState 
createSeekerState() {<a name="line.505"></a>
-<span class="sourceLineNo">506</span>        return new 
DiffSeekerState(this.tmpPair, this.includesTags());<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>  }<a name="line.509"></a>
-<span class="sourceLineNo">510</span><a name="line.510"></a>
-<span class="sourceLineNo">511</span>  @Override<a name="line.511"></a>
-<span class="sourceLineNo">512</span>  protected ByteBuffer 
internalDecodeKeyValues(DataInputStream source, int allocateHeaderLength,<a 
name="line.512"></a>
-<span class="sourceLineNo">513</span>      int skipLastBytes, 
HFileBlockDefaultDecodingContext decodingCtx) throws IOException {<a 
name="line.513"></a>
-<span class="sourceLineNo">514</span>    int decompressedSize = 
source.readInt();<a name="line.514"></a>
-<span class="sourceLineNo">515</span>    ByteBuffer buffer = 
ByteBuffer.allocate(decompressedSize +<a name="line.515"></a>
-<span class="sourceLineNo">516</span>        allocateHeaderLength);<a 
name="line.516"></a>
-<span class="sourceLineNo">517</span>    
buffer.position(allocateHeaderLength);<a name="line.517"></a>
-<span class="sourceLineNo">518</span>    DiffCompressionState state = new 
DiffCompressionState();<a name="line.518"></a>
-<span class="sourceLineNo">519</span>    while (source.available() &gt; 
skipLastBytes) {<a name="line.519"></a>
-<span class="sourceLineNo">520</span>      uncompressSingleKeyValue(source, 
buffer, state);<a name="line.520"></a>
-<span class="sourceLineNo">521</span>      afterDecodingKeyValue(source, 
buffer, decodingCtx);<a name="line.521"></a>
-<span class="sourceLineNo">522</span>    }<a name="line.522"></a>
-<span class="sourceLineNo">523</span><a name="line.523"></a>
-<span class="sourceLineNo">524</span>    if (source.available() != 
skipLastBytes) {<a name="line.524"></a>
-<span class="sourceLineNo">525</span>      throw new 
IllegalStateException("Read too much bytes.");<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>    return buffer;<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">370</span>    public 
DiffSeekerState(ObjectIntPair&lt;ByteBuffer&gt; tmpPair,<a name="line.370"></a>
+<span class="sourceLineNo">371</span>        boolean includeTags, boolean 
tagsCompressed) {<a name="line.371"></a>
+<span class="sourceLineNo">372</span>      super(tmpPair, includeTags, 
tagsCompressed);<a name="line.372"></a>
+<span class="sourceLineNo">373</span>    }<a name="line.373"></a>
+<span class="sourceLineNo">374</span><a name="line.374"></a>
+<span class="sourceLineNo">375</span>    @Override<a name="line.375"></a>
+<span class="sourceLineNo">376</span>    protected void 
copyFromNext(SeekerState that) {<a name="line.376"></a>
+<span class="sourceLineNo">377</span>      super.copyFromNext(that);<a 
name="line.377"></a>
+<span class="sourceLineNo">378</span>      DiffSeekerState other = 
(DiffSeekerState) that;<a name="line.378"></a>
+<span class="sourceLineNo">379</span>      rowLengthWithSize = 
other.rowLengthWithSize;<a name="line.379"></a>
+<span class="sourceLineNo">380</span>      timestamp = other.timestamp;<a 
name="line.380"></a>
+<span class="sourceLineNo">381</span>    }<a name="line.381"></a>
+<span class="sourceLineNo">382</span>  }<a name="line.382"></a>
+<span class="sourceLineNo">383</span><a name="line.383"></a>
+<span class="sourceLineNo">384</span>  @Override<a name="line.384"></a>
+<span class="sourceLineNo">385</span>  public EncodedSeeker 
createSeeker(CellComparator comparator,<a name="line.385"></a>
+<span class="sourceLineNo">386</span>      HFileBlockDecodingContext 
decodingCtx) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span>    return new 
BufferedEncodedSeeker&lt;DiffSeekerState&gt;(comparator, decodingCtx) {<a 
name="line.387"></a>
+<span class="sourceLineNo">388</span>      private byte[] 
familyNameWithSize;<a name="line.388"></a>
+<span class="sourceLineNo">389</span>      private static final int 
TIMESTAMP_WITH_TYPE_LENGTH =<a name="line.389"></a>
+<span class="sourceLineNo">390</span>          Bytes.SIZEOF_LONG + 
Bytes.SIZEOF_BYTE;<a name="line.390"></a>
+<span class="sourceLineNo">391</span><a name="line.391"></a>
+<span class="sourceLineNo">392</span>      private void decode(boolean 
isFirst) {<a name="line.392"></a>
+<span class="sourceLineNo">393</span>        byte flag = 
currentBuffer.get();<a name="line.393"></a>
+<span class="sourceLineNo">394</span>        byte type = 0;<a 
name="line.394"></a>
+<span class="sourceLineNo">395</span>        if ((flag &amp; 
FLAG_SAME_KEY_LENGTH) == 0) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span>          if (!isFirst) {<a 
name="line.396"></a>
+<span class="sourceLineNo">397</span>            type = 
current.keyBuffer[current.keyLength - Bytes.SIZEOF_BYTE];<a name="line.397"></a>
+<span class="sourceLineNo">398</span>          }<a name="line.398"></a>
+<span class="sourceLineNo">399</span>          current.keyLength = 
ByteBuff.readCompressedInt(currentBuffer);<a name="line.399"></a>
+<span class="sourceLineNo">400</span>        }<a name="line.400"></a>
+<span class="sourceLineNo">401</span>        if ((flag &amp; 
FLAG_SAME_VALUE_LENGTH) == 0) {<a name="line.401"></a>
+<span class="sourceLineNo">402</span>          current.valueLength = 
ByteBuff.readCompressedInt(currentBuffer);<a name="line.402"></a>
+<span class="sourceLineNo">403</span>        }<a name="line.403"></a>
+<span class="sourceLineNo">404</span>        current.lastCommonPrefix = 
ByteBuff.readCompressedInt(currentBuffer);<a name="line.404"></a>
+<span class="sourceLineNo">405</span><a name="line.405"></a>
+<span class="sourceLineNo">406</span>        current.ensureSpaceForKey();<a 
name="line.406"></a>
+<span class="sourceLineNo">407</span><a name="line.407"></a>
+<span class="sourceLineNo">408</span>        if (current.lastCommonPrefix &lt; 
Bytes.SIZEOF_SHORT) {<a name="line.408"></a>
+<span class="sourceLineNo">409</span>          // length of row is different, 
copy everything except family<a name="line.409"></a>
+<span class="sourceLineNo">410</span><a name="line.410"></a>
+<span class="sourceLineNo">411</span>          // copy the row size<a 
name="line.411"></a>
+<span class="sourceLineNo">412</span>          
currentBuffer.get(current.keyBuffer, current.lastCommonPrefix,<a 
name="line.412"></a>
+<span class="sourceLineNo">413</span>              Bytes.SIZEOF_SHORT - 
current.lastCommonPrefix);<a name="line.413"></a>
+<span class="sourceLineNo">414</span>          current.rowLengthWithSize = 
Bytes.toShort(current.keyBuffer, 0) +<a name="line.414"></a>
+<span class="sourceLineNo">415</span>              Bytes.SIZEOF_SHORT;<a 
name="line.415"></a>
+<span class="sourceLineNo">416</span><a name="line.416"></a>
+<span class="sourceLineNo">417</span>          // copy the rest of row<a 
name="line.417"></a>
+<span class="sourceLineNo">418</span>          
currentBuffer.get(current.keyBuffer, Bytes.SIZEOF_SHORT,<a name="line.418"></a>
+<span class="sourceLineNo">419</span>              current.rowLengthWithSize - 
Bytes.SIZEOF_SHORT);<a name="line.419"></a>
+<span class="sourceLineNo">420</span><a name="line.420"></a>
+<span class="sourceLineNo">421</span>          // copy the column family<a 
name="line.421"></a>
+<span class="sourceLineNo">422</span>          
System.arraycopy(familyNameWithSize, 0, current.keyBuffer,<a 
name="line.422"></a>
+<span class="sourceLineNo">423</span>              current.rowLengthWithSize, 
familyNameWithSize.length);<a name="line.423"></a>
+<span class="sourceLineNo">424</span><a name="line.424"></a>
+<span class="sourceLineNo">425</span>          // copy the qualifier<a 
name="line.425"></a>
+<span class="sourceLineNo">426</span>          
currentBuffer.get(current.keyBuffer,<a name="line.426"></a>
+<span class="sourceLineNo">427</span>              current.rowLengthWithSize + 
familyNameWithSize.length,<a name="line.427"></a>
+<span class="sourceLineNo">428</span>              current.keyLength - 
current.rowLengthWithSize -<a name="line.428"></a>
+<span class="sourceLineNo">429</span>              familyNameWithSize.length - 
TIMESTAMP_WITH_TYPE_LENGTH);<a name="line.429"></a>
+<span class="sourceLineNo">430</span>        } else if 
(current.lastCommonPrefix &lt; current.rowLengthWithSize) {<a 
name="line.430"></a>
+<span class="sourceLineNo">431</span>          // we have to copy part of row 
and qualifier,<a name="line.431"></a>
+<span class="sourceLineNo">432</span>          // but column family is in 
right place<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span>          // before column family (rest 
of row)<a name="line.434"></a>
+<span class="sourceLineNo">435</span>          
currentBuffer.get(current.keyBuffer, current.lastCommonPrefix,<a 
name="line.435"></a>
+<span class="sourceLineNo">436</span>              current.rowLengthWithSize - 
current.lastCommonPrefix);<a name="line.436"></a>
+<span class="sourceLineNo">437</span><a name="line.437"></a>
+<span class="sourceLineNo">438</span>          // after column family 
(qualifier)<a name="line.438"></a>
+<span class="sourceLineNo">439</span>          
currentBuffer.get(current.keyBuffer,<a name="line.439"></a>
+<span class="sourceLineNo">440</span>              current.rowLengthWithSize + 
familyNameWithSize.length,<a name="line.440"></a>
+<span class="sourceLineNo">441</span>              current.keyLength - 
current.rowLengthWithSize -<a name="line.441"></a>
+<span class="sourceLineNo">442</span>              familyNameWithSize.length - 
TIMESTAMP_WITH_TYPE_LENGTH);<a name="line.442"></a>
+<span class="sourceLineNo">443</span>        } else {<a name="line.443"></a>
+<span class="sourceLineNo">444</span>          // copy just the ending<a 
name="line.444"></a>
+<span class="sourceLineNo">445</span>          
currentBuffer.get(current.keyBuffer, current.lastCommonPrefix,<a 
name="line.445"></a>
+<span class="sourceLineNo">446</span>              current.keyLength - 
TIMESTAMP_WITH_TYPE_LENGTH -<a name="line.446"></a>
+<span class="sourceLineNo">447</span>              
current.lastCommonPrefix);<a name="line.447"></a>
+<span class="sourceLineNo">448</span>        }<a name="line.448"></a>
+<span class="sourceLineNo">449</span><a name="line.449"></a>
+<span class="sourceLineNo">450</span>        // timestamp<a 
name="line.450"></a>
+<span class="sourceLineNo">451</span>        int pos = current.keyLength - 
TIMESTAMP_WITH_TYPE_LENGTH;<a name="line.451"></a>
+<span class="sourceLineNo">452</span>        int timestampFitInBytes = 1 +<a 
name="line.452"></a>
+<span class="sourceLineNo">453</span>            ((flag &amp; 
MASK_TIMESTAMP_LENGTH) &gt;&gt;&gt; SHIFT_TIMESTAMP_LENGTH);<a 
name="line.453"></a>
+<span class="sourceLineNo">454</span>        long timestampOrDiff = 
ByteBuff.readLong(currentBuffer, timestampFitInBytes);<a name="line.454"></a>
+<span class="sourceLineNo">455</span>        if ((flag &amp; 
FLAG_TIMESTAMP_SIGN) != 0) {<a name="line.455"></a>
+<span class="sourceLineNo">456</span>          timestampOrDiff = 
-timestampOrDiff;<a name="line.456"></a>
+<span class="sourceLineNo">457</span>        }<a name="line.457"></a>
+<span class="sourceLineNo">458</span>        if ((flag &amp; 
FLAG_TIMESTAMP_IS_DIFF) == 0) { // it is timestamp<a name="line.458"></a>
+<span class="sourceLineNo">459</span>          current.timestamp = 
timestampOrDiff;<a name="line.459"></a>
+<span class="sourceLineNo">460</span>        } else { // it is diff<a 
name="line.460"></a>
+<span class="sourceLineNo">461</span>          current.timestamp = 
current.timestamp - timestampOrDiff;<a name="line.461"></a>
+<span class="sourceLineNo">462</span>        }<a name="line.462"></a>
+<span class="sourceLineNo">463</span>        Bytes.putLong(current.keyBuffer, 
pos, current.timestamp);<a name="line.463"></a>
+<span class="sourceLineNo">464</span>        pos += Bytes.SIZEOF_LONG;<a 
name="line.464"></a>
+<span class="sourceLineNo">465</span><a name="line.465"></a>
+<span class="sourceLineNo">466</span>        // type<a name="line.466"></a>
+<span class="sourceLineNo">467</span>        if ((flag &amp; FLAG_SAME_TYPE) 
== 0) {<a name="line.467"></a>
+<span class="sourceLineNo">468</span>          
currentBuffer.get(current.keyBuffer, pos, Bytes.SIZEOF_BYTE);<a 
name="line.468"></a>
+<span class="sourceLineNo">469</span>        } else if ((flag &amp; 
FLAG_SAME_KEY_LENGTH) == 0) {<a name="line.469"></a>
+<span class="sourceLineNo">470</span>          current.keyBuffer[pos] = 
type;<a name="line.470"></a>
+<span class="sourceLineNo">471</span>        }<a name="line.471"></a>
+<span class="sourceLineNo">472</span><a name="line.472"></a>
+<span class="sourceLineNo">473</span>        current.valueOffset = 
currentBuffer.position();<a name="line.473"></a>
+<span class="sourceLineNo">474</span>        
currentBuffer.skip(current.valueLength);<a name="line.474"></a>
+<span class="sourceLineNo">475</span><a name="line.475"></a>
+<span class="sourceLineNo">476</span>        if (includesTags()) {<a 
name="line.476"></a>
+<span class="sourceLineNo">477</span>          decodeTags();<a 
name="line.477"></a>
+<span class="sourceLineNo">478</span>        }<a name="line.478"></a>
+<span class="sourceLineNo">479</span>        if (includesMvcc()) {<a 
name="line.479"></a>
+<span class="sourceLineNo">480</span>          current.memstoreTS = 
ByteBuff.readVLong(currentBuffer);<a name="line.480"></a>
+<span class="sourceLineNo">481</span>        } else {<a name="line.481"></a>
+<span class="sourceLineNo">482</span>          current.memstoreTS = 0;<a 
name="line.482"></a>
+<span class="sourceLineNo">483</span>        }<a name="line.483"></a>
+<span class="sourceLineNo">484</span>        current.nextKvOffset = 
currentBuffer.position();<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>      @Override<a name="line.487"></a>
+<span class="sourceLineNo">488</span>      protected void decodeFirst() {<a 
name="line.488"></a>
+<span class="sourceLineNo">489</span>        
currentBuffer.skip(Bytes.SIZEOF_INT);<a name="line.489"></a>
+<span class="sourceLineNo">490</span><a name="line.490"></a>
+<span class="sourceLineNo">491</span>        // read column family<a 
name="line.491"></a>
+<span class="sourceLineNo">492</span>        byte familyNameLength = 
currentBuffer.get();<a name="line.492"></a>
+<span class="sourceLineNo">493</span>        familyNameWithSize = new 
byte[familyNameLength + Bytes.SIZEOF_BYTE];<a name="line.493"></a>
+<span class="sourceLineNo">494</span>        familyNameWithSize[0] = 
familyNameLength;<a name="line.494"></a>
+<span class="sourceLineNo">495</span>        
currentBuffer.get(familyNameWithSize, Bytes.SIZEOF_BYTE,<a name="line.495"></a>
+<span class="sourceLineNo">496</span>            familyNameLength);<a 
name="line.496"></a>
+<span class="sourceLineNo">497</span>        decode(true);<a 
name="line.497"></a>
+<span class="sourceLineNo">498</span>      }<a name="line.498"></a>
+<span class="sourceLineNo">499</span><a name="line.499"></a>
+<span class="sourceLineNo">500</span>      @Override<a name="line.500"></a>
+<span class="sourceLineNo">501</span>      protected void decodeNext() {<a 
name="line.501"></a>
+<span class="sourceLineNo">502</span>        decode(false);<a 
name="line.502"></a>
+<span class="sourceLineNo">503</span>      }<a name="line.503"></a>
+<span class="sourceLineNo">504</span><a name="line.504"></a>
+<span class="sourceLineNo">505</span>      @Override<a name="line.505"></a>
+<span class="sourceLineNo">506</span>      protected DiffSeekerState 
createSeekerState() {<a name="line.506"></a>
+<span class="sourceLineNo">507</span>        return new 
DiffSeekerState(this.tmpPair, this.includesTags(),<a name="line.507"></a>
+<span class="sourceLineNo">508</span>            this.tagsCompressed());<a 
name="line.508"></a>
+<span class="sourceLineNo">509</span>      }<a name="line.509"></a>
+<span class="sourceLineNo">510</span>    };<a name="line.510"></a>
+<span class="sourceLineNo">511</span>  }<a name="line.511"></a>
+<span class="sourceLineNo">512</span><a name="line.512"></a>
+<span class="sourceLineNo">513</span>  @Override<a name="line.513"></a>
+<span class="sourceLineNo">514</span>  protected ByteBuffer 
internalDecodeKeyValues(DataInputStream source, int allocateHeaderLength,<a 
name="line.514"></a>
+<span class="sourceLineNo">515</span>      int skipLastBytes, 
HFileBlockDefaultDecodingContext decodingCtx) throws IOException {<a 
name="line.515"></a>
+<span class="sourceLineNo">516</span>    int decompressedSize = 
source.readInt();<a name="line.516"></a>
+<span class="sourceLineNo">517</span>    ByteBuffer buffer = 
ByteBuffer.allocate(decompressedSize +<a name="line.517"></a>
+<span class="sourceLineNo">518</span>        allocateHeaderLength);<a 
name="line.518"></a>
+<span class="sourceLineNo">519</span>    
buffer.position(allocateHeaderLength);<a name="line.519"></a>
+<span class="sourceLineNo">520</span>    DiffCompressionState state = new 
DiffCompressionState();<a name="line.520"></a>
+<span class="sourceLineNo">521</span>    while (source.available() &gt; 
skipLastBytes) {<a name="line.521"></a>
+<span class="sourceLineNo">522</span>      uncompressSingleKeyValue(source, 
buffer, state);<a name="line.522"></a>
+<span class="sourceLineNo">523</span>      afterDecodingKeyValue(source, 
buffer, decodingCtx);<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>    if (source.available() != 
skipLastBytes) {<a name="line.526"></a>
+<span class="sourceLineNo">527</span>      throw new 
IllegalStateException("Read too much bytes.");<a name="line.527"></a>
+<span class="sourceLineNo">528</span>    }<a name="line.528"></a>
+<span class="sourceLineNo">529</span><a name="line.529"></a>
+<span class="sourceLineNo">530</span>    return buffer;<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/45a663dd/devapidocs/src-html/org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.html
index 54788f6..e372d03 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.html
@@ -375,167 +375,169 @@
 <span class="sourceLineNo">367</span>    private int rowLengthWithSize;<a 
name="line.367"></a>
 <span class="sourceLineNo">368</span>    private long timestamp;<a 
name="line.368"></a>
 <span class="sourceLineNo">369</span><a name="line.369"></a>
-<span class="sourceLineNo">370</span>    public 
DiffSeekerState(ObjectIntPair&lt;ByteBuffer&gt; tmpPair, boolean includeTags) 
{<a name="line.370"></a>
-<span class="sourceLineNo">371</span>      super(tmpPair, includeTags);<a 
name="line.371"></a>
-<span class="sourceLineNo">372</span>    }<a name="line.372"></a>
-<span class="sourceLineNo">373</span><a name="line.373"></a>
-<span class="sourceLineNo">374</span>    @Override<a name="line.374"></a>
-<span class="sourceLineNo">375</span>    protected void 
copyFromNext(SeekerState that) {<a name="line.375"></a>
-<span class="sourceLineNo">376</span>      super.copyFromNext(that);<a 
name="line.376"></a>
-<span class="sourceLineNo">377</span>      DiffSeekerState other = 
(DiffSeekerState) that;<a name="line.377"></a>
-<span class="sourceLineNo">378</span>      rowLengthWithSize = 
other.rowLengthWithSize;<a name="line.378"></a>
-<span class="sourceLineNo">379</span>      timestamp = other.timestamp;<a 
name="line.379"></a>
-<span class="sourceLineNo">380</span>    }<a name="line.380"></a>
-<span class="sourceLineNo">381</span>  }<a name="line.381"></a>
-<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span>  @Override<a name="line.383"></a>
-<span class="sourceLineNo">384</span>  public EncodedSeeker 
createSeeker(CellComparator comparator,<a name="line.384"></a>
-<span class="sourceLineNo">385</span>      HFileBlockDecodingContext 
decodingCtx) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span>    return new 
BufferedEncodedSeeker&lt;DiffSeekerState&gt;(comparator, decodingCtx) {<a 
name="line.386"></a>
-<span class="sourceLineNo">387</span>      private byte[] 
familyNameWithSize;<a name="line.387"></a>
-<span class="sourceLineNo">388</span>      private static final int 
TIMESTAMP_WITH_TYPE_LENGTH =<a name="line.388"></a>
-<span class="sourceLineNo">389</span>          Bytes.SIZEOF_LONG + 
Bytes.SIZEOF_BYTE;<a name="line.389"></a>
-<span class="sourceLineNo">390</span><a name="line.390"></a>
-<span class="sourceLineNo">391</span>      private void decode(boolean 
isFirst) {<a name="line.391"></a>
-<span class="sourceLineNo">392</span>        byte flag = 
currentBuffer.get();<a name="line.392"></a>
-<span class="sourceLineNo">393</span>        byte type = 0;<a 
name="line.393"></a>
-<span class="sourceLineNo">394</span>        if ((flag &amp; 
FLAG_SAME_KEY_LENGTH) == 0) {<a name="line.394"></a>
-<span class="sourceLineNo">395</span>          if (!isFirst) {<a 
name="line.395"></a>
-<span class="sourceLineNo">396</span>            type = 
current.keyBuffer[current.keyLength - Bytes.SIZEOF_BYTE];<a name="line.396"></a>
-<span class="sourceLineNo">397</span>          }<a name="line.397"></a>
-<span class="sourceLineNo">398</span>          current.keyLength = 
ByteBuff.readCompressedInt(currentBuffer);<a name="line.398"></a>
-<span class="sourceLineNo">399</span>        }<a name="line.399"></a>
-<span class="sourceLineNo">400</span>        if ((flag &amp; 
FLAG_SAME_VALUE_LENGTH) == 0) {<a name="line.400"></a>
-<span class="sourceLineNo">401</span>          current.valueLength = 
ByteBuff.readCompressedInt(currentBuffer);<a name="line.401"></a>
-<span class="sourceLineNo">402</span>        }<a name="line.402"></a>
-<span class="sourceLineNo">403</span>        current.lastCommonPrefix = 
ByteBuff.readCompressedInt(currentBuffer);<a name="line.403"></a>
-<span class="sourceLineNo">404</span><a name="line.404"></a>
-<span class="sourceLineNo">405</span>        current.ensureSpaceForKey();<a 
name="line.405"></a>
-<span class="sourceLineNo">406</span><a name="line.406"></a>
-<span class="sourceLineNo">407</span>        if (current.lastCommonPrefix &lt; 
Bytes.SIZEOF_SHORT) {<a name="line.407"></a>
-<span class="sourceLineNo">408</span>          // length of row is different, 
copy everything except family<a name="line.408"></a>
-<span class="sourceLineNo">409</span><a name="line.409"></a>
-<span class="sourceLineNo">410</span>          // copy the row size<a 
name="line.410"></a>
-<span class="sourceLineNo">411</span>          
currentBuffer.get(current.keyBuffer, current.lastCommonPrefix,<a 
name="line.411"></a>
-<span class="sourceLineNo">412</span>              Bytes.SIZEOF_SHORT - 
current.lastCommonPrefix);<a name="line.412"></a>
-<span class="sourceLineNo">413</span>          current.rowLengthWithSize = 
Bytes.toShort(current.keyBuffer, 0) +<a name="line.413"></a>
-<span class="sourceLineNo">414</span>              Bytes.SIZEOF_SHORT;<a 
name="line.414"></a>
-<span class="sourceLineNo">415</span><a name="line.415"></a>
-<span class="sourceLineNo">416</span>          // copy the rest of row<a 
name="line.416"></a>
-<span class="sourceLineNo">417</span>          
currentBuffer.get(current.keyBuffer, Bytes.SIZEOF_SHORT,<a name="line.417"></a>
-<span class="sourceLineNo">418</span>              current.rowLengthWithSize - 
Bytes.SIZEOF_SHORT);<a name="line.418"></a>
-<span class="sourceLineNo">419</span><a name="line.419"></a>
-<span class="sourceLineNo">420</span>          // copy the column family<a 
name="line.420"></a>
-<span class="sourceLineNo">421</span>          
System.arraycopy(familyNameWithSize, 0, current.keyBuffer,<a 
name="line.421"></a>
-<span class="sourceLineNo">422</span>              current.rowLengthWithSize, 
familyNameWithSize.length);<a name="line.422"></a>
-<span class="sourceLineNo">423</span><a name="line.423"></a>
-<span class="sourceLineNo">424</span>          // copy the qualifier<a 
name="line.424"></a>
-<span class="sourceLineNo">425</span>          
currentBuffer.get(current.keyBuffer,<a name="line.425"></a>
-<span class="sourceLineNo">426</span>              current.rowLengthWithSize + 
familyNameWithSize.length,<a name="line.426"></a>
-<span class="sourceLineNo">427</span>              current.keyLength - 
current.rowLengthWithSize -<a name="line.427"></a>
-<span class="sourceLineNo">428</span>              familyNameWithSize.length - 
TIMESTAMP_WITH_TYPE_LENGTH);<a name="line.428"></a>
-<span class="sourceLineNo">429</span>        } else if 
(current.lastCommonPrefix &lt; current.rowLengthWithSize) {<a 
name="line.429"></a>
-<span class="sourceLineNo">430</span>          // we have to copy part of row 
and qualifier,<a name="line.430"></a>
-<span class="sourceLineNo">431</span>          // but column family is in 
right place<a name="line.431"></a>
-<span class="sourceLineNo">432</span><a name="line.432"></a>
-<span class="sourceLineNo">433</span>          // before column family (rest 
of row)<a name="line.433"></a>
-<span class="sourceLineNo">434</span>          
currentBuffer.get(current.keyBuffer, current.lastCommonPrefix,<a 
name="line.434"></a>
-<span class="sourceLineNo">435</span>              current.rowLengthWithSize - 
current.lastCommonPrefix);<a name="line.435"></a>
-<span class="sourceLineNo">436</span><a name="line.436"></a>
-<span class="sourceLineNo">437</span>          // after column family 
(qualifier)<a name="line.437"></a>
-<span class="sourceLineNo">438</span>          
currentBuffer.get(current.keyBuffer,<a name="line.438"></a>
-<span class="sourceLineNo">439</span>              current.rowLengthWithSize + 
familyNameWithSize.length,<a name="line.439"></a>
-<span class="sourceLineNo">440</span>              current.keyLength - 
current.rowLengthWithSize -<a name="line.440"></a>
-<span class="sourceLineNo">441</span>              familyNameWithSize.length - 
TIMESTAMP_WITH_TYPE_LENGTH);<a name="line.441"></a>
-<span class="sourceLineNo">442</span>        } else {<a name="line.442"></a>
-<span class="sourceLineNo">443</span>          // copy just the ending<a 
name="line.443"></a>
-<span class="sourceLineNo">444</span>          
currentBuffer.get(current.keyBuffer, current.lastCommonPrefix,<a 
name="line.444"></a>
-<span class="sourceLineNo">445</span>              current.keyLength - 
TIMESTAMP_WITH_TYPE_LENGTH -<a name="line.445"></a>
-<span class="sourceLineNo">446</span>              
current.lastCommonPrefix);<a name="line.446"></a>
-<span class="sourceLineNo">447</span>        }<a name="line.447"></a>
-<span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span>        // timestamp<a 
name="line.449"></a>
-<span class="sourceLineNo">450</span>        int pos = current.keyLength - 
TIMESTAMP_WITH_TYPE_LENGTH;<a name="line.450"></a>
-<span class="sourceLineNo">451</span>        int timestampFitInBytes = 1 +<a 
name="line.451"></a>
-<span class="sourceLineNo">452</span>            ((flag &amp; 
MASK_TIMESTAMP_LENGTH) &gt;&gt;&gt; SHIFT_TIMESTAMP_LENGTH);<a 
name="line.452"></a>
-<span class="sourceLineNo">453</span>        long timestampOrDiff = 
ByteBuff.readLong(currentBuffer, timestampFitInBytes);<a name="line.453"></a>
-<span class="sourceLineNo">454</span>        if ((flag &amp; 
FLAG_TIMESTAMP_SIGN) != 0) {<a name="line.454"></a>
-<span class="sourceLineNo">455</span>          timestampOrDiff = 
-timestampOrDiff;<a name="line.455"></a>
-<span class="sourceLineNo">456</span>        }<a name="line.456"></a>
-<span class="sourceLineNo">457</span>        if ((flag &amp; 
FLAG_TIMESTAMP_IS_DIFF) == 0) { // it is timestamp<a name="line.457"></a>
-<span class="sourceLineNo">458</span>          current.timestamp = 
timestampOrDiff;<a name="line.458"></a>
-<span class="sourceLineNo">459</span>        } else { // it is diff<a 
name="line.459"></a>
-<span class="sourceLineNo">460</span>          current.timestamp = 
current.timestamp - timestampOrDiff;<a name="line.460"></a>
-<span class="sourceLineNo">461</span>        }<a name="line.461"></a>
-<span class="sourceLineNo">462</span>        Bytes.putLong(current.keyBuffer, 
pos, current.timestamp);<a name="line.462"></a>
-<span class="sourceLineNo">463</span>        pos += Bytes.SIZEOF_LONG;<a 
name="line.463"></a>
-<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span>        // type<a name="line.465"></a>
-<span class="sourceLineNo">466</span>        if ((flag &amp; FLAG_SAME_TYPE) 
== 0) {<a name="line.466"></a>
-<span class="sourceLineNo">467</span>          
currentBuffer.get(current.keyBuffer, pos, Bytes.SIZEOF_BYTE);<a 
name="line.467"></a>
-<span class="sourceLineNo">468</span>        } else if ((flag &amp; 
FLAG_SAME_KEY_LENGTH) == 0) {<a name="line.468"></a>
-<span class="sourceLineNo">469</span>          current.keyBuffer[pos] = 
type;<a name="line.469"></a>
-<span class="sourceLineNo">470</span>        }<a name="line.470"></a>
-<span class="sourceLineNo">471</span><a name="line.471"></a>
-<span class="sourceLineNo">472</span>        current.valueOffset = 
currentBuffer.position();<a name="line.472"></a>
-<span class="sourceLineNo">473</span>        
currentBuffer.skip(current.valueLength);<a name="line.473"></a>
-<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span>        if (includesTags()) {<a 
name="line.475"></a>
-<span class="sourceLineNo">476</span>          decodeTags();<a 
name="line.476"></a>
-<span class="sourceLineNo">477</span>        }<a name="line.477"></a>
-<span class="sourceLineNo">478</span>        if (includesMvcc()) {<a 
name="line.478"></a>
-<span class="sourceLineNo">479</span>          current.memstoreTS = 
ByteBuff.readVLong(currentBuffer);<a name="line.479"></a>
-<span class="sourceLineNo">480</span>        } else {<a name="line.480"></a>
-<span class="sourceLineNo">481</span>          current.memstoreTS = 0;<a 
name="line.481"></a>
-<span class="sourceLineNo">482</span>        }<a name="line.482"></a>
-<span class="sourceLineNo">483</span>        current.nextKvOffset = 
currentBuffer.position();<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>      @Override<a name="line.486"></a>
-<span class="sourceLineNo">487</span>      protected void decodeFirst() {<a 
name="line.487"></a>
-<span class="sourceLineNo">488</span>        
currentBuffer.skip(Bytes.SIZEOF_INT);<a name="line.488"></a>
-<span class="sourceLineNo">489</span><a name="line.489"></a>
-<span class="sourceLineNo">490</span>        // read column family<a 
name="line.490"></a>
-<span class="sourceLineNo">491</span>        byte familyNameLength = 
currentBuffer.get();<a name="line.491"></a>
-<span class="sourceLineNo">492</span>        familyNameWithSize = new 
byte[familyNameLength + Bytes.SIZEOF_BYTE];<a name="line.492"></a>
-<span class="sourceLineNo">493</span>        familyNameWithSize[0] = 
familyNameLength;<a name="line.493"></a>
-<span class="sourceLineNo">494</span>        
currentBuffer.get(familyNameWithSize, Bytes.SIZEOF_BYTE,<a name="line.494"></a>
-<span class="sourceLineNo">495</span>            familyNameLength);<a 
name="line.495"></a>
-<span class="sourceLineNo">496</span>        decode(true);<a 
name="line.496"></a>
-<span class="sourceLineNo">497</span>      }<a name="line.497"></a>
-<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span>      @Override<a name="line.499"></a>
-<span class="sourceLineNo">500</span>      protected void decodeNext() {<a 
name="line.500"></a>
-<span class="sourceLineNo">501</span>        decode(false);<a 
name="line.501"></a>
-<span class="sourceLineNo">502</span>      }<a name="line.502"></a>
-<span class="sourceLineNo">503</span><a name="line.503"></a>
-<span class="sourceLineNo">504</span>      @Override<a name="line.504"></a>
-<span class="sourceLineNo">505</span>      protected DiffSeekerState 
createSeekerState() {<a name="line.505"></a>
-<span class="sourceLineNo">506</span>        return new 
DiffSeekerState(this.tmpPair, this.includesTags());<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>  }<a name="line.509"></a>
-<span class="sourceLineNo">510</span><a name="line.510"></a>
-<span class="sourceLineNo">511</span>  @Override<a name="line.511"></a>
-<span class="sourceLineNo">512</span>  protected ByteBuffer 
internalDecodeKeyValues(DataInputStream source, int allocateHeaderLength,<a 
name="line.512"></a>
-<span class="sourceLineNo">513</span>      int skipLastBytes, 
HFileBlockDefaultDecodingContext decodingCtx) throws IOException {<a 
name="line.513"></a>
-<span class="sourceLineNo">514</span>    int decompressedSize = 
source.readInt();<a name="line.514"></a>
-<span class="sourceLineNo">515</span>    ByteBuffer buffer = 
ByteBuffer.allocate(decompressedSize +<a name="line.515"></a>
-<span class="sourceLineNo">516</span>        allocateHeaderLength);<a 
name="line.516"></a>
-<span class="sourceLineNo">517</span>    
buffer.position(allocateHeaderLength);<a name="line.517"></a>
-<span class="sourceLineNo">518</span>    DiffCompressionState state = new 
DiffCompressionState();<a name="line.518"></a>
-<span class="sourceLineNo">519</span>    while (source.available() &gt; 
skipLastBytes) {<a name="line.519"></a>
-<span class="sourceLineNo">520</span>      uncompressSingleKeyValue(source, 
buffer, state);<a name="line.520"></a>
-<span class="sourceLineNo">521</span>      afterDecodingKeyValue(source, 
buffer, decodingCtx);<a name="line.521"></a>
-<span class="sourceLineNo">522</span>    }<a name="line.522"></a>
-<span class="sourceLineNo">523</span><a name="line.523"></a>
-<span class="sourceLineNo">524</span>    if (source.available() != 
skipLastBytes) {<a name="line.524"></a>
-<span class="sourceLineNo">525</span>      throw new 
IllegalStateException("Read too much bytes.");<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>    return buffer;<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">370</span>    public 
DiffSeekerState(ObjectIntPair&lt;ByteBuffer&gt; tmpPair,<a name="line.370"></a>
+<span class="sourceLineNo">371</span>        boolean includeTags, boolean 
tagsCompressed) {<a name="line.371"></a>
+<span class="sourceLineNo">372</span>      super(tmpPair, includeTags, 
tagsCompressed);<a name="line.372"></a>
+<span class="sourceLineNo">373</span>    }<a name="line.373"></a>
+<span class="sourceLineNo">374</span><a name="line.374"></a>
+<span class="sourceLineNo">375</span>    @Override<a name="line.375"></a>
+<span class="sourceLineNo">376</span>    protected void 
copyFromNext(SeekerState that) {<a name="line.376"></a>
+<span class="sourceLineNo">377</span>      super.copyFromNext(that);<a 
name="line.377"></a>
+<span class="sourceLineNo">378</span>      DiffSeekerState other = 
(DiffSeekerState) that;<a name="line.378"></a>
+<span class="sourceLineNo">379</span>      rowLengthWithSize = 
other.rowLengthWithSize;<a name="line.379"></a>
+<span class="sourceLineNo">380</span>      timestamp = other.timestamp;<a 
name="line.380"></a>
+<span class="sourceLineNo">381</span>    }<a name="line.381"></a>
+<span class="sourceLineNo">382</span>  }<a name="line.382"></a>
+<span class="sourceLineNo">383</span><a name="line.383"></a>
+<span class="sourceLineNo">384</span>  @Override<a name="line.384"></a>
+<span class="sourceLineNo">385</span>  public EncodedSeeker 
createSeeker(CellComparator comparator,<a name="line.385"></a>
+<span class="sourceLineNo">386</span>      HFileBlockDecodingContext 
decodingCtx) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span>    return new 
BufferedEncodedSeeker&lt;DiffSeekerState&gt;(comparator, decodingCtx) {<a 
name="line.387"></a>
+<span class="sourceLineNo">388</span>      private byte[] 
familyNameWithSize;<a name="line.388"></a>
+<span class="sourceLineNo">389</span>      private static final int 
TIMESTAMP_WITH_TYPE_LENGTH =<a name="line.389"></a>
+<span class="sourceLineNo">390</span>          Bytes.SIZEOF_LONG + 
Bytes.SIZEOF_BYTE;<a name="line.390"></a>
+<span class="sourceLineNo">391</span><a name="line.391"></a>
+<span class="sourceLineNo">392</span>      private void decode(boolean 
isFirst) {<a name="line.392"></a>
+<span class="sourceLineNo">393</span>        byte flag = 
currentBuffer.get();<a name="line.393"></a>
+<span class="sourceLineNo">394</span>        byte type = 0;<a 
name="line.394"></a>
+<span class="sourceLineNo">395</span>        if ((flag &amp; 
FLAG_SAME_KEY_LENGTH) == 0) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span>          if (!isFirst) {<a 
name="line.396"></a>
+<span class="sourceLineNo">397</span>            type = 
current.keyBuffer[current.keyLength - Bytes.SIZEOF_BYTE];<a name="line.397"></a>
+<span class="sourceLineNo">398</span>          }<a name="line.398"></a>
+<span class="sourceLineNo">399</span>          current.keyLength = 
ByteBuff.readCompressedInt(currentBuffer);<a name="line.399"></a>
+<span class="sourceLineNo">400</span>        }<a name="line.400"></a>
+<span class="sourceLineNo">401</span>        if ((flag &amp; 
FLAG_SAME_VALUE_LENGTH) == 0) {<a name="line.401"></a>
+<span class="sourceLineNo">402</span>          current.valueLength = 
ByteBuff.readCompressedInt(currentBuffer);<a name="line.402"></a>
+<span class="sourceLineNo">403</span>        }<a name="line.403"></a>
+<span class="sourceLineNo">404</span>        current.lastCommonPrefix = 
ByteBuff.readCompressedInt(currentBuffer);<a name="line.404"></a>
+<span class="sourceLineNo">405</span><a name="line.405"></a>
+<span class="sourceLineNo">406</span>        current.ensureSpaceForKey();<a 
name="line.406"></a>
+<span class="sourceLineNo">407</span><a name="line.407"></a>
+<span class="sourceLineNo">408</span>        if (current.lastCommonPrefix &lt; 
Bytes.SIZEOF_SHORT) {<a name="line.408"></a>
+<span class="sourceLineNo">409</span>          // length of row is different, 
copy everything except family<a name="line.409"></a>
+<span class="sourceLineNo">410</span><a name="line.410"></a>
+<span class="sourceLineNo">411</span>          // copy the row size<a 
name="line.411"></a>
+<span class="sourceLineNo">412</span>          
currentBuffer.get(current.keyBuffer, current.lastCommonPrefix,<a 
name="line.412"></a>
+<span class="sourceLineNo">413</span>              Bytes.SIZEOF_SHORT - 
current.lastCommonPrefix);<a name="line.413"></a>
+<span class="sourceLineNo">414</span>          current.rowLengthWithSize = 
Bytes.toShort(current.keyBuffer, 0) +<a name="line.414"></a>
+<span class="sourceLineNo">415</span>              Bytes.SIZEOF_SHORT;<a 
name="line.415"></a>
+<span class="sourceLineNo">416</span><a name="line.416"></a>
+<span class="sourceLineNo">417</span>          // copy the rest of row<a 
name="line.417"></a>
+<span class="sourceLineNo">418</span>          
currentBuffer.get(current.keyBuffer, Bytes.SIZEOF_SHORT,<a name="line.418"></a>
+<span class="sourceLineNo">419</span>              current.rowLengthWithSize - 
Bytes.SIZEOF_SHORT);<a name="line.419"></a>
+<span class="sourceLineNo">420</span><a name="line.420"></a>
+<span class="sourceLineNo">421</span>          // copy the column family<a 
name="line.421"></a>
+<span class="sourceLineNo">422</span>          
System.arraycopy(familyNameWithSize, 0, current.keyBuffer,<a 
name="line.422"></a>
+<span class="sourceLineNo">423</span>              current.rowLengthWithSize, 
familyNameWithSize.length);<a name="line.423"></a>
+<span class="sourceLineNo">424</span><a name="line.424"></a>
+<span class="sourceLineNo">425</span>          // copy the qualifier<a 
name="line.425"></a>
+<span class="sourceLineNo">426</span>          
currentBuffer.get(current.keyBuffer,<a name="line.426"></a>
+<span class="sourceLineNo">427</span>              current.rowLengthWithSize + 
familyNameWithSize.length,<a name="line.427"></a>
+<span class="sourceLineNo">428</span>              current.keyLength - 
current.rowLengthWithSize -<a name="line.428"></a>
+<span class="sourceLineNo">429</span>              familyNameWithSize.length - 
TIMESTAMP_WITH_TYPE_LENGTH);<a name="line.429"></a>
+<span class="sourceLineNo">430</span>        } else if 
(current.lastCommonPrefix &lt; current.rowLengthWithSize) {<a 
name="line.430"></a>
+<span class="sourceLineNo">431</span>          // we have to copy part of row 
and qualifier,<a name="line.431"></a>
+<span class="sourceLineNo">432</span>          // but column family is in 
right place<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span>          // before column family (rest 
of row)<a name="line.434"></a>
+<span class="sourceLineNo">435</span>          
currentBuffer.get(current.keyBuffer, current.lastCommonPrefix,<a 
name="line.435"></a>
+<span class="sourceLineNo">436</span>              current.rowLengthWithSize - 
current.lastCommonPrefix);<a name="line.436"></a>
+<span class="sourceLineNo">437</span><a name="line.437"></a>
+<span class="sourceLineNo">438</span>          // after column family 
(qualifier)<a name="line.438"></a>
+<span class="sourceLineNo">439</span>          
currentBuffer.get(current.keyBuffer,<a name="line.439"></a>
+<span class="sourceLineNo">440</span>              current.rowLengthWithSize + 
familyNameWithSize.length,<a name="line.440"></a>
+<span class="sourceLineNo">441</span>              current.keyLength - 
current.rowLengthWithSize -<a name="line.441"></a>
+<span class="sourceLineNo">442</span>              familyNameWithSize.length - 
TIMESTAMP_WITH_TYPE_LENGTH);<a name="line.442"></a>
+<span class="sourceLineNo">443</span>        } else {<a name="line.443"></a>
+<span class="sourceLineNo">444</span>          // copy just the ending<a 
name="line.444"></a>
+<span class="sourceLineNo">445</span>          
currentBuffer.get(current.keyBuffer, current.lastCommonPrefix,<a 
name="line.445"></a>
+<span class="sourceLineNo">446</span>              current.keyLength - 
TIMESTAMP_WITH_TYPE_LENGTH -<a name="line.446"></a>
+<span class="sourceLineNo">447</span>              
current.lastCommonPrefix);<a name="line.447"></a>
+<span class="sourceLineNo">448</span>        }<a name="line.448"></a>
+<span class="sourceLineNo">449</span><a name="line.449"></a>
+<span class="sourceLineNo">450</span>        // timestamp<a 
name="line.450"></a>
+<span class="sourceLineNo">451</span>        int pos = current.keyLength - 
TIMESTAMP_WITH_TYPE_LENGTH;<a name="line.451"></a>
+<span class="sourceLineNo">452</span>        int timestampFitInBytes = 1 +<a 
name="line.452"></a>
+<span class="sourceLineNo">453</span>            ((flag &amp; 
MASK_TIMESTAMP_LENGTH) &gt;&gt;&gt; SHIFT_TIMESTAMP_LENGTH);<a 
name="line.453"></a>
+<span class="sourceLineNo">454</span>        long timestampOrDiff = 
ByteBuff.readLong(currentBuffer, timestampFitInBytes);<a name="line.454"></a>
+<span class="sourceLineNo">455</span>        if ((flag &amp; 
FLAG_TIMESTAMP_SIGN) != 0) {<a name="line.455"></a>
+<span class="sourceLineNo">456</span>          timestampOrDiff = 
-timestampOrDiff;<a name="line.456"></a>
+<span class="sourceLineNo">457</span>        }<a name="line.457"></a>
+<span class="sourceLineNo">458</span>        if ((flag &amp; 
FLAG_TIMESTAMP_IS_DIFF) == 0) { // it is timestamp<a name="line.458"></a>
+<span class="sourceLineNo">459</span>          current.timestamp = 
timestampOrDiff;<a name="line.459"></a>
+<span class="sourceLineNo">460</span>        } else { // it is diff<a 
name="line.460"></a>
+<span class="sourceLineNo">461</span>          current.timestamp = 
current.timestamp - timestampOrDiff;<a name="line.461"></a>
+<span class="sourceLineNo">462</span>        }<a name="line.462"></a>
+<span class="sourceLineNo">463</span>        Bytes.putLong(current.keyBuffer, 
pos, current.timestamp);<a name="line.463"></a>
+<span class="sourceLineNo">464</span>        pos += Bytes.SIZEOF_LONG;<a 
name="line.464"></a>
+<span class="sourceLineNo">465</span><a name="line.465"></a>
+<span class="sourceLineNo">466</span>        // type<a name="line.466"></a>
+<span class="sourceLineNo">467</span>        if ((flag &amp; FLAG_SAME_TYPE) 
== 0) {<a name="line.467"></a>
+<span class="sourceLineNo">468</span>          
currentBuffer.get(current.keyBuffer, pos, Bytes.SIZEOF_BYTE);<a 
name="line.468"></a>
+<span class="sourceLineNo">469</span>        } else if ((flag &amp; 
FLAG_SAME_KEY_LENGTH) == 0) {<a name="line.469"></a>
+<span class="sourceLineNo">470</span>          current.keyBuffer[pos] = 
type;<a name="line.470"></a>
+<span class="sourceLineNo">471</span>        }<a name="line.471"></a>
+<span class="sourceLineNo">472</span><a name="line.472"></a>
+<span class="sourceLineNo">473</span>        current.valueOffset = 
currentBuffer.position();<a name="line.473"></a>
+<span class="sourceLineNo">474</span>        
currentBuffer.skip(current.valueLength);<a name="line.474"></a>
+<span class="sourceLineNo">475</span><a name="line.475"></a>
+<span class="sourceLineNo">476</span>        if (includesTags()) {<a 
name="line.476"></a>
+<span class="sourceLineNo">477</span>          decodeTags();<a 
name="line.477"></a>
+<span class="sourceLineNo">478</span>        }<a name="line.478"></a>
+<span class="sourceLineNo">479</span>        if (includesMvcc()) {<a 
name="line.479"></a>
+<span class="sourceLineNo">480</span>          current.memstoreTS = 
ByteBuff.readVLong(currentBuffer);<a name="line.480"></a>
+<span class="sourceLineNo">481</span>        } else {<a name="line.481"></a>
+<span class="sourceLineNo">482</span>          current.memstoreTS = 0;<a 
name="line.482"></a>
+<span class="sourceLineNo">483</span>        }<a name="line.483"></a>
+<span class="sourceLineNo">484</span>        current.nextKvOffset = 
currentBuffer.position();<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>      @Override<a name="line.487"></a>
+<span class="sourceLineNo">488</span>      protected void decodeFirst() {<a 
name="line.488"></a>
+<span class="sourceLineNo">489</span>        
currentBuffer.skip(Bytes.SIZEOF_INT);<a name="line.489"></a>
+<span class="sourceLineNo">490</span><a name="line.490"></a>
+<span class="sourceLineNo">491</span>        // read column family<a 
name="line.491"></a>
+<span class="sourceLineNo">492</span>        byte familyNameLength = 
currentBuffer.get();<a name="line.492"></a>
+<span class="sourceLineNo">493</span>        familyNameWithSize = new 
byte[familyNameLength + Bytes.SIZEOF_BYTE];<a name="line.493"></a>
+<span class="sourceLineNo">494</span>        familyNameWithSize[0] = 
familyNameLength;<a name="line.494"></a>
+<span class="sourceLineNo">495</span>        
currentBuffer.get(familyNameWithSize, Bytes.SIZEOF_BYTE,<a name="line.495"></a>
+<span class="sourceLineNo">496</span>            familyNameLength);<a 
name="line.496"></a>
+<span class="sourceLineNo">497</span>        decode(true);<a 
name="line.497"></a>
+<span class="sourceLineNo">498</span>      }<a name="line.498"></a>
+<span class="sourceLineNo">499</span><a name="line.499"></a>
+<span class="sourceLineNo">500</span>      @Override<a name="line.500"></a>
+<span class="sourceLineNo">501</span>      protected void decodeNext() {<a 
name="line.501"></a>
+<span class="sourceLineNo">502</span>        decode(false);<a 
name="line.502"></a>
+<span class="sourceLineNo">503</span>      }<a name="line.503"></a>
+<span class="sourceLineNo">504</span><a name="line.504"></a>
+<span class="sourceLineNo">505</span>      @Override<a name="line.505"></a>
+<span class="sourceLineNo">506</span>      protected DiffSeekerState 
createSeekerState() {<a name="line.506"></a>
+<span class="sourceLineNo">507</span>        return new 
DiffSeekerState(this.tmpPair, this.includesTags(),<a name="line.507"></a>
+<span class="sourceLineNo">508</span>            this.tagsCompressed());<a 
name="line.508"></a>
+<span class="sourceLineNo">509</span>      }<a name="line.509"></a>
+<span class="sourceLineNo">510</span>    };<a name="line.510"></a>
+<span class="sourceLineNo">511</span>  }<a name="line.511"></a>
+<span class="sourceLineNo">512</span><a name="line.512"></a>
+<span class="sourceLineNo">513</span>  @Override<a name="line.513"></a>
+<span class="sourceLineNo">514</span>  protected ByteBuffer 
internalDecodeKeyValues(DataInputStream source, int allocateHeaderLength,<a 
name="line.514"></a>
+<span class="sourceLineNo">515</span>      int skipLastBytes, 
HFileBlockDefaultDecodingContext decodingCtx) throws IOException {<a 
name="line.515"></a>
+<span class="sourceLineNo">516</span>    int decompressedSize = 
source.readInt();<a name="line.516"></a>
+<span class="sourceLineNo">517</span>    ByteBuffer buffer = 
ByteBuffer.allocate(decompressedSize +<a name="line.517"></a>
+<span class="sourceLineNo">518</span>        allocateHeaderLength);<a 
name="line.518"></a>
+<span class="sourceLineNo">519</span>    
buffer.position(allocateHeaderLength);<a name="line.519"></a>
+<span class="sourceLineNo">520</span>    DiffCompressionState state = new 
DiffCompressionState();<a name="line.520"></a>
+<span class="sourceLineNo">521</span>    while (source.available() &gt; 
skipLastBytes) {<a name="line.521"></a>
+<span class="sourceLineNo">522</span>      uncompressSingleKeyValue(source, 
buffer, state);<a name="line.522"></a>
+<span class="sourceLineNo">523</span>      afterDecodingKeyValue(source, 
buffer, decodingCtx);<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>    if (source.available() != 
skipLastBytes) {<a name="line.526"></a>
+<span class="sourceLineNo">527</span>      throw new 
IllegalStateException("Read too much bytes.");<a name="line.527"></a>
+<span class="sourceLineNo">528</span>    }<a name="line.528"></a>
+<span class="sourceLineNo">529</span><a name="line.529"></a>
+<span class="sourceLineNo">530</span>    return buffer;<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>
 
 
 

Reply via email to