You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2016/06/15 23:18:45 UTC

[10/51] [abbrv] [partial] hbase git commit: Published site at 158568e7806e461275406bc15856ba26e4660f4c

http://git-wip-us.apache.org/repos/asf/hbase/blob/702fbc6f/apidocs/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html b/apidocs/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html
index c8b0609..5867380 100644
--- a/apidocs/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html
+++ b/apidocs/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html
@@ -106,7 +106,7 @@
 <br>
 <pre>@InterfaceAudience.Public
 @InterfaceStability.Stable
-public class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.109">LoadIncrementalHFiles</a>
+public class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.110">LoadIncrementalHFiles</a>
 extends org.apache.hadoop.conf.Configured
 implements org.apache.hadoop.util.Tool</pre>
 <div class="block">Tool to load the output of HFileOutputFormat into an existing table.</div>
@@ -195,14 +195,6 @@ implements org.apache.hadoop.util.Tool</pre>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#doBulkLoad(org.apache.hadoop.fs.Path,%20org.apache.hadoop.hbase.client.HTable)">doBulkLoad</a></strong>(org.apache.hadoop.fs.Path&nbsp;hfofDir,
-                    org.apache.hadoop.hbase.client.HTable&nbsp;table)</code>
-<div class="block">Perform a bulk load of the given directory into the given
- pre-existing table.</div>
-</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.LoadQueueItem&gt;</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#groupOrSplit(com.google.common.collect.Multimap,%20org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.LoadQueueItem,%20org.apache.hadoop.hbase.client.Table,%20org.apache.hadoop.hbase.util.Pair)">groupOrSplit</a></strong>(com.google.common.collect.Multimap&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>,org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.LoadQueueItem&gt;&nbsp;regionGroups,
                         org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.LoadQueueItem&nbsp;item,
@@ -211,18 +203,44 @@ implements org.apache.hadoop.util.Tool</pre>
 <div class="block">Attempt to assign the given load queue item into its target region group.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static byte[][]</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#inferBoundaries(java.util.TreeMap)">inferBoundaries</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html?is-external=true" title="class or interface in java.util">TreeMap</a>&lt;byte[],<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&gt;&nbsp;bdryMap)</code>&nbsp;</td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#loadHFileQueue(org.apache.hadoop.hbase.client.Table,%20org.apache.hadoop.hbase.client.Connection,%20java.util.Deque,%20org.apache.hadoop.hbase.util.Pair)">loadHFileQueue</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/client/Table.html" title="interface in org.apache.hadoop.hbase.client">Table</a>&nbsp;table,
+                            <a href="../../../../../org/apache/hadoop/hbase/client/Connection.html" title="interface in org.apache.hadoop.hbase.client">Connection</a>&nbsp;conn,
+                            <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Deque.html?is-external=true" title="class or interface in java.util">Deque</a>&lt;org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.LoadQueueItem&gt;&nbsp;queue,
+                            <a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a>&lt;byte[][],byte[][]&gt;&nbsp;startEndKeys)</code>
+<div class="block">Used by the replication sink to load the hfiles from the source cluster.</div>
+</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#main(java.lang.String[])">main</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#prepareHFileQueue(org.apache.hadoop.fs.Path,%20org.apache.hadoop.hbase.client.Table,%20java.util.Deque,%20boolean)">prepareHFileQueue</a></strong>(org.apache.hadoop.fs.Path&nbsp;hfilesDir,
+                                  <a href="../../../../../org/apache/hadoop/hbase/client/Table.html" title="interface in org.apache.hadoop.hbase.client">Table</a>&nbsp;table,
+                                  <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Deque.html?is-external=true" title="class or interface in java.util">Deque</a>&lt;org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.LoadQueueItem&gt;&nbsp;queue,
+                                  boolean&nbsp;validateHFile)</code>
+<div class="block">Prepare a collection of <code>LoadIncrementalHFiles.LoadQueueItem</code> from list of source hfiles contained in the
+ passed directory and validates whether the prepared queue has all the valid table column
+ families in it.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#run(java.lang.String[])">run</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)</code>&nbsp;</td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#setBulkToken(java.lang.String)">setBulkToken</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;stagingDir)</code>
+<div class="block">Called from replication sink, where it manages bulkToken(staging directory) by itself.</div>
+</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.LoadQueueItem&gt;</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#splitStoreFile(org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.LoadQueueItem,%20org.apache.hadoop.hbase.client.Table,%20byte[],%20byte[])">splitStoreFile</a></strong>(org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.LoadQueueItem&nbsp;item,
@@ -281,7 +299,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>NAME</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.113">NAME</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.114">NAME</a></pre>
 <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.NAME">Constant Field Values</a></dd></dl>
 </li>
 </ul>
