http://git-wip-us.apache.org/repos/asf/hbase-site/blob/07e68d46/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMultiParallel.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMultiParallel.html 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMultiParallel.html
index 588db2b..d494d4e 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMultiParallel.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMultiParallel.html
@@ -650,112 +650,140 @@
 <span class="sourceLineNo">642</span>    put.addColumn(BYTES_FAMILY, qual2, 
val2);<a name="line.642"></a>
 <span class="sourceLineNo">643</span>    actions.add(put);<a 
name="line.643"></a>
 <span class="sourceLineNo">644</span><a name="line.644"></a>
-<span class="sourceLineNo">645</span>    results = new 
Object[actions.size()];<a name="line.645"></a>
-<span class="sourceLineNo">646</span>    table.batch(actions, results);<a 
name="line.646"></a>
-<span class="sourceLineNo">647</span><a name="line.647"></a>
-<span class="sourceLineNo">648</span>    // Validation<a name="line.648"></a>
-<span class="sourceLineNo">649</span><a name="line.649"></a>
-<span class="sourceLineNo">650</span>    validateResult(results[0]);<a 
name="line.650"></a>
-<span class="sourceLineNo">651</span>    validateResult(results[1]);<a 
name="line.651"></a>
-<span class="sourceLineNo">652</span>    validateEmpty(results[2]);<a 
name="line.652"></a>
-<span class="sourceLineNo">653</span>    validateEmpty(results[3]);<a 
name="line.653"></a>
-<span class="sourceLineNo">654</span>    validateResult(results[4]);<a 
name="line.654"></a>
-<span class="sourceLineNo">655</span>    validateEmpty(results[5]);<a 
name="line.655"></a>
+<span class="sourceLineNo">645</span>    // 6 RowMutations<a 
name="line.645"></a>
+<span class="sourceLineNo">646</span>    RowMutations rm = new 
RowMutations(KEYS[50]);<a name="line.646"></a>
+<span class="sourceLineNo">647</span>    put = new Put(KEYS[50]);<a 
name="line.647"></a>
+<span class="sourceLineNo">648</span>    put.addColumn(BYTES_FAMILY, qual2, 
val2);<a name="line.648"></a>
+<span class="sourceLineNo">649</span>    rm.add(put);<a name="line.649"></a>
+<span class="sourceLineNo">650</span>    byte[] qual3 = 
Bytes.toBytes("qual3");<a name="line.650"></a>
+<span class="sourceLineNo">651</span>    byte[] val3 = 
Bytes.toBytes("putvalue3");<a name="line.651"></a>
+<span class="sourceLineNo">652</span>    put = new Put(KEYS[50]);<a 
name="line.652"></a>
+<span class="sourceLineNo">653</span>    put.addColumn(BYTES_FAMILY, qual3, 
val3);<a name="line.653"></a>
+<span class="sourceLineNo">654</span>    rm.add(put);<a name="line.654"></a>
+<span class="sourceLineNo">655</span>    actions.add(rm);<a 
name="line.655"></a>
 <span class="sourceLineNo">656</span><a name="line.656"></a>
-<span class="sourceLineNo">657</span>    // validate last put, externally from 
the batch<a name="line.657"></a>
-<span class="sourceLineNo">658</span>    get = new Get(KEYS[40]);<a 
name="line.658"></a>
-<span class="sourceLineNo">659</span>    get.addColumn(BYTES_FAMILY, qual2);<a 
name="line.659"></a>
-<span class="sourceLineNo">660</span>    Result r = table.get(get);<a 
name="line.660"></a>
-<span class="sourceLineNo">661</span>    validateResult(r, qual2, val2);<a 
name="line.661"></a>
-<span class="sourceLineNo">662</span><a name="line.662"></a>
-<span class="sourceLineNo">663</span>    table.close();<a name="line.663"></a>
-<span class="sourceLineNo">664</span>  }<a name="line.664"></a>
-<span class="sourceLineNo">665</span><a name="line.665"></a>
-<span class="sourceLineNo">666</span>  // // Helper methods ////<a 
name="line.666"></a>
-<span class="sourceLineNo">667</span><a name="line.667"></a>
-<span class="sourceLineNo">668</span>  private void validateResult(Object r) 
{<a name="line.668"></a>
-<span class="sourceLineNo">669</span>    validateResult(r, QUALIFIER, 
VALUE);<a name="line.669"></a>
-<span class="sourceLineNo">670</span>  }<a name="line.670"></a>
-<span class="sourceLineNo">671</span><a name="line.671"></a>
-<span class="sourceLineNo">672</span>  private void validateResult(Object r1, 
byte[] qual, byte[] val) {<a name="line.672"></a>
-<span class="sourceLineNo">673</span>    Result r = (Result)r1;<a 
name="line.673"></a>
-<span class="sourceLineNo">674</span>    
Assert.assertTrue(r.containsColumn(BYTES_FAMILY, qual));<a name="line.674"></a>
-<span class="sourceLineNo">675</span>    byte[] value = 
r.getValue(BYTES_FAMILY, qual);<a name="line.675"></a>
-<span class="sourceLineNo">676</span>    if (0 != Bytes.compareTo(val, value)) 
{<a name="line.676"></a>
-<span class="sourceLineNo">677</span>      fail("Expected [" + 
Bytes.toStringBinary(val)<a name="line.677"></a>
-<span class="sourceLineNo">678</span>          + "] but got [" + 
Bytes.toStringBinary(value) + "]");<a name="line.678"></a>
-<span class="sourceLineNo">679</span>    }<a name="line.679"></a>
-<span class="sourceLineNo">680</span>  }<a name="line.680"></a>
-<span class="sourceLineNo">681</span><a name="line.681"></a>
-<span class="sourceLineNo">682</span>  private List&lt;Put&gt; 
constructPutRequests() {<a name="line.682"></a>
-<span class="sourceLineNo">683</span>    List&lt;Put&gt; puts = new 
ArrayList&lt;&gt;();<a name="line.683"></a>
-<span class="sourceLineNo">684</span>    for (byte[] k : KEYS) {<a 
name="line.684"></a>
-<span class="sourceLineNo">685</span>      Put put = new Put(k);<a 
name="line.685"></a>
-<span class="sourceLineNo">686</span>      put.addColumn(BYTES_FAMILY, 
QUALIFIER, VALUE);<a name="line.686"></a>
-<span class="sourceLineNo">687</span>      puts.add(put);<a 
name="line.687"></a>
-<span class="sourceLineNo">688</span>    }<a name="line.688"></a>
-<span class="sourceLineNo">689</span>    return puts;<a name="line.689"></a>
-<span class="sourceLineNo">690</span>  }<a name="line.690"></a>
+<span class="sourceLineNo">657</span>    // 7 Add another Get to the mixed 
sequence after RowMutations<a name="line.657"></a>
+<span class="sourceLineNo">658</span>    get = new Get(KEYS[10]);<a 
name="line.658"></a>
+<span class="sourceLineNo">659</span>    get.addColumn(BYTES_FAMILY, 
QUALIFIER);<a name="line.659"></a>
+<span class="sourceLineNo">660</span>    actions.add(get);<a 
name="line.660"></a>
+<span class="sourceLineNo">661</span><a name="line.661"></a>
+<span class="sourceLineNo">662</span>    results = new 
Object[actions.size()];<a name="line.662"></a>
+<span class="sourceLineNo">663</span>    table.batch(actions, results);<a 
name="line.663"></a>
+<span class="sourceLineNo">664</span><a name="line.664"></a>
+<span class="sourceLineNo">665</span>    // Validation<a name="line.665"></a>
+<span class="sourceLineNo">666</span><a name="line.666"></a>
+<span class="sourceLineNo">667</span>    validateResult(results[0]);<a 
name="line.667"></a>
+<span class="sourceLineNo">668</span>    validateResult(results[1]);<a 
name="line.668"></a>
+<span class="sourceLineNo">669</span>    validateEmpty(results[3]);<a 
name="line.669"></a>
+<span class="sourceLineNo">670</span>    validateResult(results[4]);<a 
name="line.670"></a>
+<span class="sourceLineNo">671</span>    validateEmpty(results[5]);<a 
name="line.671"></a>
+<span class="sourceLineNo">672</span>    validateEmpty(results[6]);<a 
name="line.672"></a>
+<span class="sourceLineNo">673</span>    validateResult(results[7]);<a 
name="line.673"></a>
+<span class="sourceLineNo">674</span><a name="line.674"></a>
+<span class="sourceLineNo">675</span>    // validate last put, externally from 
the batch<a name="line.675"></a>
+<span class="sourceLineNo">676</span>    get = new Get(KEYS[40]);<a 
name="line.676"></a>
+<span class="sourceLineNo">677</span>    get.addColumn(BYTES_FAMILY, qual2);<a 
name="line.677"></a>
+<span class="sourceLineNo">678</span>    Result r = table.get(get);<a 
name="line.678"></a>
+<span class="sourceLineNo">679</span>    validateResult(r, qual2, val2);<a 
name="line.679"></a>
+<span class="sourceLineNo">680</span><a name="line.680"></a>
+<span class="sourceLineNo">681</span>    // validate last RowMutations, 
externally from the batch<a name="line.681"></a>
+<span class="sourceLineNo">682</span>    get = new Get(KEYS[50]);<a 
name="line.682"></a>
+<span class="sourceLineNo">683</span>    get.addColumn(BYTES_FAMILY, qual2);<a 
name="line.683"></a>
+<span class="sourceLineNo">684</span>    r = table.get(get);<a 
name="line.684"></a>
+<span class="sourceLineNo">685</span>    validateResult(r, qual2, val2);<a 
name="line.685"></a>
+<span class="sourceLineNo">686</span><a name="line.686"></a>
+<span class="sourceLineNo">687</span>    get = new Get(KEYS[50]);<a 
name="line.687"></a>
+<span class="sourceLineNo">688</span>    get.addColumn(BYTES_FAMILY, qual3);<a 
name="line.688"></a>
+<span class="sourceLineNo">689</span>    r = table.get(get);<a 
name="line.689"></a>
+<span class="sourceLineNo">690</span>    validateResult(r, qual3, val3);<a 
name="line.690"></a>
 <span class="sourceLineNo">691</span><a name="line.691"></a>
