hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject [19/51] [partial] hbase-site git commit: Published site at 52fd70500e0a00e273e2ec0c09d7c914b89432ce.
Date Thu, 24 Mar 2016 15:54:59 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f30982bd/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html
index 3529a44..4556e83 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html
@@ -141,7 +141,7 @@
 <span class="sourceLineNo">133</span>  protected List&lt;KeyValueScanner&gt; currentScanners = new ArrayList&lt;KeyValueScanner&gt;();<a name="line.133"></a>
 <span class="sourceLineNo">134</span>  // flush update lock<a name="line.134"></a>
 <span class="sourceLineNo">135</span>  private ReentrantLock flushLock = new ReentrantLock();<a name="line.135"></a>
-<span class="sourceLineNo">136</span>  <a name="line.136"></a>
+<span class="sourceLineNo">136</span><a name="line.136"></a>
 <span class="sourceLineNo">137</span>  protected final long readPt;<a name="line.137"></a>
 <span class="sourceLineNo">138</span><a name="line.138"></a>
 <span class="sourceLineNo">139</span>  // used by the injection framework to test race between StoreScanner construction and compaction<a name="line.139"></a>
@@ -608,317 +608,378 @@
 <span class="sourceLineNo">600</span>        continue;<a name="line.600"></a>
 <span class="sourceLineNo">601</span><a name="line.601"></a>
 <span class="sourceLineNo">602</span>      case DONE:<a name="line.602"></a>