@@ -291,7 +309,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>MAX_FILES_PER_REGION_PER_FAMILY</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.114">MAX_FILES_PER_REGION_PER_FAMILY</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.115">MAX_FILES_PER_REGION_PER_FAMILY</a></pre>
 <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.MAX_FILES_PER_REGION_PER_FAMILY">Constant Field Values</a></dd></dl>
 </li>
 </ul>
@@ -301,7 +319,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>CREATE_TABLE_CONF_KEY</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.117">CREATE_TABLE_CONF_KEY</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.118">CREATE_TABLE_CONF_KEY</a></pre>
 <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.CREATE_TABLE_CONF_KEY">Constant Field Values</a></dd></dl>
 </li>
 </ul>
@@ -319,7 +337,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>LoadIncrementalHFiles</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.131">LoadIncrementalHFiles</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.137">LoadIncrementalHFiles</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)
                       throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl><dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -333,43 +351,62 @@ implements org.apache.hadoop.util.Tool</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="doBulkLoad(org.apache.hadoop.fs.Path, org.apache.hadoop.hbase.client.HTable)">
+<a name="doBulkLoad(org.apache.hadoop.fs.Path, org.apache.hadoop.hbase.client.Admin, org.apache.hadoop.hbase.client.Table, org.apache.hadoop.hbase.client.RegionLocator)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>doBulkLoad</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.299">doBulkLoad</a>(org.apache.hadoop.fs.Path&nbsp;hfofDir,
-              org.apache.hadoop.hbase.client.HTable&nbsp;table)
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.314">doBulkLoad</a>(org.apache.hadoop.fs.Path&nbsp;hfofDir,
+              <a href="../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a>&nbsp;admin,
+              <a href="../../../../../org/apache/hadoop/hbase/client/Table.html" title="interface in org.apache.hadoop.hbase.client">Table</a>&nbsp;table,
+              <a href="../../../../../org/apache/hadoop/hbase/client/RegionLocator.html" title="interface in org.apache.hadoop.hbase.client">RegionLocator</a>&nbsp;regionLocator)
                 throws <a href="../../../../../org/apache/hadoop/hbase/TableNotFoundException.html" title="class in org.apache.hadoop.hbase">TableNotFoundException</a>,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Perform a bulk load of the given directory into the given
  pre-existing table.  This method is not threadsafe.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>hfofDir</code> - the directory that was provided as the output path
- of a job using HFileOutputFormat</dd><dd><code>table</code> - the table to load into</dd>
+   of a job using HFileOutputFormat</dd><dd><code>table</code> - the table to load into</dd>
 <dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/TableNotFoundException.html" title="class in org.apache.hadoop.hbase">TableNotFoundException</a></code> - if table does not yet exist</dd>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd></dl>
 </li>
 </ul>