-<span class="sourceLineNo">692</span>  private void validateLoadedData(Table 
table) throws IOException {<a name="line.692"></a>
-<span class="sourceLineNo">693</span>    // get the data back and validate 
that it is correct<a name="line.693"></a>
-<span class="sourceLineNo">694</span>    LOG.info("Validating data on " + 
table);<a name="line.694"></a>
-<span class="sourceLineNo">695</span>    List&lt;Get&gt; gets = new 
ArrayList&lt;&gt;();<a name="line.695"></a>
-<span class="sourceLineNo">696</span>    for (byte[] k : KEYS) {<a 
name="line.696"></a>
-<span class="sourceLineNo">697</span>      Get get = new Get(k);<a 
name="line.697"></a>
-<span class="sourceLineNo">698</span>      get.addColumn(BYTES_FAMILY, 
QUALIFIER);<a name="line.698"></a>
-<span class="sourceLineNo">699</span>      gets.add(get);<a 
name="line.699"></a>
-<span class="sourceLineNo">700</span>    }<a name="line.700"></a>
-<span class="sourceLineNo">701</span>    int retryNum = 10;<a 
name="line.701"></a>
-<span class="sourceLineNo">702</span>    Result[] results = null;<a 
name="line.702"></a>
-<span class="sourceLineNo">703</span>    do  {<a name="line.703"></a>
-<span class="sourceLineNo">704</span>      results = table.get(gets);<a 
name="line.704"></a>
-<span class="sourceLineNo">705</span>      boolean finished = true;<a 
name="line.705"></a>
-<span class="sourceLineNo">706</span>      for (Result result : results) {<a 
name="line.706"></a>
-<span class="sourceLineNo">707</span>        if (result.isEmpty()) {<a 
name="line.707"></a>
-<span class="sourceLineNo">708</span>          finished = false;<a 
name="line.708"></a>
-<span class="sourceLineNo">709</span>          break;<a name="line.709"></a>
-<span class="sourceLineNo">710</span>        }<a name="line.710"></a>
-<span class="sourceLineNo">711</span>      }<a name="line.711"></a>
-<span class="sourceLineNo">712</span>      if (finished) {<a 
name="line.712"></a>
-<span class="sourceLineNo">713</span>        break;<a name="line.713"></a>
-<span class="sourceLineNo">714</span>      }<a name="line.714"></a>
-<span class="sourceLineNo">715</span>      try {<a name="line.715"></a>
-<span class="sourceLineNo">716</span>        Thread.sleep(10);<a 
name="line.716"></a>
-<span class="sourceLineNo">717</span>      } catch (InterruptedException e) 
{<a name="line.717"></a>
-<span class="sourceLineNo">718</span>      }<a name="line.718"></a>
-<span class="sourceLineNo">719</span>      retryNum--;<a name="line.719"></a>
-<span class="sourceLineNo">720</span>    } while (retryNum &gt; 0);<a 
name="line.720"></a>
-<span class="sourceLineNo">721</span><a name="line.721"></a>
-<span class="sourceLineNo">722</span>    if (retryNum == 0) {<a 
name="line.722"></a>
-<span class="sourceLineNo">723</span>      fail("Timeout for validate 
data");<a name="line.723"></a>
-<span class="sourceLineNo">724</span>    } else {<a name="line.724"></a>
-<span class="sourceLineNo">725</span>      if (results != null) {<a 
name="line.725"></a>
-<span class="sourceLineNo">726</span>        for (Result r : results) {<a 
name="line.726"></a>
-<span class="sourceLineNo">727</span>          
Assert.assertTrue(r.containsColumn(BYTES_FAMILY, QUALIFIER));<a 
name="line.727"></a>
-<span class="sourceLineNo">728</span>          Assert.assertEquals(0, 
Bytes.compareTo(VALUE, r<a name="line.728"></a>
-<span class="sourceLineNo">729</span>            .getValue(BYTES_FAMILY, 
QUALIFIER)));<a name="line.729"></a>
-<span class="sourceLineNo">730</span>        }<a name="line.730"></a>
-<span class="sourceLineNo">731</span>        LOG.info("Validating data on " + 
table + " successfully!");<a name="line.731"></a>
-<span class="sourceLineNo">732</span>      }<a name="line.732"></a>
-<span class="sourceLineNo">733</span>    }<a name="line.733"></a>
-<span class="sourceLineNo">734</span>  }<a name="line.734"></a>
-<span class="sourceLineNo">735</span><a name="line.735"></a>
-<span class="sourceLineNo">736</span>  private void validateEmpty(Object r1) 
{<a name="line.736"></a>
-<span class="sourceLineNo">737</span>    Result result = (Result)r1;<a 
name="line.737"></a>
-<span class="sourceLineNo">738</span>    Assert.assertTrue(result != null);<a 
name="line.738"></a>
-<span class="sourceLineNo">739</span>    Assert.assertTrue(result.getRow() == 
null);<a name="line.739"></a>
-<span class="sourceLineNo">740</span>    Assert.assertEquals(0, 
result.rawCells().length);<a name="line.740"></a>
-<span class="sourceLineNo">741</span>  }<a name="line.741"></a>
-<span class="sourceLineNo">742</span><a name="line.742"></a>
-<span class="sourceLineNo">743</span>  private void 
validateSizeAndEmpty(Object[] results, int expectedSize) {<a 
name="line.743"></a>
-<span class="sourceLineNo">744</span>    // Validate got back the same number 
of Result objects, all empty<a name="line.744"></a>
-<span class="sourceLineNo">745</span>    Assert.assertEquals(expectedSize, 
results.length);<a name="line.745"></a>
-<span class="sourceLineNo">746</span>    for (Object result : results) {<a 
name="line.746"></a>
-<span class="sourceLineNo">747</span>      validateEmpty(result);<a 
name="line.747"></a>
-<span class="sourceLineNo">748</span>    }<a name="line.748"></a>
-<span class="sourceLineNo">749</span>  }<a name="line.749"></a>
-<span class="sourceLineNo">750</span>}<a name="line.750"></a>
+<span class="sourceLineNo">692</span>    table.close();<a name="line.692"></a>
+<span class="sourceLineNo">693</span>  }<a name="line.693"></a>
+<span class="sourceLineNo">694</span><a name="line.694"></a>
+<span class="sourceLineNo">695</span>  // // Helper methods ////<a 
name="line.695"></a>
+<span class="sourceLineNo">696</span><a name="line.696"></a>
+<span class="sourceLineNo">697</span>  private void validateResult(Object r) 
{<a name="line.697"></a>
+<span class="sourceLineNo">698</span>    validateResult(r, QUALIFIER, 
VALUE);<a name="line.698"></a>
+<span class="sourceLineNo">699</span>  }<a name="line.699"></a>
+<span class="sourceLineNo">700</span><a name="line.700"></a>
+<span class="sourceLineNo">701</span>  private void validateResult(Object r1, 
byte[] qual, byte[] val) {<a name="line.701"></a>
+<span class="sourceLineNo">702</span>    Result r = (Result)r1;<a 
name="line.702"></a>
+<span class="sourceLineNo">703</span>    
Assert.assertTrue(r.containsColumn(BYTES_FAMILY, qual));<a name="line.703"></a>
+<span class="sourceLineNo">704</span>    byte[] value = 
r.getValue(BYTES_FAMILY, qual);<a name="line.704"></a>
+<span class="sourceLineNo">705</span>    if (0 != Bytes.compareTo(val, value)) 
{<a name="line.705"></a>
+<span class="sourceLineNo">706</span>      fail("Expected [" + 
Bytes.toStringBinary(val)<a name="line.706"></a>
+<span class="sourceLineNo">707</span>          + "] but got [" + 
Bytes.toStringBinary(value) + "]");<a name="line.707"></a>
+<span class="sourceLineNo">708</span>    }<a name="line.708"></a>
+<span class="sourceLineNo">709</span>  }<a name="line.709"></a>
+<span class="sourceLineNo">710</span><a name="line.710"></a>
+<span class="sourceLineNo">711</span>  private List&lt;Put&gt; 
constructPutRequests() {<a name="line.711"></a>
+<span class="sourceLineNo">712</span>    List&lt;Put&gt; puts = new 
ArrayList&lt;&gt;();<a name="line.712"></a>
+<span class="sourceLineNo">713</span>    for (byte[] k : KEYS) {<a 
name="line.713"></a>
+<span class="sourceLineNo">714</span>      Put put = new Put(k);<a 
name="line.714"></a>
+<span class="sourceLineNo">715</span>      put.addColumn(BYTES_FAMILY, 
QUALIFIER, VALUE);<a name="line.715"></a>
+<span class="sourceLineNo">716</span>      puts.add(put);<a 
name="line.716"></a>
+<span class="sourceLineNo">717</span>    }<a name="line.717"></a>
+<span class="sourceLineNo">718</span>    return puts;<a name="line.718"></a>
+<span class="sourceLineNo">719</span>  }<a name="line.719"></a>
+<span class="sourceLineNo">720</span><a name="line.720"></a>
+<span class="sourceLineNo">721</span>  private void validateLoadedData(Table 
table) throws IOException {<a name="line.721"></a>
+<span class="sourceLineNo">722</span>    // get the data back and validate 
that it is correct<a name="line.722"></a>
+<span class="sourceLineNo">723</span>    LOG.info("Validating data on " + 
table);<a name="line.723"></a>
+<span class="sourceLineNo">724</span>    List&lt;Get&gt; gets = new 
ArrayList&lt;&gt;();<a name="line.724"></a>
+<span class="sourceLineNo">725</span>    for (byte[] k : KEYS) {<a 
name="line.725"></a>
+<span class="sourceLineNo">726</span>      Get get = new Get(k);<a 
name="line.726"></a>
+<span class="sourceLineNo">727</span>      get.addColumn(BYTES_FAMILY, 
QUALIFIER);<a name="line.727"></a>
+<span class="sourceLineNo">728</span>      gets.add(get);<a 
name="line.728"></a>
+<span class="sourceLineNo">729</span>    }<a name="line.729"></a>
+<span class="sourceLineNo">730</span>    int retryNum = 10;<a 
name="line.730"></a>
+<span class="sourceLineNo">731</span>    Result[] results = null;<a 
name="line.731"></a>
+<span class="sourceLineNo">732</span>    do  {<a name="line.732"></a>
+<span class="sourceLineNo">733</span>      results = table.get(gets);<a 
name="line.733"></a>
+<span class="sourceLineNo">734</span>      boolean finished = true;<a 
name="line.734"></a>
+<span class="sourceLineNo">735</span>      for (Result result : results) {<a 
name="line.735"></a>
+<span class="sourceLineNo">736</span>        if (result.isEmpty()) {<a 
name="line.736"></a>
+<span class="sourceLineNo">737</span>          finished = false;<a 
name="line.737"></a>
+<span class="sourceLineNo">738</span>          break;<a name="line.738"></a>
+<span class="sourceLineNo">739</span>        }<a name="line.739"></a>
+<span class="sourceLineNo">740</span>      }<a name="line.740"></a>
+<span class="sourceLineNo">741</span>      if (finished) {<a 
name="line.741"></a>
+<span class="sourceLineNo">742</span>        break;<a name="line.742"></a>
+<span class="sourceLineNo">743</span>      }<a name="line.743"></a>
+<span class="sourceLineNo">744</span>      try {<a name="line.744"></a>
+<span class="sourceLineNo">745</span>        Thread.sleep(10);<a 
name="line.745"></a>
+<span class="sourceLineNo">746</span>      } catch (InterruptedException e) 
{<a name="line.746"></a>
+<span class="sourceLineNo">747</span>      }<a name="line.747"></a>
+<span class="sourceLineNo">748</span>      retryNum--;<a name="line.748"></a>
+<span class="sourceLineNo">749</span>    } while (retryNum &gt; 0);<a 
name="line.749"></a>
+<span class="sourceLineNo">750</span><a name="line.750"></a>
+<span class="sourceLineNo">751</span>    if (retryNum == 0) {<a 
name="line.751"></a>
+<span class="sourceLineNo">752</span>      fail("Timeout for validate 
data");<a name="line.752"></a>
+<span class="sourceLineNo">753</span>    } else {<a name="line.753"></a>
+<span class="sourceLineNo">754</span>      if (results != null) {<a 
name="line.754"></a>
+<span class="sourceLineNo">755</span>        for (Result r : results) {<a 
name="line.755"></a>
+<span class="sourceLineNo">756</span>          
Assert.assertTrue(r.containsColumn(BYTES_FAMILY, QUALIFIER));<a 
name="line.756"></a>
+<span class="sourceLineNo">757</span>          Assert.assertEquals(0, 
Bytes.compareTo(VALUE, r<a name="line.757"></a>
+<span class="sourceLineNo">758</span>            .getValue(BYTES_FAMILY, 
QUALIFIER)));<a name="line.758"></a>
+<span class="sourceLineNo">759</span>        }<a name="line.759"></a>
+<span class="sourceLineNo">760</span>        LOG.info("Validating data on " + 
table + " successfully!");<a name="line.760"></a>
+<span class="sourceLineNo">761</span>      }<a name="line.761"></a>
+<span class="sourceLineNo">762</span>    }<a name="line.762"></a>
+<span class="sourceLineNo">763</span>  }<a name="line.763"></a>
+<span class="sourceLineNo">764</span><a name="line.764"></a>
+<span class="sourceLineNo">765</span>  private void validateEmpty(Object r1) 
{<a name="line.765"></a>
+<span class="sourceLineNo">766</span>    Result result = (Result)r1;<a 
name="line.766"></a>
+<span class="sourceLineNo">767</span>    Assert.assertTrue(result != null);<a 
name="line.767"></a>
+<span class="sourceLineNo">768</span>    
Assert.assertTrue(result.isEmpty());<a name="line.768"></a>
+<span class="sourceLineNo">769</span>  }<a name="line.769"></a>
+<span class="sourceLineNo">770</span><a name="line.770"></a>
+<span class="sourceLineNo">771</span>  private void 
validateSizeAndEmpty(Object[] results, int expectedSize) {<a 
name="line.771"></a>
+<span class="sourceLineNo">772</span>    // Validate got back the same number 
of Result objects, all empty<a name="line.772"></a>
+<span class="sourceLineNo">773</span>    Assert.assertEquals(expectedSize, 
results.length);<a name="line.773"></a>
+<span class="sourceLineNo">774</span>    for (Object result : results) {<a 
name="line.774"></a>
+<span class="sourceLineNo">775</span>      validateEmpty(result);<a 
name="line.775"></a>
+<span class="sourceLineNo">776</span>    }<a name="line.776"></a>
+<span class="sourceLineNo">777</span>  }<a name="line.777"></a>
+<span class="sourceLineNo">778</span>}<a name="line.778"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/07e68d46/testdevapidocs/src-html/org/apache/hadoop/hbase/codec/keyvalue/TestKeyValueTool.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/codec/keyvalue/TestKeyValueTool.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/codec/keyvalue/TestKeyValueTool.html
index 24b8f5f..6633752 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/codec/keyvalue/TestKeyValueTool.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/codec/keyvalue/TestKeyValueTool.html
@@ -39,32 +39,32 @@
 <span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.codec.prefixtree.row.data.TestRowDataRandomKeyValuesWithTags;<a
 name="line.31"></a>
 <span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.codec.prefixtree.row.data.TestRowDataTrivialWithTags;<a 
