http://git-wip-us.apache.org/repos/asf/hbase-site/blob/33c287c2/apidocs/overview-tree.html
----------------------------------------------------------------------
diff --git a/apidocs/overview-tree.html b/apidocs/overview-tree.html
index 9429c41..1224487 100644
--- a/apidocs/overview-tree.html
+++ b/apidocs/overview-tree.html
@@ -203,7 +203,6 @@
 <li type="circle">org.apache.hadoop.hbase.io.crypto.<a 
href="org/apache/hadoop/hbase/io/crypto/Encryption.Context.html" title="class 
in org.apache.hadoop.hbase.io.crypto"><span 
class="strong">Encryption.Context</span></a></li>
 </ul>
 </li>
-<li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.html" title="class in 
org.apache.hadoop.hbase.ipc"><span 
class="strong">CoprocessorRpcChannel</span></a> (implements 
com.google.protobuf.BlockingRpcChannel, com.google.protobuf.RpcChannel)</li>
 <li type="circle">org.apache.hadoop.hbase.util.<a 
href="org/apache/hadoop/hbase/util/Counter.html" title="class in 
org.apache.hadoop.hbase.util"><span class="strong">Counter</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.io.crypto.<a 
href="org/apache/hadoop/hbase/io/crypto/DefaultCipherProvider.html" 
title="class in org.apache.hadoop.hbase.io.crypto"><span 
class="strong">DefaultCipherProvider</span></a> (implements 
org.apache.hadoop.hbase.io.crypto.<a 
href="org/apache/hadoop/hbase/io/crypto/CipherProvider.html" title="interface 
in org.apache.hadoop.hbase.io.crypto">CipherProvider</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.io.crypto.<a 
href="org/apache/hadoop/hbase/io/crypto/Encryption.html" title="class in 
org.apache.hadoop.hbase.io.crypto"><span 
class="strong">Encryption</span></a></li>
@@ -463,6 +462,7 @@
 <li type="circle">org.apache.hadoop.hbase.types.<a 
href="org/apache/hadoop/hbase/types/Struct.html" title="class in 
org.apache.hadoop.hbase.types"><span class="strong">Struct</span></a> 
(implements org.apache.hadoop.hbase.types.<a 
href="org/apache/hadoop/hbase/types/DataType.html" title="interface in 
org.apache.hadoop.hbase.types">DataType</a>&lt;T&gt;)</li>
 <li type="circle">org.apache.hadoop.hbase.types.<a 
href="org/apache/hadoop/hbase/types/StructBuilder.html" title="class in 
org.apache.hadoop.hbase.types"><span 
class="strong">StructBuilder</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.types.<a 
href="org/apache/hadoop/hbase/types/StructIterator.html" title="class in 
org.apache.hadoop.hbase.types"><span class="strong">StructIterator</span></a> 
(implements java.util.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/Iterator.html?is-external=true";
 title="class or interface in java.util">Iterator</a>&lt;E&gt;)</li>
+<li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="org/apache/hadoop/hbase/ipc/SyncCoprocessorRpcChannel.html" title="class 
in org.apache.hadoop.hbase.ipc"><span 
class="strong">SyncCoprocessorRpcChannel</span></a> (implements 
org.apache.hadoop.hbase.ipc.<a 
href="org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.html" title="interface 
in org.apache.hadoop.hbase.ipc">CoprocessorRpcChannel</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.mapred.<a 
href="org/apache/hadoop/hbase/mapred/TableInputFormatBase.html" title="class in 
org.apache.hadoop.hbase.mapred"><span 
class="strong">TableInputFormatBase</span></a> (implements 
org.apache.hadoop.mapred.InputFormat&lt;K,V&gt;)
 <ul>
 <li type="circle">org.apache.hadoop.hbase.mapred.<a 
href="org/apache/hadoop/hbase/mapred/TableInputFormat.html" title="class in 
org.apache.hadoop.hbase.mapred"><span 
class="strong">TableInputFormat</span></a> (implements 
org.apache.hadoop.mapred.JobConfigurable)</li>
@@ -772,6 +772,11 @@
 <li type="circle">org.apache.hadoop.hbase.mapred.<a 
href="org/apache/hadoop/hbase/mapred/TableReduce.html" title="interface in 
org.apache.hadoop.hbase.mapred"><span 
class="strong">TableReduce</span></a>&lt;K,V&gt;</li>
 </ul>
 </li>
+<li type="circle">com.google.protobuf.BlockingRpcChannel
+<ul>
+<li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.html" title="interface 
in org.apache.hadoop.hbase.ipc"><span 
class="strong">CoprocessorRpcChannel</span></a> (also extends 
com.google.protobuf.RpcChannel)</li>
+</ul>
+</li>
 <li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/BufferedMutator.ExceptionListener.html" 
title="interface in org.apache.hadoop.hbase.client"><span 
class="strong">BufferedMutator.ExceptionListener</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a 
href="org/apache/hadoop/hbase/Cell.html" title="interface in 
org.apache.hadoop.hbase"><span class="strong">Cell</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.backoff.<a 
href="org/apache/hadoop/hbase/client/backoff/ClientBackoffPolicy.html" 
title="interface in org.apache.hadoop.hbase.client.backoff"><span 
class="strong">ClientBackoffPolicy</span></a></li>
@@ -796,6 +801,16 @@
 <li type="circle">org.apache.hadoop.hbase.types.<a 
href="org/apache/hadoop/hbase/types/DataType.html" title="interface in 
org.apache.hadoop.hbase.types"><span 
class="strong">DataType</span></a>&lt;T&gt;</li>
 <li type="circle">org.apache.hadoop.hbase.io.crypto.<a 
href="org/apache/hadoop/hbase/io/crypto/Decryptor.html" title="interface in 
org.apache.hadoop.hbase.io.crypto"><span 
class="strong">Decryptor</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.io.crypto.<a 
href="org/apache/hadoop/hbase/io/crypto/Encryptor.html" title="interface in 
org.apache.hadoop.hbase.io.crypto"><span 
class="strong">Encryptor</span></a></li>
+<li type="circle">java.util.concurrent.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/Future.html?is-external=true";
 title="class or interface in java.util.concurrent"><span 
class="strong">Future</span></a>&lt;V&gt;
+<ul>
+<li type="circle">io.netty.util.concurrent.Future&lt;V&gt;
+<ul>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/Future.html" title="interface in 
org.apache.hadoop.hbase.client"><span 
class="strong">Future</span></a>&lt;V&gt;</li>
+</ul>
+</li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/Future.html" title="interface in 
org.apache.hadoop.hbase.client"><span 
class="strong">Future</span></a>&lt;V&gt;</li>
+</ul>
+</li>
 <li type="circle">java.lang.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Iterable.html?is-external=true";
 title="class or interface in java.lang"><span 
class="strong">Iterable</span></a>&lt;T&gt;
 <ul>
 <li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/ResultScanner.html" title="interface in 
org.apache.hadoop.hbase.client"><span class="strong">ResultScanner</span></a> 
(also extends java.io.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Closeable.html?is-external=true";
 title="class or interface in java.io">Closeable</a>)</li>
@@ -818,6 +833,11 @@
 </ul>
 </li>
 <li type="circle">org.apache.hadoop.hbase.io.crypto.<a 
href="org/apache/hadoop/hbase/io/crypto/KeyProvider.html" title="interface in 
org.apache.hadoop.hbase.io.crypto"><span 
class="strong">KeyProvider</span></a></li>
+<li type="circle">com.google.protobuf.RpcChannel
+<ul>
+<li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.html" title="interface 
in org.apache.hadoop.hbase.ipc"><span 
class="strong">CoprocessorRpcChannel</span></a> (also extends 
com.google.protobuf.BlockingRpcChannel)</li>
+</ul>
+</li>
 <li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/RpcRetryingCaller.html" title="interface 
in org.apache.hadoop.hbase.client"><span 
class="strong">RpcRetryingCaller</span></a>&lt;T&gt;</li>
 </ul>
 <h2 title="Enum Hierarchy">Enum Hierarchy</h2>
@@ -829,24 +849,24 @@
 <li type="circle">org.apache.hadoop.hbase.util.<a 
href="org/apache/hadoop/hbase/util/Order.html" title="enum in 
org.apache.hadoop.hbase.util"><span class="strong">Order</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a 
href="org/apache/hadoop/hbase/KeepDeletedCells.html" title="enum in 
org.apache.hadoop.hbase"><span class="strong">KeepDeletedCells</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.io.encoding.<a 
href="org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.html" title="enum 
in org.apache.hadoop.hbase.io.encoding"><span 
class="strong">DataBlockEncoding</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a 
href="org/apache/hadoop/hbase/filter/RegexStringComparator.EngineType.html" 
title="enum in org.apache.hadoop.hbase.filter"><span 
class="strong">RegexStringComparator.EngineType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a 
href="org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html" title="enum 
in org.apache.hadoop.hbase.filter"><span 
class="strong">BitComparator.BitwiseOp</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a 
href="org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html" title="enum 
in org.apache.hadoop.hbase.filter"><span 
class="strong">CompareFilter.CompareOp</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a 
href="org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in 
org.apache.hadoop.hbase.filter"><span 
class="strong">Filter.ReturnCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a 
href="org/apache/hadoop/hbase/filter/RegexStringComparator.EngineType.html" 
title="enum in org.apache.hadoop.hbase.filter"><span 
class="strong">RegexStringComparator.EngineType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a 
href="org/apache/hadoop/hbase/filter/FilterList.Operator.html" title="enum in 
org.apache.hadoop.hbase.filter"><span 
class="strong">FilterList.Operator</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="org/apache/hadoop/hbase/regionserver/BloomType.html" title="enum in 
org.apache.hadoop.hbase.regionserver"><span 
class="strong">BloomType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a 
href="org/apache/hadoop/hbase/quotas/ThrottlingException.Type.html" title="enum 
in org.apache.hadoop.hbase.quotas"><span 
class="strong">ThrottlingException.Type</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a 
href="org/apache/hadoop/hbase/quotas/QuotaScope.html" title="enum in 
org.apache.hadoop.hbase.quotas"><span class="strong">QuotaScope</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a 
href="org/apache/hadoop/hbase/quotas/QuotaType.html" title="enum in 
org.apache.hadoop.hbase.quotas"><span class="strong">QuotaType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a 
href="org/apache/hadoop/hbase/quotas/ThrottleType.html" title="enum in 
org.apache.hadoop.hbase.quotas"><span 
class="strong">ThrottleType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/Consistency.html" title="enum in 
org.apache.hadoop.hbase.client"><span class="strong">Consistency</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a 
href="org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in 
org.apache.hadoop.hbase.filter"><span 
class="strong">Filter.ReturnCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/CompactType.html" title="enum in 
org.apache.hadoop.hbase.client"><span class="strong">CompactType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in 
org.apache.hadoop.hbase.client"><span 
class="strong">IsolationLevel</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/SnapshotType.html" title="enum in 
org.apache.hadoop.hbase.client"><span 
class="strong">SnapshotType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/MasterSwitchType.html" title="enum in 
org.apache.hadoop.hbase.client"><span 
class="strong">MasterSwitchType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/CompactionState.html" title="enum in 
org.apache.hadoop.hbase.client"><span 
class="strong">CompactionState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/CompactType.html" title="enum in 
org.apache.hadoop.hbase.client"><span class="strong">CompactType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/Durability.html" title="enum in 
org.apache.hadoop.hbase.client"><span class="strong">Durability</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/SnapshotType.html" title="enum in 
org.apache.hadoop.hbase.client"><span 
class="strong">SnapshotType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/Consistency.html" title="enum in 
org.apache.hadoop.hbase.client"><span class="strong">Consistency</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.security.<a 
href="org/apache/hadoop/hbase/client/security/SecurityCapability.html" 
title="enum in org.apache.hadoop.hbase.client.security"><span 
class="strong">SecurityCapability</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a 
href="org/apache/hadoop/hbase/quotas/ThrottlingException.Type.html" title="enum 
in org.apache.hadoop.hbase.quotas"><span 
class="strong">ThrottlingException.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a 
href="org/apache/hadoop/hbase/quotas/ThrottleType.html" title="enum in 
org.apache.hadoop.hbase.quotas"><span 
class="strong">ThrottleType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a 
href="org/apache/hadoop/hbase/quotas/QuotaType.html" title="enum in 
org.apache.hadoop.hbase.quotas"><span class="strong">QuotaType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a 
href="org/apache/hadoop/hbase/quotas/QuotaScope.html" title="enum in 
org.apache.hadoop.hbase.quotas"><span class="strong">QuotaScope</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="org/apache/hadoop/hbase/regionserver/BloomType.html" title="enum in 
org.apache.hadoop.hbase.regionserver"><span 
class="strong">BloomType</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/33c287c2/apidocs/src-html/org/apache/hadoop/hbase/client/Future.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/client/Future.html 
b/apidocs/src-html/org/apache/hadoop/hbase/client/Future.html
new file mode 100644
index 0000000..29253f4
--- /dev/null
+++ b/apidocs/src-html/org/apache/hadoop/hbase/client/Future.html
@@ -0,0 +1,103 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<html lang="en">
+<head>
+<title>Source code</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" 
title="Style">
+</head>
+<body>
+<div class="sourceContainer">
+<pre><span class="sourceLineNo">001</span>/**<a name="line.1"></a>
+<span class="sourceLineNo">002</span> * Licensed to the Apache Software 
Foundation (ASF) under one<a name="line.2"></a>
+<span class="sourceLineNo">003</span> * or more contributor license 
agreements.  See the NOTICE file<a name="line.3"></a>
+<span class="sourceLineNo">004</span> * distributed with this work for 
additional information<a name="line.4"></a>
+<span class="sourceLineNo">005</span> * regarding copyright ownership.  The 
ASF licenses this file<a name="line.5"></a>
+<span class="sourceLineNo">006</span> * to you under the Apache License, 
Version 2.0 (the<a name="line.6"></a>
+<span class="sourceLineNo">007</span> * "License"); you may not use this file 
except in compliance<a name="line.7"></a>
+<span class="sourceLineNo">008</span> * with the License.  You may obtain a 
copy of the License at<a name="line.8"></a>
+<span class="sourceLineNo">009</span> *<a name="line.9"></a>
+<span class="sourceLineNo">010</span> *     
http://www.apache.org/licenses/LICENSE-2.0<a name="line.10"></a>
+<span class="sourceLineNo">011</span> *<a name="line.11"></a>
+<span class="sourceLineNo">012</span> * Unless required by applicable law or 
agreed to in writing, software<a name="line.12"></a>
+<span class="sourceLineNo">013</span> * distributed under the License is 
distributed on an "AS IS" BASIS,<a name="line.13"></a>
+<span class="sourceLineNo">014</span> * WITHOUT WARRANTIES OR CONDITIONS OF 
ANY KIND, either express or implied.<a name="line.14"></a>
+<span class="sourceLineNo">015</span> * See the License for the specific 
language governing permissions and<a name="line.15"></a>
+<span class="sourceLineNo">016</span> * limitations under the License.<a 
name="line.16"></a>
+<span class="sourceLineNo">017</span> */<a name="line.17"></a>
+<span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.client;<a 
name="line.18"></a>
+<span class="sourceLineNo">019</span><a name="line.19"></a>
+<span class="sourceLineNo">020</span>import 
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import 
org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.21"></a>
+<span class="sourceLineNo">022</span><a name="line.22"></a>
+<span class="sourceLineNo">023</span>/**<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * Promise for responses<a 
name="line.24"></a>
+<span class="sourceLineNo">025</span> * @param &lt;V&gt; Value type<a 
name="line.25"></a>
+<span class="sourceLineNo">026</span> */<a name="line.26"></a>
+<span class="sourceLineNo">027</span>@InterfaceAudience.Public<a 
name="line.27"></a>
+<span class="sourceLineNo">028</span>@InterfaceStability.Evolving<a 
name="line.28"></a>
+<span class="sourceLineNo">029</span>public interface Future&lt;V&gt; extends 
io.netty.util.concurrent.Future&lt;V&gt; {<a name="line.29"></a>
+<span class="sourceLineNo">030</span><a name="line.30"></a>
+<span class="sourceLineNo">031</span>}<a name="line.31"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/33c287c2/apidocs/src-html/org/apache/hadoop/hbase/ipc/CallTimeoutException.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/ipc/CallTimeoutException.html 
b/apidocs/src-html/org/apache/hadoop/hbase/ipc/CallTimeoutException.html
index 3895dcc..32d5f20 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/ipc/CallTimeoutException.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/ipc/CallTimeoutException.html
@@ -25,10 +25,10 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.ipc;<a 
name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import 
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import 
org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.21"></a>
-<span class="sourceLineNo">022</span><a name="line.22"></a>
-<span class="sourceLineNo">023</span>import java.io.IOException;<a 
name="line.23"></a>
+<span class="sourceLineNo">020</span>import java.io.IOException;<a 
name="line.20"></a>
+<span class="sourceLineNo">021</span><a name="line.21"></a>
+<span class="sourceLineNo">022</span>import 
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import 
org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.23"></a>
 <span class="sourceLineNo">024</span><a name="line.24"></a>
 <span class="sourceLineNo">025</span>/**<a name="line.25"></a>
 <span class="sourceLineNo">026</span> * Client-side call timeout<a 
name="line.26"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/33c287c2/apidocs/src-html/org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.html 
b/apidocs/src-html/org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.html
index 8f8193e..428ca4f 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.html
@@ -6,7 +6,7 @@
 </head>
 <body>
 <div class="sourceContainer">
-<pre><span class="sourceLineNo">001</span>/*<a name="line.1"></a>
+<pre><span class="sourceLineNo">001</span>/**<a name="line.1"></a>
 <span class="sourceLineNo">002</span> * Licensed to the Apache Software 
Foundation (ASF) under one<a name="line.2"></a>
 <span class="sourceLineNo">003</span> * or more contributor license 
agreements.  See the NOTICE file<a name="line.3"></a>
 <span class="sourceLineNo">004</span> * distributed with this work for 
additional information<a name="line.4"></a>
@@ -15,7 +15,7 @@
 <span class="sourceLineNo">007</span> * "License"); you may not use this file 
except in compliance<a name="line.7"></a>
 <span class="sourceLineNo">008</span> * with the License.  You may obtain a 
copy of the License at<a name="line.8"></a>
 <span class="sourceLineNo">009</span> *<a name="line.9"></a>
-<span class="sourceLineNo">010</span> * 
http://www.apache.org/licenses/LICENSE-2.0<a name="line.10"></a>
+<span class="sourceLineNo">010</span> *     
http://www.apache.org/licenses/LICENSE-2.0<a name="line.10"></a>
 <span class="sourceLineNo">011</span> *<a name="line.11"></a>
 <span class="sourceLineNo">012</span> * Unless required by applicable law or 
agreed to in writing, software<a name="line.12"></a>
 <span class="sourceLineNo">013</span> * distributed under the License is 
distributed on an "AS IS" BASIS,<a name="line.13"></a>
@@ -23,71 +23,23 @@
 <span class="sourceLineNo">015</span> * See the License for the specific 
language governing permissions and<a name="line.15"></a>
 <span class="sourceLineNo">016</span> * limitations under the License.<a 
name="line.16"></a>
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
-<span class="sourceLineNo">018</span><a name="line.18"></a>
-<span class="sourceLineNo">019</span>package org.apache.hadoop.hbase.ipc;<a 
name="line.19"></a>
-<span class="sourceLineNo">020</span><a name="line.20"></a>
-<span class="sourceLineNo">021</span>import java.io.IOException;<a 
name="line.21"></a>
-<span class="sourceLineNo">022</span><a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.commons.logging.Log;<a 
name="line.23"></a>
-<span class="sourceLineNo">024</span>import 
org.apache.commons.logging.LogFactory;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import 
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import 
org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.protobuf.ResponseConverter;<a name="line.27"></a>
-<span class="sourceLineNo">028</span><a name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
com.google.protobuf.BlockingRpcChannel;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import com.google.protobuf.Descriptors;<a 
name="line.30"></a>
-<span class="sourceLineNo">031</span>import com.google.protobuf.Message;<a 
name="line.31"></a>
-<span class="sourceLineNo">032</span>import com.google.protobuf.RpcCallback;<a 
name="line.32"></a>
-<span class="sourceLineNo">033</span>import com.google.protobuf.RpcChannel;<a 
name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
com.google.protobuf.RpcController;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
com.google.protobuf.ServiceException;<a name="line.35"></a>
-<span class="sourceLineNo">036</span><a name="line.36"></a>
-<span class="sourceLineNo">037</span>/**<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * Base class which provides clients with 
an RPC connection to<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * call coprocessor endpoint {@link 
com.google.protobuf.Service}s.<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * Note that clients should not use this 
class directly, except through<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * {@link 
org.apache.hadoop.hbase.client.HTableInterface#coprocessorService(byte[])}.<a 
name="line.41"></a>
-<span class="sourceLineNo">042</span> */<a name="line.42"></a>
-<span class="sourceLineNo">043</span>@InterfaceAudience.Public<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span>@InterfaceStability.Evolving<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>public abstract class 
CoprocessorRpcChannel implements RpcChannel, BlockingRpcChannel {<a 
name="line.45"></a>
-<span class="sourceLineNo">046</span>  private static final Log LOG = 
LogFactory.getLog(CoprocessorRpcChannel.class);<a name="line.46"></a>
-<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span>  @Override<a name="line.48"></a>
-<span class="sourceLineNo">049</span>  @InterfaceAudience.Private<a 
name="line.49"></a>
-<span class="sourceLineNo">050</span>  public void 
callMethod(Descriptors.MethodDescriptor method,<a name="line.50"></a>
-<span class="sourceLineNo">051</span>                         RpcController 
controller,<a name="line.51"></a>
-<span class="sourceLineNo">052</span>                         Message request, 
Message responsePrototype,<a name="line.52"></a>
-<span class="sourceLineNo">053</span>                         
RpcCallback&lt;Message&gt; callback) {<a name="line.53"></a>
-<span class="sourceLineNo">054</span>    Message response = null;<a 
name="line.54"></a>
-<span class="sourceLineNo">055</span>    try {<a name="line.55"></a>
-<span class="sourceLineNo">056</span>      response = 
callExecService(controller, method, request, responsePrototype);<a 
name="line.56"></a>
-<span class="sourceLineNo">057</span>    } catch (IOException ioe) {<a 
name="line.57"></a>
-<span class="sourceLineNo">058</span>      LOG.warn("Call failed on 
IOException", ioe);<a name="line.58"></a>
-<span class="sourceLineNo">059</span>      
ResponseConverter.setControllerException(controller, ioe);<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    }<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    if (callback != null) {<a 
name="line.61"></a>
-<span class="sourceLineNo">062</span>      callback.run(response);<a 
name="line.62"></a>
-<span class="sourceLineNo">063</span>    }<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  }<a name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span>  @Override<a name="line.66"></a>
-<span class="sourceLineNo">067</span>  @InterfaceAudience.Private<a 
name="line.67"></a>
-<span class="sourceLineNo">068</span>  public Message 
callBlockingMethod(Descriptors.MethodDescriptor method,<a name="line.68"></a>
-<span class="sourceLineNo">069</span>                                    
RpcController controller,<a name="line.69"></a>
-<span class="sourceLineNo">070</span>                                    
Message request, Message responsePrototype)<a name="line.70"></a>
-<span class="sourceLineNo">071</span>      throws ServiceException {<a 
name="line.71"></a>
-<span class="sourceLineNo">072</span>    try {<a name="line.72"></a>
-<span class="sourceLineNo">073</span>      return callExecService(controller, 
method, request, responsePrototype);<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    } catch (IOException ioe) {<a 
name="line.74"></a>
-<span class="sourceLineNo">075</span>      throw new ServiceException("Error 
calling method "+method.getFullName(), ioe);<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    }<a name="line.76"></a>
-<span class="sourceLineNo">077</span>  }<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span>  protected abstract Message 
callExecService(RpcController controller,<a name="line.79"></a>
-<span class="sourceLineNo">080</span>      Descriptors.MethodDescriptor 
method, Message request, Message responsePrototype)<a name="line.80"></a>
-<span class="sourceLineNo">081</span>          throws IOException;<a 
name="line.81"></a>
-<span class="sourceLineNo">082</span>}<a name="line.82"></a>
+<span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.ipc;<a 
name="line.18"></a>
+<span class="sourceLineNo">019</span><a name="line.19"></a>
+<span class="sourceLineNo">020</span>import 
com.google.protobuf.BlockingRpcChannel;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import com.google.protobuf.RpcChannel;<a 
name="line.21"></a>
+<span class="sourceLineNo">022</span>import 
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import 
org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.23"></a>
+<span class="sourceLineNo">024</span><a name="line.24"></a>
+<span class="sourceLineNo">025</span>/**<a name="line.25"></a>
+<span class="sourceLineNo">026</span> * Base interface which provides clients 
with an RPC connection to<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * call coprocessor endpoint {@link 
com.google.protobuf.Service}s.<a name="line.27"></a>
+<span class="sourceLineNo">028</span> * Note that clients should not use this 
class directly, except through<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * {@link 
org.apache.hadoop.hbase.client.Table#coprocessorService(byte[])}.<a 
name="line.29"></a>
+<span class="sourceLineNo">030</span> */<a name="line.30"></a>
+<span class="sourceLineNo">031</span>@InterfaceAudience.Public<a 
name="line.31"></a>
+<span class="sourceLineNo">032</span>@InterfaceStability.Evolving<a 
name="line.32"></a>
+<span class="sourceLineNo">033</span>public interface CoprocessorRpcChannel 
extends RpcChannel, BlockingRpcChannel {<a name="line.33"></a>
+<span class="sourceLineNo">034</span>}<a name="line.34"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/33c287c2/apidocs/src-html/org/apache/hadoop/hbase/ipc/SyncCoprocessorRpcChannel.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/ipc/SyncCoprocessorRpcChannel.html 
b/apidocs/src-html/org/apache/hadoop/hbase/ipc/SyncCoprocessorRpcChannel.html
new file mode 100644
index 0000000..d18e9eb
--- /dev/null
+++ 
b/apidocs/src-html/org/apache/hadoop/hbase/ipc/SyncCoprocessorRpcChannel.html
@@ -0,0 +1,151 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<html lang="en">
+<head>
+<title>Source code</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" 
title="Style">
+</head>
+<body>
+<div class="sourceContainer">
+<pre><span class="sourceLineNo">001</span>/*<a name="line.1"></a>
+<span class="sourceLineNo">002</span> * Licensed to the Apache Software 
Foundation (ASF) under one<a name="line.2"></a>
+<span class="sourceLineNo">003</span> * or more contributor license 
agreements.  See the NOTICE file<a name="line.3"></a>
+<span class="sourceLineNo">004</span> * distributed with this work for 
additional information<a name="line.4"></a>
+<span class="sourceLineNo">005</span> * regarding copyright ownership.  The 
ASF licenses this file<a name="line.5"></a>
+<span class="sourceLineNo">006</span> * to you under the Apache License, 
Version 2.0 (the<a name="line.6"></a>
+<span class="sourceLineNo">007</span> * "License"); you may not use this file 
except in compliance<a name="line.7"></a>
+<span class="sourceLineNo">008</span> * with the License.  You may obtain a 
copy of the License at<a name="line.8"></a>
+<span class="sourceLineNo">009</span> *<a name="line.9"></a>
+<span class="sourceLineNo">010</span> * 
http://www.apache.org/licenses/LICENSE-2.0<a name="line.10"></a>
+<span class="sourceLineNo">011</span> *<a name="line.11"></a>
+<span class="sourceLineNo">012</span> * Unless required by applicable law or 
agreed to in writing, software<a name="line.12"></a>
+<span class="sourceLineNo">013</span> * distributed under the License is 
distributed on an "AS IS" BASIS,<a name="line.13"></a>
+<span class="sourceLineNo">014</span> * WITHOUT WARRANTIES OR CONDITIONS OF 
ANY KIND, either express or implied.<a name="line.14"></a>
+<span class="sourceLineNo">015</span> * See the License for the specific 
language governing permissions and<a name="line.15"></a>
+<span class="sourceLineNo">016</span> * limitations under the License.<a 
name="line.16"></a>
+<span class="sourceLineNo">017</span> */<a name="line.17"></a>
+<span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.ipc;<a 
name="line.18"></a>
+<span class="sourceLineNo">019</span><a name="line.19"></a>
+<span class="sourceLineNo">020</span>import com.google.protobuf.Descriptors;<a 
name="line.20"></a>
+<span class="sourceLineNo">021</span>import com.google.protobuf.Message;<a 
name="line.21"></a>
+<span class="sourceLineNo">022</span>import com.google.protobuf.RpcCallback;<a 
name="line.22"></a>
+<span class="sourceLineNo">023</span>import 
com.google.protobuf.RpcController;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import 
com.google.protobuf.ServiceException;<a name="line.24"></a>
+<span class="sourceLineNo">025</span><a name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.io.IOException;<a 
name="line.26"></a>
+<span class="sourceLineNo">027</span><a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.commons.logging.Log;<a 
name="line.28"></a>
+<span class="sourceLineNo">029</span>import 
org.apache.commons.logging.LogFactory;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.protobuf.ResponseConverter;<a name="line.32"></a>
+<span class="sourceLineNo">033</span><a name="line.33"></a>
+<span class="sourceLineNo">034</span>/**<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * Base class which provides clients with 
an RPC connection to<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * call coprocessor endpoint {@link 
com.google.protobuf.Service}s.<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * Note that clients should not use this 
class directly, except through<a name="line.37"></a>
+<span class="sourceLineNo">038</span> * {@link 
org.apache.hadoop.hbase.client.HTableInterface#coprocessorService(byte[])}.<a 
name="line.38"></a>
+<span class="sourceLineNo">039</span> */<a name="line.39"></a>
+<span class="sourceLineNo">040</span>@InterfaceAudience.Public<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span>@InterfaceStability.Evolving<a 
name="line.41"></a>
+<span class="sourceLineNo">042</span>public abstract class 
SyncCoprocessorRpcChannel implements CoprocessorRpcChannel {<a 
name="line.42"></a>
+<span class="sourceLineNo">043</span>  private static final Log LOG = 
LogFactory.getLog(SyncCoprocessorRpcChannel.class);<a name="line.43"></a>
+<span class="sourceLineNo">044</span><a name="line.44"></a>
+<span class="sourceLineNo">045</span>  @Override<a name="line.45"></a>
+<span class="sourceLineNo">046</span>  @InterfaceAudience.Private<a 
name="line.46"></a>
+<span class="sourceLineNo">047</span>  public void 
callMethod(Descriptors.MethodDescriptor method,<a name="line.47"></a>
+<span class="sourceLineNo">048</span>                         RpcController 
controller,<a name="line.48"></a>
+<span class="sourceLineNo">049</span>                         Message request, 
Message responsePrototype,<a name="line.49"></a>
+<span class="sourceLineNo">050</span>                         
RpcCallback&lt;Message&gt; callback) {<a name="line.50"></a>
+<span class="sourceLineNo">051</span>    Message response = null;<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>    try {<a name="line.52"></a>
+<span class="sourceLineNo">053</span>      response = 
callExecService(controller, method, request, responsePrototype);<a 
name="line.53"></a>
+<span class="sourceLineNo">054</span>    } catch (IOException ioe) {<a 
name="line.54"></a>
+<span class="sourceLineNo">055</span>      LOG.warn("Call failed on 
IOException", ioe);<a name="line.55"></a>
+<span class="sourceLineNo">056</span>      
ResponseConverter.setControllerException(controller, ioe);<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    }<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    if (callback != null) {<a 
name="line.58"></a>
+<span class="sourceLineNo">059</span>      callback.run(response);<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>    }<a name="line.60"></a>
+<span class="sourceLineNo">061</span>  }<a name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span>  @Override<a name="line.63"></a>
+<span class="sourceLineNo">064</span>  @InterfaceAudience.Private<a 
name="line.64"></a>
+<span class="sourceLineNo">065</span>  public Message 
callBlockingMethod(Descriptors.MethodDescriptor method,<a name="line.65"></a>
+<span class="sourceLineNo">066</span>                                    
RpcController controller,<a name="line.66"></a>
+<span class="sourceLineNo">067</span>                                    
Message request, Message responsePrototype)<a name="line.67"></a>
+<span class="sourceLineNo">068</span>      throws ServiceException {<a 
name="line.68"></a>
+<span class="sourceLineNo">069</span>    try {<a name="line.69"></a>
+<span class="sourceLineNo">070</span>      return callExecService(controller, 
method, request, responsePrototype);<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    } catch (IOException ioe) {<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span>      throw new ServiceException("Error 
calling method "+method.getFullName(), ioe);<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    }<a name="line.73"></a>
+<span class="sourceLineNo">074</span>  }<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span>  protected abstract Message 
callExecService(RpcController controller,<a name="line.76"></a>
+<span class="sourceLineNo">077</span>      Descriptors.MethodDescriptor 
method, Message request, Message responsePrototype)<a name="line.77"></a>
+<span class="sourceLineNo">078</span>          throws IOException;<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>}<a name="line.79"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/33c287c2/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html 
b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html
index b3f5aff..677dc0a 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html
@@ -100,215 +100,244 @@
 <span class="sourceLineNo">092</span>     * Counter enumeration to count the 
actual rows.<a name="line.92"></a>
 <span class="sourceLineNo">093</span>     */<a name="line.93"></a>
 <span class="sourceLineNo">094</span>    public static enum Counters {<a 
name="line.94"></a>
-<span class="sourceLineNo">095</span>      ROWS<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    }<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>    /**<a name="line.98"></a>
-<span class="sourceLineNo">099</span>     * Maps the data.<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>     *<a name="line.100"></a>
-<span class="sourceLineNo">101</span>     * @param row     The current table 
row key.<a name="line.101"></a>
-<span class="sourceLineNo">102</span>     * @param values  The columns.<a 
name="line.102"></a>
-<span class="sourceLineNo">103</span>     * @param context The current 
context.<a name="line.103"></a>
-<span class="sourceLineNo">104</span>     * @throws IOException When something 
is broken with the data.<a name="line.104"></a>
-<span class="sourceLineNo">105</span>     * @see 
org.apache.hadoop.mapreduce.Mapper#map(KEYIN, VALUEIN,<a name="line.105"></a>
-<span class="sourceLineNo">106</span>     *      
org.apache.hadoop.mapreduce.Mapper.Context)<a name="line.106"></a>
-<span class="sourceLineNo">107</span>     */<a name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span>    @Override<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    public void 
map(ImmutableBytesWritable row, Result values,<a name="line.110"></a>
-<span class="sourceLineNo">111</span>                    Context context)<a 
name="line.111"></a>
-<span class="sourceLineNo">112</span>        throws IOException {<a 
name="line.112"></a>
-<span class="sourceLineNo">113</span>      Preconditions.checkState(values != 
null,<a name="line.113"></a>
-<span class="sourceLineNo">114</span>          "values passed to the map is 
null");<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      String currentFamilyName = null;<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>      String currentQualifierName = 
null;<a name="line.116"></a>
-<span class="sourceLineNo">117</span>      String currentRowKey = null;<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>      Configuration config = 
context.getConfiguration();<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      String separator = 
config.get("ReportSeparator",":");<a name="line.119"></a>
-<span class="sourceLineNo">120</span>      try {<a name="line.120"></a>
-<span class="sourceLineNo">121</span>        
context.getCounter(Counters.ROWS).increment(1);<a name="line.121"></a>
-<span class="sourceLineNo">122</span>        context.write(new Text("Total 
ROWS"), new IntWritable(1));<a name="line.122"></a>
-<span class="sourceLineNo">123</span>        if (values != null &amp;&amp; 
!values.isEmpty()) {<a name="line.123"></a>
-<span class="sourceLineNo">124</span>          for (Cell value : 
values.listCells()) {<a name="line.124"></a>
-<span class="sourceLineNo">125</span>            currentRowKey = 
Bytes.toStringBinary(CellUtil.cloneRow(value));<a name="line.125"></a>
-<span class="sourceLineNo">126</span>            String thisRowFamilyName = 
Bytes.toStringBinary(CellUtil.cloneFamily(value));<a name="line.126"></a>
-<span class="sourceLineNo">127</span>            if 
(!thisRowFamilyName.equals(currentFamilyName)) {<a name="line.127"></a>
-<span class="sourceLineNo">128</span>              currentFamilyName = 
thisRowFamilyName;<a name="line.128"></a>
-<span class="sourceLineNo">129</span>              context.getCounter("CF", 
thisRowFamilyName).increment(1);<a name="line.129"></a>
-<span class="sourceLineNo">130</span>              if (1 == 
context.getCounter("CF", thisRowFamilyName).getValue()) {<a name="line.130"></a>
-<span class="sourceLineNo">131</span>                context.write(new 
Text("Total Families Across all Rows"), new IntWritable(1));<a 
name="line.131"></a>
-<span class="sourceLineNo">132</span>                context.write(new 
Text(thisRowFamilyName), new IntWritable(1));<a name="line.132"></a>
-<span class="sourceLineNo">133</span>              }<a name="line.133"></a>
-<span class="sourceLineNo">134</span>            }<a name="line.134"></a>
-<span class="sourceLineNo">135</span>            String thisRowQualifierName = 
thisRowFamilyName + separator<a name="line.135"></a>
-<span class="sourceLineNo">136</span>                + 
Bytes.toStringBinary(CellUtil.cloneQualifier(value));<a name="line.136"></a>
-<span class="sourceLineNo">137</span>            if 
(!thisRowQualifierName.equals(currentQualifierName)) {<a name="line.137"></a>
-<span class="sourceLineNo">138</span>              currentQualifierName = 
thisRowQualifierName;<a name="line.138"></a>
-<span class="sourceLineNo">139</span>              context.getCounter("CFQL", 
thisRowQualifierName).increment(1);<a name="line.139"></a>
-<span class="sourceLineNo">140</span>              context.write(new 
Text("Total Qualifiers across all Rows"),<a name="line.140"></a>
-<span class="sourceLineNo">141</span>                  new IntWritable(1));<a 
name="line.141"></a>
-<span class="sourceLineNo">142</span>              context.write(new 
Text(thisRowQualifierName), new IntWritable(1));<a name="line.142"></a>
-<span class="sourceLineNo">143</span>              // Intialize versions<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>              
context.getCounter("QL_VERSIONS", currentRowKey + separator +<a 
name="line.144"></a>
-<span class="sourceLineNo">145</span>                  
thisRowQualifierName).increment(1);<a name="line.145"></a>
-<span class="sourceLineNo">146</span>              context.write(new 
Text(currentRowKey + separator<a name="line.146"></a>
-<span class="sourceLineNo">147</span>                  + thisRowQualifierName 
+ "_Versions"), new IntWritable(1));<a name="line.147"></a>
-<span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span>            } else {<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>              // Increment versions<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span>              currentQualifierName = 
thisRowQualifierName;<a name="line.151"></a>
-<span class="sourceLineNo">152</span>              
context.getCounter("QL_VERSIONS", currentRowKey + separator +<a 
name="line.152"></a>
-<span class="sourceLineNo">153</span>                  
thisRowQualifierName).increment(1);<a name="line.153"></a>
-<span class="sourceLineNo">154</span>              context.write(new 
Text(currentRowKey + separator<a name="line.154"></a>
-<span class="sourceLineNo">155</span>                  + thisRowQualifierName 
+ "_Versions"), new IntWritable(1));<a name="line.155"></a>
-<span class="sourceLineNo">156</span>            }<a name="line.156"></a>
-<span class="sourceLineNo">157</span>          }<a name="line.157"></a>
-<span class="sourceLineNo">158</span>        }<a name="line.158"></a>
-<span class="sourceLineNo">159</span>      } catch (InterruptedException e) 
{<a name="line.159"></a>
-<span class="sourceLineNo">160</span>        e.printStackTrace();<a 
name="line.160"></a>
-<span class="sourceLineNo">161</span>      }<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    }<a name="line.162"></a>
-<span class="sourceLineNo">163</span>  }<a name="line.163"></a>
-<span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span>  static class IntSumReducer&lt;Key&gt; 
extends Reducer&lt;Key, IntWritable,<a name="line.165"></a>
-<span class="sourceLineNo">166</span>      Key, IntWritable&gt; {<a 
name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>    private IntWritable result = new 
IntWritable();<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    public void reduce(Key key, 
Iterable&lt;IntWritable&gt; values,<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      Context context)<a 
name="line.170"></a>
-<span class="sourceLineNo">171</span>    throws IOException, 
InterruptedException {<a name="line.171"></a>
-<span class="sourceLineNo">172</span>      int sum = 0;<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      for (IntWritable val : values) {<a 
name="line.173"></a>
-<span class="sourceLineNo">174</span>        sum += val.get();<a 
name="line.174"></a>
-<span class="sourceLineNo">175</span>      }<a name="line.175"></a>
-<span class="sourceLineNo">176</span>      result.set(sum);<a 
name="line.176"></a>
-<span class="sourceLineNo">177</span>      context.write(key, result);<a 
name="line.177"></a>
-<span class="sourceLineNo">178</span>    }<a name="line.178"></a>
-<span class="sourceLineNo">179</span>  }<a name="line.179"></a>
-<span class="sourceLineNo">180</span><a name="line.180"></a>
-<span class="sourceLineNo">181</span>  /**<a name="line.181"></a>
-<span class="sourceLineNo">182</span>   * Sets up the actual job.<a 
name="line.182"></a>
-<span class="sourceLineNo">183</span>   *<a name="line.183"></a>
-<span class="sourceLineNo">184</span>   * @param conf The current 
configuration.<a name="line.184"></a>
-<span class="sourceLineNo">185</span>   * @param args The command line 
parameters.<a name="line.185"></a>
-<span class="sourceLineNo">186</span>   * @return The newly created job.<a 
name="line.186"></a>
-<span class="sourceLineNo">187</span>   * @throws IOException When setting up 
the job fails.<a name="line.187"></a>
-<span class="sourceLineNo">188</span>   */<a name="line.188"></a>
-<span class="sourceLineNo">189</span>  public static Job 
createSubmittableJob(Configuration conf, String[] args)<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      throws IOException {<a 
name="line.190"></a>
-<span class="sourceLineNo">191</span>    String tableName = args[0];<a 
name="line.191"></a>
-<span class="sourceLineNo">192</span>    Path outputDir = new Path(args[1]);<a 
name="line.192"></a>
-<span class="sourceLineNo">193</span>    String reportSeparatorString = 
(args.length &gt; 2) ? args[2]: ":";<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    conf.set("ReportSeparator", 
reportSeparatorString);<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    Job job = Job.getInstance(conf, 
conf.get(JOB_NAME_CONF_KEY, NAME + "_" + tableName));<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    
job.setJarByClass(CellCounter.class);<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    Scan scan = 
getConfiguredScanForJob(conf, args);<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    
TableMapReduceUtil.initTableMapperJob(tableName, scan,<a name="line.198"></a>
-<span class="sourceLineNo">199</span>        CellCounterMapper.class, 
ImmutableBytesWritable.class, Result.class, job);<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    job.setNumReduceTasks(1);<a 
name="line.200"></a>
-<span class="sourceLineNo">201</span>    
job.setMapOutputKeyClass(Text.class);<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    
job.setMapOutputValueClass(IntWritable.class);<a name="line.202"></a>
-<span class="sourceLineNo">203</span>    
job.setOutputFormatClass(TextOutputFormat.class);<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    job.setOutputKeyClass(Text.class);<a 
name="line.204"></a>
-<span class="sourceLineNo">205</span>    
job.setOutputValueClass(IntWritable.class);<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    FileOutputFormat.setOutputPath(job, 
outputDir);<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    
job.setReducerClass(IntSumReducer.class);<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    return job;<a name="line.208"></a>
-<span class="sourceLineNo">209</span>  }<a name="line.209"></a>
-<span class="sourceLineNo">210</span><a name="line.210"></a>
-<span class="sourceLineNo">211</span>  private static Scan 
getConfiguredScanForJob(Configuration conf, String[] args) throws IOException 
{<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    Scan s = new Scan();<a 
name="line.212"></a>
-<span class="sourceLineNo">213</span>    // Set Scan Versions<a 
name="line.213"></a>
-<span class="sourceLineNo">214</span>    
s.setMaxVersions(Integer.MAX_VALUE);<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    s.setCacheBlocks(false);<a 
name="line.215"></a>
-<span class="sourceLineNo">216</span>    // Set Scan Column Family<a 
name="line.216"></a>
-<span class="sourceLineNo">217</span>    if 
(conf.get(TableInputFormat.SCAN_COLUMN_FAMILY) != null) {<a name="line.217"></a>
-<span class="sourceLineNo">218</span>      
s.addFamily(Bytes.toBytes(conf.get(TableInputFormat.SCAN_COLUMN_FAMILY)));<a 
name="line.218"></a>
-<span class="sourceLineNo">219</span>    }<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    // Set RowFilter or Prefix Filter if 
applicable.<a name="line.220"></a>
-<span class="sourceLineNo">221</span>    Filter rowFilter = 
getRowFilter(args);<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    if (rowFilter!= null) {<a 
name="line.222"></a>
-<span class="sourceLineNo">223</span>      LOG.info("Setting Row Filter for 
counter.");<a name="line.223"></a>
-<span class="sourceLineNo">224</span>      s.setFilter(rowFilter);<a 
name="line.224"></a>
-<span class="sourceLineNo">225</span>    }<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    // Set TimeRange if defined<a 
name="line.226"></a>
-<span class="sourceLineNo">227</span>    long timeRange[] = 
getTimeRange(args);<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    if (timeRange != null) {<a 
name="line.228"></a>
-<span class="sourceLineNo">229</span>      LOG.info("Setting TimeRange for 
counter.");<a name="line.229"></a>
-<span class="sourceLineNo">230</span>      s.setTimeRange(timeRange[0], 
timeRange[1]);<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    }<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    return s;<a name="line.232"></a>
-<span class="sourceLineNo">233</span>  }<a name="line.233"></a>
-<span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span>  private static Filter 
getRowFilter(String[] args) {<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    Filter rowFilter = null;<a 
name="line.237"></a>
-<span class="sourceLineNo">238</span>    String filterCriteria = (args.length 
&gt; 3) ? args[3]: null;<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    if (filterCriteria == null) return 
null;<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    if (filterCriteria.startsWith("^")) 
{<a name="line.240"></a>
-<span class="sourceLineNo">241</span>      String regexPattern = 
filterCriteria.substring(1, filterCriteria.length());<a name="line.241"></a>
-<span class="sourceLineNo">242</span>      rowFilter = new 
RowFilter(CompareFilter.CompareOp.EQUAL, new 
RegexStringComparator(regexPattern));<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    } else {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      rowFilter = new 
PrefixFilter(Bytes.toBytesBinary(filterCriteria));<a name="line.244"></a>
+<span class="sourceLineNo">095</span>      ROWS,<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      CELLS<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    }<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span>    private Configuration conf;<a 
name="line.99"></a>
+<span class="sourceLineNo">100</span>    private String separator;<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span>    // state of current row, family, 
column needs to persist across map() invocations<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    // in order to properly handle 
scanner batching, where a single qualifier may have too<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    // many versions for a single map() 
call<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    private byte[] lastRow;<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span>    private String currentRowKey;<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span>    byte[] currentFamily = null;<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>    String currentFamilyName = null;<a 
name="line.108"></a>
+<span class="sourceLineNo">109</span>    byte[] currentQualifier = null;<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>    // family + qualifier<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>    String currentQualifierName = null;<a 
name="line.111"></a>
+<span class="sourceLineNo">112</span>    // rowkey + family + qualifier<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>    String currentRowQualifierName = 
null;<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span>    @Override<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    protected void setup(Context context) 
throws IOException, InterruptedException {<a name="line.116"></a>
+<span class="sourceLineNo">117</span>      conf = 
context.getConfiguration();<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      separator = 
conf.get("ReportSeparator",":");<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    }<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span>    /**<a name="line.121"></a>
+<span class="sourceLineNo">122</span>     * Maps the data.<a 
name="line.122"></a>
+<span class="sourceLineNo">123</span>     *<a name="line.123"></a>
+<span class="sourceLineNo">124</span>     * @param row     The current table 
row key.<a name="line.124"></a>
+<span class="sourceLineNo">125</span>     * @param values  The columns.<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>     * @param context The current 
context.<a name="line.126"></a>
+<span class="sourceLineNo">127</span>     * @throws IOException When something 
is broken with the data.<a name="line.127"></a>
+<span class="sourceLineNo">128</span>     * @see 
org.apache.hadoop.mapreduce.Mapper#map(KEYIN, VALUEIN,<a name="line.128"></a>
+<span class="sourceLineNo">129</span>     *      
org.apache.hadoop.mapreduce.Mapper.Context)<a name="line.129"></a>
+<span class="sourceLineNo">130</span>     */<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span>    @Override<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    public void 
map(ImmutableBytesWritable row, Result values,<a name="line.133"></a>
+<span class="sourceLineNo">134</span>                    Context context)<a 
name="line.134"></a>
+<span class="sourceLineNo">135</span>        throws IOException {<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>      Preconditions.checkState(values != 
null,<a name="line.136"></a>
+<span class="sourceLineNo">137</span>          "values passed to the map is 
null");<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span>      try {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>        byte[] currentRow = 
values.getRow();<a name="line.140"></a>
+<span class="sourceLineNo">141</span>        if (lastRow == null || 
!Bytes.equals(lastRow, currentRow)) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span>          lastRow = currentRow;<a 
name="line.142"></a>
+<span class="sourceLineNo">143</span>          currentRowKey = 
Bytes.toStringBinary(currentRow);<a name="line.143"></a>
+<span class="sourceLineNo">144</span>          currentFamily = null;<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>          currentQualifier = null;<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span>          
context.getCounter(Counters.ROWS).increment(1);<a name="line.146"></a>
+<span class="sourceLineNo">147</span>          context.write(new Text("Total 
ROWS"), new IntWritable(1));<a name="line.147"></a>
+<span class="sourceLineNo">148</span>        }<a name="line.148"></a>
+<span class="sourceLineNo">149</span>        if (!values.isEmpty()) {<a 
name="line.149"></a>
+<span class="sourceLineNo">150</span>          int cellCount = 0;<a 
name="line.150"></a>
+<span class="sourceLineNo">151</span>          for (Cell value : 
values.listCells()) {<a name="line.151"></a>
+<span class="sourceLineNo">152</span>            cellCount++;<a 
name="line.152"></a>
+<span class="sourceLineNo">153</span>            if (currentFamily == null || 
!CellUtil.matchingFamily(value, currentFamily)) {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>              currentFamily = 
CellUtil.cloneFamily(value);<a name="line.154"></a>
+<span class="sourceLineNo">155</span>              currentFamilyName = 
Bytes.toStringBinary(currentFamily);<a name="line.155"></a>
+<span class="sourceLineNo">156</span>              currentQualifier = null;<a 
name="line.156"></a>
+<span class="sourceLineNo">157</span>              context.getCounter("CF", 
currentFamilyName).increment(1);<a name="line.157"></a>
+<span class="sourceLineNo">158</span>              if (1 == 
context.getCounter("CF", currentFamilyName).getValue()) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span>                context.write(new 
Text("Total Families Across all Rows"), new IntWritable(1));<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span>                context.write(new 
Text(currentFamily), new IntWritable(1));<a name="line.160"></a>
+<span class="sourceLineNo">161</span>              }<a name="line.161"></a>
+<span class="sourceLineNo">162</span>            }<a name="line.162"></a>
+<span class="sourceLineNo">163</span>            if (currentQualifier == null 
|| !CellUtil.matchingQualifier(value, currentQualifier)) {<a 
name="line.163"></a>
+<span class="sourceLineNo">164</span>              currentQualifier = 
CellUtil.cloneQualifier(value);<a name="line.164"></a>
+<span class="sourceLineNo">165</span>              currentQualifierName = 
currentFamilyName + separator +<a name="line.165"></a>
+<span class="sourceLineNo">166</span>                  
Bytes.toStringBinary(currentQualifier);<a name="line.166"></a>
+<span class="sourceLineNo">167</span>              currentRowQualifierName = 
currentRowKey + separator + currentQualifierName;<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span>              context.write(new 
Text("Total Qualifiers across all Rows"),<a name="line.169"></a>
+<span class="sourceLineNo">170</span>                  new IntWritable(1));<a 
name="line.170"></a>
+<span class="sourceLineNo">171</span>              context.write(new 
Text(currentQualifierName), new IntWritable(1));<a name="line.171"></a>
+<span class="sourceLineNo">172</span>            }<a name="line.172"></a>
+<span class="sourceLineNo">173</span>            // Increment versions<a 
name="line.173"></a>
+<span class="sourceLineNo">174</span>            context.write(new 
Text(currentRowQualifierName + "_Versions"), new IntWritable(1));<a 
name="line.174"></a>
+<span class="sourceLineNo">175</span>          }<a name="line.175"></a>
+<span class="sourceLineNo">176</span>          
context.getCounter(Counters.CELLS).increment(cellCount);<a name="line.176"></a>
+<span class="sourceLineNo">177</span>        }<a name="line.177"></a>
+<span class="sourceLineNo">178</span>      } catch (InterruptedException e) 
{<a name="line.178"></a>
+<span class="sourceLineNo">179</span>        e.printStackTrace();<a 
name="line.179"></a>
+<span class="sourceLineNo">180</span>      }<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    }<a name="line.181"></a>
+<span class="sourceLineNo">182</span>  }<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span>  static class IntSumReducer&lt;Key&gt; 
extends Reducer&lt;Key, IntWritable,<a name="line.184"></a>
+<span class="sourceLineNo">185</span>      Key, IntWritable&gt; {<a 
name="line.185"></a>
+<span class="sourceLineNo">186</span><a name="line.186"></a>
+<span class="sourceLineNo">187</span>    private IntWritable result = new 
IntWritable();<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    public void reduce(Key key, 
Iterable&lt;IntWritable&gt; values,<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      Context context)<a 
name="line.189"></a>
+<span class="sourceLineNo">190</span>    throws IOException, 
InterruptedException {<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      int sum = 0;<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      for (IntWritable val : values) {<a 
name="line.192"></a>
+<span class="sourceLineNo">193</span>        sum += val.get();<a 
name="line.193"></a>
+<span class="sourceLineNo">194</span>      }<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      result.set(sum);<a 
name="line.195"></a>
+<span class="sourceLineNo">196</span>      context.write(key, result);<a 
name="line.196"></a>
+<span class="sourceLineNo">197</span>    }<a name="line.197"></a>
+<span class="sourceLineNo">198</span>  }<a name="line.198"></a>
+<span class="sourceLineNo">199</span><a name="line.199"></a>
+<span class="sourceLineNo">200</span>  /**<a name="line.200"></a>
+<span class="sourceLineNo">201</span>   * Sets up the actual job.<a 
name="line.201"></a>
+<span class="sourceLineNo">202</span>   *<a name="line.202"></a>
+<span class="sourceLineNo">203</span>   * @param conf The current 
configuration.<a name="line.203"></a>
+<span class="sourceLineNo">204</span>   * @param args The command line 
parameters.<a name="line.204"></a>
+<span class="sourceLineNo">205</span>   * @return The newly created job.<a 
name="line.205"></a>
+<span class="sourceLineNo">206</span>   * @throws IOException When setting up 
the job fails.<a name="line.206"></a>
+<span class="sourceLineNo">207</span>   */<a name="line.207"></a>
+<span class="sourceLineNo">208</span>  public static Job 
createSubmittableJob(Configuration conf, String[] args)<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      throws IOException {<a 
name="line.209"></a>
+<span class="sourceLineNo">210</span>    String tableName = args[0];<a 
name="line.210"></a>
+<span class="sourceLineNo">211</span>    Path outputDir = new Path(args[1]);<a 
name="line.211"></a>
+<span class="sourceLineNo">212</span>    String reportSeparatorString = 
(args.length &gt; 2) ? args[2]: ":";<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    conf.set("ReportSeparator", 
reportSeparatorString);<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    Job job = Job.getInstance(conf, 
conf.get(JOB_NAME_CONF_KEY, NAME + "_" + tableName));<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    
job.setJarByClass(CellCounter.class);<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    Scan scan = 
getConfiguredScanForJob(conf, args);<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    
TableMapReduceUtil.initTableMapperJob(tableName, scan,<a name="line.217"></a>
+<span class="sourceLineNo">218</span>        CellCounterMapper.class, 
ImmutableBytesWritable.class, Result.class, job);<a name="line.218"></a>
+<span class="sourceLineNo">219</span>    job.setNumReduceTasks(1);<a 
name="line.219"></a>
+<span class="sourceLineNo">220</span>    
job.setMapOutputKeyClass(Text.class);<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    
job.setMapOutputValueClass(IntWritable.class);<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    
job.setOutputFormatClass(TextOutputFormat.class);<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    job.setOutputKeyClass(Text.class);<a 
name="line.223"></a>
+<span class="sourceLineNo">224</span>    
job.setOutputValueClass(IntWritable.class);<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    FileOutputFormat.setOutputPath(job, 
outputDir);<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    
job.setReducerClass(IntSumReducer.class);<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    return job;<a name="line.227"></a>
+<span class="sourceLineNo">228</span>  }<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span>  private static Scan 
getConfiguredScanForJob(Configuration conf, String[] args)<a 
name="line.230"></a>
+<span class="sourceLineNo">231</span>      throws IOException {<a 
name="line.231"></a>
+<span class="sourceLineNo">232</span>    // create scan with any properties 
set from TableInputFormat<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    Scan s = 
TableInputFormat.createScanFromConfiguration(conf);<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    // Set Scan Versions<a 
name="line.234"></a>
+<span class="sourceLineNo">235</span>    if 
(conf.get(TableInputFormat.SCAN_MAXVERSIONS) == null) {<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      // default to all versions unless 
explicitly set<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      
s.setMaxVersions(Integer.MAX_VALUE);<a name="line.237"></a>
+<span class="sourceLineNo">238</span>    }<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    s.setCacheBlocks(false);<a 
name="line.239"></a>
+<span class="sourceLineNo">240</span>    // Set RowFilter or Prefix Filter if 
applicable.<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    Filter rowFilter = 
getRowFilter(args);<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    if (rowFilter!= null) {<a 
name="line.242"></a>
+<span class="sourceLineNo">243</span>      LOG.info("Setting Row Filter for 
counter.");<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      s.setFilter(rowFilter);<a 
name="line.244"></a>
 <span class="sourceLineNo">245</span>    }<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    return rowFilter;<a 
name="line.246"></a>
-<span class="sourceLineNo">247</span>  }<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span>  private static long[] 
getTimeRange(String[] args) throws IOException {<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    final String startTimeArgKey = 
"--starttime=";<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    final String endTimeArgKey = 
"--endtime=";<a name="line.251"></a>
-<span class="sourceLineNo">252</span>    long startTime = 0L;<a 
name="line.252"></a>
-<span class="sourceLineNo">253</span>    long endTime = 0L;<a 
name="line.253"></a>
+<span class="sourceLineNo">246</span>    // Set TimeRange if defined<a 
name="line.246"></a>
+<span class="sourceLineNo">247</span>    long timeRange[] = 
getTimeRange(args);<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    if (timeRange != null) {<a 
name="line.248"></a>
+<span class="sourceLineNo">249</span>      LOG.info("Setting TimeRange for 
counter.");<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      s.setTimeRange(timeRange[0], 
timeRange[1]);<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    }<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    return s;<a name="line.252"></a>
+<span class="sourceLineNo">253</span>  }<a name="line.253"></a>
 <span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span>    for (int i = 1; i &lt; args.length; 
i++) {<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      System.out.println("i:" + i + 
"arg[i]" + args[i]);<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      if 
(args[i].startsWith(startTimeArgKey)) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span>        startTime = 
Long.parseLong(args[i].substring(startTimeArgKey.length()));<a 
name="line.258"></a>
-<span class="sourceLineNo">259</span>      }<a name="line.259"></a>
-<span class="sourceLineNo">260</span>      if 
(args[i].startsWith(endTimeArgKey)) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span>        endTime = 
Long.parseLong(args[i].substring(endTimeArgKey.length()));<a 
name="line.261"></a>
-<span class="sourceLineNo">262</span>      }<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    }<a name="line.263"></a>
-<span class="sourceLineNo">264</span><a name="line.264"></a>
-<span class="sourceLineNo">265</span>    if (startTime == 0 &amp;&amp; endTime 
== 0)<a name="line.265"></a>
-<span class="sourceLineNo">266</span>      return null;<a name="line.266"></a>
-<span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span>    endTime = endTime == 0 ? 
HConstants.LATEST_TIMESTAMP : endTime;<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    return new long [] {startTime, 
endTime};<a name="line.269"></a>
-<span class="sourceLineNo">270</span>  }<a name="line.270"></a>
-<span class="sourceLineNo">271</span><a name="line.271"></a>
-<span class="sourceLineNo">272</span>  @Override<a name="line.272"></a>
-<span class="sourceLineNo">273</span>  public int run(String[] args) throws 
Exception {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    if (args.length &lt; 2) {<a 
name="line.274"></a>
-<span class="sourceLineNo">275</span>      System.err.println("ERROR: Wrong 
number of parameters: " + args.length);<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      System.err.println("Usage: 
CellCounter ");<a name="line.276"></a>
-<span class="sourceLineNo">277</span>      System.err.println("       
&lt;tablename&gt; &lt;outputDir&gt; &lt;reportSeparator&gt; [^[regex pattern] 
or " +<a name="line.277"></a>
-<span class="sourceLineNo">278</span>        "[Prefix] for row filter]] 
--starttime=[starttime] --endtime=[endtime]");<a name="line.278"></a>
-<span class="sourceLineNo">279</span>      System.err.println("  Note: -D 
properties will be applied to the conf used. ");<a name="line.279"></a>
-<span class="sourceLineNo">280</span>      System.err.println("  Additionally, 
the following SCAN properties can be specified");<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      System.err.println("  to get fine 
grained control on what is counted..");<a name="line.281"></a>
-<span class="sourceLineNo">282</span>      System.err.println("   -D " + 
TableInputFormat.SCAN_COLUMN_FAMILY + "=&lt;familyName&gt;");<a 
name="line.282"></a>
-<span class="sourceLineNo">283</span>      System.err.println(" 
&lt;reportSeparator&gt; parameter can be used to override the default report 
separator " +<a name="line.283"></a>
-<span class="sourceLineNo">284</span>          "string : used to separate the 
rowId/column family name and qualifier name.");<a name="line.284"></a>
-<span class="sourceLineNo">285</span>      System.err.println(" [^[regex 
pattern] or [Prefix] parameter can be used to limit the cell counter count " 
+<a name="line.285"></a>
-<span class="sourceLineNo">286</span>          "operation to a limited subset 
of rows from the table based on regex or prefix pattern.");<a 
name="line.286"></a>
-<span class="sourceLineNo">287</span>      return -1;<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    }<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    Job job = 
createSubmittableJob(getConf(), args);<a name="line.289"></a>
-<span class="sourceLineNo">290</span>    return (job.waitForCompletion(true) ? 
0 : 1);<a name="line.290"></a>
-<span class="sourceLineNo">291</span>  }<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span>  /**<a name="line.293"></a>
-<span class="sourceLineNo">294</span>   * Main entry point.<a 
name="line.294"></a>
-<span class="sourceLineNo">295</span>   * @param args The command line 
parameters.<a name="line.295"></a>
-<span class="sourceLineNo">296</span>   * @throws Exception When running the 
job fails.<a name="line.296"></a>
-<span class="sourceLineNo">297</span>   */<a name="line.297"></a>
-<span class="sourceLineNo">298</span>  public static void main(String[] args) 
throws Exception {<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    int errCode = 
ToolRunner.run(HBaseConfiguration.create(), new CellCounter(), args);<a 
name="line.299"></a>
-<span class="sourceLineNo">300</span>    System.exit(errCode);<a 
name="line.300"></a>
-<span class="sourceLineNo">301</span>  }<a name="line.301"></a>
-<span class="sourceLineNo">302</span><a name="line.302"></a>
-<span class="sourceLineNo">303</span>}<a name="line.303"></a>
+<span class="sourceLineNo">255</span><a name="line.255"></a>
+<span class="sourceLineNo">256</span>  private static Filter 
getRowFilter(String[] args) {<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    Filter rowFilter = null;<a 
name="line.257"></a>
+<span class="sourceLineNo">258</span>    String filterCriteria = (args.length 
&gt; 3) ? args[3]: null;<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    if (filterCriteria == null) return 
null;<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    if (filterCriteria.startsWith("^")) 
{<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      String regexPattern = 
filterCriteria.substring(1, filterCriteria.length());<a name="line.261"></a>
+<span class="sourceLineNo">262</span>      rowFilter = new 
RowFilter(CompareFilter.CompareOp.EQUAL, new 
RegexStringComparator(regexPattern));<a name="line.262"></a>
+<span class="sourceLineNo">263</span>    } else {<a name="line.263"></a>
+<span class="sourceLineNo">264</span>      rowFilter = new 
PrefixFilter(Bytes.toBytesBinary(filterCriteria));<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    }<a name="line.265"></a>
+<span class="sourceLineNo">266</span>    return rowFilter;<a 
name="line.266"></a>
+<span class="sourceLineNo">267</span>  }<a name="line.267"></a>
+<span class="sourceLineNo">268</span><a name="line.268"></a>
+<span class="sourceLineNo">269</span>  private static long[] 
getTimeRange(String[] args) throws IOException {<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    final String startTimeArgKey = 
"--starttime=";<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    final String endTimeArgKey = 
"--endtime=";<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    long startTime = 0L;<a 
name="line.272"></a>
+<span class="sourceLineNo">273</span>    long endTime = 0L;<a 
name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span>    for (int i = 1; i &lt; args.length; 
i++) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span>      System.out.println("i:" + i + 
"arg[i]" + args[i]);<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      if 
(args[i].startsWith(startTimeArgKey)) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span>        startTime = 
Long.parseLong(args[i].substring(startTimeArgKey.length()));<a 
name="line.278"></a>
+<span class="sourceLineNo">279</span>      }<a name="line.279"></a>
+<span class="sourceLineNo">280</span>      if 
(args[i].startsWith(endTimeArgKey)) {<a name="line.280"></a>
+<span class="sourceLineNo">281</span>        endTime = 
Long.parseLong(args[i].substring(endTimeArgKey.length()));<a 
name="line.281"></a>
+<span class="sourceLineNo">282</span>      }<a name="line.282"></a>
+<span class="sourceLineNo">283</span>    }<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">285</span>    if (startTime == 0 &amp;&amp; endTime 
== 0)<a name="line.285"></a>
+<span class="sourceLineNo">286</span>      return null;<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span>    endTime = endTime == 0 ? 
HConstants.LATEST_TIMESTAMP : endTime;<a name="line.288"></a>
+<span class="sourceLineNo">289</span>    return new long [] {startTime, 
endTime};<a name="line.289"></a>
+<span class="sourceLineNo">290</span>  }<a name="line.290"></a>
+<span class="sourceLineNo">291</span><a name="line.291"></a>
+<span class="sourceLineNo">292</span>  @Override<a name="line.292"></a>
+<span class="sourceLineNo">293</span>  public int run(String[] args) throws 
Exception {<a name="line.293"></a>
+<span class="sourceLineNo">294</span>    if (args.length &lt; 2) {<a 
name="line.294"></a>
+<span class="sourceLineNo">295</span>      System.err.println("ERROR: Wrong 
number of parameters: " + args.length);<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      System.err.println("Usage: 
CellCounter ");<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      System.err.println("       
&lt;tablename&gt; &lt;outputDir&gt; &lt;reportSeparator&gt; [^[regex pattern] 
or " +<a name="line.297"></a>
+<span class="sourceLineNo">298</span>        "[Prefix] for row filter]] 
--starttime=[starttime] --endtime=[endtime]");<a name="line.298"></a>
+<span class="sourceLineNo">299</span>      System.err.println("  Note: -D 
properties will be applied to the conf used. ");<a name="line.299"></a>
+<span class="sourceLineNo">300</span>      System.err.println("  Additionally, 
all of the SCAN properties from TableInputFormat");<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      System.err.println("  can be 
specified to get fine grained control on what is counted..");<a 
name="line.301"></a>
+<span class="sourceLineNo">302</span>      System.err.println("   -D " + 
TableInputFormat.SCAN_ROW_START + "=&lt;rowkey&gt;");<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      System.err.println("   -D " + 
TableInputFormat.SCAN_ROW_STOP + "=&lt;rowkey&gt;");<a name="line.303"></a>
+<span class="sourceLineNo">304</span>      System.err.println("   -D " + 
TableInputFormat.SCAN_COLUMNS + "=\"&lt;col1&gt; &lt;col2&gt;...\"");<a 
name="line.304"></a>
+<span class="sourceLineNo">305</span>      System.err.println("   -D " + 
TableInputFormat.SCAN_COLUMN_FAMILY + "=&lt;familyName&gt;");<a 
name="line.305"></a>
+<span class="sourceLineNo">306</span>      System.err.println("   -D " + 
TableInputFormat.SCAN_TIMESTAMP + "=&lt;timestamp&gt;");<a name="line.306"></a>
+<span class="sourceLineNo">307</span>      System.err.println("   -D " + 
TableInputFormat.SCAN_TIMERANGE_START + "=&lt;timestamp&gt;");<a 
name="line.307"></a>
+<span class="sourceLineNo">308</span>      System.err.println("   -D " + 
TableInputFormat.SCAN_TIMERANGE_END + "=&lt;timestamp&gt;");<a 
name="line.308"></a>
+<span class="sourceLineNo">309</span>      System.err.println("   -D " + 
TableInputFormat.SCAN_MAXVERSIONS + "=&lt;count&gt;");<a name="line.309"></a>
+<span class="sourceLineNo">310</span>      System.err.println("   -D " + 
TableInputFormat.SCAN_CACHEDROWS + "=&lt;count&gt;");<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      System.err.println("   -D " + 
TableInputFormat.SCAN_BATCHSIZE + "=&lt;count&gt;");<a name="line.311"></a>
+<span class="sourceLineNo">312</span>      System.err.println(" 
&lt;reportSeparator&gt; parameter can be used to override the default report 
separator " +<a name="line.312"></a>
+<span class="sourceLineNo">313</span>          "string : used to separate the 
rowId/column family name and qualifier name.");<a name="line.313"></a>
+<span class="sourceLineNo">314</span>      System.err.println(" [^[regex 
pattern] or [Prefix] parameter can be used to limit the cell counter count " 
+<a name="line.314"></a>
+<span class="sourceLineNo">315</span>          "operation to a limited subset 
of rows from the table based on regex or prefix pattern.");<a 
name="line.315"></a>
+<span class="sourceLineNo">316</span>      return -1;<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    }<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    Job job = 
createSubmittableJob(getConf(), args);<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    return (job.waitForCompletion(true) ? 
0 : 1);<a name="line.319"></a>
+<span class="sourceLineNo">320</span>  }<a name="line.320"></a>
+<span class="sourceLineNo">321</span><a name="line.321"></a>
+<span class="sourceLineNo">322</span>  /**<a name="line.322"></a>
+<span class="sourceLineNo">323</span>   * Main entry point.<a 
name="line.323"></a>
+<span class="sourceLineNo">324</span>   * @param args The command line 
parameters.<a name="line.324"></a>
+<span class="sourceLineNo">325</span>   * @throws Exception When running the 
job fails.<a name="line.325"></a>
+<span class="sourceLineNo">326</span>   */<a name="line.326"></a>
+<span class="sourceLineNo">327</span>  public static void main(String[] args) 
throws Exception {<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    int errCode = 
ToolRunner.run(HBaseConfiguration.create(), new CellCounter(), args);<a 
name="line.328"></a>
+<span class="sourceLineNo">329</span>    System.exit(errCode);<a 
name="line.329"></a>
+<span class="sourceLineNo">330</span>  }<a name="line.330"></a>
+<span class="sourceLineNo">331</span><a name="line.331"></a>
+<span class="sourceLineNo">332</span>}<a name="line.332"></a>
 
 
 

Reply via email to