-<a name="doBulkLoad(org.apache.hadoop.fs.Path, org.apache.hadoop.hbase.client.Admin, org.apache.hadoop.hbase.client.Table, org.apache.hadoop.hbase.client.RegionLocator)">
+<a name="prepareHFileQueue(org.apache.hadoop.fs.Path, org.apache.hadoop.hbase.client.Table, java.util.Deque, boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>doBulkLoad</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.317">doBulkLoad</a>(org.apache.hadoop.fs.Path&nbsp;hfofDir,
-              <a href="../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a>&nbsp;admin,
-              <a href="../../../../../org/apache/hadoop/hbase/client/Table.html" title="interface in org.apache.hadoop.hbase.client">Table</a>&nbsp;table,
-              <a href="../../../../../org/apache/hadoop/hbase/client/RegionLocator.html" title="interface in org.apache.hadoop.hbase.client">RegionLocator</a>&nbsp;regionLocator)
-                throws <a href="../../../../../org/apache/hadoop/hbase/TableNotFoundException.html" title="class in org.apache.hadoop.hbase">TableNotFoundException</a>,
-                       <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
-<div class="block">Perform a bulk load of the given directory into the given
- pre-existing table.  This method is not threadsafe.</div>
-<dl><dt><span class="strong">Parameters:</span></dt><dd><code>hfofDir</code> - the directory that was provided as the output path
- of a job using HFileOutputFormat</dd><dd><code>table</code> - the table to load into</dd>
+<h4>prepareHFileQueue</h4>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.425">prepareHFileQueue</a>(org.apache.hadoop.fs.Path&nbsp;hfilesDir,
+                     <a href="../../../../../org/apache/hadoop/hbase/client/Table.html" title="interface in org.apache.hadoop.hbase.client">Table</a>&nbsp;table,
+                     <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Deque.html?is-external=true" title="class or interface in java.util">Deque</a>&lt;org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.LoadQueueItem&gt;&nbsp;queue,
+                     boolean&nbsp;validateHFile)
+                       throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<div class="block">Prepare a collection of <code>LoadIncrementalHFiles.LoadQueueItem</code> from list of source hfiles contained in the
+ passed directory and validates whether the prepared queue has all the valid table column
+ families in it.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>hfilesDir</code> - directory containing list of hfiles to be loaded into the table</dd><dd><code>table</code> - table to which hfiles should be loaded</dd><dd><code>queue</code> - queue which needs to be loaded into the table</dd><dd><code>validateHFile</code> - if true hfiles will be validated for its format</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - If any I/O or network error occurred</dd></dl>
+</li>
+</ul>
+<a name="loadHFileQueue(org.apache.hadoop.hbase.client.Table, org.apache.hadoop.hbase.client.Connection, java.util.Deque, org.apache.hadoop.hbase.util.Pair)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>loadHFileQueue</h4>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.480">loadHFileQueue</a>(<a href="../../../../../org/apache/hadoop/hbase/client/Table.html" title="interface in org.apache.hadoop.hbase.client">Table</a>&nbsp;table,
+                  <a href="../../../../../org/apache/hadoop/hbase/client/Connection.html" title="interface in org.apache.hadoop.hbase.client">Connection</a>&nbsp;conn,
+                  <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Deque.html?is-external=true" title="class or interface in java.util">Deque</a>&lt;org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.LoadQueueItem&gt;&nbsp;queue,
+                  <a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a>&lt;byte[][],byte[][]&gt;&nbsp;startEndKeys)
+                    throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<div class="block">Used by the replication sink to load the hfiles from the source cluster. It does the following,
+ 1. <a href="../../../../../org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#groupOrSplitPhase(org.apache.hadoop.hbase.client.Table,%20java.util.concurrent.ExecutorService,%20java.util.Deque,%20org.apache.hadoop.hbase.util.Pair)"><code>groupOrSplitPhase(Table, ExecutorService, Deque, Pair)</code></a> 2.
+ <a href="../../../../../org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#bulkLoadPhase(org.apache.hadoop.hbase.client.Table,%20org.apache.hadoop.hbase.client.Connection,%20java.util.concurrent.ExecutorService,%20java.util.Deque,%20com.google.common.collect.Multimap)"><code>bulkLoadPhase(Table, Connection, ExecutorService, Deque, Multimap)</code></a></div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>table</code> - Table to which these hfiles should be loaded to</dd><dd><code>conn</code> - Connection to use</dd><dd><code>queue</code> - <code>LoadIncrementalHFiles.LoadQueueItem</code> has hfiles yet to be loaded</dd><dd><code>startEndKeys</code> - starting and ending row keys of the region</dd>
 <dt><span class="strong">Throws:</span></dt>
-<dd><code><a href="../../../../../org/apache/hadoop/hbase/TableNotFoundException.html" title="class in org.apache.hadoop.hbase">TableNotFoundException</a></code> - if table does not yet exist</dd>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd></dl>
 </li>
 </ul>
@@ -379,7 +416,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>bulkLoadPhase</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.454">bulkLoadPhase</a>(<a href="../../../../../org/apache/hadoop/hbase/client/Table.html" title="interface in org.apache.hadoop.hbase.client">Table</a>&nbsp;table,
+<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.500">bulkLoadPhase</a>(<a href="../../../../../org/apache/hadoop/hbase/client/Table.html" title="interface in org.apache.hadoop.hbase.client">Table</a>&nbsp;table,
                  <a href="../../../../../org/apache/hadoop/hbase/client/Connection.html" title="interface in org.apache.hadoop.hbase.client">Connection</a>&nbsp;conn,
                  <a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/ExecutorService.html?is-external=true" title="class or interface in java.util.concurrent">ExecutorService</a>&nbsp;pool,
                  <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Deque.html?is-external=true" title="class or interface in java.util">Deque</a>&lt;org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.LoadQueueItem&gt;&nbsp;queue,
@@ -398,7 +435,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>splitStoreFile</h4>
-<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.LoadQueueItem&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.577">splitStoreFile</a>(org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.LoadQueueItem&nbsp;item,
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.LoadQueueItem&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.623">splitStoreFile</a>(org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.LoadQueueItem&nbsp;item,
                                                                                          <a href="../../../../../org/apache/hadoop/hbase/client/Table.html" title="interface in org.apache.hadoop.hbase.client">Table</a>&nbsp;table,
                                                                                          byte[]&nbsp;startKey,
                                                                                          byte[]&nbsp;splitKey)