name="line.32"></a>
 <span class="sourceLineNo">033</span>import org.junit.Assert;<a 
name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.junit.Test;<a 
name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.junit.experimental.categories.Category;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.junit.runner.RunWith;<a 
name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.junit.runners.Parameterized;<a 
name="line.37"></a>
-<span class="sourceLineNo">038</span>import 
org.junit.runners.Parameterized.Parameters;<a name="line.38"></a>
-<span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span>@Category({MiscTests.class, 
SmallTests.class})<a name="line.40"></a>
-<span class="sourceLineNo">041</span>@RunWith(Parameterized.class)<a 
name="line.41"></a>
-<span class="sourceLineNo">042</span>public class TestKeyValueTool {<a 
name="line.42"></a>
-<span class="sourceLineNo">043</span><a name="line.43"></a>
-<span class="sourceLineNo">044</span>  @Parameters<a name="line.44"></a>
-<span class="sourceLineNo">045</span>  public static 
Collection&lt;Object[]&gt; parameters() {<a name="line.45"></a>
-<span class="sourceLineNo">046</span>    return 
TestRowData.InMemory.getAllAsObjectArray();<a name="line.46"></a>
-<span class="sourceLineNo">047</span>  }<a name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span>  private TestRowData rows;<a 
name="line.49"></a>
-<span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span>  public TestKeyValueTool(TestRowData 
testRows) {<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    this.rows = testRows;<a 
name="line.52"></a>
-<span class="sourceLineNo">053</span>  }<a name="line.53"></a>
+<span class="sourceLineNo">034</span>import org.junit.Assume;<a 
name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.junit.Test;<a 
name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.junit.experimental.categories.Category;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.junit.runner.RunWith;<a 
name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.junit.runners.Parameterized;<a 
name="line.38"></a>
+<span class="sourceLineNo">039</span>import 
org.junit.runners.Parameterized.Parameters;<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span>import static 
org.junit.Assume.assumeFalse;<a name="line.41"></a>
+<span class="sourceLineNo">042</span><a name="line.42"></a>
+<span class="sourceLineNo">043</span>@Category({MiscTests.class, 
SmallTests.class})<a name="line.43"></a>
+<span class="sourceLineNo">044</span>@RunWith(Parameterized.class)<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span>public class TestKeyValueTool {<a 
name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span>  @Parameters<a name="line.47"></a>
+<span class="sourceLineNo">048</span>  public static 
Collection&lt;Object[]&gt; parameters() {<a name="line.48"></a>
+<span class="sourceLineNo">049</span>    return 
TestRowData.InMemory.getAllAsObjectArray();<a name="line.49"></a>
+<span class="sourceLineNo">050</span>  }<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span>  @Parameterized.Parameter<a 
name="line.52"></a>
+<span class="sourceLineNo">053</span>  public TestRowData rows;<a 
name="line.53"></a>
 <span class="sourceLineNo">054</span><a name="line.54"></a>
 <span class="sourceLineNo">055</span>  @Test<a name="line.55"></a>
 <span class="sourceLineNo">056</span>  public void testRoundTripToBytes() {<a 
name="line.56"></a>
-<span class="sourceLineNo">057</span>    if(rows instanceof 
TestRowDataTrivialWithTags || rows instanceof 
TestRowDataRandomKeyValuesWithTags) {<a name="line.57"></a>
-<span class="sourceLineNo">058</span>      return;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    }<a name="line.59"></a>
+<span class="sourceLineNo">057</span>    assumeFalse(rows instanceof 
TestRowDataTrivialWithTags);<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    assumeFalse(rows instanceof 
TestRowDataRandomKeyValuesWithTags);<a name="line.58"></a>
+<span class="sourceLineNo">059</span><a name="line.59"></a>
 <span class="sourceLineNo">060</span>    List&lt;KeyValue&gt; kvs = 
rows.getInputs();<a name="line.60"></a>
 <span class="sourceLineNo">061</span>    ByteBuffer bb = 
KeyValueTestUtil.toByteBufferAndRewind(kvs, false);<a name="line.61"></a>
 <span class="sourceLineNo">062</span>    List&lt;KeyValue&gt; roundTrippedKvs 
= KeyValueTestUtil.rewindThenToList(bb, false, false);<a name="line.62"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/07e68d46/testdevapidocs/src-html/org/apache/hadoop/hbase/codec/prefixtree/row/TestRowEncoder.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/codec/prefixtree/row/TestRowEncoder.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/codec/prefixtree/row/TestRowEncoder.html
index 7be8682..8c3fa8f 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/codec/prefixtree/row/TestRowEncoder.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/codec/prefixtree/row/TestRowEncoder.html
@@ -63,147 +63,143 @@
 <span class="sourceLineNo">055</span><a name="line.55"></a>
 <span class="sourceLineNo">056</span>  @Parameters<a name="line.56"></a>
 <span class="sourceLineNo">057</span>  public static 
Collection&lt;Object[]&gt; parameters() {<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    List&lt;Object[]&gt; parameters = 
Lists.newArrayList();<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    for (TestRowData testRows : 
TestRowData.InMemory.getAll()) {<a name="line.59"></a>
-<span class="sourceLineNo">060</span>      parameters.add(new Object[] { 
testRows });<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    }<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    return parameters;<a 
name="line.62"></a>
-<span class="sourceLineNo">063</span>  }<a name="line.63"></a>
-<span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span>  protected TestRowData rows;<a 
name="line.65"></a>
-<span class="sourceLineNo">066</span>  protected List&lt;KeyValue&gt; 
inputKvs;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>  protected boolean includeMemstoreTS = 
true;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>  protected ByteArrayOutputStream os;<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span>  protected PrefixTreeEncoder encoder;<a 
name="line.69"></a>
-<span class="sourceLineNo">070</span>  protected int totalBytes;<a 
name="line.70"></a>
-<span class="sourceLineNo">071</span>  protected PrefixTreeBlockMeta 
blockMetaWriter;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>  protected byte[] outputBytes;<a 
name="line.72"></a>
-<span class="sourceLineNo">073</span>  protected ByteBuff buffer;<a 
name="line.73"></a>
-<span class="sourceLineNo">074</span>  protected ByteArrayInputStream is;<a 
name="line.74"></a>
-<span class="sourceLineNo">075</span>  protected PrefixTreeBlockMeta 
blockMetaReader;<a name="line.75"></a>
-<span class="sourceLineNo">076</span>  protected byte[] inputBytes;<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span>  protected PrefixTreeArraySearcher 
searcher;<a name="line.77"></a>
+<span class="sourceLineNo">058</span>    return 
TestRowData.InMemory.getAllAsObjectArray();<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  }<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span>  protected TestRowData rows;<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>  protected List&lt;KeyValue&gt; 
inputKvs;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>  protected boolean includeMemstoreTS = 
true;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>  protected ByteArrayOutputStream os;<a 
name="line.64"></a>
+<span class="sourceLineNo">065</span>  protected PrefixTreeEncoder encoder;<a 
name="line.65"></a>
+<span class="sourceLineNo">066</span>  protected int totalBytes;<a 
name="line.66"></a>
+<span class="sourceLineNo">067</span>  protected PrefixTreeBlockMeta 
blockMetaWriter;<a name="line.67"></a>
+<span class="sourceLineNo">068</span>  protected byte[] outputBytes;<a 
name="line.68"></a>
+<span class="sourceLineNo">069</span>  protected ByteBuff buffer;<a 
name="line.69"></a>
+<span class="sourceLineNo">070</span>  protected ByteArrayInputStream is;<a 
name="line.70"></a>
+<span class="sourceLineNo">071</span>  protected PrefixTreeBlockMeta 
blockMetaReader;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>  protected byte[] inputBytes;<a 
name="line.72"></a>
+<span class="sourceLineNo">073</span>  protected PrefixTreeArraySearcher 
searcher;<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>  public TestRowEncoder(TestRowData 
testRows) {<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    this.rows = testRows;<a 
name="line.76"></a>
+<span class="sourceLineNo">077</span>  }<a name="line.77"></a>
 <span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span>  public TestRowEncoder(TestRowData 
testRows) {<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    this.rows = testRows;<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span>  }<a name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span>  @Before<a name="line.83"></a>
-<span class="sourceLineNo">084</span>  public void compile() throws 
IOException {<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    // Always run with tags. But should 
also ensure that KVs without tags work fine<a name="line.85"></a>
-<span class="sourceLineNo">086</span>    os = new ByteArrayOutputStream(1 
&lt;&lt; 20);<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    encoder = new PrefixTreeEncoder(os, 
includeMemstoreTS);<a name="line.87"></a>
-<span class="sourceLineNo">088</span><a name="line.88"></a>
-<span class="sourceLineNo">089</span>    inputKvs = rows.getInputs();<a 
name="line.89"></a>
-<span class="sourceLineNo">090</span>    for (KeyValue kv : inputKvs) {<a 
name="line.90"></a>
-<span class="sourceLineNo">091</span>      encoder.write(kv);<a 
name="line.91"></a>
-<span class="sourceLineNo">092</span>    }<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    encoder.flush();<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    totalBytes = 
encoder.getTotalBytes();<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    blockMetaWriter = 
encoder.getBlockMeta();<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    outputBytes = os.toByteArray();<a 
name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>    // start reading, but save the 
assertions for @Test methods<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    ByteBuffer out = 
ByteBuffer.allocateDirect(outputBytes.length);<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    
ByteBufferUtils.copyFromArrayToBuffer(out, outputBytes, 0, 
outputBytes.length);<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    out.position(0);<a 
name="line.101"></a>
-<span class="sourceLineNo">102</span>    buffer = new SingleByteBuff(out);<a 
name="line.102"></a>
-<span class="sourceLineNo">103</span>    blockMetaReader = new 
PrefixTreeBlockMeta(buffer);<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span>    searcher = new 
PrefixTreeArraySearcher(blockMetaReader, blockMetaReader.getRowTreeDepth(),<a 
name="line.105"></a>
-<span class="sourceLineNo">106</span>        
blockMetaReader.getMaxRowLength(), blockMetaReader.getMaxQualifierLength(),<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>        
blockMetaReader.getMaxTagsLength());<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    searcher.initOnBlock(blockMetaReader, 
buffer, includeMemstoreTS);<a name="line.108"></a>
-<span class="sourceLineNo">109</span>  }<a name="line.109"></a>
-<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span>  @Test<a name="line.111"></a>
-<span class="sourceLineNo">112</span>  public void testEncoderOutput() throws 
IOException {<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    Assert.assertEquals(totalBytes, 
outputBytes.length);<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    Assert.assertEquals(blockMetaWriter, 
blockMetaReader);<a name="line.114"></a>
-<span class="sourceLineNo">115</span>  }<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>  @Test<a name="line.117"></a>
-<span class="sourceLineNo">118</span>  public void testForwardScanner() {<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>    int counter = -1;<a 
name="line.119"></a>
-<span class="sourceLineNo">120</span>    while (searcher.advance()) {<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span>      ++counter;<a name="line.121"></a>
-<span class="sourceLineNo">122</span>      KeyValue inputKv = 
rows.getInputs().get(counter);<a name="line.122"></a>
-<span class="sourceLineNo">123</span>      KeyValue outputKv = 
KeyValueUtil.copyToNewKeyValue(searcher.current());<a name="line.123"></a>
-<span class="sourceLineNo">124</span>      assertKeyAndValueEqual(inputKv, 
outputKv);<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    }<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    // assert same number of cells<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>    
Assert.assertEquals(rows.getInputs().size(), counter + 1);<a 
name="line.127"></a>
-<span class="sourceLineNo">128</span>  }<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span>  /**<a name="line.131"></a>
-<span class="sourceLineNo">132</span>   * probably not needed since 
testReverseScannerWithJitter() below is more thorough<a name="line.132"></a>
-<span class="sourceLineNo">133</span>   */<a name="line.133"></a>
-<span class="sourceLineNo">134</span>  @Test<a name="line.134"></a>
-<span class="sourceLineNo">135</span>  public void testReverseScanner() {<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span>    searcher.positionAfterLastCell();<a 
name="line.136"></a>
-<span class="sourceLineNo">137</span>    int counter = -1;<a 
name="line.137"></a>
-<span class="sourceLineNo">138</span>    while (searcher.previous()) {<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>      ++counter;<a name="line.139"></a>
-<span class="sourceLineNo">140</span>      int oppositeIndex = 
rows.getInputs().size() - counter - 1;<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      KeyValue inputKv = 
rows.getInputs().get(oppositeIndex);<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      KeyValue outputKv = 
KeyValueUtil.copyToNewKeyValue(searcher.current());<a name="line.142"></a>
-<span class="sourceLineNo">143</span>      assertKeyAndValueEqual(inputKv, 
outputKv);<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    }<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    
Assert.assertEquals(rows.getInputs().size(), counter + 1);<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span>  }<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span>  /**<a name="line.149"></a>
-<span class="sourceLineNo">150</span>   * Exercise the nubCellsRemain variable 
by calling next+previous.  NubCellsRemain is basically<a name="line.150"></a>
-<span class="sourceLineNo">151</span>   * a special fan index.<a 
name="line.151"></a>
-<span class="sourceLineNo">152</span>   */<a name="line.152"></a>
-<span class="sourceLineNo">153</span>  @Test<a name="line.153"></a>
-<span class="sourceLineNo">154</span>  public void 
testReverseScannerWithJitter() {<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    searcher.positionAfterLastCell();<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>    int counter = -1;<a 
name="line.156"></a>
-<span class="sourceLineNo">157</span>    while (true) {<a name="line.157"></a>
-<span class="sourceLineNo">158</span>      boolean foundCell = 
searcher.previous();<a name="line.158"></a>
-<span class="sourceLineNo">159</span>      if (!foundCell) {<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>        break;<a name="line.160"></a>
-<span class="sourceLineNo">161</span>      }<a name="line.161"></a>
-<span class="sourceLineNo">162</span>      ++counter;<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>      // a next+previous should cancel 
out<a name="line.164"></a>
-<span class="sourceLineNo">165</span>      if (!searcher.isAfterLast()) {<a 
name="line.165"></a>
-<span class="sourceLineNo">166</span>        searcher.advance();<a 
name="line.166"></a>
-<span class="sourceLineNo">167</span>        searcher.previous();<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span>      }<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span>      int oppositeIndex = 
rows.getInputs().size() - counter - 1;<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      KeyValue inputKv = 
rows.getInputs().get(oppositeIndex);<a name="line.171"></a>
-<span class="sourceLineNo">172</span>      KeyValue outputKv = 
KeyValueUtil.copyToNewKeyValue(searcher.current());<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      assertKeyAndValueEqual(inputKv, 
outputKv);<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    }<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    
Assert.assertEquals(rows.getInputs().size(), counter + 1);<a 
name="line.175"></a>
-<span class="sourceLineNo">176</span>  }<a name="line.176"></a>
-<span class="sourceLineNo">177</span><a name="line.177"></a>
-<span class="sourceLineNo">178</span>  @Test<a name="line.178"></a>
-<span class="sourceLineNo">179</span>  public void 
testIndividualBlockMetaAssertions() {<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    
rows.individualBlockMetaAssertions(blockMetaReader);<a name="line.180"></a>
-<span class="sourceLineNo">181</span>  }<a name="line.181"></a>
-<span class="sourceLineNo">182</span><a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span>  /**************** helper 
**************************/<a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span>  protected void 
assertKeyAndValueEqual(Cell expected, Cell actual) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    // assert keys are equal (doesn't 
compare values)<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    Assert.assertEquals(expected, 
actual);<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    if (includeMemstoreTS) {<a 
name="line.189"></a>
-<span class="sourceLineNo">190</span>      
Assert.assertEquals(expected.getSequenceId(), actual.getSequenceId());<a 
name="line.190"></a>
-<span class="sourceLineNo">191</span>    }<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    // assert values equal<a 
name="line.192"></a>
-<span class="sourceLineNo">193</span>    
Assert.assertTrue(Bytes.equals(expected.getValueArray(), 
expected.getValueOffset(),<a name="line.193"></a>
-<span class="sourceLineNo">194</span>      expected.getValueLength(), 
actual.getValueArray(), actual.getValueOffset(),<a name="line.194"></a>
-<span class="sourceLineNo">195</span>      actual.getValueLength()));<a 
name="line.195"></a>
-<span class="sourceLineNo">196</span>  }<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span>}<a name="line.198"></a>
+<span class="sourceLineNo">079</span>  @Before<a name="line.79"></a>
+<span class="sourceLineNo">080</span>  public void compile() throws 
IOException {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    // Always run with tags. But should 
also ensure that KVs without tags work fine<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    os = new ByteArrayOutputStream(1 
&lt;&lt; 20);<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    encoder = new PrefixTreeEncoder(os, 
includeMemstoreTS);<a name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span>    inputKvs = rows.getInputs();<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>    for (KeyValue kv : inputKvs) {<a 
name="line.86"></a>
+<span class="sourceLineNo">087</span>      encoder.write(kv);<a 
name="line.87"></a>
+<span class="sourceLineNo">088</span>    }<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    encoder.flush();<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    totalBytes = 
encoder.getTotalBytes();<a name="line.90"></a>
+<span class="sourceLineNo">091</span>    blockMetaWriter = 
encoder.getBlockMeta();<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    outputBytes = os.toByteArray();<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span>    // start reading, but save the 
assertions for @Test methods<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    ByteBuffer out = 
ByteBuffer.allocateDirect(outputBytes.length);<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    
ByteBufferUtils.copyFromArrayToBuffer(out, outputBytes, 0, 
outputBytes.length);<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    out.position(0);<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    buffer = new SingleByteBuff(out);<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>    blockMetaReader = new 
PrefixTreeBlockMeta(buffer);<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span>    searcher = new 
PrefixTreeArraySearcher(blockMetaReader, blockMetaReader.getRowTreeDepth(),<a 
name="line.101"></a>
+<span class="sourceLineNo">102</span>        
blockMetaReader.getMaxRowLength(), blockMetaReader.getMaxQualifierLength(),<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>        
blockMetaReader.getMaxTagsLength());<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    searcher.initOnBlock(blockMetaReader, 
buffer, includeMemstoreTS);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>  }<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span>  @Test<a name="line.107"></a>
+<span class="sourceLineNo">108</span>  public void testEncoderOutput() throws 
IOException {<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    Assert.assertEquals(totalBytes, 
outputBytes.length);<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    Assert.assertEquals(blockMetaWriter, 
blockMetaReader);<a name="line.110"></a>
+<span class="sourceLineNo">111</span>  }<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span>  @Test<a name="line.113"></a>
+<span class="sourceLineNo">114</span>  public void testForwardScanner() {<a 
name="line.114"></a>
+<span class="sourceLineNo">115</span>    int counter = -1;<a 
name="line.115"></a>
+<span class="sourceLineNo">116</span>    while (searcher.advance()) {<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>      ++counter;<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      KeyValue inputKv = 
rows.getInputs().get(counter);<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      KeyValue outputKv = 
KeyValueUtil.copyToNewKeyValue(searcher.current());<a name="line.119"></a>
+<span class="sourceLineNo">120</span>      assertKeyAndValueEqual(inputKv, 
outputKv);<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    }<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    // assert same number of cells<a 
name="line.122"></a>
+<span class="sourceLineNo">123</span>    
Assert.assertEquals(rows.getInputs().size(), counter + 1);<a 
name="line.123"></a>
+<span class="sourceLineNo">124</span>  }<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span>  /**<a name="line.127"></a>
+<span class="sourceLineNo">128</span>   * probably not needed since 
testReverseScannerWithJitter() below is more thorough<a name="line.128"></a>
+<span class="sourceLineNo">129</span>   */<a name="line.129"></a>
+<span class="sourceLineNo">130</span>  @Test<a name="line.130"></a>
+<span class="sourceLineNo">131</span>  public void testReverseScanner() {<a 
name="line.131"></a>
+<span class="sourceLineNo">132</span>    searcher.positionAfterLastCell();<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>    int counter = -1;<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>    while (searcher.previous()) {<a 
name="line.134"></a>
+<span class="sourceLineNo">135</span>      ++counter;<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      int oppositeIndex = 
rows.getInputs().size() - counter - 1;<a name="line.136"></a>
+<span class="sourceLineNo">137</span>      KeyValue inputKv = 
rows.getInputs().get(oppositeIndex);<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      KeyValue outputKv = 
KeyValueUtil.copyToNewKeyValue(searcher.current());<a name="line.138"></a>
+<span class="sourceLineNo">139</span>      assertKeyAndValueEqual(inputKv, 
outputKv);<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    }<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    
Assert.assertEquals(rows.getInputs().size(), counter + 1);<a 
name="line.141"></a>
+<span class="sourceLineNo">142</span>  }<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span>  /**<a name="line.145"></a>
+<span class="sourceLineNo">146</span>   * Exercise the nubCellsRemain variable 
by calling next+previous.  NubCellsRemain is basically<a name="line.146"></a>
+<span class="sourceLineNo">147</span>   * a special fan index.<a 
name="line.147"></a>
+<span class="sourceLineNo">148</span>   */<a name="line.148"></a>
+<span class="sourceLineNo">149</span>  @Test<a name="line.149"></a>
+<span class="sourceLineNo">150</span>  public void 
testReverseScannerWithJitter() {<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    searcher.positionAfterLastCell();<a 
name="line.151"></a>
+<span class="sourceLineNo">152</span>    int counter = -1;<a 
name="line.152"></a>
+<span class="sourceLineNo">153</span>    while (true) {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>      boolean foundCell = 
searcher.previous();<a name="line.154"></a>
+<span class="sourceLineNo">155</span>      if (!foundCell) {<a 
name="line.155"></a>
+<span class="sourceLineNo">156</span>        break;<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      }<a name="line.157"></a>
+<span class="sourceLineNo">158</span>      ++counter;<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span>      // a next+previous should cancel 
out<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      if (!searcher.isAfterLast()) {<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>        searcher.advance();<a 
name="line.162"></a>
+<span class="sourceLineNo">163</span>        searcher.previous();<a 
name="line.163"></a>
+<span class="sourceLineNo">164</span>      }<a name="line.164"></a>
+<span class="sourceLineNo">165</span><a name="line.165"></a>
+<span class="sourceLineNo">166</span>      int oppositeIndex = 
rows.getInputs().size() - counter - 1;<a name="line.166"></a>
+<span class="sourceLineNo">167</span>      KeyValue inputKv = 
rows.getInputs().get(oppositeIndex);<a name="line.167"></a>
+<span class="sourceLineNo">168</span>      KeyValue outputKv = 
KeyValueUtil.copyToNewKeyValue(searcher.current());<a name="line.168"></a>
+<span class="sourceLineNo">169</span>      assertKeyAndValueEqual(inputKv, 
outputKv);<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    }<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    
Assert.assertEquals(rows.getInputs().size(), counter + 1);<a 
name="line.171"></a>
+<span class="sourceLineNo">172</span>  }<a name="line.172"></a>
+<span class="sourceLineNo">173</span><a name="line.173"></a>
+<span class="sourceLineNo">174</span>  @Test<a name="line.174"></a>
+<span class="sourceLineNo">175</span>  public void 
testIndividualBlockMetaAssertions() {<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    
rows.individualBlockMetaAssertions(blockMetaReader);<a name="line.176"></a>
+<span class="sourceLineNo">177</span>  }<a name="line.177"></a>
+<span class="sourceLineNo">178</span><a name="line.178"></a>
+<span class="sourceLineNo">179</span><a name="line.179"></a>
+<span class="sourceLineNo">180</span>  /**************** helper 
**************************/<a name="line.180"></a>
+<span class="sourceLineNo">181</span><a name="line.181"></a>
+<span class="sourceLineNo">182</span>  protected void 
assertKeyAndValueEqual(Cell expected, Cell actual) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    // assert keys are equal (doesn't 
compare values)<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    Assert.assertEquals(expected, 
actual);<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    if (includeMemstoreTS) {<a 
name="line.185"></a>
+<span class="sourceLineNo">186</span>      
Assert.assertEquals(expected.getSequenceId(), actual.getSequenceId());<a 
name="line.186"></a>
+<span class="sourceLineNo">187</span>    }<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    // assert values equal<a 
name="line.188"></a>
+<span class="sourceLineNo">189</span>    
Assert.assertTrue(Bytes.equals(expected.getValueArray(), 
expected.getValueOffset(),<a name="line.189"></a>
+<span class="sourceLineNo">190</span>      expected.getValueLength(), 
actual.getValueArray(), actual.getValueOffset(),<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      actual.getValueLength()));<a 
name="line.191"></a>
+<span class="sourceLineNo">192</span>  }<a name="line.192"></a>
+<span class="sourceLineNo">193</span><a name="line.193"></a>
+<span class="sourceLineNo">194</span>}<a name="line.194"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/07e68d46/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestKeyOnlyFilter.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestKeyOnlyFilter.html 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestKeyOnlyFilter.html
index 2aaa2ed..096c741 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestKeyOnlyFilter.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/filter/TestKeyOnlyFilter.html
@@ -34,105 +34,98 @@
 <span class="sourceLineNo">026</span>import 