-<span class="sourceLineNo">603</span>        matcher.curCell = null;<a name="line.603"></a>
-<span class="sourceLineNo">604</span>        return scannerContext.setScannerState(NextState.MORE_VALUES).hasMoreValues();<a name="line.604"></a>
-<span class="sourceLineNo">605</span><a name="line.605"></a>
-<span class="sourceLineNo">606</span>      case DONE_SCAN:<a name="line.606"></a>
-<span class="sourceLineNo">607</span>        close(false);// Do all cleanup except heap.close()<a name="line.607"></a>
-<span class="sourceLineNo">608</span>        return scannerContext.setScannerState(NextState.NO_MORE_VALUES).hasMoreValues();<a name="line.608"></a>
-<span class="sourceLineNo">609</span><a name="line.609"></a>
-<span class="sourceLineNo">610</span>      case SEEK_NEXT_ROW:<a name="line.610"></a>
-<span class="sourceLineNo">611</span>        // This is just a relatively simple end of scan fix, to short-cut end<a name="line.611"></a>
-<span class="sourceLineNo">612</span>        // us if there is an endKey in the scan.<a name="line.612"></a>
-<span class="sourceLineNo">613</span>        if (!matcher.moreRowsMayExistAfter(cell)) {<a name="line.613"></a>
-<span class="sourceLineNo">614</span>          close(false);// Do all cleanup except heap.close()<a name="line.614"></a>
-<span class="sourceLineNo">615</span>          return scannerContext.setScannerState(NextState.NO_MORE_VALUES).hasMoreValues();<a name="line.615"></a>
-<span class="sourceLineNo">616</span>        }<a name="line.616"></a>
-<span class="sourceLineNo">617</span>        matcher.curCell = null;<a name="line.617"></a>
-<span class="sourceLineNo">618</span>        seekToNextRow(cell);<a name="line.618"></a>
-<span class="sourceLineNo">619</span>        break;<a name="line.619"></a>
-<span class="sourceLineNo">620</span><a name="line.620"></a>
-<span class="sourceLineNo">621</span>      case SEEK_NEXT_COL:<a name="line.621"></a>
-<span class="sourceLineNo">622</span>        seekAsDirection(matcher.getKeyForNextColumn(cell));<a name="line.622"></a>
-<span class="sourceLineNo">623</span>        break;<a name="line.623"></a>
-<span class="sourceLineNo">624</span><a name="line.624"></a>
-<span class="sourceLineNo">625</span>      case SKIP:<a name="line.625"></a>
-<span class="sourceLineNo">626</span>        this.heap.next();<a name="line.626"></a>
-<span class="sourceLineNo">627</span>        break;<a name="line.627"></a>
-<span class="sourceLineNo">628</span><a name="line.628"></a>
-<span class="sourceLineNo">629</span>      case SEEK_NEXT_USING_HINT:<a name="line.629"></a>
-<span class="sourceLineNo">630</span>        Cell nextKV = matcher.getNextKeyHint(cell);<a name="line.630"></a>
-<span class="sourceLineNo">631</span>        if (nextKV != null) {<a name="line.631"></a>
-<span class="sourceLineNo">632</span>          seekAsDirection(nextKV);<a name="line.632"></a>
-<span class="sourceLineNo">633</span>        } else {<a name="line.633"></a>
-<span class="sourceLineNo">634</span>          heap.next();<a name="line.634"></a>
-<span class="sourceLineNo">635</span>        }<a name="line.635"></a>
-<span class="sourceLineNo">636</span>        break;<a name="line.636"></a>
-<span class="sourceLineNo">637</span><a name="line.637"></a>
-<span class="sourceLineNo">638</span>      default:<a name="line.638"></a>
-<span class="sourceLineNo">639</span>        throw new RuntimeException("UNEXPECTED");<a name="line.639"></a>
-<span class="sourceLineNo">640</span>      }<a name="line.640"></a>
-<span class="sourceLineNo">641</span>    } while ((cell = this.heap.peek()) != null);<a name="line.641"></a>
-<span class="sourceLineNo">642</span><a name="line.642"></a>
-<span class="sourceLineNo">643</span>    if (count &gt; 0) {<a name="line.643"></a>
-<span class="sourceLineNo">644</span>      return scannerContext.setScannerState(NextState.MORE_VALUES).hasMoreValues();<a name="line.644"></a>
-<span class="sourceLineNo">645</span>    }<a name="line.645"></a>
-<span class="sourceLineNo">646</span><a name="line.646"></a>
-<span class="sourceLineNo">647</span>    // No more keys<a name="line.647"></a>
-<span class="sourceLineNo">648</span>    close(false);// Do all cleanup except heap.close()<a name="line.648"></a>
-<span class="sourceLineNo">649</span>    return scannerContext.setScannerState(NextState.NO_MORE_VALUES).hasMoreValues();<a name="line.649"></a>
-<span class="sourceLineNo">650</span>  }<a name="line.650"></a>
-<span class="sourceLineNo">651</span><a name="line.651"></a>
-<span class="sourceLineNo">652</span>  /*<a name="line.652"></a>
-<span class="sourceLineNo">653</span>   * See if we should actually SEEK or rather just SKIP to the next Cell.<a name="line.653"></a>
-<span class="sourceLineNo">654</span>   * (see HBASE-13109)<a name="line.654"></a>
-<span class="sourceLineNo">655</span>   */<a name="line.655"></a>
-<span class="sourceLineNo">656</span>  private ScanQueryMatcher.MatchCode optimize(ScanQueryMatcher.MatchCode qcode, Cell cell) {<a name="line.656"></a>
-<span class="sourceLineNo">657</span>    switch(qcode) {<a name="line.657"></a>
-<span class="sourceLineNo">658</span>    case INCLUDE_AND_SEEK_NEXT_COL:<a name="line.658"></a>
-<span class="sourceLineNo">659</span>    case SEEK_NEXT_COL:<a name="line.659"></a>
-<span class="sourceLineNo">660</span>    {<a name="line.660"></a>
-<span class="sourceLineNo">661</span>      Cell nextIndexedKey = getNextIndexedKey();<a name="line.661"></a>
-<span class="sourceLineNo">662</span>      if (nextIndexedKey != null &amp;&amp; nextIndexedKey != KeyValueScanner.NO_NEXT_INDEXED_KEY<a name="line.662"></a>
-<span class="sourceLineNo">663</span>          &amp;&amp; matcher.compareKeyForNextColumn(nextIndexedKey, cell) &gt;= 0) {<a name="line.663"></a>
-<span class="sourceLineNo">664</span>        return qcode == MatchCode.SEEK_NEXT_COL ? MatchCode.SKIP : MatchCode.INCLUDE;<a name="line.664"></a>
-<span class="sourceLineNo">665</span>      }<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      break;<a name="line.666"></a>
-<span class="sourceLineNo">667</span>    }<a name="line.667"></a>
-<span class="sourceLineNo">668</span>    case INCLUDE_AND_SEEK_NEXT_ROW:<a name="line.668"></a>
-<span class="sourceLineNo">669</span>    case SEEK_NEXT_ROW:<a name="line.669"></a>
-<span class="sourceLineNo">670</span>    {<a name="line.670"></a>
-<span class="sourceLineNo">671</span>      Cell nextIndexedKey = getNextIndexedKey();<a name="line.671"></a>
-<span class="sourceLineNo">672</span>      if (nextIndexedKey != null &amp;&amp; nextIndexedKey != KeyValueScanner.NO_NEXT_INDEXED_KEY<a name="line.672"></a>
-<span class="sourceLineNo">673</span>          &amp;&amp; matcher.compareKeyForNextRow(nextIndexedKey, cell) &gt;= 0) {<a name="line.673"></a>
-<span class="sourceLineNo">674</span>        return qcode == MatchCode.SEEK_NEXT_ROW ? MatchCode.SKIP : MatchCode.INCLUDE;<a name="line.674"></a>
-<span class="sourceLineNo">675</span>      }<a name="line.675"></a>
-<span class="sourceLineNo">676</span>      break;<a name="line.676"></a>
-<span class="sourceLineNo">677</span>    }<a name="line.677"></a>
-<span class="sourceLineNo">678</span>    default:<a name="line.678"></a>
-<span class="sourceLineNo">679</span>      break;<a name="line.679"></a>
-<span class="sourceLineNo">680</span>    }<a name="line.680"></a>
-<span class="sourceLineNo">681</span>    return qcode;<a name="line.681"></a>
-<span class="sourceLineNo">682</span>  }<a name="line.682"></a>
-<span class="sourceLineNo">683</span><a name="line.683"></a>
-<span class="sourceLineNo">684</span>  // Implementation of ChangedReadersObserver<a name="line.684"></a>
-<span class="sourceLineNo">685</span>  @Override<a name="line.685"></a>
-<span class="sourceLineNo">686</span>  public void updateReaders(List&lt;StoreFile&gt; sfs) throws IOException {<a name="line.686"></a>
-<span class="sourceLineNo">687</span>    flushed = true;<a name="line.687"></a>
-<span class="sourceLineNo">688</span>    flushLock.lock();<a name="line.688"></a>
-<span class="sourceLineNo">689</span>    try {<a name="line.689"></a>
-<span class="sourceLineNo">690</span>      flushedStoreFiles.addAll(sfs);<a name="line.690"></a>
-<span class="sourceLineNo">691</span>    } finally {<a name="line.691"></a>
-<span class="sourceLineNo">692</span>      flushLock.unlock();<a name="line.692"></a>
-<span class="sourceLineNo">693</span>    }<a name="line.693"></a>
-<span class="sourceLineNo">694</span>    // Let the next() call handle re-creating and seeking<a name="line.694"></a>
-<span class="sourceLineNo">695</span>  }<a name="line.695"></a>
-<span class="sourceLineNo">696</span><a name="line.696"></a>
-<span class="sourceLineNo">697</span>  /**<a name="line.697"></a>
-<span class="sourceLineNo">698</span>   * @param flushed indicates if there was a flush<a name="line.698"></a>
-<span class="sourceLineNo">699</span>   * @return true if top of heap has changed (and KeyValueHeap has to try the<a name="line.699"></a>
-<span class="sourceLineNo">700</span>   *         next KV)<a name="line.700"></a>
-<span class="sourceLineNo">701</span>   * @throws IOException<a name="line.701"></a>
-<span class="sourceLineNo">702</span>   */<a name="line.702"></a>
-<span class="sourceLineNo">703</span>  protected boolean checkReseek(boolean flushed) throws IOException {<a name="line.703"></a>
-<span class="sourceLineNo">704</span>    if (flushed &amp;&amp; this.lastTop != null) {<a name="line.704"></a>
-<span class="sourceLineNo">705</span>      resetScannerStack(this.lastTop);<a name="line.705"></a>
-<span class="sourceLineNo">706</span>      if (this.heap.peek() == null<a name="line.706"></a>
-<span class="sourceLineNo">707</span>          || store.getComparator().compareRows(this.lastTop, this.heap.peek()) != 0) {<a name="line.707"></a>
-<span class="sourceLineNo">708</span>        LOG.debug("Storescanner.peek() is changed where before = "<a name="line.708"></a>
-<span class="sourceLineNo">709</span>            + this.lastTop.toString() + ",and after = " + this.heap.peek());<a name="line.709"></a>
-<span class="sourceLineNo">710</span>        this.lastTop = null;<a name="line.710"></a>
-<span class="sourceLineNo">711</span>        return true;<a name="line.711"></a>
-<span class="sourceLineNo">712</span>      }<a name="line.712"></a>
-<span class="sourceLineNo">713</span>      this.lastTop = null; // gone!<a name="line.713"></a>
-<span class="sourceLineNo">714</span>    }<a name="line.714"></a>
-<span class="sourceLineNo">715</span>    // else dont need to reseek<a name="line.715"></a>
-<span class="sourceLineNo">716</span>    return false;<a name="line.716"></a>
-<span class="sourceLineNo">717</span>  }<a name="line.717"></a>
-<span class="sourceLineNo">718</span><a name="line.718"></a>
-<span class="sourceLineNo">719</span>  protected void resetScannerStack(Cell lastTopKey) throws IOException {<a name="line.719"></a>
-<span class="sourceLineNo">720</span>    /* When we have the scan object, should we not pass it to getScanners()<a name="line.720"></a>
-<span class="sourceLineNo">721</span>     * to get a limited set of scanners? We did so in the constructor and we<a name="line.721"></a>
-<span class="sourceLineNo">722</span>     * could have done it now by storing the scan object from the constructor<a name="line.722"></a>
-<span class="sourceLineNo">723</span>     */<a name="line.723"></a>
-<span class="sourceLineNo">724</span><a name="line.724"></a>
-<span class="sourceLineNo">725</span>    final boolean isCompaction = false;<a name="line.725"></a>
-<span class="sourceLineNo">726</span>    boolean usePread = get || scanUsePread;<a name="line.726"></a>
-<span class="sourceLineNo">727</span>    List&lt;KeyValueScanner&gt; scanners = null;<a name="line.727"></a>
-<span class="sourceLineNo">728</span>    try {<a name="line.728"></a>
-<span class="sourceLineNo">729</span>      flushLock.lock();<a name="line.729"></a>
-<span class="sourceLineNo">730</span>      scanners = selectScannersFrom(store.getScanners(flushedStoreFiles, cacheBlocks, get, usePread,<a name="line.730"></a>
-<span class="sourceLineNo">731</span>        isCompaction, matcher, scan.getStartRow(), scan.getStopRow(), this.readPt, true));<a name="line.731"></a>
-<span class="sourceLineNo">732</span>      // Clear the current set of flushed store files so that they don't get added again<a name="line.732"></a>
-<span class="sourceLineNo">733</span>      flushedStoreFiles.clear();<a name="line.733"></a>
-<span class="sourceLineNo">734</span>    } finally {<a name="line.734"></a>
-<span class="sourceLineNo">735</span>      flushLock.unlock();<a name="line.735"></a>
-<span class="sourceLineNo">736</span>    }<a name="line.736"></a>
-<span class="sourceLineNo">737</span><a name="line.737"></a>
-<span class="sourceLineNo">738</span>    // Seek the new scanners to the last key<a name="line.738"></a>
-<span class="sourceLineNo">739</span>    seekScanners(scanners, lastTopKey, false, parallelSeekEnabled);<a name="line.739"></a>
-<span class="sourceLineNo">740</span>    // remove the older memstore scanner<a name="line.740"></a>
-<span class="sourceLineNo">741</span>    for (int i = 0; i &lt; currentScanners.size(); i++) {<a name="line.741"></a>
-<span class="sourceLineNo">742</span>      if (!currentScanners.get(i).isFileScanner()) {<a name="line.742"></a>
-<span class="sourceLineNo">743</span>        currentScanners.remove(i);<a name="line.743"></a>
-<span class="sourceLineNo">744</span>        break;<a name="line.744"></a>
-<span class="sourceLineNo">745</span>      }<a name="line.745"></a>
-<span class="sourceLineNo">746</span>    }<a name="line.746"></a>
-<span class="sourceLineNo">747</span>    // add the newly created scanners on the flushed files and the current active memstore scanner<a name="line.747"></a>
-<span class="sourceLineNo">748</span>    addCurrentScanners(scanners);<a name="line.748"></a>
-<span class="sourceLineNo">749</span>    // Combine all seeked scanners with a heap<a name="line.749"></a>
-<span class="sourceLineNo">750</span>    resetKVHeap(this.currentScanners, store.getComparator());<a name="line.750"></a>
-<span class="sourceLineNo">751</span>    // Reset the state of the Query Matcher and set to top row.<a name="line.751"></a>
-<span class="sourceLineNo">752</span>    // Only reset and call setRow if the row changes; avoids confusing the<a name="line.752"></a>
-<span class="sourceLineNo">753</span>    // query matcher if scanning intra-row.<a name="line.753"></a>
-<span class="sourceLineNo">754</span>    Cell cell = heap.peek();<a name="line.754"></a>
-<span class="sourceLineNo">755</span>    if (cell == null) {<a name="line.755"></a>
-<span class="sourceLineNo">756</span>      cell = lastTopKey;<a name="line.756"></a>
-<span class="sourceLineNo">757</span>    }<a name="line.757"></a>
-<span class="sourceLineNo">758</span>    if ((matcher.curCell == null) || !CellUtil.matchingRows(cell, matcher.curCell)) {<a name="line.758"></a>
-<span class="sourceLineNo">759</span>      this.countPerRow = 0;<a name="line.759"></a>
-<span class="sourceLineNo">760</span>      // The setToNewRow will call reset internally<a name="line.760"></a>
-<span class="sourceLineNo">761</span>      matcher.setToNewRow(cell);<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>  /**<a name="line.765"></a>
-<span class="sourceLineNo">766</span>   * Check whether scan as expected order<a name="line.766"></a>
-<span class="sourceLineNo">767</span>   * @param prevKV<a name="line.767"></a>
-<span class="sourceLineNo">768</span>   * @param kv<a name="line.768"></a>
-<span class="sourceLineNo">769</span>   * @param comparator<a name="line.769"></a>
-<span class="sourceLineNo">770</span>   * @throws IOException<a name="line.770"></a>
-<span class="sourceLineNo">771</span>   */<a name="line.771"></a>
-<span class="sourceLineNo">772</span>  protected void checkScanOrder(Cell prevKV, Cell kv,<a name="line.772"></a>
-<span class="sourceLineNo">773</span>      CellComparator comparator) throws IOException {<a name="line.773"></a>
-<span class="sourceLineNo">774</span>    // Check that the heap gives us KVs in an increasing order.<a name="line.774"></a>
-<span class="sourceLineNo">775</span>    assert prevKV == null || comparator == null<a name="line.775"></a>
-<span class="sourceLineNo">776</span>        || comparator.compare(prevKV, kv) &lt;= 0 : "Key " + prevKV<a name="line.776"></a>
-<span class="sourceLineNo">777</span>        + " followed by a " + "smaller key " + kv + " in cf " + store;<a name="line.777"></a>
+<span class="sourceLineNo">603</span>        // Optimization for Gets! If DONE, no more to get on this row, early exit!<a name="line.603"></a>
+<span class="sourceLineNo">604</span>        if (this.scan.isGetScan()) {<a name="line.604"></a>
+<span class="sourceLineNo">605</span>          // Then no more to this row... exit.<a name="line.605"></a>
+<span class="sourceLineNo">606</span>          close(false);// Do all cleanup except heap.close()<a name="line.606"></a>
+<span class="sourceLineNo">607</span>          return scannerContext.setScannerState(NextState.NO_MORE_VALUES).hasMoreValues();<a name="line.607"></a>
+<span class="sourceLineNo">608</span>        }<a name="line.608"></a>
+<span class="sourceLineNo">609</span>        matcher.curCell = null;<a name="line.609"></a>
+<span class="sourceLineNo">610</span>        return scannerContext.setScannerState(NextState.MORE_VALUES).hasMoreValues();<a name="line.610"></a>
+<span class="sourceLineNo">611</span><a name="line.611"></a>
+<span class="sourceLineNo">612</span>      case DONE_SCAN:<a name="line.612"></a>
+<span class="sourceLineNo">613</span>        close(false);// Do all cleanup except heap.close()<a name="line.613"></a>
+<span class="sourceLineNo">614</span>        return scannerContext.setScannerState(NextState.NO_MORE_VALUES).hasMoreValues();<a name="line.614"></a>
+<span class="sourceLineNo">615</span><a name="line.615"></a>
+<span class="sourceLineNo">616</span>      case SEEK_NEXT_ROW:<a name="line.616"></a>
+<span class="sourceLineNo">617</span>        // This is just a relatively simple end of scan fix, to short-cut end<a name="line.617"></a>
+<span class="sourceLineNo">618</span>        // us if there is an endKey in the scan.<a name="line.618"></a>
+<span class="sourceLineNo">619</span>        if (!matcher.moreRowsMayExistAfter(cell)) {<a name="line.619"></a>
+<span class="sourceLineNo">620</span>          close(false);// Do all cleanup except heap.close()<a name="line.620"></a>
+<span class="sourceLineNo">621</span>          return scannerContext.setScannerState(NextState.NO_MORE_VALUES).hasMoreValues();<a name="line.621"></a>
+<span class="sourceLineNo">622</span>        }<a name="line.622"></a>
+<span class="sourceLineNo">623</span>        matcher.curCell = null;<a name="line.623"></a>
+<span class="sourceLineNo">624</span>        seekToNextRow(cell);<a name="line.624"></a>
+<span class="sourceLineNo">625</span>        break;<a name="line.625"></a>
+<span class="sourceLineNo">626</span><a name="line.626"></a>
+<span class="sourceLineNo">627</span>      case SEEK_NEXT_COL:<a name="line.627"></a>
+<span class="sourceLineNo">628</span>        seekAsDirection(matcher.getKeyForNextColumn(cell));<a name="line.628"></a>
+<span class="sourceLineNo">629</span>        break;<a name="line.629"></a>
+<span class="sourceLineNo">630</span><a name="line.630"></a>
+<span class="sourceLineNo">631</span>      case SKIP:<a name="line.631"></a>
+<span class="sourceLineNo">632</span>        this.heap.next();<a name="line.632"></a>
+<span class="sourceLineNo">633</span>        break;<a name="line.633"></a>
+<span class="sourceLineNo">634</span><a name="line.634"></a>
+<span class="sourceLineNo">635</span>      case SEEK_NEXT_USING_HINT:<a name="line.635"></a>
+<span class="sourceLineNo">636</span>        Cell nextKV = matcher.getNextKeyHint(cell);<a name="line.636"></a>
+<span class="sourceLineNo">637</span>        if (nextKV != null) {<a name="line.637"></a>
+<span class="sourceLineNo">638</span>          seekAsDirection(nextKV);<a name="line.638"></a>
+<span class="sourceLineNo">639</span>        } else {<a name="line.639"></a>
+<span class="sourceLineNo">640</span>          heap.next();<a name="line.640"></a>
+<span class="sourceLineNo">641</span>        }<a name="line.641"></a>
+<span class="sourceLineNo">642</span>        break;<a name="line.642"></a>
+<span class="sourceLineNo">643</span><a name="line.643"></a>
+<span class="sourceLineNo">644</span>      default:<a name="line.644"></a>
+<span class="sourceLineNo">645</span>        throw new RuntimeException("UNEXPECTED");<a name="line.645"></a>
+<span class="sourceLineNo">646</span>      }<a name="line.646"></a>
+<span class="sourceLineNo">647</span>    } while ((cell = this.heap.peek()) != null);<a name="line.647"></a>
+<span class="sourceLineNo">648</span><a name="line.648"></a>
+<span class="sourceLineNo">649</span>    if (count &gt; 0) {<a name="line.649"></a>
+<span class="sourceLineNo">650</span>      return scannerContext.setScannerState(NextState.MORE_VALUES).hasMoreValues();<a name="line.650"></a>
+<span class="sourceLineNo">651</span>    }<a name="line.651"></a>
+<span class="sourceLineNo">652</span><a name="line.652"></a>
+<span class="sourceLineNo">653</span>    // No more keys<a name="line.653"></a>
+<span class="sourceLineNo">654</span>    close(false);// Do all cleanup except heap.close()<a name="line.654"></a>
+<span class="sourceLineNo">655</span>    return scannerContext.setScannerState(NextState.NO_MORE_VALUES).hasMoreValues();<a name="line.655"></a>
+<span class="sourceLineNo">656</span>  }<a name="line.656"></a>
+<span class="sourceLineNo">657</span><a name="line.657"></a>
+<span class="sourceLineNo">658</span>  /**<a name="line.658"></a>
+<span class="sourceLineNo">659</span>   * See if we should actually SEEK or rather just SKIP to the next Cell (see HBASE-13109).<a name="line.659"></a>
+<span class="sourceLineNo">660</span>   * This method works together with ColumnTrackers and Filters. ColumnTrackers may issue SEEK<a name="line.660"></a>
+<span class="sourceLineNo">661</span>   * hints, such as seek to next column, next row, or seek to an arbitrary seek key.<a name="line.661"></a>
+<span class="sourceLineNo">662</span>   * This method intercepts these qcodes and decides whether a seek is the most efficient _actual_<a name="line.662"></a>
+<span class="sourceLineNo">663</span>   * way to get us to the requested cell (SEEKs are more expensive than SKIP, SKIP, SKIP inside the<a name="line.663"></a>
+<span class="sourceLineNo">664</span>   * current, loaded block).<a name="line.664"></a>
+<span class="sourceLineNo">665</span>   * It does this by looking at the next indexed key of the current HFile. This key<a name="line.665"></a>
+<span class="sourceLineNo">666</span>   * is then compared with the _SEEK_ key, where a SEEK key is an artificial 'last possible key<a name="line.666"></a>
+<span class="sourceLineNo">667</span>   * on the row' (only in here, we avoid actually creating a SEEK key; in the compare we work with<a name="line.667"></a>
+<span class="sourceLineNo">668</span>   * the current Cell but compare as though it were a seek key; see down in<a name="line.668"></a>
+<span class="sourceLineNo">669</span>   * matcher.compareKeyForNextRow, etc). If the compare gets us onto the<a name="line.669"></a>
+<span class="sourceLineNo">670</span>   * next block we *_SEEK, otherwise we just INCLUDE or SKIP, and let the ColumnTrackers or Filters<a name="line.670"></a>
+<span class="sourceLineNo">671</span>   * go through the next Cell, and so on)<a name="line.671"></a>
+<span class="sourceLineNo">672</span>   *<a name="line.672"></a>
+<span class="sourceLineNo">673</span>   * &lt;p&gt;The ColumnTrackers and Filters must behave correctly in all cases, i.e. if they are past the<a name="line.673"></a>
+<span class="sourceLineNo">674</span>   * Cells they care about they must issues a SKIP or SEEK.<a name="line.674"></a>
+<span class="sourceLineNo">675</span>   *<a name="line.675"></a>
+<span class="sourceLineNo">676</span>   * &lt;p&gt;Other notes:<a name="line.676"></a>
+<span class="sourceLineNo">677</span>   * &lt;ul&gt;<a name="line.677"></a>
+<span class="sourceLineNo">678</span>   * &lt;li&gt;Rows can straddle block boundaries&lt;/li&gt;<a name="line.678"></a>
+<span class="sourceLineNo">679</span>   * &lt;li&gt;Versions of columns can straddle block boundaries (i.e. column C1 at T1 might be in a<a name="line.679"></a>
+<span class="sourceLineNo">680</span>   * different block than column C1 at T2)&lt;/li&gt;<a name="line.680"></a>
+<span class="sourceLineNo">681</span>   * &lt;li&gt;We want to SKIP and INCLUDE if the chance is high that we'll find the desired Cell after a<a name="line.681"></a>
+<span class="sourceLineNo">682</span>   * few SKIPs...&lt;/li&gt;<a name="line.682"></a>
+<span class="sourceLineNo">683</span>   * &lt;li&gt;We want to INCLUDE_AND_SEEK and SEEK when the chance is high that we'll be able to seek<a name="line.683"></a>
+<span class="sourceLineNo">684</span>   * past many Cells, especially if we know we need to go to the next block.&lt;/li&gt;<a name="line.684"></a>
+<span class="sourceLineNo">685</span>   * &lt;/ul&gt;<a name="line.685"></a>
+<span class="sourceLineNo">686</span>   * &lt;p&gt;A good proxy (best effort) to determine whether INCLUDE/SKIP is better than SEEK is whether<a name="line.686"></a>
+<span class="sourceLineNo">687</span>   * we'll likely end up seeking to the next block (or past the next block) to get our next column.<a name="line.687"></a>
+<span class="sourceLineNo">688</span>   * Example:<a name="line.688"></a>
+<span class="sourceLineNo">689</span>   * &lt;pre&gt;<a name="line.689"></a>
+<span class="sourceLineNo">690</span>   * |    BLOCK 1              |     BLOCK 2                   |<a name="line.690"></a>
+<span class="sourceLineNo">691</span>   * |  r1/c1, r1/c2, r1/c3    |    r1/c4, r1/c5, r2/c1        |<a name="line.691"></a>
+<span class="sourceLineNo">692</span>   *                                   ^         ^<a name="line.692"></a>
+<span class="sourceLineNo">693</span>   *                                   |         |<a name="line.693"></a>
+<span class="sourceLineNo">694</span>   *                           Next Index Key   SEEK_NEXT_ROW (before r2/c1)<a name="line.694"></a>
+<span class="sourceLineNo">695</span>   *<a name="line.695"></a>
+<span class="sourceLineNo">696</span>   *<a name="line.696"></a>
+<span class="sourceLineNo">697</span>   * |    BLOCK 1                       |     BLOCK 2                      |<a name="line.697"></a>
+<span class="sourceLineNo">698</span>   * |  r1/c1/t5, r1/c1/t4, r1/c1/t3    |    r1/c1/t2, r1/c1/T1, r1/c2/T3  |<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>   *                                    Next Index Key        SEEK_NEXT_COL<a name="line.701"></a>
+<span class="sourceLineNo">702</span>   * &lt;/pre&gt;<a name="line.702"></a>
+<span class="sourceLineNo">703</span>   * Now imagine we want columns c1 and c3 (see first diagram above), the 'Next Index Key' of r1/c4<a name="line.703"></a>
+<span class="sourceLineNo">704</span>   * is &gt; r1/c3 so we should seek to get to the c1 on the next row, r2. In second case, say we only<a name="line.704"></a>
+<span class="sourceLineNo">705</span>   * want one version of c1, after we have it, a SEEK_COL will be issued to get to c2. Looking at<a name="line.705"></a>
+<span class="sourceLineNo">706</span>   * the 'Next Index Key', it would land us in the next block, so we should SEEK. In other scenarios<a name="line.706"></a>
+<span class="sourceLineNo">707</span>   * where the SEEK will not land us in the next block, it is very likely better to issues a series<a name="line.707"></a>
+<span class="sourceLineNo">708</span>   * of SKIPs.<a name="line.708"></a>
+<span class="sourceLineNo">709</span>   */<a name="line.709"></a>
+<span class="sourceLineNo">710</span>  @VisibleForTesting<a name="line.710"></a>
+<span class="sourceLineNo">711</span>  protected ScanQueryMatcher.MatchCode optimize(ScanQueryMatcher.MatchCode qcode, Cell cell) {<a name="line.711"></a>
+<span class="sourceLineNo">712</span>    switch(qcode) {<a name="line.712"></a>
+<span class="sourceLineNo">713</span>    case INCLUDE_AND_SEEK_NEXT_COL:<a name="line.713"></a>
+<span class="sourceLineNo">714</span>    case SEEK_NEXT_COL:<a name="line.714"></a>
+<span class="sourceLineNo">715</span>    {<a name="line.715"></a>
+<span class="sourceLineNo">716</span>      Cell nextIndexedKey = getNextIndexedKey();<a name="line.716"></a>
+<span class="sourceLineNo">717</span>      if (nextIndexedKey != null &amp;&amp; nextIndexedKey != KeyValueScanner.NO_NEXT_INDEXED_KEY<a name="line.717"></a>
+<span class="sourceLineNo">718</span>          &amp;&amp; matcher.compareKeyForNextColumn(nextIndexedKey, cell) &gt;= 0) {<a name="line.718"></a>
+<span class="sourceLineNo">719</span>        return qcode == MatchCode.SEEK_NEXT_COL ? MatchCode.SKIP : MatchCode.INCLUDE;<a name="line.719"></a>
+<span class="sourceLineNo">720</span>      }<a name="line.720"></a>
+<span class="sourceLineNo">721</span>      break;<a name="line.721"></a>
+<span class="sourceLineNo">722</span>    }<a name="line.722"></a>
+<span class="sourceLineNo">723</span>    case INCLUDE_AND_SEEK_NEXT_ROW:<a name="line.723"></a>
+<span class="sourceLineNo">724</span>    case SEEK_NEXT_ROW:<a name="line.724"></a>
+<span class="sourceLineNo">725</span>    {<a name="line.725"></a>
+<span class="sourceLineNo">726</span>      // If it is a Get Scan, then we know that we are done with this row; there are no more<a name="line.726"></a>
+<span class="sourceLineNo">727</span>      // rows beyond the current one: don't try to optimize. We are DONE. Return the *_NEXT_ROW<a name="line.727"></a>
+<span class="sourceLineNo">728</span>      // qcode as is. When the caller gets these flags on a Get Scan, it knows it can shut down the<a name="line.728"></a>
+<span class="sourceLineNo">729</span>      // Scan.<a name="line.729"></a>
+<span class="sourceLineNo">730</span>      if (!this.scan.isGetScan()) {<a name="line.730"></a>
+<span class="sourceLineNo">731</span>        Cell nextIndexedKey = getNextIndexedKey();<a name="line.731"></a>
+<span class="sourceLineNo">732</span>        if (nextIndexedKey != null &amp;&amp; nextIndexedKey != KeyValueScanner.NO_NEXT_INDEXED_KEY<a name="line.732"></a>
+<span class="sourceLineNo">733</span>            &amp;&amp; matcher.compareKeyForNextRow(nextIndexedKey, cell) &gt; 0) {<a name="line.733"></a>
+<span class="sourceLineNo">734</span>          return qcode == MatchCode.SEEK_NEXT_ROW ? MatchCode.SKIP : MatchCode.INCLUDE;<a name="line.734"></a>
+<span class="sourceLineNo">735</span>        }<a name="line.735"></a>
+<span class="sourceLineNo">736</span>      }<a name="line.736"></a>
+<span class="sourceLineNo">737</span>      break;<a name="line.737"></a>
+<span class="sourceLineNo">738</span>    }<a name="line.738"></a>
+<span class="sourceLineNo">739</span>    default:<a name="line.739"></a>
+<span class="sourceLineNo">740</span>      break;<a name="line.740"></a>
+<span class="sourceLineNo">741</span>    }<a name="line.741"></a>
+<span class="sourceLineNo">742</span>    return qcode;<a name="line.742"></a>
+<span class="sourceLineNo">743</span>  }<a name="line.743"></a>
+<span class="sourceLineNo">744</span><a name="line.744"></a>
+<span class="sourceLineNo">745</span>  // Implementation of ChangedReadersObserver<a name="line.745"></a>
+<span class="sourceLineNo">746</span>  @Override<a name="line.746"></a>
+<span class="sourceLineNo">747</span>  public void updateReaders(List&lt;StoreFile&gt; sfs) throws IOException {<a name="line.747"></a>
+<span class="sourceLineNo">748</span>    flushed = true;<a name="line.748"></a>
+<span class="sourceLineNo">749</span>    flushLock.lock();<a name="line.749"></a>
+<span class="sourceLineNo">750</span>    try {<a name="line.750"></a>
+<span class="sourceLineNo">751</span>      flushedStoreFiles.addAll(sfs);<a name="line.751"></a>
+<span class="sourceLineNo">752</span>    } finally {<a name="line.752"></a>
+<span class="sourceLineNo">753</span>      flushLock.unlock();<a name="line.753"></a>
+<span class="sourceLineNo">754</span>    }<a name="line.754"></a>
+<span class="sourceLineNo">755</span>    // Let the next() call handle re-creating and seeking<a name="line.755"></a>
+<span class="sourceLineNo">756</span>  }<a name="line.756"></a>
+<span class="sourceLineNo">757</span><a name="line.757"></a>
+<span class="sourceLineNo">758</span>  /**<a name="line.758"></a>
+<span class="sourceLineNo">759</span>   * @param flushed indicates if there was a flush<a name="line.759"></a>
+<span class="sourceLineNo">760</span>   * @return true if top of heap has changed (and KeyValueHeap has to try the<a name="line.760"></a>
+<span class="sourceLineNo">761</span>   *         next KV)<a name="line.761"></a>
+<span class="sourceLineNo">762</span>   * @throws IOException<a name="line.762"></a>
+<span class="sourceLineNo">763</span>   */<a name="line.763"></a>
+<span class="sourceLineNo">764</span>  protected boolean checkReseek(boolean flushed) throws IOException {<a name="line.764"></a>
+<span class="sourceLineNo">765</span>    if (flushed &amp;&amp; this.lastTop != null) {<a name="line.765"></a>
+<span class="sourceLineNo">766</span>      resetScannerStack(this.lastTop);<a name="line.766"></a>
+<span class="sourceLineNo">767</span>      if (this.heap.peek() == null<a name="line.767"></a>
+<span class="sourceLineNo">768</span>          || store.getComparator().compareRows(this.lastTop, this.heap.peek()) != 0) {<a name="line.768"></a>
+<span class="sourceLineNo">769</span>        LOG.debug("Storescanner.peek() is changed where before = "<a name="line.769"></a>
+<span class="sourceLineNo">770</span>            + this.lastTop.toString() + ",and after = " + this.heap.peek());<a name="line.770"></a>
+<span class="sourceLineNo">771</span>        this.lastTop = null;<a name="line.771"></a>
+<span class="sourceLineNo">772</span>        return true;<a name="line.772"></a>
+<span class="sourceLineNo">773</span>      }<a name="line.773"></a>
+<span class="sourceLineNo">774</span>      this.lastTop = null; // gone!<a name="line.774"></a>
+<span class="sourceLineNo">775</span>    }<a name="line.775"></a>
+<span class="sourceLineNo">776</span>    // else dont need to reseek<a name="line.776"></a>
+<span class="sourceLineNo">777</span>    return false;<a name="line.777"></a>
 <span class="sourceLineNo">778</span>  }<a name="line.778"></a>
 <span class="sourceLineNo">779</span><a name="line.779"></a>