@@ -413,7 +450,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>groupOrSplit</h4>
-<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.LoadQueueItem&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.624">groupOrSplit</a>(com.google.common.collect.Multimap&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>,org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.LoadQueueItem&gt;&nbsp;regionGroups,
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.LoadQueueItem&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.678">groupOrSplit</a>(com.google.common.collect.Multimap&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>,org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.LoadQueueItem&gt;&nbsp;regionGroups,
                                                                                        org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.LoadQueueItem&nbsp;item,
                                                                                        <a href="../../../../../org/apache/hadoop/hbase/client/Table.html" title="interface in org.apache.hadoop.hbase.client">Table</a>&nbsp;table,
                                                                                        <a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a>&lt;byte[][],byte[][]&gt;&nbsp;startEndKeys)
@@ -425,7 +462,7 @@ implements org.apache.hadoop.util.Tool</pre>
 
  protected for testing</div>
 <dl><dt><span class="strong">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd></dl>
+<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - if an IO failure is encountered</dd></dl>
 </li>
 </ul>
 <a name="tryAtomicRegionLoad(org.apache.hadoop.hbase.client.Connection, org.apache.hadoop.hbase.TableName, byte[], java.util.Collection)">
@@ -434,7 +471,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>tryAtomicRegionLoad</h4>
-<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.LoadQueueItem&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.714">tryAtomicRegionLoad</a>(<a href="../../../../../org/apache/hadoop/hbase/client/Connection.html" title="interface in org.apache.hadoop.hbase.client">Connection</a>&nbsp;conn,
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.LoadQueueItem&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.772">tryAtomicRegionLoad</a>(<a href="../../../../../org/apache/hadoop/hbase/client/Connection.html" title="interface in org.apache.hadoop.hbase.client">Connection</a>&nbsp;conn,
                                                                                               <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
                                                                                               byte[]&nbsp;first,
                                                                                               <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles.LoadQueueItem&gt;&nbsp;lqis)
@@ -448,7 +485,7 @@ implements org.apache.hadoop.util.Tool</pre>
 
  Protected for testing.</div>
 <dl><dt><span class="strong">Returns:</span></dt><dd>empty list if success, list of items to retry on recoverable
- failure</dd>
+   failure</dd>
 <dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd></dl>
 </li>
@@ -459,7 +496,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>inferBoundaries</h4>
-<pre>public static&nbsp;byte[][]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.887">inferBoundaries</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html?is-external=true" title="class or interface in java.util">TreeMap</a>&lt;byte[],<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&gt;&nbsp;bdryMap)</pre>
+<pre>public static&nbsp;byte[][]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.958">inferBoundaries</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html?is-external=true" title="class or interface in java.util">TreeMap</a>&lt;byte[],<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&gt;&nbsp;bdryMap)</pre>
 </li>
 </ul>
 <a name="run(java.lang.String[])">
@@ -468,7 +505,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>run</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.963">run</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.1038">run</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
         throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><strong>Specified by:</strong></dt>
@@ -480,15 +517,31 @@ implements org.apache.hadoop.util.Tool</pre>
 <a name="main(java.lang.String[])">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.997">main</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.1072">main</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                  throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl><dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
 </li>
 </ul>
+<a name="setBulkToken(java.lang.String)">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setBulkToken</h4>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#line.1087">setBulkToken</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;stagingDir)</pre>
+<div class="block">Called from replication sink, where it manages bulkToken(staging directory) by itself. This is
+ used only when <code>SecureBulkLoadEndpoint</code> is configured in hbase.coprocessor.region.classes
+ property. This directory is used as a temporary directory where all files are initially
+ copied/moved from user given directory, set all the required file permissions and then from
+ their it is finally loaded into a table. This should be set only when, one would like to manage
+ the staging directory by itself. Otherwise this tool will handle this by itself.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>stagingDir</code> - staging directory path</dd></dl>
+</li>
+</ul>
 </li>
 </ul>
 </li>
@@ -556,6 +609,6 @@ implements org.apache.hadoop.util.Tool</pre>
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2016 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/hbase/blob/702fbc6f/apidocs/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormat.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormat.html b/apidocs/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormat.html
index 4ad4fb1..fe88bec 100644
--- a/apidocs/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormat.html
+++ b/apidocs/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormat.html
@@ -369,6 +369,6 @@ implements org.apache.hadoop.conf.Configurable</pre>
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2016 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/hbase/blob/702fbc6f/apidocs/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.html b/apidocs/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.html
index e43361a..bbd7f39 100644
--- a/apidocs/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.html
+++ b/apidocs/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.html
@@ -254,7 +254,7 @@ extends org.apache.hadoop.mapreduce.InputFormat&lt;<a href="../../../../../org/a
 <ul class="blockList">
 <li class="blockList">
 <h4>getSplits</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.mapreduce.InputSplit&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.html#line.165">getSplits</a>(org.apache.hadoop.mapreduce.JobContext&nbsp;context)
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.mapreduce.InputSplit&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.html#line.161">getSplits</a>(org.apache.hadoop.mapreduce.JobContext&nbsp;context)
                                                        throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Calculates the splits that will serve as input for the map tasks. The
  number of splits matches the number of regions in a table.</div>