org.apache.hadoop.hbase.ByteBufferKeyValue;<a name="line.26"></a>
 <span class="sourceLineNo">027</span><a name="line.27"></a>
 <span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.CellUtil;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.KeyValue;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.KeyValue.Type;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.KeyValueUtil;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.filter.KeyOnlyFilter.KeyOnlyByteBufferCell;<a 
name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.filter.KeyOnlyFilter.KeyOnlyCell;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.testclassification.MiscTests;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.junit.Test;<a 
name="line.37"></a>
-<span class="sourceLineNo">038</span>import 
org.junit.experimental.categories.Category;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.junit.runner.RunWith;<a 
name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.junit.runners.Parameterized;<a 
name="line.40"></a>
-<span class="sourceLineNo">041</span>import 
org.junit.runners.Parameterized.Parameters;<a name="line.41"></a>
-<span class="sourceLineNo">042</span><a name="line.42"></a>
-<span class="sourceLineNo">043</span>@Category({ MiscTests.class, 
SmallTests.class })<a name="line.43"></a>
-<span class="sourceLineNo">044</span>@RunWith(Parameterized.class)<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>public class TestKeyOnlyFilter {<a 
name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span>  private final boolean lenAsVal;<a 
name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span>  @Parameters<a name="line.49"></a>
-<span class="sourceLineNo">050</span>  public static 
Collection&lt;Object[]&gt; parameters() {<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    List&lt;Object[]&gt; paramList = new 
ArrayList&lt;&gt;(2);<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    {<a name="line.52"></a>
-<span class="sourceLineNo">053</span>      paramList.add(new Object[] { false 
});<a name="line.53"></a>
-<span class="sourceLineNo">054</span>      paramList.add(new Object[] { true 
});<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    }<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    return paramList;<a 
name="line.56"></a>
-<span class="sourceLineNo">057</span>  }<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span>  public TestKeyOnlyFilter(boolean 
lenAsVal) {<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    this.lenAsVal = lenAsVal;<a 
name="line.60"></a>
-<span class="sourceLineNo">061</span>  }<a name="line.61"></a>
-<span class="sourceLineNo">062</span><a name="line.62"></a>
-<span class="sourceLineNo">063</span>  @Test<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  public void testKeyOnly() throws 
Exception {<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    byte[] r = Bytes.toBytes("row1");<a 
name="line.65"></a>
-<span class="sourceLineNo">066</span>    byte[] f = Bytes.toBytes("cf1");<a 
name="line.66"></a>
-<span class="sourceLineNo">067</span>    byte[] q = Bytes.toBytes("qual1");<a 
name="line.67"></a>
-<span class="sourceLineNo">068</span>    byte[] v = Bytes.toBytes("val1");<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span>    byte[] tags = 
Bytes.toBytes("tag1");<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    KeyValue kv = new KeyValue(r, f, q, 
0, q.length, 1234L, Type.Put, v, 0,<a name="line.70"></a>
-<span class="sourceLineNo">071</span>        v.length, tags);<a 
name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span>    ByteBuffer buffer = 
ByteBuffer.wrap(kv.getBuffer());<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    ByteBufferKeyValue bbCell = new 
ByteBufferKeyValue(buffer, 0,<a name="line.74"></a>
-<span class="sourceLineNo">075</span>        buffer.remaining());<a 
name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span>    // KV format: 
&lt;keylen:4&gt;&lt;valuelen:4&gt;&lt;key:keylen&gt;&lt;value:valuelen&gt;<a 
name="line.77"></a>
-<span class="sourceLineNo">078</span>    // Rebuild as: 
&lt;keylen:4&gt;&lt;0:4&gt;&lt;key:keylen&gt;<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    int dataLen = lenAsVal ? 
Bytes.SIZEOF_INT : 0;<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    int keyOffset = (2 * 
Bytes.SIZEOF_INT);<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    int keyLen = 
KeyValueUtil.keyLength(kv);<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    byte[] newBuffer = new byte[keyLen + 
keyOffset + dataLen];<a name="line.82"></a>
-<span class="sourceLineNo">083</span>    Bytes.putInt(newBuffer, 0, keyLen);<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span>    Bytes.putInt(newBuffer, 
Bytes.SIZEOF_INT, dataLen);<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    KeyValueUtil.appendKeyTo(kv, 
newBuffer, keyOffset);<a name="line.85"></a>
-<span class="sourceLineNo">086</span>    if (lenAsVal) {<a name="line.86"></a>
-<span class="sourceLineNo">087</span>      Bytes.putInt(newBuffer, 
newBuffer.length - dataLen, kv.getValueLength());<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    }<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    KeyValue KeyOnlyKeyValue = new 
KeyValue(newBuffer);<a name="line.89"></a>
+<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.HBaseCommonTestingUtility;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.KeyValue;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.KeyValue.Type;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.KeyValueUtil;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.filter.KeyOnlyFilter.KeyOnlyByteBufferCell;<a 
name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.filter.KeyOnlyFilter.KeyOnlyCell;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.testclassification.MiscTests;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.junit.Test;<a 
name="line.38"></a>
+<span class="sourceLineNo">039</span>import 
org.junit.experimental.categories.Category;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.junit.runner.RunWith;<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.junit.runners.Parameterized;<a 
name="line.41"></a>
+<span class="sourceLineNo">042</span>import 
org.junit.runners.Parameterized.Parameters;<a name="line.42"></a>
+<span class="sourceLineNo">043</span><a name="line.43"></a>
+<span class="sourceLineNo">044</span>@Category({ MiscTests.class, 
SmallTests.class })<a name="line.44"></a>
+<span class="sourceLineNo">045</span>@RunWith(Parameterized.class)<a 
name="line.45"></a>
+<span class="sourceLineNo">046</span>public class TestKeyOnlyFilter {<a 
name="line.46"></a>
+<span class="sourceLineNo">047</span><a name="line.47"></a>
+<span class="sourceLineNo">048</span>  @Parameterized.Parameter<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>  public boolean lenAsVal;<a 
name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>  @Parameters<a name="line.51"></a>
+<span class="sourceLineNo">052</span>  public static 
Collection&lt;Object[]&gt; parameters() {<a name="line.52"></a>
+<span class="sourceLineNo">053</span>    return 
HBaseCommonTestingUtility.BOOLEAN_PARAMETERIZED;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>  }<a name="line.54"></a>
+<span class="sourceLineNo">055</span><a name="line.55"></a>
+<span class="sourceLineNo">056</span>  @Test<a name="line.56"></a>
+<span class="sourceLineNo">057</span>  public void testKeyOnly() throws 
Exception {<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    byte[] r = Bytes.toBytes("row1");<a 
name="line.58"></a>
+<span class="sourceLineNo">059</span>    byte[] f = Bytes.toBytes("cf1");<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>    byte[] q = Bytes.toBytes("qual1");<a 
name="line.60"></a>
+<span class="sourceLineNo">061</span>    byte[] v = Bytes.toBytes("val1");<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>    byte[] tags = 
Bytes.toBytes("tag1");<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    KeyValue kv = new KeyValue(r, f, q, 
0, q.length, 1234L, Type.Put, v, 0,<a name="line.63"></a>
+<span class="sourceLineNo">064</span>        v.length, tags);<a 
name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span>    ByteBuffer buffer = 
ByteBuffer.wrap(kv.getBuffer());<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    ByteBufferKeyValue bbCell = new 
ByteBufferKeyValue(buffer, 0,<a name="line.67"></a>
+<span class="sourceLineNo">068</span>        buffer.remaining());<a 
name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span>    // KV format: 
&lt;keylen:4&gt;&lt;valuelen:4&gt;&lt;key:keylen&gt;&lt;value:valuelen&gt;<a 
name="line.70"></a>
+<span class="sourceLineNo">071</span>    // Rebuild as: 
&lt;keylen:4&gt;&lt;0:4&gt;&lt;key:keylen&gt;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    int dataLen = lenAsVal ? 
Bytes.SIZEOF_INT : 0;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    int keyOffset = (2 * 
Bytes.SIZEOF_INT);<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    int keyLen = 
KeyValueUtil.keyLength(kv);<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    byte[] newBuffer = new byte[keyLen + 
keyOffset + dataLen];<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    Bytes.putInt(newBuffer, 0, keyLen);<a 
name="line.76"></a>
+<span class="sourceLineNo">077</span>    Bytes.putInt(newBuffer, 
Bytes.SIZEOF_INT, dataLen);<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    KeyValueUtil.appendKeyTo(kv, 
newBuffer, keyOffset);<a name="line.78"></a>
+<span class="sourceLineNo">079</span>    if (lenAsVal) {<a name="line.79"></a>
+<span class="sourceLineNo">080</span>      Bytes.putInt(newBuffer, 
newBuffer.length - dataLen, kv.getValueLength());<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    }<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    KeyValue KeyOnlyKeyValue = new 
KeyValue(newBuffer);<a name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span>    KeyOnlyCell keyOnlyCell = new 
KeyOnlyCell(kv, lenAsVal);<a name="line.84"></a>
+<span class="sourceLineNo">085</span>    KeyOnlyByteBufferCell 
keyOnlyByteBufferedCell = new KeyOnlyByteBufferCell(<a name="line.85"></a>
+<span class="sourceLineNo">086</span>        bbCell, lenAsVal);<a 
name="line.86"></a>
+<span class="sourceLineNo">087</span><a name="line.87"></a>
+<span class="sourceLineNo">088</span>    
assertTrue(CellUtil.matchingRows(KeyOnlyKeyValue, keyOnlyCell));<a 
name="line.88"></a>
+<span class="sourceLineNo">089</span>    
assertTrue(CellUtil.matchingRows(KeyOnlyKeyValue, keyOnlyByteBufferedCell));<a 
name="line.89"></a>
 <span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span>    KeyOnlyCell keyOnlyCell = new 
KeyOnlyCell(kv, lenAsVal);<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    KeyOnlyByteBufferCell 
keyOnlyByteBufferedCell = new KeyOnlyByteBufferCell(<a name="line.92"></a>
-<span class="sourceLineNo">093</span>        bbCell, lenAsVal);<a 
name="line.93"></a>
+<span class="sourceLineNo">091</span>    
assertTrue(CellUtil.matchingFamily(KeyOnlyKeyValue, keyOnlyCell));<a 
name="line.91"></a>
+<span class="sourceLineNo">092</span>    assertTrue(CellUtil<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>        .matchingFamily(KeyOnlyKeyValue, 
keyOnlyByteBufferedCell));<a name="line.93"></a>
 <span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span>    
assertTrue(CellUtil.matchingRows(KeyOnlyKeyValue, keyOnlyCell));<a 
name="line.95"></a>
-<span class="sourceLineNo">096</span>    
assertTrue(CellUtil.matchingRows(KeyOnlyKeyValue, keyOnlyByteBufferedCell));<a 
name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>    
assertTrue(CellUtil.matchingFamily(KeyOnlyKeyValue, keyOnlyCell));<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>    assertTrue(CellUtil<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>        .matchingFamily(KeyOnlyKeyValue, 
keyOnlyByteBufferedCell));<a name="line.100"></a>
-<span class="sourceLineNo">101</span><a name="line.101"></a>
-<span class="sourceLineNo">102</span>    
assertTrue(CellUtil.matchingQualifier(KeyOnlyKeyValue, keyOnlyCell));<a 
name="line.102"></a>
-<span class="sourceLineNo">103</span>    
assertTrue(CellUtil.matchingQualifier(KeyOnlyKeyValue,<a name="line.103"></a>
-<span class="sourceLineNo">104</span>        keyOnlyByteBufferedCell));<a 
name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span>    
assertTrue(CellUtil.matchingValue(KeyOnlyKeyValue, keyOnlyCell));<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>    
assertTrue(KeyOnlyKeyValue.getValueLength() == keyOnlyByteBufferedCell<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>        .getValueLength());<a 
name="line.108"></a>
-<span class="sourceLineNo">109</span>    if 
(keyOnlyByteBufferedCell.getValueLength() &gt; 0) {<a name="line.109"></a>
-<span class="sourceLineNo">110</span>      
assertTrue(CellUtil.matchingValue(KeyOnlyKeyValue,<a name="line.110"></a>
-<span class="sourceLineNo">111</span>          keyOnlyByteBufferedCell));<a 
name="line.111"></a>
-<span class="sourceLineNo">112</span>    }<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span>    
assertTrue(KeyOnlyKeyValue.getTimestamp() == keyOnlyCell.getTimestamp());<a 
name="line.114"></a>
-<span class="sourceLineNo">115</span>    
assertTrue(KeyOnlyKeyValue.getTimestamp() == keyOnlyByteBufferedCell<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>        .getTimestamp());<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span>    
assertTrue(KeyOnlyKeyValue.getTypeByte() == keyOnlyCell.getTypeByte());<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>    
assertTrue(KeyOnlyKeyValue.getTypeByte() == keyOnlyByteBufferedCell<a 
name="line.119"></a>
-<span class="sourceLineNo">120</span>        .getTypeByte());<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span><a name="line.121"></a>
-<span class="sourceLineNo">122</span>    
assertTrue(KeyOnlyKeyValue.getTagsLength() == keyOnlyCell.getTagsLength());<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>    
assertTrue(KeyOnlyKeyValue.getTagsLength() == keyOnlyByteBufferedCell<a 
name="line.123"></a>
-<span class="sourceLineNo">124</span>        .getTagsLength());<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span>  }<a name="line.125"></a>
-<span class="sourceLineNo">126</span><a name="line.126"></a>
-<span class="sourceLineNo">127</span>}<a name="line.127"></a>
+<span class="sourceLineNo">095</span>    
assertTrue(CellUtil.matchingQualifier(KeyOnlyKeyValue, keyOnlyCell));<a 
name="line.95"></a>
+<span class="sourceLineNo">096</span>    
assertTrue(CellUtil.matchingQualifier(KeyOnlyKeyValue,<a name="line.96"></a>
+<span class="sourceLineNo">097</span>        keyOnlyByteBufferedCell));<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span>    
assertTrue(CellUtil.matchingValue(KeyOnlyKeyValue, keyOnlyCell));<a 
name="line.99"></a>
+<span class="sourceLineNo">100</span>    
assertTrue(KeyOnlyKeyValue.getValueLength() == keyOnlyByteBufferedCell<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>        .getValueLength());<a 
name="line.101"></a>
+<span class="sourceLineNo">102</span>    if 
(keyOnlyByteBufferedCell.getValueLength() &gt; 0) {<a name="line.102"></a>
+<span class="sourceLineNo">103</span>      
assertTrue(CellUtil.matchingValue(KeyOnlyKeyValue,<a name="line.103"></a>
+<span class="sourceLineNo">104</span>          keyOnlyByteBufferedCell));<a 
name="line.104"></a>
+<span class="sourceLineNo">105</span>    }<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span>    
assertTrue(KeyOnlyKeyValue.getTimestamp() == keyOnlyCell.getTimestamp());<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>    
assertTrue(KeyOnlyKeyValue.getTimestamp() == keyOnlyByteBufferedCell<a 
name="line.108"></a>
+<span class="sourceLineNo">109</span>        .getTimestamp());<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span>    
assertTrue(KeyOnlyKeyValue.getTypeByte() == keyOnlyCell.getTypeByte());<a 
name="line.111"></a>
+<span class="sourceLineNo">112</span>    
assertTrue(KeyOnlyKeyValue.getTypeByte() == keyOnlyByteBufferedCell<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>        .getTypeByte());<a 
name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span>    
assertTrue(KeyOnlyKeyValue.getTagsLength() == keyOnlyCell.getTagsLength());<a 
name="line.115"></a>
+<span class="sourceLineNo">116</span>    
assertTrue(KeyOnlyKeyValue.getTagsLength() == keyOnlyByteBufferedCell<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>        .getTagsLength());<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>  }<a name="line.118"></a>
+<span class="sourceLineNo">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span>}<a name="line.120"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/07e68d46/testdevapidocs/src-html/org/apache/hadoop/hbase/io/encoding/TestSeekToBlockWithEncoders.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/io/encoding/TestSeekToBlockWithEncoders.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/io/encoding/TestSeekToBlockWithEncoders.html
index 6d5717d..2ebef81 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/io/encoding/TestSeekToBlockWithEncoders.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/io/encoding/TestSeekToBlockWithEncoders.html
@@ -35,7 +35,7 @@
 <span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.Cell;<a 