-<span class="sourceLineNo">780</span>  protected boolean seekToNextRow(Cell c) throws IOException {<a name="line.780"></a>
-<span class="sourceLineNo">781</span>    return reseek(CellUtil.createLastOnRow(c));<a name="line.781"></a>
-<span class="sourceLineNo">782</span>  }<a name="line.782"></a>
-<span class="sourceLineNo">783</span><a name="line.783"></a>
-<span class="sourceLineNo">784</span>  /**<a name="line.784"></a>
-<span class="sourceLineNo">785</span>   * Do a reseek in a normal StoreScanner(scan forward)<a name="line.785"></a>
-<span class="sourceLineNo">786</span>   * @param kv<a name="line.786"></a>
-<span class="sourceLineNo">787</span>   * @return true if scanner has values left, false if end of scanner<a name="line.787"></a>
-<span class="sourceLineNo">788</span>   * @throws IOException<a name="line.788"></a>
-<span class="sourceLineNo">789</span>   */<a name="line.789"></a>
-<span class="sourceLineNo">790</span>  protected boolean seekAsDirection(Cell kv)<a name="line.790"></a>
-<span class="sourceLineNo">791</span>      throws IOException {<a name="line.791"></a>
-<span class="sourceLineNo">792</span>    return reseek(kv);<a name="line.792"></a>
-<span class="sourceLineNo">793</span>  }<a name="line.793"></a>
-<span class="sourceLineNo">794</span><a name="line.794"></a>
-<span class="sourceLineNo">795</span>  @Override<a name="line.795"></a>
-<span class="sourceLineNo">796</span>  public boolean reseek(Cell kv) throws IOException {<a name="line.796"></a>
-<span class="sourceLineNo">797</span>    boolean flushed = checkFlushed();<a name="line.797"></a>
-<span class="sourceLineNo">798</span>    // Heap will not be null, if this is called from next() which.<a name="line.798"></a>
-<span class="sourceLineNo">799</span>    // If called from RegionScanner.reseek(...) make sure the scanner<a name="line.799"></a>
-<span class="sourceLineNo">800</span>    // stack is reset if needed.<a name="line.800"></a>
-<span class="sourceLineNo">801</span>    checkReseek(flushed);<a name="line.801"></a>
-<span class="sourceLineNo">802</span>    if (explicitColumnQuery &amp;&amp; lazySeekEnabledGlobally) {<a name="line.802"></a>
-<span class="sourceLineNo">803</span>      return heap.requestSeek(kv, true, useRowColBloom);<a name="line.803"></a>
-<span class="sourceLineNo">804</span>    }<a name="line.804"></a>
-<span class="sourceLineNo">805</span>    return heap.reseek(kv);<a name="line.805"></a>
-<span class="sourceLineNo">806</span>  }<a name="line.806"></a>
-<span class="sourceLineNo">807</span><a name="line.807"></a>
-<span class="sourceLineNo">808</span>  protected boolean checkFlushed() {<a name="line.808"></a>
-<span class="sourceLineNo">809</span>    // check the var without any lock. Suppose even if we see the old<a name="line.809"></a>
-<span class="sourceLineNo">810</span>    // value here still it is ok to continue because we will not be resetting<a name="line.810"></a>
-<span class="sourceLineNo">811</span>    // the heap but will continue with the referenced memstore's snapshot. For compactions<a name="line.811"></a>
-<span class="sourceLineNo">812</span>    // any way we don't need the updateReaders at all to happen as we still continue with <a name="line.812"></a>
-<span class="sourceLineNo">813</span>    // the older files<a name="line.813"></a>
-<span class="sourceLineNo">814</span>    if (flushed) {<a name="line.814"></a>
-<span class="sourceLineNo">815</span>      // If there is a flush and the current scan is notified on the flush ensure that the <a name="line.815"></a>
-<span class="sourceLineNo">816</span>      // scan's heap gets reset and we do a seek on the newly flushed file.<a name="line.816"></a>
-<span class="sourceLineNo">817</span>      if(!this.closing) {<a name="line.817"></a>
-<span class="sourceLineNo">818</span>        this.lastTop = this.peek();<a name="line.818"></a>
-<span class="sourceLineNo">819</span>      } else {<a name="line.819"></a>
-<span class="sourceLineNo">820</span>        return false;<a name="line.820"></a>
-<span class="sourceLineNo">821</span>      }<a name="line.821"></a>
-<span class="sourceLineNo">822</span>      // reset the flag<a name="line.822"></a>
-<span class="sourceLineNo">823</span>      flushed = false;<a name="line.823"></a>
-<span class="sourceLineNo">824</span>      return true;<a name="line.824"></a>
-<span class="sourceLineNo">825</span>    }<a name="line.825"></a>
-<span class="sourceLineNo">826</span>    return false;<a name="line.826"></a>
-<span class="sourceLineNo">827</span>  }<a name="line.827"></a>
-<span class="sourceLineNo">828</span><a name="line.828"></a>
-<span class="sourceLineNo">829</span>  @Override<a name="line.829"></a>
-<span class="sourceLineNo">830</span>  public long getSequenceID() {<a name="line.830"></a>
-<span class="sourceLineNo">831</span>    return 0;<a name="line.831"></a>
-<span class="sourceLineNo">832</span>  }<a name="line.832"></a>
-<span class="sourceLineNo">833</span><a name="line.833"></a>
-<span class="sourceLineNo">834</span>  /**<a name="line.834"></a>
-<span class="sourceLineNo">835</span>   * Seek storefiles in parallel to optimize IO latency as much as possible<a name="line.835"></a>
-<span class="sourceLineNo">836</span>   * @param scanners the list {@link KeyValueScanner}s to be read from<a name="line.836"></a>
-<span class="sourceLineNo">837</span>   * @param kv the KeyValue on which the operation is being requested<a name="line.837"></a>
-<span class="sourceLineNo">838</span>   * @throws IOException<a name="line.838"></a>
-<span class="sourceLineNo">839</span>   */<a name="line.839"></a>
-<span class="sourceLineNo">840</span>  private void parallelSeek(final List&lt;? extends KeyValueScanner&gt;<a name="line.840"></a>
-<span class="sourceLineNo">841</span>      scanners, final Cell kv) throws IOException {<a name="line.841"></a>
-<span class="sourceLineNo">842</span>    if (scanners.isEmpty()) return;<a name="line.842"></a>
-<span class="sourceLineNo">843</span>    int storeFileScannerCount = scanners.size();<a name="line.843"></a>
-<span class="sourceLineNo">844</span>    CountDownLatch latch = new CountDownLatch(storeFileScannerCount);<a name="line.844"></a>
-<span class="sourceLineNo">845</span>    List&lt;ParallelSeekHandler&gt; handlers = <a name="line.845"></a>
-<span class="sourceLineNo">846</span>        new ArrayList&lt;ParallelSeekHandler&gt;(storeFileScannerCount);<a name="line.846"></a>
-<span class="sourceLineNo">847</span>    for (KeyValueScanner scanner : scanners) {<a name="line.847"></a>
-<span class="sourceLineNo">848</span>      if (scanner instanceof StoreFileScanner) {<a name="line.848"></a>
-<span class="sourceLineNo">849</span>        ParallelSeekHandler seekHandler = new ParallelSeekHandler(scanner, kv,<a name="line.849"></a>
-<span class="sourceLineNo">850</span>          this.readPt, latch);<a name="line.850"></a>
-<span class="sourceLineNo">851</span>        executor.submit(seekHandler);<a name="line.851"></a>
-<span class="sourceLineNo">852</span>        handlers.add(seekHandler);<a name="line.852"></a>
-<span class="sourceLineNo">853</span>      } else {<a name="line.853"></a>
-<span class="sourceLineNo">854</span>        scanner.seek(kv);<a name="line.854"></a>
-<span class="sourceLineNo">855</span>        latch.countDown();<a name="line.855"></a>
-<span class="sourceLineNo">856</span>      }<a name="line.856"></a>
-<span class="sourceLineNo">857</span>    }<a name="line.857"></a>
-<span class="sourceLineNo">858</span><a name="line.858"></a>
-<span class="sourceLineNo">859</span>    try {<a name="line.859"></a>
-<span class="sourceLineNo">860</span>      latch.await();<a name="line.860"></a>
-<span class="sourceLineNo">861</span>    } catch (InterruptedException ie) {<a name="line.861"></a>
-<span class="sourceLineNo">862</span>      throw (InterruptedIOException)new InterruptedIOException().initCause(ie);<a name="line.862"></a>
-<span class="sourceLineNo">863</span>    }<a name="line.863"></a>
-<span class="sourceLineNo">864</span><a name="line.864"></a>
-<span class="sourceLineNo">865</span>    for (ParallelSeekHandler handler : handlers) {<a name="line.865"></a>
-<span class="sourceLineNo">866</span>      if (handler.getErr() != null) {<a name="line.866"></a>
-<span class="sourceLineNo">867</span>        throw new IOException(handler.getErr());<a name="line.867"></a>
-<span class="sourceLineNo">868</span>      }<a name="line.868"></a>
-<span class="sourceLineNo">869</span>    }<a name="line.869"></a>
-<span class="sourceLineNo">870</span>  }<a name="line.870"></a>
-<span class="sourceLineNo">871</span><a name="line.871"></a>
-<span class="sourceLineNo">872</span>  /**<a name="line.872"></a>
-<span class="sourceLineNo">873</span>   * Used in testing.<a name="line.873"></a>
-<span class="sourceLineNo">874</span>   * @return all scanners in no particular order<a name="line.874"></a>
-<span class="sourceLineNo">875</span>   */<a name="line.875"></a>
-<span class="sourceLineNo">876</span>  List&lt;KeyValueScanner&gt; getAllScannersForTesting() {<a name="line.876"></a>
-<span class="sourceLineNo">877</span>    List&lt;KeyValueScanner&gt; allScanners = new ArrayList&lt;KeyValueScanner&gt;();<a name="line.877"></a>
-<span class="sourceLineNo">878</span>    KeyValueScanner current = heap.getCurrentForTesting();<a name="line.878"></a>
-<span class="sourceLineNo">879</span>    if (current != null)<a name="line.879"></a>
-<span class="sourceLineNo">880</span>      allScanners.add(current);<a name="line.880"></a>
-<span class="sourceLineNo">881</span>    for (KeyValueScanner scanner : heap.getHeap())<a name="line.881"></a>
-<span class="sourceLineNo">882</span>      allScanners.add(scanner);<a name="line.882"></a>
-<span class="sourceLineNo">883</span>    return allScanners;<a name="line.883"></a>
-<span class="sourceLineNo">884</span>  }<a name="line.884"></a>
-<span class="sourceLineNo">885</span><a name="line.885"></a>
-<span class="sourceLineNo">886</span>  static void enableLazySeekGlobally(boolean enable) {<a name="line.886"></a>
-<span class="sourceLineNo">887</span>    lazySeekEnabledGlobally = enable;<a name="line.887"></a>
+<span class="sourceLineNo">780</span>  protected void resetScannerStack(Cell lastTopKey) throws IOException {<a name="line.780"></a>
+<span class="sourceLineNo">781</span>    /* When we have the scan object, should we not pass it to getScanners()<a name="line.781"></a>
+<span class="sourceLineNo">782</span>     * to get a limited set of scanners? We did so in the constructor and we<a name="line.782"></a>
+<span class="sourceLineNo">783</span>     * could have done it now by storing the scan object from the constructor<a name="line.783"></a>
+<span class="sourceLineNo">784</span>     */<a name="line.784"></a>
+<span class="sourceLineNo">785</span><a name="line.785"></a>
+<span class="sourceLineNo">786</span>    final boolean isCompaction = false;<a name="line.786"></a>
+<span class="sourceLineNo">787</span>    boolean usePread = get || scanUsePread;<a name="line.787"></a>
+<span class="sourceLineNo">788</span>    List&lt;KeyValueScanner&gt; scanners = null;<a name="line.788"></a>
+<span class="sourceLineNo">789</span>    try {<a name="line.789"></a>
+<span class="sourceLineNo">790</span>      flushLock.lock();<a name="line.790"></a>
+<span class="sourceLineNo">791</span>      scanners = selectScannersFrom(store.getScanners(flushedStoreFiles, cacheBlocks, get, usePread,<a name="line.791"></a>
+<span class="sourceLineNo">792</span>        isCompaction, matcher, scan.getStartRow(), scan.getStopRow(), this.readPt, true));<a name="line.792"></a>
+<span class="sourceLineNo">793</span>      // Clear the current set of flushed store files so that they don't get added again<a name="line.793"></a>
+<span class="sourceLineNo">794</span>      flushedStoreFiles.clear();<a name="line.794"></a>
+<span class="sourceLineNo">795</span>    } finally {<a name="line.795"></a>
+<span class="sourceLineNo">796</span>      flushLock.unlock();<a name="line.796"></a>
+<span class="sourceLineNo">797</span>    }<a name="line.797"></a>
+<span class="sourceLineNo">798</span><a name="line.798"></a>
+<span class="sourceLineNo">799</span>    // Seek the new scanners to the last key<a name="line.799"></a>
+<span class="sourceLineNo">800</span>    seekScanners(scanners, lastTopKey, false, parallelSeekEnabled);<a name="line.800"></a>
+<span class="sourceLineNo">801</span>    // remove the older memstore scanner<a name="line.801"></a>
+<span class="sourceLineNo">802</span>    for (int i = 0; i &lt; currentScanners.size(); i++) {<a name="line.802"></a>
+<span class="sourceLineNo">803</span>      if (!currentScanners.get(i).isFileScanner()) {<a name="line.803"></a>
+<span class="sourceLineNo">804</span>        currentScanners.remove(i);<a name="line.804"></a>
+<span class="sourceLineNo">805</span>        break;<a name="line.805"></a>
+<span class="sourceLineNo">806</span>      }<a name="line.806"></a>
+<span class="sourceLineNo">807</span>    }<a name="line.807"></a>
+<span class="sourceLineNo">808</span>    // add the newly created scanners on the flushed files and the current active memstore scanner<a name="line.808"></a>
+<span class="sourceLineNo">809</span>    addCurrentScanners(scanners);<a name="line.809"></a>
+<span class="sourceLineNo">810</span>    // Combine all seeked scanners with a heap<a name="line.810"></a>
+<span class="sourceLineNo">811</span>    resetKVHeap(this.currentScanners, store.getComparator());<a name="line.811"></a>
+<span class="sourceLineNo">812</span>    // Reset the state of the Query Matcher and set to top row.<a name="line.812"></a>
+<span class="sourceLineNo">813</span>    // Only reset and call setRow if the row changes; avoids confusing the<a name="line.813"></a>
+<span class="sourceLineNo">814</span>    // query matcher if scanning intra-row.<a name="line.814"></a>
+<span class="sourceLineNo">815</span>    Cell cell = heap.peek();<a name="line.815"></a>
+<span class="sourceLineNo">816</span>    if (cell == null) {<a name="line.816"></a>
+<span class="sourceLineNo">817</span>      cell = lastTopKey;<a name="line.817"></a>
+<span class="sourceLineNo">818</span>    }<a name="line.818"></a>
+<span class="sourceLineNo">819</span>    if ((matcher.curCell == null) || !CellUtil.matchingRows(cell, matcher.curCell)) {<a name="line.819"></a>
+<span class="sourceLineNo">820</span>      this.countPerRow = 0;<a name="line.820"></a>
+<span class="sourceLineNo">821</span>      // The setToNewRow will call reset internally<a name="line.821"></a>
+<span class="sourceLineNo">822</span>      matcher.setToNewRow(cell);<a name="line.822"></a>
+<span class="sourceLineNo">823</span>    }<a name="line.823"></a>
+<span class="sourceLineNo">824</span>  }<a name="line.824"></a>
+<span class="sourceLineNo">825</span><a name="line.825"></a>
+<span class="sourceLineNo">826</span>  /**<a name="line.826"></a>
+<span class="sourceLineNo">827</span>   * Check whether scan as expected order<a name="line.827"></a>
+<span class="sourceLineNo">828</span>   * @param prevKV<a name="line.828"></a>
+<span class="sourceLineNo">829</span>   * @param kv<a name="line.829"></a>
+<span class="sourceLineNo">830</span>   * @param comparator<a name="line.830"></a>
+<span class="sourceLineNo">831</span>   * @throws IOException<a name="line.831"></a>
+<span class="sourceLineNo">832</span>   */<a name="line.832"></a>
+<span class="sourceLineNo">833</span>  protected void checkScanOrder(Cell prevKV, Cell kv,<a name="line.833"></a>
+<span class="sourceLineNo">834</span>      CellComparator comparator) throws IOException {<a name="line.834"></a>
+<span class="sourceLineNo">835</span>    // Check that the heap gives us KVs in an increasing order.<a name="line.835"></a>
+<span class="sourceLineNo">836</span>    assert prevKV == null || comparator == null<a name="line.836"></a>
+<span class="sourceLineNo">837</span>        || comparator.compare(prevKV, kv) &lt;= 0 : "Key " + prevKV<a name="line.837"></a>
+<span class="sourceLineNo">838</span>        + " followed by a " + "smaller key " + kv + " in cf " + store;<a name="line.838"></a>
+<span class="sourceLineNo">839</span>  }<a name="line.839"></a>
+<span class="sourceLineNo">840</span><a name="line.840"></a>
+<span class="sourceLineNo">841</span>  protected boolean seekToNextRow(Cell c) throws IOException {<a name="line.841"></a>
+<span class="sourceLineNo">842</span>    return reseek(CellUtil.createLastOnRow(c));<a name="line.842"></a>
+<span class="sourceLineNo">843</span>  }<a name="line.843"></a>
+<span class="sourceLineNo">844</span><a name="line.844"></a>
+<span class="sourceLineNo">845</span>  /**<a name="line.845"></a>
+<span class="sourceLineNo">846</span>   * Do a reseek in a normal StoreScanner(scan forward)<a name="line.846"></a>
+<span class="sourceLineNo">847</span>   * @param kv<a name="line.847"></a>
+<span class="sourceLineNo">848</span>   * @return true if scanner has values left, false if end of scanner<a name="line.848"></a>
+<span class="sourceLineNo">849</span>   * @throws IOException<a name="line.849"></a>
+<span class="sourceLineNo">850</span>   */<a name="line.850"></a>
+<span class="sourceLineNo">851</span>  protected boolean seekAsDirection(Cell kv)<a name="line.851"></a>
+<span class="sourceLineNo">852</span>      throws IOException {<a name="line.852"></a>
+<span class="sourceLineNo">853</span>    return reseek(kv);<a name="line.853"></a>
+<span class="sourceLineNo">854</span>  }<a name="line.854"></a>
+<span class="sourceLineNo">855</span><a name="line.855"></a>
+<span class="sourceLineNo">856</span>  @Override<a name="line.856"></a>
+<span class="sourceLineNo">857</span>  public boolean reseek(Cell kv) throws IOException {<a name="line.857"></a>
+<span class="sourceLineNo">858</span>    boolean flushed = checkFlushed();<a name="line.858"></a>
+<span class="sourceLineNo">859</span>    // Heap will not be null, if this is called from next() which.<a name="line.859"></a>
+<span class="sourceLineNo">860</span>    // If called from RegionScanner.reseek(...) make sure the scanner<a name="line.860"></a>
+<span class="sourceLineNo">861</span>    // stack is reset if needed.<a name="line.861"></a>
+<span class="sourceLineNo">862</span>    checkReseek(flushed);<a name="line.862"></a>
+<span class="sourceLineNo">863</span>    if (explicitColumnQuery &amp;&amp; lazySeekEnabledGlobally) {<a name="line.863"></a>
+<span class="sourceLineNo">864</span>      return heap.requestSeek(kv, true, useRowColBloom);<a name="line.864"></a>
+<span class="sourceLineNo">865</span>    }<a name="line.865"></a>
+<span class="sourceLineNo">866</span>    return heap.reseek(kv);<a name="line.866"></a>
+<span class="sourceLineNo">867</span>  }<a name="line.867"></a>
+<span class="sourceLineNo">868</span><a name="line.868"></a>
+<span class="sourceLineNo">869</span>  protected boolean checkFlushed() {<a name="line.869"></a>
+<span class="sourceLineNo">870</span>    // check the var without any lock. Suppose even if we see the old<a name="line.870"></a>
+<span class="sourceLineNo">871</span>    // value here still it is ok to continue because we will not be resetting<a name="line.871"></a>
+<span class="sourceLineNo">872</span>    // the heap but will continue with the referenced memstore's snapshot. For compactions<a name="line.872"></a>
+<span class="sourceLineNo">873</span>    // any way we don't need the updateReaders at all to happen as we still continue with<a name="line.873"></a>
+<span class="sourceLineNo">874</span>    // the older files<a name="line.874"></a>
+<span class="sourceLineNo">875</span>    if (flushed) {<a name="line.875"></a>
+<span class="sourceLineNo">876</span>      // If there is a flush and the current scan is notified on the flush ensure that the<a name="line.876"></a>
+<span class="sourceLineNo">877</span>      // scan's heap gets reset and we do a seek on the newly flushed file.<a name="line.877"></a>
+<span class="sourceLineNo">878</span>      if(!this.closing) {<a name="line.878"></a>
+<span class="sourceLineNo">879</span>        this.lastTop = this.peek();<a name="line.879"></a>
+<span class="sourceLineNo">880</span>      } else {<a name="line.880"></a>
+<span class="sourceLineNo">881</span>        return false;<a name="line.881"></a>
+<span class="sourceLineNo">882</span>      }<a name="line.882"></a>
+<span class="sourceLineNo">883</span>      // reset the flag<a name="line.883"></a>
+<span class="sourceLineNo">884</span>      flushed = false;<a name="line.884"></a>
+<span class="sourceLineNo">885</span>      return true;<a name="line.885"></a>
+<span class="sourceLineNo">886</span>    }<a name="line.886"></a>
+<span class="sourceLineNo">887</span>    return false;<a name="line.887"></a>
 <span class="sourceLineNo">888</span>  }<a name="line.888"></a>
 <span class="sourceLineNo">889</span><a name="line.889"></a>
-<span class="sourceLineNo">890</span>  /**<a name="line.890"></a>
-<span class="sourceLineNo">891</span>   * @return The estimated number of KVs seen by this scanner (includes some skipped KVs).<a name="line.891"></a>
-<span class="sourceLineNo">892</span>   */<a name="line.892"></a>
-<span class="sourceLineNo">893</span>  public long getEstimatedNumberOfKvsScanned() {<a name="line.893"></a>
-<span class="sourceLineNo">894</span>    return this.kvsScanned;<a name="line.894"></a>
-<span class="sourceLineNo">895</span>  }<a name="line.895"></a>
-<span class="sourceLineNo">896</span><a name="line.896"></a>
-<span class="sourceLineNo">897</span>  @Override<a name="line.897"></a>
-<span class="sourceLineNo">898</span>  public Cell getNextIndexedKey() {<a name="line.898"></a>
-<span class="sourceLineNo">899</span>    return this.heap.getNextIndexedKey();<a name="line.899"></a>
-<span class="sourceLineNo">900</span>  }<a name="line.900"></a>
-<span class="sourceLineNo">901</span><a name="line.901"></a>
-<span class="sourceLineNo">902</span>  @Override<a name="line.902"></a>
-<span class="sourceLineNo">903</span>  public void shipped() throws IOException {<a name="line.903"></a>
-<span class="sourceLineNo">904</span>    for (KeyValueHeap h : this.heapsForDelayedClose) {<a name="line.904"></a>
-<span class="sourceLineNo">905</span>      h.close();// There wont be further fetch of Cells from these scanners. Just close.<a name="line.905"></a>
-<span class="sourceLineNo">906</span>    }<a name="line.906"></a>
-<span class="sourceLineNo">907</span>    this.heapsForDelayedClose.clear();<a name="line.907"></a>
-<span class="sourceLineNo">908</span>    if (this.heap != null) {<a name="line.908"></a>
-<span class="sourceLineNo">909</span>      this.heap.shipped();<a name="line.909"></a>
-<span class="sourceLineNo">910</span>    }<a name="line.910"></a>
-<span class="sourceLineNo">911</span>  }<a name="line.911"></a>
-<span class="sourceLineNo">912</span>}<a name="line.912"></a>
-<span class="sourceLineNo">913</span><a name="line.913"></a>
+<span class="sourceLineNo">890</span>  @Override<a name="line.890"></a>
+<span class="sourceLineNo">891</span>  public long getSequenceID() {<a name="line.891"></a>
+<span class="sourceLineNo">892</span>    return 0;<a name="line.892"></a>
+<span class="sourceLineNo">893</span>  }<a name="line.893"></a>
+<span class="sourceLineNo">894</span><a name="line.894"></a>
+<span class="sourceLineNo">895</span>  /**<a name="line.895"></a>
+<span class="sourceLineNo">896</span>   * Seek storefiles in parallel to optimize IO latency as much as possible<a name="line.896"></a>
+<span class="sourceLineNo">897</span>   * @param scanners the list {@link KeyValueScanner}s to be read from<a name="line.897"></a>
+<span class="sourceLineNo">898</span>   * @param kv the KeyValue on which the operation is being requested<a name="line.898"></a>
+<span class="sourceLineNo">899</span>   * @throws IOException<a name="line.899"></a>
+<span class="sourceLineNo">900</span>   */<a name="line.900"></a>
+<span class="sourceLineNo">901</span>  private void parallelSeek(final List&lt;? extends KeyValueScanner&gt;<a name="line.901"></a>
+<span class="sourceLineNo">902</span>      scanners, final Cell kv) throws IOException {<a name="line.902"></a>
+<span class="sourceLineNo">903</span>    if (scanners.isEmpty()) return;<a name="line.903"></a>
+<span class="sourceLineNo">904</span>    int storeFileScannerCount = scanners.size();<a name="line.904"></a>
+<span class="sourceLineNo">905</span>    CountDownLatch latch = new CountDownLatch(storeFileScannerCount);<a name="line.905"></a>
+<span class="sourceLineNo">906</span>    List&lt;ParallelSeekHandler&gt; handlers =<a name="line.906"></a>
+<span class="sourceLineNo">907</span>        new ArrayList&lt;ParallelSeekHandler&gt;(storeFileScannerCount);<a name="line.907"></a>
+<span class="sourceLineNo">908</span>    for (KeyValueScanner scanner : scanners) {<a name="line.908"></a>
+<span class="sourceLineNo">909</span>      if (scanner instanceof StoreFileScanner) {<a name="line.909"></a>
+<span class="sourceLineNo">910</span>        ParallelSeekHandler seekHandler = new ParallelSeekHandler(scanner, kv,<a name="line.910"></a>
+<span class="sourceLineNo">911</span>          this.readPt, latch);<a name="line.911"></a>
+<span class="sourceLineNo">912</span>        executor.submit(seekHandler);<a name="line.912"></a>
+<span class="sourceLineNo">913</span>        handlers.add(seekHandler);<a name="line.913"></a>
+<span class="sourceLineNo">914</span>      } else {<a name="line.914"></a>
+<span class="sourceLineNo">915</span>        scanner.seek(kv);<a name="line.915"></a>
+<span class="sourceLineNo">916</span>        latch.countDown();<a name="line.916"></a>
+<span class="sourceLineNo">917</span>      }<a name="line.917"></a>
+<span class="sourceLineNo">918</span>    }<a name="line.918"></a>
+<span class="sourceLineNo">919</span><a name="line.919"></a>
+<span class="sourceLineNo">920</span>    try {<a name="line.920"></a>
+<span class="sourceLineNo">921</span>      latch.await();<a name="line.921"></a>
+<span class="sourceLineNo">922</span>    } catch (InterruptedException ie) {<a name="line.922"></a>
+<span class="sourceLineNo">923</span>      throw (InterruptedIOException)new InterruptedIOException().initCause(ie);<a name="line.923"></a>
+<span class="sourceLineNo">924</span>    }<a name="line.924"></a>
+<span class="sourceLineNo">925</span><a name="line.925"></a>
+<span class="sourceLineNo">926</span>    for (ParallelSeekHandler handler : handlers) {<a name="line.926"></a>
+<span class="sourceLineNo">927</span>      if (handler.getErr() != null) {<a name="line.927"></a>
+<span class="sourceLineNo">928</span>        throw new IOException(handler.getErr());<a name="line.928"></a>
+<span class="sourceLineNo">929</span>      }<a name="line.929"></a>
+<span class="sourceLineNo">930</span>    }<a name="line.930"></a>
+<span class="sourceLineNo">931</span>  }<a name="line.931"></a>
+<span class="sourceLineNo">932</span><a name="line.932"></a>
+<span class="sourceLineNo">933</span>  /**<a name="line.933"></a>
+<span class="sourceLineNo">934</span>   * Used in testing.<a name="line.934"></a>
+<span class="sourceLineNo">935</span>   * @return all scanners in no particular order<a name="line.935"></a>
+<span class="sourceLineNo">936</span>   */<a name="line.936"></a>
+<span class="sourceLineNo">937</span>  List&lt;KeyValueScanner&gt; getAllScannersForTesting() {<a name="line.937"></a>
+<span class="sourceLineNo">938</span>    List&lt;KeyValueScanner&gt; allScanners = new ArrayList&lt;KeyValueScanner&gt;();<a name="line.938"></a>
+<span class="sourceLineNo">939</span>    KeyValueScanner current = heap.getCurrentForTesting();<a name="line.939"></a>
+<span class="sourceLineNo">940</span>    if (current != null)<a name="line.940"></a>
+<span class="sourceLineNo">941</span>      allScanners.add(current);<a name="line.941"></a>
+<span class="sourceLineNo">942</span>    for (KeyValueScanner scanner : heap.getHeap())<a name="line.942"></a>
+<span class="sourceLineNo">943</span>      allScanners.add(scanner);<a name="line.943"></a>
+<span class="sourceLineNo">944</span>    return allScanners;<a name="line.944"></a>
+<span class="sourceLineNo">945</span>  }<a name="line.945"></a>
+<span class="sourceLineNo">946</span><a name="line.946"></a>
+<span class="sourceLineNo">947</span>  static void enableLazySeekGlobally(boolean enable) {<a name="line.947"></a>
+<span class="sourceLineNo">948</span>    lazySeekEnabledGlobally = enable;<a name="line.948"></a>
+<span class="sourceLineNo">949</span>  }<a name="line.949"></a>
+<span class="sourceLineNo">950</span><a name="line.950"></a>
+<span class="sourceLineNo">951</span>  /**<a name="line.951"></a>
+<span class="sourceLineNo">952</span>   * @return The estimated number of KVs seen by this scanner (includes some skipped KVs).<a name="line.952"></a>
+<span class="sourceLineNo">953</span>   */<a name="line.953"></a>
+<span class="sourceLineNo">954</span>  public long getEstimatedNumberOfKvsScanned() {<a name="line.954"></a>
+<span class="sourceLineNo">955</span>    return this.kvsScanned;<a name="line.955"></a>
+<span class="sourceLineNo">956</span>  }<a name="line.956"></a>
+<span class="sourceLineNo">957</span><a name="line.957"></a>
+<span class="sourceLineNo">958</span>  @Override<a name="line.958"></a>
+<span class="sourceLineNo">959</span>  public Cell getNextIndexedKey() {<a name="line.959"></a>
+<span class="sourceLineNo">960</span>    return this.heap.getNextIndexedKey();<a name="line.960"></a>
+<span class="sourceLineNo">961</span>  }<a name="line.961"></a>
+<span class="sourceLineNo">962</span><a name="line.962"></a>
+<span class="sourceLineNo">963</span>  @Override<a name="line.963"></a>
+<span class="sourceLineNo">964</span>  public void shipped() throws IOException {<a name="line.964"></a>
+<span class="sourceLineNo">965</span>    for (KeyValueHeap h : this.heapsForDelayedClose) {<a name="line.965"></a>
+<span class="sourceLineNo">966</span>      h.close();// There wont be further fetch of Cells from these scanners. Just close.<a name="line.966"></a>
+<span class="sourceLineNo">967</span>    }<a name="line.967"></a>
+<span class="sourceLineNo">968</span>    this.heapsForDelayedClose.clear();<a name="line.968"></a>
+<span class="sourceLineNo">969</span>    if (this.heap != null) {<a name="line.969"></a>
+<span class="sourceLineNo">970</span>      this.heap.shipped();<a name="line.970"></a>
+<span class="sourceLineNo">971</span>    }<a name="line.971"></a>
+<span class="sourceLineNo">972</span>  }<a name="line.972"></a>
+<span class="sourceLineNo">973</span>}<a name="line.973"></a>
+<span class="sourceLineNo">974</span><a name="line.974"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f30982bd/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.Counter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.Counter.html b/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.Counter.html
index 14327de..0a8e897 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.Counter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.Counter.html
@@ -1065,11 +1065,11 @@
 <span class="sourceLineNo">1057</span>    System.err.println("  -bandwidth              Limit bandwidth to this value in MB/second.");<a name="line.1057"></a>
 <span class="sourceLineNo">1058</span>    System.err.println();<a name="line.1058"></a>
 <span class="sourceLineNo">1059</span>    System.err.println("Examples:");<a name="line.1059"></a>