@@ -273,7 +273,7 @@ extends org.apache.hadoop.mapreduce.InputFormat&lt;<a href="../../../../../org/a
 <ul class="blockList">
 <li class="blockList">
 <h4>includeRegionInSplit</h4>
-<pre>protected&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.html#line.271">includeRegionInSplit</a>(byte[]&nbsp;startKey,
+<pre>protected&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.html#line.269">includeRegionInSplit</a>(byte[]&nbsp;startKey,
                            byte[]&nbsp;endKey)</pre>
 <div class="block">Test if the given region is to be included in the InputSplit while
  splitting the regions of a table.
@@ -301,7 +301,7 @@ extends org.apache.hadoop.mapreduce.InputFormat&lt;<a href="../../../../../org/a
 <ul class="blockList">
 <li class="blockList">
 <h4>getScans</h4>
-<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.html#line.279">getScans</a>()</pre>
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.html#line.277">getScans</a>()</pre>
 <div class="block">Allows subclasses to get the list of <a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client"><code>Scan</code></a> objects.</div>
 </li>
 </ul>
@@ -311,7 +311,7 @@ extends org.apache.hadoop.mapreduce.InputFormat&lt;<a href="../../../../../org/a
 <ul class="blockList">
 <li class="blockList">
 <h4>setScans</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.html#line.288">setScans</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a>&gt;&nbsp;scans)</pre>
+<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.html#line.286">setScans</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a>&gt;&nbsp;scans)</pre>
 <div class="block">Allows subclasses to set the list of <a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client"><code>Scan</code></a> objects.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>scans</code> - The list of <a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client"><code>Scan</code></a> used to define the input</dd></dl>
 </li>
@@ -322,7 +322,7 @@ extends org.apache.hadoop.mapreduce.InputFormat&lt;<a href="../../../../../org/a
 <ul class="blockListLast">
 <li class="blockList">
 <h4>setTableRecordReader</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.html#line.298">setTableRecordReader</a>(<a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableRecordReader.html" title="class in org.apache.hadoop.hbase.mapreduce">TableRecordReader</a>&nbsp;tableRecordReader)</pre>
+<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.html#line.296">setTableRecordReader</a>(<a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableRecordReader.html" title="class in org.apache.hadoop.hbase.mapreduce">TableRecordReader</a>&nbsp;tableRecordReader)</pre>
 <div class="block">Allows subclasses to set the <a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableRecordReader.html" title="class in org.apache.hadoop.hbase.mapreduce"><code>TableRecordReader</code></a>.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>tableRecordReader</code> - A different <a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableRecordReader.html" title="class in org.apache.hadoop.hbase.mapreduce"><code>TableRecordReader</code></a>
           implementation.</dd></dl>