name="line.27"></a>
 <span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.CellComparator;<a name="line.28"></a>
 <span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.CellUtil;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.30"></a>
+<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.HBaseCommonTestingUtility;<a name="line.30"></a>
 <span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.31"></a>
 <span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.KeyValue;<a name="line.32"></a>
 <span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.io.compress.Compression;<a name="line.33"></a>
@@ -59,7 +59,7 @@
 <span class="sourceLineNo">051</span><a name="line.51"></a>
 <span class="sourceLineNo">052</span>  @Parameters<a name="line.52"></a>
 <span class="sourceLineNo">053</span>  public static 
Collection&lt;Object[]&gt; parameters() {<a name="line.53"></a>
-<span class="sourceLineNo">054</span>    return 
HBaseTestingUtility.BOOLEAN_PARAMETERIZED;<a name="line.54"></a>
+<span class="sourceLineNo">054</span>    return 
HBaseCommonTestingUtility.BOOLEAN_PARAMETERIZED;<a name="line.54"></a>
 <span class="sourceLineNo">055</span>  }<a name="line.55"></a>
 <span class="sourceLineNo">056</span><a name="line.56"></a>
 <span class="sourceLineNo">057</span>  public 
TestSeekToBlockWithEncoders(boolean useOffheapData) {<a name="line.57"></a>

Reply via email to