-<span class="sourceLineNo">1060</span>    System.err.println("  hbase " + getClass().getName() + " \\");<a name="line.1060"></a>
+<span class="sourceLineNo">1060</span>    System.err.println("  hbase snapshot export \\");<a name="line.1060"></a>
 <span class="sourceLineNo">1061</span>    System.err.println("    -snapshot MySnapshot -copy-to hdfs://srv2:8082/hbase \\");<a name="line.1061"></a>
 <span class="sourceLineNo">1062</span>    System.err.println("    -chuser MyUser -chgroup MyGroup -chmod 700 -mappers 16");<a name="line.1062"></a>
 <span class="sourceLineNo">1063</span>    System.err.println();<a name="line.1063"></a>
-<span class="sourceLineNo">1064</span>    System.err.println("  hbase " + getClass().getName() + " \\");<a name="line.1064"></a>
+<span class="sourceLineNo">1064</span>    System.err.println("  hbase snapshot export \\");<a name="line.1064"></a>
 <span class="sourceLineNo">1065</span>    System.err.println("    -snapshot MySnapshot -copy-from hdfs://srv2:8082/hbase \\");<a name="line.1065"></a>
 <span class="sourceLineNo">1066</span>    System.err.println("    -copy-to hdfs://srv1:50070/hbase \\");<a name="line.1066"></a>
 <span class="sourceLineNo">1067</span>    System.exit(1);<a name="line.1067"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f30982bd/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.ExportMapper.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.ExportMapper.html b/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.ExportMapper.html