@@ -395,6 +395,6 @@ extends org.apache.hadoop.mapreduce.InputFormat&lt;<a href="../../../../../org/a
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2016 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/hbase/blob/702fbc6f/apidocs/org/apache/hadoop/hbase/mapreduce/MultiTableOutputFormat.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/mapreduce/MultiTableOutputFormat.html b/apidocs/org/apache/hadoop/hbase/mapreduce/MultiTableOutputFormat.html
index 12745b9..2b3dea7 100644
--- a/apidocs/org/apache/hadoop/hbase/mapreduce/MultiTableOutputFormat.html
+++ b/apidocs/org/apache/hadoop/hbase/mapreduce/MultiTableOutputFormat.html
@@ -396,6 +396,6 @@ extends org.apache.hadoop.mapreduce.OutputFormat&lt;<a href="../../../../../org/
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2016 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/hbase/blob/702fbc6f/apidocs/org/apache/hadoop/hbase/mapreduce/MultiTableSnapshotInputFormat.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/mapreduce/MultiTableSnapshotInputFormat.html b/apidocs/org/apache/hadoop/hbase/mapreduce/MultiTableSnapshotInputFormat.html
index ee65758..a60b2ea 100644
--- a/apidocs/org/apache/hadoop/hbase/mapreduce/MultiTableSnapshotInputFormat.html
+++ b/apidocs/org/apache/hadoop/hbase/mapreduce/MultiTableSnapshotInputFormat.html
@@ -337,6 +337,6 @@ extends <a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableSnapshotI
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2016 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/hbase/blob/702fbc6f/apidocs/org/apache/hadoop/hbase/mapreduce/PutCombiner.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/mapreduce/PutCombiner.html b/apidocs/org/apache/hadoop/hbase/mapreduce/PutCombiner.html
index 7749def..22fe4d0 100644
--- a/apidocs/org/apache/hadoop/hbase/mapreduce/PutCombiner.html
+++ b/apidocs/org/apache/hadoop/hbase/mapreduce/PutCombiner.html
@@ -282,6 +282,6 @@ extends org.apache.hadoop.mapreduce.Reducer&lt;K,<a href="../../../../../org/apa
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2016 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/hbase/blob/702fbc6f/apidocs/org/apache/hadoop/hbase/mapreduce/PutSortReducer.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/mapreduce/PutSortReducer.html b/apidocs/org/apache/hadoop/hbase/mapreduce/PutSortReducer.html
index 2d8c187..018cfb1 100644
--- a/apidocs/org/apache/hadoop/hbase/mapreduce/PutSortReducer.html
+++ b/apidocs/org/apache/hadoop/hbase/mapreduce/PutSortReducer.html
@@ -283,6 +283,6 @@ extends org.apache.hadoop.mapreduce.Reducer&lt;<a href="../../../../../org/apach
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2016 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/hbase/blob/702fbc6f/apidocs/org/apache/hadoop/hbase/mapreduce/RowCounter.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/mapreduce/RowCounter.html b/apidocs/org/apache/hadoop/hbase/mapreduce/RowCounter.html
index ec186e2..f36ed32 100644
--- a/apidocs/org/apache/hadoop/hbase/mapreduce/RowCounter.html
+++ b/apidocs/org/apache/hadoop/hbase/mapreduce/RowCounter.html
@@ -238,7 +238,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>run</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/RowCounter.html#line.200">run</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/RowCounter.html#line.199">run</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
         throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><strong>Specified by:</strong></dt>
@@ -253,7 +253,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/RowCounter.html#line.227">main</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/RowCounter.html#line.226">main</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                  throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Main entry point.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>args</code> - The command line parameters.</dd>
@@ -328,6 +328,6 @@ implements org.apache.hadoop.util.Tool</pre>
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2016 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/hbase/blob/702fbc6f/apidocs/org/apache/hadoop/hbase/mapreduce/SimpleTotalOrderPartitioner.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/mapreduce/SimpleTotalOrderPartitioner.html b/apidocs/org/apache/hadoop/hbase/mapreduce/SimpleTotalOrderPartitioner.html
index 4eab3be..ec01002 100644
--- a/apidocs/org/apache/hadoop/hbase/mapreduce/SimpleTotalOrderPartitioner.html
+++ b/apidocs/org/apache/hadoop/hbase/mapreduce/SimpleTotalOrderPartitioner.html
@@ -409,6 +409,6 @@ public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2016 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/hbase/blob/702fbc6f/apidocs/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html b/apidocs/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html
index 3a591cb..f570d63 100644
--- a/apidocs/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html
+++ b/apidocs/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html
@@ -111,7 +111,7 @@
 <br>
 <pre>@InterfaceAudience.Public
 @InterfaceStability.Stable
-public class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.49">TableInputFormat</a>
+public class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.50">TableInputFormat</a>
 extends <a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.html" title="class in org.apache.hadoop.hbase.mapreduce">TableInputFormatBase</a>
 implements org.apache.hadoop.conf.Configurable</pre>
 <div class="block">Convert HBase tabular data into a format that is consumable by Map/Reduce.</div>
@@ -271,28 +271,35 @@ implements org.apache.hadoop.conf.Configurable</pre>
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a></code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#createScanFromConfiguration(org.apache.hadoop.conf.Configuration)">createScanFromConfiguration</a></strong>(org.apache.hadoop.conf.Configuration&nbsp;conf)</code>
+<div class="block">Sets up a <a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client"><code>Scan</code></a> instance, applying settings from the configuration property
+ constants defined in <code>TableInputFormat</code>.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>org.apache.hadoop.conf.Configuration</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#getConf()">getConf</a></strong>()</code>
 <div class="block">Returns the current configuration.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.mapreduce.InputSplit&gt;</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#getSplits(org.apache.hadoop.mapreduce.JobContext)">getSplits</a></strong>(org.apache.hadoop.mapreduce.JobContext&nbsp;context)</code>
 <div class="block">Calculates the splits that will serve as input for the map tasks.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>protected <a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a>&lt;byte[][],byte[][]&gt;</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#getStartEndKeys()">getStartEndKeys</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#initialize(org.apache.hadoop.mapreduce.JobContext)">initialize</a></strong>(org.apache.hadoop.mapreduce.JobContext&nbsp;context)</code>
 <div class="block">Handle subclass specific set up.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#setConf(org.apache.hadoop.conf.Configuration)">setConf</a></strong>(org.apache.hadoop.conf.Configuration&nbsp;configuration)</code>
 <div class="block">Sets the configuration.</div>