index 14327de..0a8e897 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.ExportMapper.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.ExportMapper.html
@@ -1065,11 +1065,11 @@
 <span class="sourceLineNo">1057</span>    System.err.println("  -bandwidth              Limit bandwidth to this value in MB/second.");<a name="line.1057"></a>
 <span class="sourceLineNo">1058</span>    System.err.println();<a name="line.1058"></a>
 <span class="sourceLineNo">1059</span>    System.err.println("Examples:");<a name="line.1059"></a>
-<span class="sourceLineNo">1060</span>    System.err.println("  hbase " + getClass().getName() + " \\");<a name="line.1060"></a>
+<span class="sourceLineNo">1060</span>    System.err.println("  hbase snapshot export \\");<a name="line.1060"></a>
 <span class="sourceLineNo">1061</span>    System.err.println("    -snapshot MySnapshot -copy-to hdfs://srv2:8082/hbase \\");<a name="line.1061"></a>
 <span class="sourceLineNo">1062</span>    System.err.println("    -chuser MyUser -chgroup MyGroup -chmod 700 -mappers 16");<a name="line.1062"></a>
 <span class="sourceLineNo">1063</span>    System.err.println();<a name="line.1063"></a>
-<span class="sourceLineNo">1064</span>    System.err.println("  hbase " + getClass().getName() + " \\");<a name="line.1064"></a>
+<span class="sourceLineNo">1064</span>    System.err.println("  hbase snapshot export \\");<a name="line.1064"></a>
 <span class="sourceLineNo">1065</span>    System.err.println("    -snapshot MySnapshot -copy-from hdfs://srv2:8082/hbase \\");<a name="line.1065"></a>
 <span class="sourceLineNo">1066</span>    System.err.println("    -copy-to hdfs://srv1:50070/hbase \\");<a name="line.1066"></a>
 <span class="sourceLineNo">1067</span>    System.exit(1);<a name="line.1067"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f30982bd/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.ExportSnapshotInputFormat.ExportSnapshotInputSplit.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.ExportSnapshotInputFormat.ExportSnapshotInputSplit.html b/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.ExportSnapshotInputFormat.ExportSnapshotInputSplit.html
index 14327de..0a8e897 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.ExportSnapshotInputFormat.ExportSnapshotInputSplit.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.ExportSnapshotInputFormat.ExportSnapshotInputSplit.html
@@ -1065,11 +1065,11 @@
 <span class="sourceLineNo">1057</span>    System.err.println("  -bandwidth              Limit bandwidth to this value in MB/second.");<a name="line.1057"></a>
 <span class="sourceLineNo">1058</span>    System.err.println();<a name="line.1058"></a>
 <span class="sourceLineNo">1059</span>    System.err.println("Examples:");<a name="line.1059"></a>
-<span class="sourceLineNo">1060</span>    System.err.println("  hbase " + getClass().getName() + " \\");<a name="line.1060"></a>
+<span class="sourceLineNo">1060</span>    System.err.println("  hbase snapshot export \\");<a name="line.1060"></a>
 <span class="sourceLineNo">1061</span>    System.err.println("    -snapshot MySnapshot -copy-to hdfs://srv2:8082/hbase \\");<a name="line.1061"></a>
 <span class="sourceLineNo">1062</span>    System.err.println("    -chuser MyUser -chgroup MyGroup -chmod 700 -mappers 16");<a name="line.1062"></a>
 <span class="sourceLineNo">1063</span>    System.err.println();<a name="line.1063"></a>