@@ -333,7 +340,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>INPUT_TABLE</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.56">INPUT_TABLE</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.57">INPUT_TABLE</a></pre>
 <div class="block">Job parameter that specifies the input table.</div>
 <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.TableInputFormat.INPUT_TABLE">Constant Field Values</a></dd></dl>
 </li>
@@ -344,7 +351,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>SCAN</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.65">SCAN</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.66">SCAN</a></pre>
 <div class="block">Base-64 encoded scanner. All other SCAN_ confs are ignored if this is specified.
  See <a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#convertScanToString(org.apache.hadoop.hbase.client.Scan)"><code>TableMapReduceUtil.convertScanToString(Scan)</code></a> for more details.</div>
 <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.TableInputFormat.SCAN">Constant Field Values</a></dd></dl>
@@ -356,7 +363,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>SCAN_ROW_START</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.67">SCAN_ROW_START</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.68">SCAN_ROW_START</a></pre>
 <div class="block">Scan start row</div>
 <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.TableInputFormat.SCAN_ROW_START">Constant Field Values</a></dd></dl>
 </li>
@@ -367,7 +374,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>SCAN_ROW_STOP</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.69">SCAN_ROW_STOP</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.70">SCAN_ROW_STOP</a></pre>
 <div class="block">Scan stop row</div>
 <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.TableInputFormat.SCAN_ROW_STOP">Constant Field Values</a></dd></dl>
 </li>
@@ -378,7 +385,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>SCAN_COLUMN_FAMILY</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.71">SCAN_COLUMN_FAMILY</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.72">SCAN_COLUMN_FAMILY</a></pre>
 <div class="block">Column Family to Scan</div>
 <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.TableInputFormat.SCAN_COLUMN_FAMILY">Constant Field Values</a></dd></dl>
 </li>
@@ -389,7 +396,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>SCAN_COLUMNS</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.73">SCAN_COLUMNS</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.74">SCAN_COLUMNS</a></pre>
 <div class="block">Space delimited list of columns and column families to scan.</div>
 <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.TableInputFormat.SCAN_COLUMNS">Constant Field Values</a></dd></dl>
 </li>
@@ -400,7 +407,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>SCAN_TIMESTAMP</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.75">SCAN_TIMESTAMP</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.76">SCAN_TIMESTAMP</a></pre>
 <div class="block">The timestamp used to filter columns with a specific timestamp.</div>
 <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.TableInputFormat.SCAN_TIMESTAMP">Constant Field Values</a></dd></dl>
 </li>
@@ -411,7 +418,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>SCAN_TIMERANGE_START</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.77">SCAN_TIMERANGE_START</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.78">SCAN_TIMERANGE_START</a></pre>
 <div class="block">The starting timestamp used to filter columns with a specific range of versions.</div>
 <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.TableInputFormat.SCAN_TIMERANGE_START">Constant Field Values</a></dd></dl>
 </li>
@@ -422,7 +429,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>SCAN_TIMERANGE_END</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.79">SCAN_TIMERANGE_END</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.80">SCAN_TIMERANGE_END</a></pre>
 <div class="block">The ending timestamp used to filter columns with a specific range of versions.</div>
 <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.TableInputFormat.SCAN_TIMERANGE_END">Constant Field Values</a></dd></dl>
 </li>
@@ -433,7 +440,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>SCAN_MAXVERSIONS</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.81">SCAN_MAXVERSIONS</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.82">SCAN_MAXVERSIONS</a></pre>
 <div class="block">The maximum number of version to return.</div>
 <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.TableInputFormat.SCAN_MAXVERSIONS">Constant Field Values</a></dd></dl>
 </li>
@@ -444,7 +451,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>SCAN_CACHEBLOCKS</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.83">SCAN_CACHEBLOCKS</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.84">SCAN_CACHEBLOCKS</a></pre>
 <div class="block">Set to false to disable server-side caching of blocks for this scan.</div>
 <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.TableInputFormat.SCAN_CACHEBLOCKS">Constant Field Values</a></dd></dl>
 </li>
@@ -455,7 +462,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>SCAN_CACHEDROWS</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.85">SCAN_CACHEDROWS</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.86">SCAN_CACHEDROWS</a></pre>
 <div class="block">The number of rows for caching that will be passed to scanners.</div>
 <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.TableInputFormat.SCAN_CACHEDROWS">Constant Field Values</a></dd></dl>
 </li>