-<span class="sourceLineNo">1064</span>    System.err.println("  hbase " + getClass().getName() + " \\");<a name="line.1064"></a>
+<span class="sourceLineNo">1064</span>    System.err.println("  hbase snapshot export \\");<a name="line.1064"></a>
 <span class="sourceLineNo">1065</span>    System.err.println("    -snapshot MySnapshot -copy-from hdfs://srv2:8082/hbase \\");<a name="line.1065"></a>
 <span class="sourceLineNo">1066</span>    System.err.println("    -copy-to hdfs://srv1:50070/hbase \\");<a name="line.1066"></a>
 <span class="sourceLineNo">1067</span>    System.exit(1);<a name="line.1067"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f30982bd/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.ExportSnapshotInputFormat.ExportSnapshotRecordReader.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.ExportSnapshotInputFormat.ExportSnapshotRecordReader.html b/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.ExportSnapshotInputFormat.ExportSnapshotRecordReader.html
index 14327de..0a8e897 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.ExportSnapshotInputFormat.ExportSnapshotRecordReader.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.ExportSnapshotInputFormat.ExportSnapshotRecordReader.html
@@ -1065,11 +1065,11 @@
 <span class="sourceLineNo">1057</span>    System.err.println("  -bandwidth              Limit bandwidth to this value in MB/second.");<a name="line.1057"></a>
 <span class="sourceLineNo">1058</span>    System.err.println();<a name="line.1058"></a>
 <span class="sourceLineNo">1059</span>    System.err.println("Examples:");<a name="line.1059"></a>
-<span class="sourceLineNo">1060</span>    System.err.println("  hbase " + getClass().getName() + " \\");<a name="line.1060"></a>
+<span class="sourceLineNo">1060</span>    System.err.println("  hbase snapshot export \\");<a name="line.1060"></a>
 <span class="sourceLineNo">1061</span>    System.err.println("    -snapshot MySnapshot -copy-to hdfs://srv2:8082/hbase \\");<a name="line.1061"></a>
 <span class="sourceLineNo">1062</span>    System.err.println("    -chuser MyUser -chgroup MyGroup -chmod 700 -mappers 16");<a name="line.1062"></a>
 <span class="sourceLineNo">1063</span>    System.err.println();<a name="line.1063"></a>
-<span class="sourceLineNo">1064</span>    System.err.println("  hbase " + getClass().getName() + " \\");<a name="line.1064"></a>
+<span class="sourceLineNo">1064</span>    System.err.println("  hbase snapshot export \\");<a name="line.1064"></a>
 <span class="sourceLineNo">1065</span>    System.err.println("    -snapshot MySnapshot -copy-from hdfs://srv2:8082/hbase \\");<a name="line.1065"></a>
 <span class="sourceLineNo">1066</span>    System.err.println("    -copy-to hdfs://srv1:50070/hbase \\");<a name="line.1066"></a>
 <span class="sourceLineNo">1067</span>    System.exit(1);<a name="line.1067"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f30982bd/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.ExportSnapshotInputFormat.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.ExportSnapshotInputFormat.html b/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.ExportSnapshotInputFormat.html
index 14327de..0a8e897 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.ExportSnapshotInputFormat.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.ExportSnapshotInputFormat.html
@@ -1065,11 +1065,11 @@
 <span class="sourceLineNo">1057</span>    System.err.println("  -bandwidth              Limit bandwidth to this value in MB/second.");<a name="line.1057"></a>
 <span class="sourceLineNo">1058</span>    System.err.println();<a name="line.1058"></a>
 <span class="sourceLineNo">1059</span>    System.err.println("Examples:");<a name="line.1059"></a>
-<span class="sourceLineNo">1060</span>    System.err.println("  hbase " + getClass().getName() + " \\");<a name="line.1060"></a>
+<span class="sourceLineNo">1060</span>    System.err.println("  hbase snapshot export \\");<a name="line.1060"></a>
 <span class="sourceLineNo">1061</span>    System.err.println("    -snapshot MySnapshot -copy-to hdfs://srv2:8082/hbase \\");<a name="line.1061"></a>
 <span class="sourceLineNo">1062</span>    System.err.println("    -chuser MyUser -chgroup MyGroup -chmod 700 -mappers 16");<a name="line.1062"></a>
 <span class="sourceLineNo">1063</span>    System.err.println();<a name="line.1063"></a>
-<span class="sourceLineNo">1064</span>    System.err.println("  hbase " + getClass().getName() + " \\");<a name="line.1064"></a>
+<span class="sourceLineNo">1064</span>    System.err.println("  hbase snapshot export \\");<a name="line.1064"></a>
 <span class="sourceLineNo">1065</span>    System.err.println("    -snapshot MySnapshot -copy-from hdfs://srv2:8082/hbase \\");<a name="line.1065"></a>
 <span class="sourceLineNo">1066</span>    System.err.println("    -copy-to hdfs://srv1:50070/hbase \\");<a name="line.1066"></a>
 <span class="sourceLineNo">1067</span>    System.exit(1);<a name="line.1067"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f30982bd/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.html b/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.html
index 14327de..0a8e897 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.html
@@ -1065,11 +1065,11 @@
 <span class="sourceLineNo">1057</span>    System.err.println("  -bandwidth              Limit bandwidth to this value in MB/second.");<a name="line.1057"></a>
 <span class="sourceLineNo">1058</span>    System.err.println();<a name="line.1058"></a>
 <span class="sourceLineNo">1059</span>    System.err.println("Examples:");<a name="line.1059"></a>
-<span class="sourceLineNo">1060</span>    System.err.println("  hbase " + getClass().getName() + " \\");<a name="line.1060"></a>
+<span class="sourceLineNo">1060</span>    System.err.println("  hbase snapshot export \\");<a name="line.1060"></a>
 <span class="sourceLineNo">1061</span>    System.err.println("    -snapshot MySnapshot -copy-to hdfs://srv2:8082/hbase \\");<a name="line.1061"></a>
 <span class="sourceLineNo">1062</span>    System.err.println("    -chuser MyUser -chgroup MyGroup -chmod 700 -mappers 16");<a name="line.1062"></a>
 <span class="sourceLineNo">1063</span>    System.err.println();<a name="line.1063"></a>
-<span class="sourceLineNo">1064</span>    System.err.println("  hbase " + getClass().getName() + " \\");<a name="line.1064"></a>
+<span class="sourceLineNo">1064</span>    System.err.println("  hbase snapshot export \\");<a name="line.1064"></a>
 <span class="sourceLineNo">1065</span>    System.err.println("    -snapshot MySnapshot -copy-from hdfs://srv2:8082/hbase \\");<a name="line.1065"></a>
 <span class="sourceLineNo">1066</span>    System.err.println("    -copy-to hdfs://srv1:50070/hbase \\");<a name="line.1066"></a>
 <span class="sourceLineNo">1067</span>    System.exit(1);<a name="line.1067"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f30982bd/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotInfo.SnapshotStats.FileInfo.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotInfo.SnapshotStats.FileInfo.html b/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotInfo.SnapshotStats.FileInfo.html
index dc0de15..2662234 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotInfo.SnapshotStats.FileInfo.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotInfo.SnapshotStats.FileInfo.html
@@ -475,7 +475,7 @@
 <span class="sourceLineNo">467</span>  }<a name="line.467"></a>
 <span class="sourceLineNo">468</span><a name="line.468"></a>
 <span class="sourceLineNo">469</span>  private void printUsageAndExit() {<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    System.err.printf("Usage: bin/hbase %s [options]%n", getClass().getName());<a name="line.470"></a>
+<span class="sourceLineNo">470</span>    System.err.printf("Usage: bin/hbase snapshot info [options]%n");<a name="line.470"></a>
 <span class="sourceLineNo">471</span>    System.err.println(" where [options] are:");<a name="line.471"></a>
 <span class="sourceLineNo">472</span>    System.err.println("  -h|-help                Show this help and exit.");<a name="line.472"></a>
 <span class="sourceLineNo">473</span>    System.err.println("  -remote-dir             Root directory that contains the snapshots.");<a name="line.473"></a>
@@ -487,7 +487,7 @@
 <span class="sourceLineNo">479</span>    System.err.println("  -schema                 Describe the snapshotted table.");<a name="line.479"></a>
 <span class="sourceLineNo">480</span>    System.err.println();<a name="line.480"></a>
 <span class="sourceLineNo">481</span>    System.err.println("Examples:");<a name="line.481"></a>
-<span class="sourceLineNo">482</span>    System.err.println("  hbase " + getClass() + " \\");<a name="line.482"></a>
+<span class="sourceLineNo">482</span>    System.err.println("  hbase snapshot info \\");<a name="line.482"></a>
 <span class="sourceLineNo">483</span>    System.err.println("    -snapshot MySnapshot -files");<a name="line.483"></a>
 <span class="sourceLineNo">484</span>    System.exit(1);<a name="line.484"></a>
 <span class="sourceLineNo">485</span>  }<a name="line.485"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f30982bd/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotInfo.SnapshotStats.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotInfo.SnapshotStats.html b/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotInfo.SnapshotStats.html
index dc0de15..2662234 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotInfo.SnapshotStats.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotInfo.SnapshotStats.html
@@ -475,7 +475,7 @@
 <span class="sourceLineNo">467</span>  }<a name="line.467"></a>
 <span class="sourceLineNo">468</span><a name="line.468"></a>
 <span class="sourceLineNo">469</span>  private void printUsageAndExit() {<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    System.err.printf("Usage: bin/hbase %s [options]%n", getClass().getName());<a name="line.470"></a>
+<span class="sourceLineNo">470</span>    System.err.printf("Usage: bin/hbase snapshot info [options]%n");<a name="line.470"></a>
 <span class="sourceLineNo">471</span>    System.err.println(" where [options] are:");<a name="line.471"></a>
 <span class="sourceLineNo">472</span>    System.err.println("  -h|-help                Show this help and exit.");<a name="line.472"></a>
 <span class="sourceLineNo">473</span>    System.err.println("  -remote-dir             Root directory that contains the snapshots.");<a name="line.473"></a>
@@ -487,7 +487,7 @@
 <span class="sourceLineNo">479</span>    System.err.println("  -schema                 Describe the snapshotted table.");<a name="line.479"></a>
 <span class="sourceLineNo">480</span>    System.err.println();<a name="line.480"></a>
 <span class="sourceLineNo">481</span>    System.err.println("Examples:");<a name="line.481"></a>
-<span class="sourceLineNo">482</span>    System.err.println("  hbase " + getClass() + " \\");<a name="line.482"></a>
+<span class="sourceLineNo">482</span>    System.err.println("  hbase snapshot info \\");<a name="line.482"></a>
 <span class="sourceLineNo">483</span>    System.err.println("    -snapshot MySnapshot -files");<a name="line.483"></a>
 <span class="sourceLineNo">484</span>    System.exit(1);<a name="line.484"></a>
 <span class="sourceLineNo">485</span>  }<a name="line.485"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f30982bd/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotInfo.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotInfo.html b/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotInfo.html
index dc0de15..2662234 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotInfo.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotInfo.html
@@ -475,7 +475,7 @@
 <span class="sourceLineNo">467</span>  }<a name="line.467"></a>
 <span class="sourceLineNo">468</span><a name="line.468"></a>
 <span class="sourceLineNo">469</span>  private void printUsageAndExit() {<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    System.err.printf("Usage: bin/hbase %s [options]%n", getClass().getName());<a name="line.470"></a>
+<span class="sourceLineNo">470</span>    System.err.printf("Usage: bin/hbase snapshot info [options]%n");<a name="line.470"></a>
 <span class="sourceLineNo">471</span>    System.err.println(" where [options] are:");<a name="line.471"></a>
 <span class="sourceLineNo">472</span>    System.err.println("  -h|-help                Show this help and exit.");<a name="line.472"></a>
 <span class="sourceLineNo">473</span>    System.err.println("  -remote-dir             Root directory that contains the snapshots.");<a name="line.473"></a>
@@ -487,7 +487,7 @@
 <span class="sourceLineNo">479</span>    System.err.println("  -schema                 Describe the snapshotted table.");<a name="line.479"></a>
 <span class="sourceLineNo">480</span>    System.err.println();<a name="line.480"></a>
 <span class="sourceLineNo">481</span>    System.err.println("Examples:");<a name="line.481"></a>
-<span class="sourceLineNo">482</span>    System.err.println("  hbase " + getClass() + " \\");<a name="line.482"></a>
+<span class="sourceLineNo">482</span>    System.err.println("  hbase snapshot info \\");<a name="line.482"></a>
 <span class="sourceLineNo">483</span>    System.err.println("    -snapshot MySnapshot -files");<a name="line.483"></a>
 <span class="sourceLineNo">484</span>    System.exit(1);<a name="line.484"></a>
 <span class="sourceLineNo">485</span>  }<a name="line.485"></a>


Mime
View raw message