@@ -466,7 +473,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>SCAN_BATCHSIZE</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.87">SCAN_BATCHSIZE</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.88">SCAN_BATCHSIZE</a></pre>
 <div class="block">Set the maximum number of values to return for each call to next().</div>
 <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.TableInputFormat.SCAN_BATCHSIZE">Constant Field Values</a></dd></dl>
 </li>
@@ -477,7 +484,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>SHUFFLE_MAPS</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.89">SHUFFLE_MAPS</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.90">SHUFFLE_MAPS</a></pre>
 <div class="block">Specify if we have to shuffle the map tasks.</div>
 <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.TableInputFormat.SHUFFLE_MAPS">Constant Field Values</a></dd></dl>
 </li>
@@ -496,7 +503,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>TableInputFormat</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.49">TableInputFormat</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.50">TableInputFormat</a>()</pre>
 </li>
 </ul>
 </li>
@@ -513,7 +520,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getConf</h4>
-<pre>public&nbsp;org.apache.hadoop.conf.Configuration&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.101">getConf</a>()</pre>
+<pre>public&nbsp;org.apache.hadoop.conf.Configuration&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.102">getConf</a>()</pre>
 <div class="block">Returns the current configuration.</div>
 <dl>
 <dt><strong>Specified by:</strong></dt>
@@ -527,7 +534,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>setConf</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.114">setConf</a>(org.apache.hadoop.conf.Configuration&nbsp;configuration)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.117">setConf</a>(org.apache.hadoop.conf.Configuration&nbsp;configuration)</pre>
 <div class="block">Sets the configuration. This is used to set the details for the table to
  be scanned.</div>
 <dl>
@@ -537,13 +544,33 @@ implements org.apache.hadoop.conf.Configurable</pre>
    org.apache.hadoop.conf.Configuration)</code></dd></dl>
 </li>
 </ul>
+<a name="createScanFromConfiguration(org.apache.hadoop.conf.Configuration)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createScanFromConfiguration</h4>
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.149">createScanFromConfiguration</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)
+                                        throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<div class="block">Sets up a <a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client"><code>Scan</code></a> instance, applying settings from the configuration property
+ constants defined in <code>TableInputFormat</code>.  This allows specifying things such as:
+ <ul>
+   <li>start and stop rows</li>
+   <li>column qualifiers or families</li>
+   <li>timestamps or timerange</li>
+   <li>scanner caching and batch size</li>
+ </ul></div>
+<dl><dt><span class="strong">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd></dl>
+</li>
+</ul>
 <a name="initialize(org.apache.hadoop.mapreduce.JobContext)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>initialize</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.178">initialize</a>(org.apache.hadoop.mapreduce.JobContext&nbsp;context)
+<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.197">initialize</a>(org.apache.hadoop.mapreduce.JobContext&nbsp;context)
                    throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><strong>Description copied from class:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.html#initialize(org.apache.hadoop.mapreduce.JobContext)">TableInputFormatBase</a></code></strong></div>
 <div class="block">Handle subclass specific set up.
@@ -571,7 +598,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>addColumns</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.219">addColumns</a>(<a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a>&nbsp;scan,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.238">addColumns</a>(<a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a>&nbsp;scan,
               byte[][]&nbsp;columns)</pre>
 <div class="block">Adds an array of columns specified using old format, family:qualifier.
  <p>
@@ -586,7 +613,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getSplits</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.mapreduce.InputSplit&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.236">getSplits</a>(org.apache.hadoop.mapreduce.JobContext&nbsp;context)
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.mapreduce.InputSplit&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.255">getSplits</a>(org.apache.hadoop.mapreduce.JobContext&nbsp;context)
                                                        throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Calculates the splits that will serve as input for the map tasks. The
  number of splits matches the number of regions in a table. Splits are shuffled if
@@ -607,7 +634,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getStartEndKeys</h4>
-<pre>protected&nbsp;<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a>&lt;byte[][],byte[][]&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.258">getStartEndKeys</a>()
+<pre>protected&nbsp;<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a>&lt;byte[][],byte[][]&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.277">getStartEndKeys</a>()
                                            throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><strong>Overrides:</strong></dt>
@@ -622,7 +649,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>configureSplitTable</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.274">configureSplitTable</a>(org.apache.hadoop.mapreduce.Job&nbsp;job,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html#line.293">configureSplitTable</a>(org.apache.hadoop.mapreduce.Job&nbsp;job,
                        <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName)</pre>
 <div class="block">Sets split table in map-reduce job.</div>
 </li>
@@ -694,6 +721,6 @@ implements org.apache.hadoop.conf.Configurable</pre>
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2016 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
 </body>
 </html>