You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2016/06/22 16:14:41 UTC
[09/52] [partial] hbase-site git commit: Published site at
3e0602be1665e6170b0addec59bbe8785da300b0.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ae5da13b/devapidocs/src-html/org/apache/hadoop/hbase/TableDescriptor.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/TableDescriptor.html b/devapidocs/src-html/org/apache/hadoop/hbase/TableDescriptor.html
deleted file mode 100644
index 8ffdcff..0000000
--- a/devapidocs/src-html/org/apache/hadoop/hbase/TableDescriptor.html
+++ /dev/null
@@ -1,237 +0,0 @@
-<!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;<a name="line.18"></a>
-<span class="sourceLineNo">019</span><a name="line.19"></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 com.google.common.annotations.VisibleForTesting;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.hadoop.conf.Configuration;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.exceptions.DeserializationException;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.protobuf.ProtobufUtil;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.regionserver.BloomType;<a name="line.28"></a>
-<span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span>/**<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * Class represents table state on HDFS.<a name="line.31"></a>
-<span class="sourceLineNo">032</span> */<a name="line.32"></a>
-<span class="sourceLineNo">033</span>@InterfaceAudience.Private<a name="line.33"></a>
-<span class="sourceLineNo">034</span>public class TableDescriptor {<a name="line.34"></a>
-<span class="sourceLineNo">035</span> private HTableDescriptor hTableDescriptor;<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> * Creates TableDescriptor with Enabled table.<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * @param hTableDescriptor HTableDescriptor to use<a name="line.39"></a>
-<span class="sourceLineNo">040</span> */<a name="line.40"></a>
-<span class="sourceLineNo">041</span> @VisibleForTesting<a name="line.41"></a>
-<span class="sourceLineNo">042</span> public TableDescriptor(HTableDescriptor hTableDescriptor) {<a name="line.42"></a>
-<span class="sourceLineNo">043</span> this.hTableDescriptor = hTableDescriptor;<a name="line.43"></a>
-<span class="sourceLineNo">044</span> }<a name="line.44"></a>
-<span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span> /**<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * Associated HTableDescriptor<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * @return instance of HTableDescriptor<a name="line.48"></a>
-<span class="sourceLineNo">049</span> */<a name="line.49"></a>
-<span class="sourceLineNo">050</span> public HTableDescriptor getHTableDescriptor() {<a name="line.50"></a>
-<span class="sourceLineNo">051</span> return hTableDescriptor;<a name="line.51"></a>
-<span class="sourceLineNo">052</span> }<a name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span> public void setHTableDescriptor(HTableDescriptor hTableDescriptor) {<a name="line.54"></a>
-<span class="sourceLineNo">055</span> this.hTableDescriptor = hTableDescriptor;<a name="line.55"></a>
-<span class="sourceLineNo">056</span> }<a name="line.56"></a>
-<span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span> /**<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * Convert to PB.<a name="line.59"></a>
-<span class="sourceLineNo">060</span> */<a name="line.60"></a>
-<span class="sourceLineNo">061</span> @SuppressWarnings("deprecation")<a name="line.61"></a>
-<span class="sourceLineNo">062</span> public HBaseProtos.TableDescriptor convert() {<a name="line.62"></a>
-<span class="sourceLineNo">063</span> HBaseProtos.TableDescriptor.Builder builder = HBaseProtos.TableDescriptor.newBuilder()<a name="line.63"></a>
-<span class="sourceLineNo">064</span> .setSchema(ProtobufUtil.convertToTableSchema(hTableDescriptor));<a name="line.64"></a>
-<span class="sourceLineNo">065</span> return builder.build();<a name="line.65"></a>
-<span class="sourceLineNo">066</span> }<a name="line.66"></a>
-<span class="sourceLineNo">067</span><a name="line.67"></a>
-<span class="sourceLineNo">068</span> /**<a name="line.68"></a>
-<span class="sourceLineNo">069</span> * Convert from PB<a name="line.69"></a>
-<span class="sourceLineNo">070</span> */<a name="line.70"></a>
-<span class="sourceLineNo">071</span> public static TableDescriptor convert(HBaseProtos.TableDescriptor proto) {<a name="line.71"></a>
-<span class="sourceLineNo">072</span> return new TableDescriptor(ProtobufUtil.convertToHTableDesc(proto.getSchema()));<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> * @return This instance serialized with pb with pb magic prefix<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * @see #parseFrom(byte[])<a name="line.77"></a>
-<span class="sourceLineNo">078</span> */<a name="line.78"></a>
-<span class="sourceLineNo">079</span> public byte [] toByteArray() {<a name="line.79"></a>
-<span class="sourceLineNo">080</span> return ProtobufUtil.prependPBMagic(convert().toByteArray());<a name="line.80"></a>
-<span class="sourceLineNo">081</span> }<a name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span> /**<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * @param bytes A pb serialized {@link TableDescriptor} instance with pb magic prefix<a name="line.84"></a>
-<span class="sourceLineNo">085</span> * @see #toByteArray()<a name="line.85"></a>
-<span class="sourceLineNo">086</span> */<a name="line.86"></a>
-<span class="sourceLineNo">087</span> public static TableDescriptor parseFrom(final byte [] bytes)<a name="line.87"></a>
-<span class="sourceLineNo">088</span> throws DeserializationException, IOException {<a name="line.88"></a>
-<span class="sourceLineNo">089</span> if (!ProtobufUtil.isPBMagicPrefix(bytes)) {<a name="line.89"></a>
-<span class="sourceLineNo">090</span> throw new DeserializationException("Expected PB encoded TableDescriptor");<a name="line.90"></a>
-<span class="sourceLineNo">091</span> }<a name="line.91"></a>
-<span class="sourceLineNo">092</span> int pblen = ProtobufUtil.lengthOfPBMagic();<a name="line.92"></a>
-<span class="sourceLineNo">093</span> HBaseProtos.TableDescriptor.Builder builder = HBaseProtos.TableDescriptor.newBuilder();<a name="line.93"></a>
-<span class="sourceLineNo">094</span> HBaseProtos.TableDescriptor ts;<a name="line.94"></a>
-<span class="sourceLineNo">095</span> try {<a name="line.95"></a>
-<span class="sourceLineNo">096</span> ProtobufUtil.mergeFrom(builder, bytes, pblen, bytes.length - pblen);<a name="line.96"></a>
-<span class="sourceLineNo">097</span> ts = builder.build();<a name="line.97"></a>
-<span class="sourceLineNo">098</span> } catch (IOException e) {<a name="line.98"></a>
-<span class="sourceLineNo">099</span> throw new DeserializationException(e);<a name="line.99"></a>
-<span class="sourceLineNo">100</span> }<a name="line.100"></a>
-<span class="sourceLineNo">101</span> return convert(ts);<a name="line.101"></a>
-<span class="sourceLineNo">102</span> }<a name="line.102"></a>
-<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span> @Override<a name="line.104"></a>
-<span class="sourceLineNo">105</span> public boolean equals(Object o) {<a name="line.105"></a>
-<span class="sourceLineNo">106</span> if (this == o) return true;<a name="line.106"></a>
-<span class="sourceLineNo">107</span> if (o == null || getClass() != o.getClass()) return false;<a name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span> TableDescriptor that = (TableDescriptor) o;<a name="line.109"></a>
-<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span> if (hTableDescriptor != null ?<a name="line.111"></a>
-<span class="sourceLineNo">112</span> !hTableDescriptor.equals(that.hTableDescriptor) :<a name="line.112"></a>
-<span class="sourceLineNo">113</span> that.hTableDescriptor != null) return false;<a name="line.113"></a>
-<span class="sourceLineNo">114</span> return true;<a name="line.114"></a>
-<span class="sourceLineNo">115</span> }<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span> @Override<a name="line.117"></a>
-<span class="sourceLineNo">118</span> public int hashCode() {<a name="line.118"></a>
-<span class="sourceLineNo">119</span> return hTableDescriptor != null ? hTableDescriptor.hashCode() : 0;<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> @Override<a name="line.122"></a>
-<span class="sourceLineNo">123</span> public String toString() {<a name="line.123"></a>
-<span class="sourceLineNo">124</span> return "TableDescriptor{" +<a name="line.124"></a>
-<span class="sourceLineNo">125</span> "hTableDescriptor=" + hTableDescriptor +<a name="line.125"></a>
-<span class="sourceLineNo">126</span> '}';<a name="line.126"></a>
-<span class="sourceLineNo">127</span> }<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span> public static HTableDescriptor metaTableDescriptor(final Configuration conf)<a name="line.129"></a>
-<span class="sourceLineNo">130</span> throws IOException {<a name="line.130"></a>
-<span class="sourceLineNo">131</span> HTableDescriptor metaDescriptor = new HTableDescriptor(<a name="line.131"></a>
-<span class="sourceLineNo">132</span> TableName.META_TABLE_NAME,<a name="line.132"></a>
-<span class="sourceLineNo">133</span> new HColumnDescriptor[] {<a name="line.133"></a>
-<span class="sourceLineNo">134</span> new HColumnDescriptor(HConstants.CATALOG_FAMILY)<a name="line.134"></a>
-<span class="sourceLineNo">135</span> .setMaxVersions(conf.getInt(HConstants.HBASE_META_VERSIONS,<a name="line.135"></a>
-<span class="sourceLineNo">136</span> HConstants.DEFAULT_HBASE_META_VERSIONS))<a name="line.136"></a>
-<span class="sourceLineNo">137</span> .setInMemory(true)<a name="line.137"></a>
-<span class="sourceLineNo">138</span> .setBlocksize(conf.getInt(HConstants.HBASE_META_BLOCK_SIZE,<a name="line.138"></a>
-<span class="sourceLineNo">139</span> HConstants.DEFAULT_HBASE_META_BLOCK_SIZE))<a name="line.139"></a>
-<span class="sourceLineNo">140</span> .setScope(HConstants.REPLICATION_SCOPE_LOCAL)<a name="line.140"></a>
-<span class="sourceLineNo">141</span> // Disable blooms for meta. Needs work. Seems to mess w/ getClosestOrBefore.<a name="line.141"></a>
-<span class="sourceLineNo">142</span> .setBloomFilterType(BloomType.NONE)<a name="line.142"></a>
-<span class="sourceLineNo">143</span> // Enable cache of data blocks in L1 if more than one caching tier deployed:<a name="line.143"></a>
-<span class="sourceLineNo">144</span> // e.g. if using CombinedBlockCache (BucketCache).<a name="line.144"></a>
-<span class="sourceLineNo">145</span> .setCacheDataInL1(true),<a name="line.145"></a>
-<span class="sourceLineNo">146</span> new HColumnDescriptor(HConstants.TABLE_FAMILY)<a name="line.146"></a>
-<span class="sourceLineNo">147</span> // Ten is arbitrary number. Keep versions to help debugging.<a name="line.147"></a>
-<span class="sourceLineNo">148</span> .setMaxVersions(10)<a name="line.148"></a>
-<span class="sourceLineNo">149</span> .setInMemory(true)<a name="line.149"></a>
-<span class="sourceLineNo">150</span> .setBlocksize(8 * 1024)<a name="line.150"></a>
-<span class="sourceLineNo">151</span> .setScope(HConstants.REPLICATION_SCOPE_LOCAL)<a name="line.151"></a>
-<span class="sourceLineNo">152</span> // Disable blooms for meta. Needs work. Seems to mess w/ getClosestOrBefore.<a name="line.152"></a>
-<span class="sourceLineNo">153</span> .setBloomFilterType(BloomType.NONE)<a name="line.153"></a>
-<span class="sourceLineNo">154</span> // Enable cache of data blocks in L1 if more than one caching tier deployed:<a name="line.154"></a>
-<span class="sourceLineNo">155</span> // e.g. if using CombinedBlockCache (BucketCache).<a name="line.155"></a>
-<span class="sourceLineNo">156</span> .setCacheDataInL1(true)<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> metaDescriptor.addCoprocessor(<a name="line.159"></a>
-<span class="sourceLineNo">160</span> "org.apache.hadoop.hbase.coprocessor.MultiRowMutationEndpoint",<a name="line.160"></a>
-<span class="sourceLineNo">161</span> null, Coprocessor.PRIORITY_SYSTEM, null);<a name="line.161"></a>
-<span class="sourceLineNo">162</span> return metaDescriptor;<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>}<a name="line.165"></a>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</pre>
-</div>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ae5da13b/devapidocs/src-html/org/apache/hadoop/hbase/TableDescriptors.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/TableDescriptors.html b/devapidocs/src-html/org/apache/hadoop/hbase/TableDescriptors.html
index a754ed4..17c981c 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/TableDescriptors.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/TableDescriptors.html
@@ -38,80 +38,64 @@
<span class="sourceLineNo">030</span>public interface TableDescriptors {<a name="line.30"></a>
<span class="sourceLineNo">031</span> /**<a name="line.31"></a>
<span class="sourceLineNo">032</span> * @param tableName<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * @return HTableDescriptor for tablename<a name="line.33"></a>
+<span class="sourceLineNo">033</span> * @return TableDescriptor for tablename<a name="line.33"></a>
<span class="sourceLineNo">034</span> * @throws IOException<a name="line.34"></a>
<span class="sourceLineNo">035</span> */<a name="line.35"></a>
<span class="sourceLineNo">036</span> HTableDescriptor get(final TableName tableName)<a name="line.36"></a>
-<span class="sourceLineNo">037</span> throws IOException;<a name="line.37"></a>
+<span class="sourceLineNo">037</span> throws IOException;<a name="line.37"></a>
<span class="sourceLineNo">038</span><a name="line.38"></a>
<span class="sourceLineNo">039</span> /**<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * @param tableName<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * @return TableDescriptor for tablename<a name="line.41"></a>
+<span class="sourceLineNo">040</span> * Get Map of all NamespaceDescriptors for a given namespace.<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * @return Map of all descriptors.<a name="line.41"></a>
<span class="sourceLineNo">042</span> * @throws IOException<a name="line.42"></a>
<span class="sourceLineNo">043</span> */<a name="line.43"></a>
-<span class="sourceLineNo">044</span> TableDescriptor getDescriptor(final TableName tableName)<a name="line.44"></a>
-<span class="sourceLineNo">045</span> throws IOException;<a name="line.45"></a>
+<span class="sourceLineNo">044</span> Map<String, HTableDescriptor> getByNamespace(String name)<a name="line.44"></a>
+<span class="sourceLineNo">045</span> throws IOException;<a name="line.45"></a>
<span class="sourceLineNo">046</span><a name="line.46"></a>
<span class="sourceLineNo">047</span> /**<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * Get Map of all NamespaceDescriptors for a given namespace.<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * @return Map of all descriptors.<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * @throws IOException<a name="line.50"></a>
-<span class="sourceLineNo">051</span> */<a name="line.51"></a>
-<span class="sourceLineNo">052</span> Map<String, HTableDescriptor> getByNamespace(String name)<a name="line.52"></a>
-<span class="sourceLineNo">053</span> throws IOException;<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span> /**<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * Get Map of all HTableDescriptors. Populates the descriptor cache as a<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * side effect.<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * @return Map of all descriptors.<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * @throws IOException<a name="line.59"></a>
-<span class="sourceLineNo">060</span> */<a name="line.60"></a>
-<span class="sourceLineNo">061</span> Map<String, HTableDescriptor> getAll()<a name="line.61"></a>
-<span class="sourceLineNo">062</span> throws IOException;<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> * Get Map of all TableDescriptors. Populates the descriptor cache as a<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * side effect.<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * @return Map of all descriptors.<a name="line.67"></a>
+<span class="sourceLineNo">048</span> * Get Map of all HTableDescriptors. Populates the descriptor cache as a<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * side effect.<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * @return Map of all descriptors.<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * @throws IOException<a name="line.51"></a>
+<span class="sourceLineNo">052</span> */<a name="line.52"></a>
+<span class="sourceLineNo">053</span> Map<String, HTableDescriptor> getAll()<a name="line.53"></a>
+<span class="sourceLineNo">054</span> throws IOException;<a name="line.54"></a>
+<span class="sourceLineNo">055</span><a name="line.55"></a>
+<span class="sourceLineNo">056</span> /**<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * Get Map of all TableDescriptors. Populates the descriptor cache as a<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * side effect.<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * @return Map of all descriptors.<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * @throws IOException<a name="line.60"></a>
+<span class="sourceLineNo">061</span> */<a name="line.61"></a>
+<span class="sourceLineNo">062</span> Map<String, HTableDescriptor> getAllDescriptors()<a name="line.62"></a>
+<span class="sourceLineNo">063</span> throws IOException;<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> * Add or update descriptor<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * @param htd Descriptor to set into TableDescriptors<a name="line.67"></a>
<span class="sourceLineNo">068</span> * @throws IOException<a name="line.68"></a>
<span class="sourceLineNo">069</span> */<a name="line.69"></a>
-<span class="sourceLineNo">070</span> Map<String, TableDescriptor> getAllDescriptors()<a name="line.70"></a>
-<span class="sourceLineNo">071</span> throws IOException;<a name="line.71"></a>
+<span class="sourceLineNo">070</span> void add(final HTableDescriptor htd)<a name="line.70"></a>
+<span class="sourceLineNo">071</span> throws IOException;<a name="line.71"></a>
<span class="sourceLineNo">072</span><a name="line.72"></a>
<span class="sourceLineNo">073</span> /**<a name="line.73"></a>
-<span class="sourceLineNo">074</span> * Add or update descriptor<a name="line.74"></a>
-<span class="sourceLineNo">075</span> * @param htd Descriptor to set into TableDescriptors<a name="line.75"></a>
+<span class="sourceLineNo">074</span> * @param tablename<a name="line.74"></a>
+<span class="sourceLineNo">075</span> * @return Instance of table descriptor or null if none found.<a name="line.75"></a>
<span class="sourceLineNo">076</span> * @throws IOException<a name="line.76"></a>
<span class="sourceLineNo">077</span> */<a name="line.77"></a>
-<span class="sourceLineNo">078</span> void add(final HTableDescriptor htd)<a name="line.78"></a>
+<span class="sourceLineNo">078</span> HTableDescriptor remove(final TableName tablename)<a name="line.78"></a>
<span class="sourceLineNo">079</span> throws IOException;<a name="line.79"></a>
<span class="sourceLineNo">080</span><a name="line.80"></a>
<span class="sourceLineNo">081</span> /**<a name="line.81"></a>
-<span class="sourceLineNo">082</span> * Add or update descriptor<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * @param htd Descriptor to set into TableDescriptors<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * @throws IOException<a name="line.84"></a>
-<span class="sourceLineNo">085</span> */<a name="line.85"></a>
-<span class="sourceLineNo">086</span> void add(final TableDescriptor htd)<a name="line.86"></a>
-<span class="sourceLineNo">087</span> throws IOException;<a name="line.87"></a>
-<span class="sourceLineNo">088</span><a name="line.88"></a>
-<span class="sourceLineNo">089</span> /**<a name="line.89"></a>
-<span class="sourceLineNo">090</span> * @param tablename<a name="line.90"></a>
-<span class="sourceLineNo">091</span> * @return Instance of table descriptor or null if none found.<a name="line.91"></a>
-<span class="sourceLineNo">092</span> * @throws IOException<a name="line.92"></a>
-<span class="sourceLineNo">093</span> */<a name="line.93"></a>
-<span class="sourceLineNo">094</span> HTableDescriptor remove(final TableName tablename)<a name="line.94"></a>
-<span class="sourceLineNo">095</span> throws IOException;<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> * Enables the tabledescriptor cache<a name="line.98"></a>
-<span class="sourceLineNo">099</span> */<a name="line.99"></a>
-<span class="sourceLineNo">100</span> void setCacheOn() throws IOException;<a name="line.100"></a>
-<span class="sourceLineNo">101</span><a name="line.101"></a>
-<span class="sourceLineNo">102</span> /**<a name="line.102"></a>
-<span class="sourceLineNo">103</span> * Disables the tabledescriptor cache<a name="line.103"></a>
-<span class="sourceLineNo">104</span> */<a name="line.104"></a>
-<span class="sourceLineNo">105</span> void setCacheOff() throws IOException;<a name="line.105"></a>
-<span class="sourceLineNo">106</span>}<a name="line.106"></a>
+<span class="sourceLineNo">082</span> * Enables the tabledescriptor cache<a name="line.82"></a>
+<span class="sourceLineNo">083</span> */<a name="line.83"></a>
+<span class="sourceLineNo">084</span> void setCacheOn() throws IOException;<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span> /**<a name="line.86"></a>
+<span class="sourceLineNo">087</span> * Disables the tabledescriptor cache<a name="line.87"></a>
+<span class="sourceLineNo">088</span> */<a name="line.88"></a>
+<span class="sourceLineNo">089</span> void setCacheOff() throws IOException;<a name="line.89"></a>
+<span class="sourceLineNo">090</span>}<a name="line.90"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ae5da13b/devapidocs/src-html/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.html
index 894ccdd..ea60126 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.html
@@ -191,7 +191,7 @@
<span class="sourceLineNo">183</span> if (tableCfs != null) {<a name="line.183"></a>
<span class="sourceLineNo">184</span> peerConfig.setTableCFsMap(tableCfs);<a name="line.184"></a>
<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span> this.replicationPeers.addPeer(id, peerConfig);<a name="line.186"></a>
+<span class="sourceLineNo">186</span> this.replicationPeers.registerPeer(id, peerConfig);<a name="line.186"></a>
<span class="sourceLineNo">187</span> }<a name="line.187"></a>
<span class="sourceLineNo">188</span><a name="line.188"></a>
<span class="sourceLineNo">189</span> /**<a name="line.189"></a>
@@ -200,7 +200,7 @@
<span class="sourceLineNo">192</span> * @param peerConfig configuration for the replication slave cluster<a name="line.192"></a>
<span class="sourceLineNo">193</span> */<a name="line.193"></a>
<span class="sourceLineNo">194</span> public void addPeer(String id, ReplicationPeerConfig peerConfig) throws ReplicationException {<a name="line.194"></a>
-<span class="sourceLineNo">195</span> this.replicationPeers.addPeer(id, peerConfig);<a name="line.195"></a>
+<span class="sourceLineNo">195</span> this.replicationPeers.registerPeer(id, peerConfig);<a name="line.195"></a>
<span class="sourceLineNo">196</span> }<a name="line.196"></a>
<span class="sourceLineNo">197</span><a name="line.197"></a>
<span class="sourceLineNo">198</span> /**<a name="line.198"></a>
@@ -220,7 +220,7 @@
<span class="sourceLineNo">212</span> * @param id a short name that identifies the cluster<a name="line.212"></a>
<span class="sourceLineNo">213</span> */<a name="line.213"></a>
<span class="sourceLineNo">214</span> public void removePeer(String id) throws ReplicationException {<a name="line.214"></a>
-<span class="sourceLineNo">215</span> this.replicationPeers.removePeer(id);<a name="line.215"></a>
+<span class="sourceLineNo">215</span> this.replicationPeers.unregisterPeer(id);<a name="line.215"></a>
<span class="sourceLineNo">216</span> }<a name="line.216"></a>
<span class="sourceLineNo">217</span><a name="line.217"></a>
<span class="sourceLineNo">218</span> /**<a name="line.218"></a>
@@ -564,7 +564,7 @@
<span class="sourceLineNo">556</span><a name="line.556"></a>
<span class="sourceLineNo">557</span> @VisibleForTesting<a name="line.557"></a>
<span class="sourceLineNo">558</span> public void peerAdded(String id) throws ReplicationException {<a name="line.558"></a>
-<span class="sourceLineNo">559</span> this.replicationPeers.peerAdded(id);<a name="line.559"></a>
+<span class="sourceLineNo">559</span> this.replicationPeers.peerConnected(id);<a name="line.559"></a>
<span class="sourceLineNo">560</span> }<a name="line.560"></a>
<span class="sourceLineNo">561</span><a name="line.561"></a>
<span class="sourceLineNo">562</span> @VisibleForTesting<a name="line.562"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ae5da13b/devapidocs/src-html/org/apache/hadoop/hbase/http/log/LogLevel.Servlet.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/http/log/LogLevel.Servlet.html b/devapidocs/src-html/org/apache/hadoop/hbase/http/log/LogLevel.Servlet.html
index 781f407..0f24045 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/http/log/LogLevel.Servlet.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/http/log/LogLevel.Servlet.html
@@ -80,9 +80,9 @@
<span class="sourceLineNo">072</span> System.out.println("Connecting to " + url);<a name="line.72"></a>
<span class="sourceLineNo">073</span> URLConnection connection = url.openConnection();<a name="line.73"></a>
<span class="sourceLineNo">074</span> connection.connect();<a name="line.74"></a>
-<span class="sourceLineNo">075</span> try (BufferedReader in = new BufferedReader(new InputStreamReader(<a name="line.75"></a>
-<span class="sourceLineNo">076</span> connection.getInputStream()))) {<a name="line.76"></a>
-<span class="sourceLineNo">077</span> for(String line; (line = in.readLine()) != null; ) {<a name="line.77"></a>
+<span class="sourceLineNo">075</span> try (InputStreamReader streamReader = new InputStreamReader(connection.getInputStream());<a name="line.75"></a>
+<span class="sourceLineNo">076</span> BufferedReader bufferedReader = new BufferedReader(streamReader)) {<a name="line.76"></a>
+<span class="sourceLineNo">077</span> for(String line; (line = bufferedReader.readLine()) != null; ) {<a name="line.77"></a>
<span class="sourceLineNo">078</span> if (line.startsWith(MARKER)) {<a name="line.78"></a>
<span class="sourceLineNo">079</span> System.out.println(TAG.matcher(line).replaceAll(""));<a name="line.79"></a>
<span class="sourceLineNo">080</span> }<a name="line.80"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ae5da13b/devapidocs/src-html/org/apache/hadoop/hbase/http/log/LogLevel.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/http/log/LogLevel.html b/devapidocs/src-html/org/apache/hadoop/hbase/http/log/LogLevel.html
index 781f407..0f24045 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/http/log/LogLevel.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/http/log/LogLevel.html
@@ -80,9 +80,9 @@
<span class="sourceLineNo">072</span> System.out.println("Connecting to " + url);<a name="line.72"></a>
<span class="sourceLineNo">073</span> URLConnection connection = url.openConnection();<a name="line.73"></a>
<span class="sourceLineNo">074</span> connection.connect();<a name="line.74"></a>
-<span class="sourceLineNo">075</span> try (BufferedReader in = new BufferedReader(new InputStreamReader(<a name="line.75"></a>
-<span class="sourceLineNo">076</span> connection.getInputStream()))) {<a name="line.76"></a>
-<span class="sourceLineNo">077</span> for(String line; (line = in.readLine()) != null; ) {<a name="line.77"></a>
+<span class="sourceLineNo">075</span> try (InputStreamReader streamReader = new InputStreamReader(connection.getInputStream());<a name="line.75"></a>
+<span class="sourceLineNo">076</span> BufferedReader bufferedReader = new BufferedReader(streamReader)) {<a name="line.76"></a>
+<span class="sourceLineNo">077</span> for(String line; (line = bufferedReader.readLine()) != null; ) {<a name="line.77"></a>
<span class="sourceLineNo">078</span> if (line.startsWith(MARKER)) {<a name="line.78"></a>
<span class="sourceLineNo">079</span> System.out.println(TAG.matcher(line).replaceAll(""));<a name="line.79"></a>
<span class="sourceLineNo">080</span> }<a name="line.80"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ae5da13b/devapidocs/src-html/org/apache/hadoop/hbase/ipc/FifoWithFastPathBalancedQueueRpcExecutor.FastPathHandler.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/ipc/FifoWithFastPathBalancedQueueRpcExecutor.FastPathHandler.html b/devapidocs/src-html/org/apache/hadoop/hbase/ipc/FifoWithFastPathBalancedQueueRpcExecutor.FastPathHandler.html
index 6ba8d6a..2d52a01 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/ipc/FifoWithFastPathBalancedQueueRpcExecutor.FastPathHandler.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/ipc/FifoWithFastPathBalancedQueueRpcExecutor.FastPathHandler.html
@@ -82,7 +82,7 @@
<span class="sourceLineNo">074</span> // if an empty queue of CallRunners so we are available for direct handoff when one comes in.<a name="line.74"></a>
<span class="sourceLineNo">075</span> final Deque<FastPathHandler> fastPathHandlerStack;<a name="line.75"></a>
<span class="sourceLineNo">076</span> // Semaphore to coordinate loading of fastpathed loadedTask and our running it.<a name="line.76"></a>
-<span class="sourceLineNo">077</span> private Semaphore semaphore = new Semaphore(1);<a name="line.77"></a>
+<span class="sourceLineNo">077</span> private Semaphore semaphore = new Semaphore(0);<a name="line.77"></a>
<span class="sourceLineNo">078</span> // The task we get when fast-pathing.<a name="line.78"></a>
<span class="sourceLineNo">079</span> private CallRunner loadedCallRunner;<a name="line.79"></a>
<span class="sourceLineNo">080</span><a name="line.80"></a>
@@ -90,19 +90,19 @@
<span class="sourceLineNo">082</span> final Deque<FastPathHandler> fastPathHandlerStack) {<a name="line.82"></a>
<span class="sourceLineNo">083</span> super(name, handlerFailureThreshhold, q);<a name="line.83"></a>
<span class="sourceLineNo">084</span> this.fastPathHandlerStack = fastPathHandlerStack;<a name="line.84"></a>
-<span class="sourceLineNo">085</span> this.semaphore.drainPermits();<a name="line.85"></a>
-<span class="sourceLineNo">086</span> }<a name="line.86"></a>
-<span class="sourceLineNo">087</span><a name="line.87"></a>
-<span class="sourceLineNo">088</span> protected CallRunner getCallRunner() throws InterruptedException {<a name="line.88"></a>
-<span class="sourceLineNo">089</span> // Get a callrunner if one in the Q.<a name="line.89"></a>
-<span class="sourceLineNo">090</span> CallRunner cr = this.q.poll();<a name="line.90"></a>
-<span class="sourceLineNo">091</span> if (cr == null) {<a name="line.91"></a>
-<span class="sourceLineNo">092</span> // Else, if a fastPathHandlerStack present and no callrunner in Q, register ourselves for<a name="line.92"></a>
-<span class="sourceLineNo">093</span> // the fastpath handoff done via fastPathHandlerStack.<a name="line.93"></a>
-<span class="sourceLineNo">094</span> if (this.fastPathHandlerStack != null) {<a name="line.94"></a>
-<span class="sourceLineNo">095</span> this.fastPathHandlerStack.push(this);<a name="line.95"></a>
-<span class="sourceLineNo">096</span> this.semaphore.acquire();<a name="line.96"></a>
-<span class="sourceLineNo">097</span> cr = this.loadedCallRunner;<a name="line.97"></a>
+<span class="sourceLineNo">085</span> }<a name="line.85"></a>
+<span class="sourceLineNo">086</span><a name="line.86"></a>
+<span class="sourceLineNo">087</span> protected CallRunner getCallRunner() throws InterruptedException {<a name="line.87"></a>
+<span class="sourceLineNo">088</span> // Get a callrunner if one in the Q.<a name="line.88"></a>
+<span class="sourceLineNo">089</span> CallRunner cr = this.q.poll();<a name="line.89"></a>
+<span class="sourceLineNo">090</span> if (cr == null) {<a name="line.90"></a>
+<span class="sourceLineNo">091</span> // Else, if a fastPathHandlerStack present and no callrunner in Q, register ourselves for<a name="line.91"></a>
+<span class="sourceLineNo">092</span> // the fastpath handoff done via fastPathHandlerStack.<a name="line.92"></a>
+<span class="sourceLineNo">093</span> if (this.fastPathHandlerStack != null) {<a name="line.93"></a>
+<span class="sourceLineNo">094</span> this.fastPathHandlerStack.push(this);<a name="line.94"></a>
+<span class="sourceLineNo">095</span> this.semaphore.acquire();<a name="line.95"></a>
+<span class="sourceLineNo">096</span> cr = this.loadedCallRunner;<a name="line.96"></a>
+<span class="sourceLineNo">097</span> this.loadedCallRunner = null;<a name="line.97"></a>
<span class="sourceLineNo">098</span> } else {<a name="line.98"></a>
<span class="sourceLineNo">099</span> // No fastpath available. Block until a task comes available.<a name="line.99"></a>
<span class="sourceLineNo">100</span> cr = super.getCallRunner();<a name="line.100"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ae5da13b/devapidocs/src-html/org/apache/hadoop/hbase/ipc/FifoWithFastPathBalancedQueueRpcExecutor.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/ipc/FifoWithFastPathBalancedQueueRpcExecutor.html b/devapidocs/src-html/org/apache/hadoop/hbase/ipc/FifoWithFastPathBalancedQueueRpcExecutor.html
index 6ba8d6a..2d52a01 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/ipc/FifoWithFastPathBalancedQueueRpcExecutor.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/ipc/FifoWithFastPathBalancedQueueRpcExecutor.html
@@ -82,7 +82,7 @@
<span class="sourceLineNo">074</span> // if an empty queue of CallRunners so we are available for direct handoff when one comes in.<a name="line.74"></a>
<span class="sourceLineNo">075</span> final Deque<FastPathHandler> fastPathHandlerStack;<a name="line.75"></a>
<span class="sourceLineNo">076</span> // Semaphore to coordinate loading of fastpathed loadedTask and our running it.<a name="line.76"></a>
-<span class="sourceLineNo">077</span> private Semaphore semaphore = new Semaphore(1);<a name="line.77"></a>
+<span class="sourceLineNo">077</span> private Semaphore semaphore = new Semaphore(0);<a name="line.77"></a>
<span class="sourceLineNo">078</span> // The task we get when fast-pathing.<a name="line.78"></a>
<span class="sourceLineNo">079</span> private CallRunner loadedCallRunner;<a name="line.79"></a>
<span class="sourceLineNo">080</span><a name="line.80"></a>
@@ -90,19 +90,19 @@
<span class="sourceLineNo">082</span> final Deque<FastPathHandler> fastPathHandlerStack) {<a name="line.82"></a>
<span class="sourceLineNo">083</span> super(name, handlerFailureThreshhold, q);<a name="line.83"></a>
<span class="sourceLineNo">084</span> this.fastPathHandlerStack = fastPathHandlerStack;<a name="line.84"></a>
-<span class="sourceLineNo">085</span> this.semaphore.drainPermits();<a name="line.85"></a>
-<span class="sourceLineNo">086</span> }<a name="line.86"></a>
-<span class="sourceLineNo">087</span><a name="line.87"></a>
-<span class="sourceLineNo">088</span> protected CallRunner getCallRunner() throws InterruptedException {<a name="line.88"></a>
-<span class="sourceLineNo">089</span> // Get a callrunner if one in the Q.<a name="line.89"></a>
-<span class="sourceLineNo">090</span> CallRunner cr = this.q.poll();<a name="line.90"></a>
-<span class="sourceLineNo">091</span> if (cr == null) {<a name="line.91"></a>
-<span class="sourceLineNo">092</span> // Else, if a fastPathHandlerStack present and no callrunner in Q, register ourselves for<a name="line.92"></a>
-<span class="sourceLineNo">093</span> // the fastpath handoff done via fastPathHandlerStack.<a name="line.93"></a>
-<span class="sourceLineNo">094</span> if (this.fastPathHandlerStack != null) {<a name="line.94"></a>
-<span class="sourceLineNo">095</span> this.fastPathHandlerStack.push(this);<a name="line.95"></a>
-<span class="sourceLineNo">096</span> this.semaphore.acquire();<a name="line.96"></a>
-<span class="sourceLineNo">097</span> cr = this.loadedCallRunner;<a name="line.97"></a>
+<span class="sourceLineNo">085</span> }<a name="line.85"></a>
+<span class="sourceLineNo">086</span><a name="line.86"></a>
+<span class="sourceLineNo">087</span> protected CallRunner getCallRunner() throws InterruptedException {<a name="line.87"></a>
+<span class="sourceLineNo">088</span> // Get a callrunner if one in the Q.<a name="line.88"></a>
+<span class="sourceLineNo">089</span> CallRunner cr = this.q.poll();<a name="line.89"></a>
+<span class="sourceLineNo">090</span> if (cr == null) {<a name="line.90"></a>
+<span class="sourceLineNo">091</span> // Else, if a fastPathHandlerStack present and no callrunner in Q, register ourselves for<a name="line.91"></a>
+<span class="sourceLineNo">092</span> // the fastpath handoff done via fastPathHandlerStack.<a name="line.92"></a>
+<span class="sourceLineNo">093</span> if (this.fastPathHandlerStack != null) {<a name="line.93"></a>
+<span class="sourceLineNo">094</span> this.fastPathHandlerStack.push(this);<a name="line.94"></a>
+<span class="sourceLineNo">095</span> this.semaphore.acquire();<a name="line.95"></a>
+<span class="sourceLineNo">096</span> cr = this.loadedCallRunner;<a name="line.96"></a>
+<span class="sourceLineNo">097</span> this.loadedCallRunner = null;<a name="line.97"></a>
<span class="sourceLineNo">098</span> } else {<a name="line.98"></a>
<span class="sourceLineNo">099</span> // No fastpath available. Block until a task comes available.<a name="line.99"></a>
<span class="sourceLineNo">100</span> cr = super.getCallRunner();<a name="line.100"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ae5da13b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/JarFinder.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/JarFinder.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/JarFinder.html
index 9b488a8..614f42d 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/JarFinder.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/JarFinder.html
@@ -132,62 +132,63 @@
<span class="sourceLineNo">124</span> jarDir));<a name="line.124"></a>
<span class="sourceLineNo">125</span> }<a name="line.125"></a>
<span class="sourceLineNo">126</span> }<a name="line.126"></a>
-<span class="sourceLineNo">127</span> try (JarOutputStream zos = new JarOutputStream(new FileOutputStream(jarFile))) {<a name="line.127"></a>
-<span class="sourceLineNo">128</span> jarDir(dir, "", zos);<a name="line.128"></a>
-<span class="sourceLineNo">129</span> }<a name="line.129"></a>
-<span class="sourceLineNo">130</span> }<a name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span> /**<a name="line.132"></a>
-<span class="sourceLineNo">133</span> * Returns the full path to the Jar containing the class. It always return a<a name="line.133"></a>
-<span class="sourceLineNo">134</span> * JAR.<a name="line.134"></a>
-<span class="sourceLineNo">135</span> *<a name="line.135"></a>
-<span class="sourceLineNo">136</span> * @param klass class.<a name="line.136"></a>
-<span class="sourceLineNo">137</span> *<a name="line.137"></a>
-<span class="sourceLineNo">138</span> * @return path to the Jar containing the class.<a name="line.138"></a>
-<span class="sourceLineNo">139</span> */<a name="line.139"></a>
-<span class="sourceLineNo">140</span> public static String getJar(Class klass) {<a name="line.140"></a>
-<span class="sourceLineNo">141</span> Preconditions.checkNotNull(klass, "klass");<a name="line.141"></a>
-<span class="sourceLineNo">142</span> ClassLoader loader = klass.getClassLoader();<a name="line.142"></a>
-<span class="sourceLineNo">143</span> if (loader != null) {<a name="line.143"></a>
-<span class="sourceLineNo">144</span> String class_file = klass.getName().replaceAll("\\.", "/") + ".class";<a name="line.144"></a>
-<span class="sourceLineNo">145</span> try {<a name="line.145"></a>
-<span class="sourceLineNo">146</span> for (Enumeration itr = loader.getResources(class_file);<a name="line.146"></a>
-<span class="sourceLineNo">147</span> itr.hasMoreElements(); ) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> URL url = (URL) itr.nextElement();<a name="line.148"></a>
-<span class="sourceLineNo">149</span> String path = url.getPath();<a name="line.149"></a>
-<span class="sourceLineNo">150</span> if (path.startsWith("file:")) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span> path = path.substring("file:".length());<a name="line.151"></a>
-<span class="sourceLineNo">152</span> }<a name="line.152"></a>
-<span class="sourceLineNo">153</span> path = URLDecoder.decode(path, "UTF-8");<a name="line.153"></a>
-<span class="sourceLineNo">154</span> if ("jar".equals(url.getProtocol())) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span> path = URLDecoder.decode(path, "UTF-8");<a name="line.155"></a>
-<span class="sourceLineNo">156</span> return path.replaceAll("!.*$", "");<a name="line.156"></a>
-<span class="sourceLineNo">157</span> }<a name="line.157"></a>
-<span class="sourceLineNo">158</span> else if ("file".equals(url.getProtocol())) {<a name="line.158"></a>
-<span class="sourceLineNo">159</span> String klassName = klass.getName();<a name="line.159"></a>
-<span class="sourceLineNo">160</span> klassName = klassName.replace(".", "/") + ".class";<a name="line.160"></a>
-<span class="sourceLineNo">161</span> path = path.substring(0, path.length() - klassName.length());<a name="line.161"></a>
-<span class="sourceLineNo">162</span> File baseDir = new File(path);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> File testDir = new File(System.getProperty("test.build.dir", "target/test-dir"));<a name="line.163"></a>
-<span class="sourceLineNo">164</span> testDir = testDir.getAbsoluteFile();<a name="line.164"></a>
-<span class="sourceLineNo">165</span> if (!testDir.exists()) {<a name="line.165"></a>
-<span class="sourceLineNo">166</span> testDir.mkdirs();<a name="line.166"></a>
-<span class="sourceLineNo">167</span> }<a name="line.167"></a>
-<span class="sourceLineNo">168</span> File tempJar = File.createTempFile("hadoop-", "", testDir);<a name="line.168"></a>
-<span class="sourceLineNo">169</span> tempJar = new File(tempJar.getAbsolutePath() + ".jar");<a name="line.169"></a>
-<span class="sourceLineNo">170</span> tempJar.deleteOnExit();<a name="line.170"></a>
-<span class="sourceLineNo">171</span> createJar(baseDir, tempJar);<a name="line.171"></a>
-<span class="sourceLineNo">172</span> return tempJar.getAbsolutePath();<a name="line.172"></a>
-<span class="sourceLineNo">173</span> }<a name="line.173"></a>
-<span class="sourceLineNo">174</span> }<a name="line.174"></a>
-<span class="sourceLineNo">175</span> }<a name="line.175"></a>
-<span class="sourceLineNo">176</span> catch (IOException e) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span> throw new RuntimeException(e);<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> return null;<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">127</span> try (FileOutputStream fos = new FileOutputStream(jarFile);<a name="line.127"></a>
+<span class="sourceLineNo">128</span> JarOutputStream jos = new JarOutputStream(fos)) {<a name="line.128"></a>
+<span class="sourceLineNo">129</span> jarDir(dir, "", jos);<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><a name="line.132"></a>
+<span class="sourceLineNo">133</span> /**<a name="line.133"></a>
+<span class="sourceLineNo">134</span> * Returns the full path to the Jar containing the class. It always return a<a name="line.134"></a>
+<span class="sourceLineNo">135</span> * JAR.<a name="line.135"></a>
+<span class="sourceLineNo">136</span> *<a name="line.136"></a>
+<span class="sourceLineNo">137</span> * @param klass class.<a name="line.137"></a>
+<span class="sourceLineNo">138</span> *<a name="line.138"></a>
+<span class="sourceLineNo">139</span> * @return path to the Jar containing the class.<a name="line.139"></a>
+<span class="sourceLineNo">140</span> */<a name="line.140"></a>
+<span class="sourceLineNo">141</span> public static String getJar(Class klass) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span> Preconditions.checkNotNull(klass, "klass");<a name="line.142"></a>
+<span class="sourceLineNo">143</span> ClassLoader loader = klass.getClassLoader();<a name="line.143"></a>
+<span class="sourceLineNo">144</span> if (loader != null) {<a name="line.144"></a>
+<span class="sourceLineNo">145</span> String class_file = klass.getName().replaceAll("\\.", "/") + ".class";<a name="line.145"></a>
+<span class="sourceLineNo">146</span> try {<a name="line.146"></a>
+<span class="sourceLineNo">147</span> for (Enumeration itr = loader.getResources(class_file);<a name="line.147"></a>
+<span class="sourceLineNo">148</span> itr.hasMoreElements(); ) {<a name="line.148"></a>
+<span class="sourceLineNo">149</span> URL url = (URL) itr.nextElement();<a name="line.149"></a>
+<span class="sourceLineNo">150</span> String path = url.getPath();<a name="line.150"></a>
+<span class="sourceLineNo">151</span> if (path.startsWith("file:")) {<a name="line.151"></a>
+<span class="sourceLineNo">152</span> path = path.substring("file:".length());<a name="line.152"></a>
+<span class="sourceLineNo">153</span> }<a name="line.153"></a>
+<span class="sourceLineNo">154</span> path = URLDecoder.decode(path, "UTF-8");<a name="line.154"></a>
+<span class="sourceLineNo">155</span> if ("jar".equals(url.getProtocol())) {<a name="line.155"></a>
+<span class="sourceLineNo">156</span> path = URLDecoder.decode(path, "UTF-8");<a name="line.156"></a>
+<span class="sourceLineNo">157</span> return path.replaceAll("!.*$", "");<a name="line.157"></a>
+<span class="sourceLineNo">158</span> }<a name="line.158"></a>
+<span class="sourceLineNo">159</span> else if ("file".equals(url.getProtocol())) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span> String klassName = klass.getName();<a name="line.160"></a>
+<span class="sourceLineNo">161</span> klassName = klassName.replace(".", "/") + ".class";<a name="line.161"></a>
+<span class="sourceLineNo">162</span> path = path.substring(0, path.length() - klassName.length());<a name="line.162"></a>
+<span class="sourceLineNo">163</span> File baseDir = new File(path);<a name="line.163"></a>
+<span class="sourceLineNo">164</span> File testDir = new File(System.getProperty("test.build.dir", "target/test-dir"));<a name="line.164"></a>
+<span class="sourceLineNo">165</span> testDir = testDir.getAbsoluteFile();<a name="line.165"></a>
+<span class="sourceLineNo">166</span> if (!testDir.exists()) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span> testDir.mkdirs();<a name="line.167"></a>
+<span class="sourceLineNo">168</span> }<a name="line.168"></a>
+<span class="sourceLineNo">169</span> File tempJar = File.createTempFile("hadoop-", "", testDir);<a name="line.169"></a>
+<span class="sourceLineNo">170</span> tempJar = new File(tempJar.getAbsolutePath() + ".jar");<a name="line.170"></a>
+<span class="sourceLineNo">171</span> tempJar.deleteOnExit();<a name="line.171"></a>
+<span class="sourceLineNo">172</span> createJar(baseDir, tempJar);<a name="line.172"></a>
+<span class="sourceLineNo">173</span> return tempJar.getAbsolutePath();<a name="line.173"></a>
+<span class="sourceLineNo">174</span> }<a name="line.174"></a>
+<span class="sourceLineNo">175</span> }<a name="line.175"></a>
+<span class="sourceLineNo">176</span> }<a name="line.176"></a>
+<span class="sourceLineNo">177</span> catch (IOException e) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span> throw new RuntimeException(e);<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> return null;<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>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ae5da13b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.Verifier.Counters.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.Verifier.Counters.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.Verifier.Counters.html
index 0fd9b7d..4ea6ac9 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.Verifier.Counters.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.Verifier.Counters.html
@@ -408,83 +408,87 @@
<span class="sourceLineNo">400</span> continue;<a name="line.400"></a>
<span class="sourceLineNo">401</span> }<a name="line.401"></a>
<span class="sourceLineNo">402</span><a name="line.402"></a>
-<span class="sourceLineNo">403</span> if (i == args.length-2) {<a name="line.403"></a>
-<span class="sourceLineNo">404</span> peerId = cmd;<a name="line.404"></a>
+<span class="sourceLineNo">403</span> if (cmd.startsWith("--")) {<a name="line.403"></a>
+<span class="sourceLineNo">404</span> printUsage("Invalid argument '" + cmd + "'");<a name="line.404"></a>
<span class="sourceLineNo">405</span> }<a name="line.405"></a>
<span class="sourceLineNo">406</span><a name="line.406"></a>
-<span class="sourceLineNo">407</span> if (i == args.length-1) {<a name="line.407"></a>
-<span class="sourceLineNo">408</span> tableName = cmd;<a name="line.408"></a>
+<span class="sourceLineNo">407</span> if (i == args.length-2) {<a name="line.407"></a>
+<span class="sourceLineNo">408</span> peerId = cmd;<a name="line.408"></a>
<span class="sourceLineNo">409</span> }<a name="line.409"></a>
-<span class="sourceLineNo">410</span> }<a name="line.410"></a>
-<span class="sourceLineNo">411</span> } catch (Exception e) {<a name="line.411"></a>
-<span class="sourceLineNo">412</span> e.printStackTrace();<a name="line.412"></a>
-<span class="sourceLineNo">413</span> printUsage("Can't start because " + e.getMessage());<a name="line.413"></a>
-<span class="sourceLineNo">414</span> return false;<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<a name="line.415"></a>
-<span class="sourceLineNo">416</span> return true;<a name="line.416"></a>
-<span class="sourceLineNo">417</span> }<a name="line.417"></a>
-<span class="sourceLineNo">418</span><a name="line.418"></a>
-<span class="sourceLineNo">419</span> private static void restoreDefaults() {<a name="line.419"></a>
-<span class="sourceLineNo">420</span> startTime = 0;<a name="line.420"></a>
-<span class="sourceLineNo">421</span> endTime = Long.MAX_VALUE;<a name="line.421"></a>
-<span class="sourceLineNo">422</span> batch = Integer.MAX_VALUE;<a name="line.422"></a>
-<span class="sourceLineNo">423</span> versions = -1;<a name="line.423"></a>
-<span class="sourceLineNo">424</span> tableName = null;<a name="line.424"></a>
-<span class="sourceLineNo">425</span> families = null;<a name="line.425"></a>
-<span class="sourceLineNo">426</span> peerId = null;<a name="line.426"></a>
-<span class="sourceLineNo">427</span> rowPrefixes = null;<a name="line.427"></a>
-<span class="sourceLineNo">428</span> }<a name="line.428"></a>
-<span class="sourceLineNo">429</span><a name="line.429"></a>
-<span class="sourceLineNo">430</span> /*<a name="line.430"></a>
-<span class="sourceLineNo">431</span> * @param errorMsg Error message. Can be null.<a name="line.431"></a>
-<span class="sourceLineNo">432</span> */<a name="line.432"></a>
-<span class="sourceLineNo">433</span> private static void printUsage(final String errorMsg) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> if (errorMsg != null && errorMsg.length() > 0) {<a name="line.434"></a>
-<span class="sourceLineNo">435</span> System.err.println("ERROR: " + errorMsg);<a name="line.435"></a>
-<span class="sourceLineNo">436</span> }<a name="line.436"></a>
-<span class="sourceLineNo">437</span> System.err.println("Usage: verifyrep [--starttime=X]" +<a name="line.437"></a>
-<span class="sourceLineNo">438</span> " [--stoptime=Y] [--families=A] [--row-prefixes=B] <peerid> <tablename>");<a name="line.438"></a>
-<span class="sourceLineNo">439</span> System.err.println();<a name="line.439"></a>
-<span class="sourceLineNo">440</span> System.err.println("Options:");<a name="line.440"></a>
-<span class="sourceLineNo">441</span> System.err.println(" starttime beginning of the time range");<a name="line.441"></a>
-<span class="sourceLineNo">442</span> System.err.println(" without endtime means from starttime to forever");<a name="line.442"></a>
-<span class="sourceLineNo">443</span> System.err.println(" endtime end of the time range");<a name="line.443"></a>
-<span class="sourceLineNo">444</span> System.err.println(" versions number of cell versions to verify");<a name="line.444"></a>
-<span class="sourceLineNo">445</span> System.err.println(" families comma-separated list of families to copy");<a name="line.445"></a>
-<span class="sourceLineNo">446</span> System.err.println(" row-prefixes comma-separated list of row key prefixes to filter on ");<a name="line.446"></a>
-<span class="sourceLineNo">447</span> System.err.println();<a name="line.447"></a>
-<span class="sourceLineNo">448</span> System.err.println("Args:");<a name="line.448"></a>
-<span class="sourceLineNo">449</span> System.err.println(" peerid Id of the peer used for verification, must match the one given for replication");<a name="line.449"></a>
-<span class="sourceLineNo">450</span> System.err.println(" tablename Name of the table to verify");<a name="line.450"></a>
+<span class="sourceLineNo">410</span><a name="line.410"></a>
+<span class="sourceLineNo">411</span> if (i == args.length-1) {<a name="line.411"></a>
+<span class="sourceLineNo">412</span> tableName = cmd;<a name="line.412"></a>
+<span class="sourceLineNo">413</span> }<a name="line.413"></a>
+<span class="sourceLineNo">414</span> }<a name="line.414"></a>
+<span class="sourceLineNo">415</span> } catch (Exception e) {<a name="line.415"></a>
+<span class="sourceLineNo">416</span> e.printStackTrace();<a name="line.416"></a>
+<span class="sourceLineNo">417</span> printUsage("Can't start because " + e.getMessage());<a name="line.417"></a>
+<span class="sourceLineNo">418</span> return false;<a name="line.418"></a>
+<span class="sourceLineNo">419</span> }<a name="line.419"></a>
+<span class="sourceLineNo">420</span> return true;<a name="line.420"></a>
+<span class="sourceLineNo">421</span> }<a name="line.421"></a>
+<span class="sourceLineNo">422</span><a name="line.422"></a>
+<span class="sourceLineNo">423</span> private static void restoreDefaults() {<a name="line.423"></a>
+<span class="sourceLineNo">424</span> startTime = 0;<a name="line.424"></a>
+<span class="sourceLineNo">425</span> endTime = Long.MAX_VALUE;<a name="line.425"></a>
+<span class="sourceLineNo">426</span> batch = Integer.MAX_VALUE;<a name="line.426"></a>
+<span class="sourceLineNo">427</span> versions = -1;<a name="line.427"></a>
+<span class="sourceLineNo">428</span> tableName = null;<a name="line.428"></a>
+<span class="sourceLineNo">429</span> families = null;<a name="line.429"></a>
+<span class="sourceLineNo">430</span> peerId = null;<a name="line.430"></a>
+<span class="sourceLineNo">431</span> rowPrefixes = null;<a name="line.431"></a>
+<span class="sourceLineNo">432</span> }<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span> /*<a name="line.434"></a>
+<span class="sourceLineNo">435</span> * @param errorMsg Error message. Can be null.<a name="line.435"></a>
+<span class="sourceLineNo">436</span> */<a name="line.436"></a>
+<span class="sourceLineNo">437</span> private static void printUsage(final String errorMsg) {<a name="line.437"></a>
+<span class="sourceLineNo">438</span> if (errorMsg != null && errorMsg.length() > 0) {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> System.err.println("ERROR: " + errorMsg);<a name="line.439"></a>
+<span class="sourceLineNo">440</span> }<a name="line.440"></a>
+<span class="sourceLineNo">441</span> System.err.println("Usage: verifyrep [--starttime=X]" +<a name="line.441"></a>
+<span class="sourceLineNo">442</span> " [--endtime=Y] [--families=A] [--row-prefixes=B] <peerid> <tablename>");<a name="line.442"></a>
+<span class="sourceLineNo">443</span> System.err.println();<a name="line.443"></a>
+<span class="sourceLineNo">444</span> System.err.println("Options:");<a name="line.444"></a>
+<span class="sourceLineNo">445</span> System.err.println(" starttime beginning of the time range");<a name="line.445"></a>
+<span class="sourceLineNo">446</span> System.err.println(" without endtime means from starttime to forever");<a name="line.446"></a>
+<span class="sourceLineNo">447</span> System.err.println(" endtime end of the time range");<a name="line.447"></a>
+<span class="sourceLineNo">448</span> System.err.println(" versions number of cell versions to verify");<a name="line.448"></a>
+<span class="sourceLineNo">449</span> System.err.println(" families comma-separated list of families to copy");<a name="line.449"></a>
+<span class="sourceLineNo">450</span> System.err.println(" row-prefixes comma-separated list of row key prefixes to filter on ");<a name="line.450"></a>
<span class="sourceLineNo">451</span> System.err.println();<a name="line.451"></a>
-<span class="sourceLineNo">452</span> System.err.println("Examples:");<a name="line.452"></a>
-<span class="sourceLineNo">453</span> System.err.println(" To verify the data replicated from TestTable for a 1 hour window with peer #5 ");<a name="line.453"></a>
-<span class="sourceLineNo">454</span> System.err.println(" $ bin/hbase " +<a name="line.454"></a>
-<span class="sourceLineNo">455</span> "org.apache.hadoop.hbase.mapreduce.replication.VerifyReplication" +<a name="line.455"></a>
-<span class="sourceLineNo">456</span> " --starttime=1265875194289 --endtime=1265878794289 5 TestTable ");<a name="line.456"></a>
-<span class="sourceLineNo">457</span> }<a name="line.457"></a>
-<span class="sourceLineNo">458</span><a name="line.458"></a>
-<span class="sourceLineNo">459</span> @Override<a name="line.459"></a>
-<span class="sourceLineNo">460</span> public int run(String[] args) throws Exception {<a name="line.460"></a>
-<span class="sourceLineNo">461</span> Configuration conf = this.getConf();<a name="line.461"></a>
-<span class="sourceLineNo">462</span> Job job = createSubmittableJob(conf, args);<a name="line.462"></a>
-<span class="sourceLineNo">463</span> if (job != null) {<a name="line.463"></a>
-<span class="sourceLineNo">464</span> return job.waitForCompletion(true) ? 0 : 1;<a name="line.464"></a>
-<span class="sourceLineNo">465</span> } <a name="line.465"></a>
-<span class="sourceLineNo">466</span> return 1;<a name="line.466"></a>
-<span class="sourceLineNo">467</span> }<a name="line.467"></a>
-<span class="sourceLineNo">468</span><a name="line.468"></a>
-<span class="sourceLineNo">469</span> /**<a name="line.469"></a>
-<span class="sourceLineNo">470</span> * Main entry point.<a name="line.470"></a>
-<span class="sourceLineNo">471</span> *<a name="line.471"></a>
-<span class="sourceLineNo">472</span> * @param args The command line parameters.<a name="line.472"></a>
-<span class="sourceLineNo">473</span> * @throws Exception When running the job fails.<a name="line.473"></a>
-<span class="sourceLineNo">474</span> */<a name="line.474"></a>
-<span class="sourceLineNo">475</span> public static void main(String[] args) throws Exception {<a name="line.475"></a>
-<span class="sourceLineNo">476</span> int res = ToolRunner.run(HBaseConfiguration.create(), new VerifyReplication(), args);<a name="line.476"></a>
-<span class="sourceLineNo">477</span> System.exit(res);<a name="line.477"></a>
-<span class="sourceLineNo">478</span> }<a name="line.478"></a>
-<span class="sourceLineNo">479</span>}<a name="line.479"></a>
+<span class="sourceLineNo">452</span> System.err.println("Args:");<a name="line.452"></a>
+<span class="sourceLineNo">453</span> System.err.println(" peerid Id of the peer used for verification, must match the one given for replication");<a name="line.453"></a>
+<span class="sourceLineNo">454</span> System.err.println(" tablename Name of the table to verify");<a name="line.454"></a>
+<span class="sourceLineNo">455</span> System.err.println();<a name="line.455"></a>
+<span class="sourceLineNo">456</span> System.err.println("Examples:");<a name="line.456"></a>
+<span class="sourceLineNo">457</span> System.err.println(" To verify the data replicated from TestTable for a 1 hour window with peer #5 ");<a name="line.457"></a>
+<span class="sourceLineNo">458</span> System.err.println(" $ bin/hbase " +<a name="line.458"></a>
+<span class="sourceLineNo">459</span> "org.apache.hadoop.hbase.mapreduce.replication.VerifyReplication" +<a name="line.459"></a>
+<span class="sourceLineNo">460</span> " --starttime=1265875194289 --endtime=1265878794289 5 TestTable ");<a name="line.460"></a>
+<span class="sourceLineNo">461</span> }<a name="line.461"></a>
+<span class="sourceLineNo">462</span><a name="line.462"></a>
+<span class="sourceLineNo">463</span> @Override<a name="line.463"></a>
+<span class="sourceLineNo">464</span> public int run(String[] args) throws Exception {<a name="line.464"></a>
+<span class="sourceLineNo">465</span> Configuration conf = this.getConf();<a name="line.465"></a>
+<span class="sourceLineNo">466</span> Job job = createSubmittableJob(conf, args);<a name="line.466"></a>
+<span class="sourceLineNo">467</span> if (job != null) {<a name="line.467"></a>
+<span class="sourceLineNo">468</span> return job.waitForCompletion(true) ? 0 : 1;<a name="line.468"></a>
+<span class="sourceLineNo">469</span> } <a name="line.469"></a>
+<span class="sourceLineNo">470</span> return 1;<a name="line.470"></a>
+<span class="sourceLineNo">471</span> }<a name="line.471"></a>
+<span class="sourceLineNo">472</span><a name="line.472"></a>
+<span class="sourceLineNo">473</span> /**<a name="line.473"></a>
+<span class="sourceLineNo">474</span> * Main entry point.<a name="line.474"></a>
+<span class="sourceLineNo">475</span> *<a name="line.475"></a>
+<span class="sourceLineNo">476</span> * @param args The command line parameters.<a name="line.476"></a>
+<span class="sourceLineNo">477</span> * @throws Exception When running the job fails.<a name="line.477"></a>
+<span class="sourceLineNo">478</span> */<a name="line.478"></a>
+<span class="sourceLineNo">479</span> public static void main(String[] args) throws Exception {<a name="line.479"></a>
+<span class="sourceLineNo">480</span> int res = ToolRunner.run(HBaseConfiguration.create(), new VerifyReplication(), args);<a name="line.480"></a>
+<span class="sourceLineNo">481</span> System.exit(res);<a name="line.481"></a>
+<span class="sourceLineNo">482</span> }<a name="line.482"></a>
+<span class="sourceLineNo">483</span>}<a name="line.483"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ae5da13b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.Verifier.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.Verifier.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.Verifier.html
index 0fd9b7d..4ea6ac9 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.Verifier.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.Verifier.html
@@ -408,83 +408,87 @@
<span class="sourceLineNo">400</span> continue;<a name="line.400"></a>
<span class="sourceLineNo">401</span> }<a name="line.401"></a>
<span class="sourceLineNo">402</span><a name="line.402"></a>
-<span class="sourceLineNo">403</span> if (i == args.length-2) {<a name="line.403"></a>
-<span class="sourceLineNo">404</span> peerId = cmd;<a name="line.404"></a>
+<span class="sourceLineNo">403</span> if (cmd.startsWith("--")) {<a name="line.403"></a>
+<span class="sourceLineNo">404</span> printUsage("Invalid argument '" + cmd + "'");<a name="line.404"></a>
<span class="sourceLineNo">405</span> }<a name="line.405"></a>
<span class="sourceLineNo">406</span><a name="line.406"></a>
-<span class="sourceLineNo">407</span> if (i == args.length-1) {<a name="line.407"></a>
-<span class="sourceLineNo">408</span> tableName = cmd;<a name="line.408"></a>
+<span class="sourceLineNo">407</span> if (i == args.length-2) {<a name="line.407"></a>
+<span class="sourceLineNo">408</span> peerId = cmd;<a name="line.408"></a>
<span class="sourceLineNo">409</span> }<a name="line.409"></a>
-<span class="sourceLineNo">410</span> }<a name="line.410"></a>
-<span class="sourceLineNo">411</span> } catch (Exception e) {<a name="line.411"></a>
-<span class="sourceLineNo">412</span> e.printStackTrace();<a name="line.412"></a>
-<span class="sourceLineNo">413</span> printUsage("Can't start because " + e.getMessage());<a name="line.413"></a>
-<span class="sourceLineNo">414</span> return false;<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<a name="line.415"></a>
-<span class="sourceLineNo">416</span> return true;<a name="line.416"></a>
-<span class="sourceLineNo">417</span> }<a name="line.417"></a>
-<span class="sourceLineNo">418</span><a name="line.418"></a>
-<span class="sourceLineNo">419</span> private static void restoreDefaults() {<a name="line.419"></a>
-<span class="sourceLineNo">420</span> startTime = 0;<a name="line.420"></a>
-<span class="sourceLineNo">421</span> endTime = Long.MAX_VALUE;<a name="line.421"></a>
-<span class="sourceLineNo">422</span> batch = Integer.MAX_VALUE;<a name="line.422"></a>
-<span class="sourceLineNo">423</span> versions = -1;<a name="line.423"></a>
-<span class="sourceLineNo">424</span> tableName = null;<a name="line.424"></a>
-<span class="sourceLineNo">425</span> families = null;<a name="line.425"></a>
-<span class="sourceLineNo">426</span> peerId = null;<a name="line.426"></a>
-<span class="sourceLineNo">427</span> rowPrefixes = null;<a name="line.427"></a>
-<span class="sourceLineNo">428</span> }<a name="line.428"></a>
-<span class="sourceLineNo">429</span><a name="line.429"></a>
-<span class="sourceLineNo">430</span> /*<a name="line.430"></a>
-<span class="sourceLineNo">431</span> * @param errorMsg Error message. Can be null.<a name="line.431"></a>
-<span class="sourceLineNo">432</span> */<a name="line.432"></a>
-<span class="sourceLineNo">433</span> private static void printUsage(final String errorMsg) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> if (errorMsg != null && errorMsg.length() > 0) {<a name="line.434"></a>
-<span class="sourceLineNo">435</span> System.err.println("ERROR: " + errorMsg);<a name="line.435"></a>
-<span class="sourceLineNo">436</span> }<a name="line.436"></a>
-<span class="sourceLineNo">437</span> System.err.println("Usage: verifyrep [--starttime=X]" +<a name="line.437"></a>
-<span class="sourceLineNo">438</span> " [--stoptime=Y] [--families=A] [--row-prefixes=B] <peerid> <tablename>");<a name="line.438"></a>
-<span class="sourceLineNo">439</span> System.err.println();<a name="line.439"></a>
-<span class="sourceLineNo">440</span> System.err.println("Options:");<a name="line.440"></a>
-<span class="sourceLineNo">441</span> System.err.println(" starttime beginning of the time range");<a name="line.441"></a>
-<span class="sourceLineNo">442</span> System.err.println(" without endtime means from starttime to forever");<a name="line.442"></a>
-<span class="sourceLineNo">443</span> System.err.println(" endtime end of the time range");<a name="line.443"></a>
-<span class="sourceLineNo">444</span> System.err.println(" versions number of cell versions to verify");<a name="line.444"></a>
-<span class="sourceLineNo">445</span> System.err.println(" families comma-separated list of families to copy");<a name="line.445"></a>
-<span class="sourceLineNo">446</span> System.err.println(" row-prefixes comma-separated list of row key prefixes to filter on ");<a name="line.446"></a>
-<span class="sourceLineNo">447</span> System.err.println();<a name="line.447"></a>
-<span class="sourceLineNo">448</span> System.err.println("Args:");<a name="line.448"></a>
-<span class="sourceLineNo">449</span> System.err.println(" peerid Id of the peer used for verification, must match the one given for replication");<a name="line.449"></a>
-<span class="sourceLineNo">450</span> System.err.println(" tablename Name of the table to verify");<a name="line.450"></a>
+<span class="sourceLineNo">410</span><a name="line.410"></a>
+<span class="sourceLineNo">411</span> if (i == args.length-1) {<a name="line.411"></a>
+<span class="sourceLineNo">412</span> tableName = cmd;<a name="line.412"></a>
+<span class="sourceLineNo">413</span> }<a name="line.413"></a>
+<span class="sourceLineNo">414</span> }<a name="line.414"></a>
+<span class="sourceLineNo">415</span> } catch (Exception e) {<a name="line.415"></a>
+<span class="sourceLineNo">416</span> e.printStackTrace();<a name="line.416"></a>
+<span class="sourceLineNo">417</span> printUsage("Can't start because " + e.getMessage());<a name="line.417"></a>
+<span class="sourceLineNo">418</span> return false;<a name="line.418"></a>
+<span class="sourceLineNo">419</span> }<a name="line.419"></a>
+<span class="sourceLineNo">420</span> return true;<a name="line.420"></a>
+<span class="sourceLineNo">421</span> }<a name="line.421"></a>
+<span class="sourceLineNo">422</span><a name="line.422"></a>
+<span class="sourceLineNo">423</span> private static void restoreDefaults() {<a name="line.423"></a>
+<span class="sourceLineNo">424</span> startTime = 0;<a name="line.424"></a>
+<span class="sourceLineNo">425</span> endTime = Long.MAX_VALUE;<a name="line.425"></a>
+<span class="sourceLineNo">426</span> batch = Integer.MAX_VALUE;<a name="line.426"></a>
+<span class="sourceLineNo">427</span> versions = -1;<a name="line.427"></a>
+<span class="sourceLineNo">428</span> tableName = null;<a name="line.428"></a>
+<span class="sourceLineNo">429</span> families = null;<a name="line.429"></a>
+<span class="sourceLineNo">430</span> peerId = null;<a name="line.430"></a>
+<span class="sourceLineNo">431</span> rowPrefixes = null;<a name="line.431"></a>
+<span class="sourceLineNo">432</span> }<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span> /*<a name="line.434"></a>
+<span class="sourceLineNo">435</span> * @param errorMsg Error message. Can be null.<a name="line.435"></a>
+<span class="sourceLineNo">436</span> */<a name="line.436"></a>
+<span class="sourceLineNo">437</span> private static void printUsage(final String errorMsg) {<a name="line.437"></a>
+<span class="sourceLineNo">438</span> if (errorMsg != null && errorMsg.length() > 0) {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> System.err.println("ERROR: " + errorMsg);<a name="line.439"></a>
+<span class="sourceLineNo">440</span> }<a name="line.440"></a>
+<span class="sourceLineNo">441</span> System.err.println("Usage: verifyrep [--starttime=X]" +<a name="line.441"></a>
+<span class="sourceLineNo">442</span> " [--endtime=Y] [--families=A] [--row-prefixes=B] <peerid> <tablename>");<a name="line.442"></a>
+<span class="sourceLineNo">443</span> System.err.println();<a name="line.443"></a>
+<span class="sourceLineNo">444</span> System.err.println("Options:");<a name="line.444"></a>
+<span class="sourceLineNo">445</span> System.err.println(" starttime beginning of the time range");<a name="line.445"></a>
+<span class="sourceLineNo">446</span> System.err.println(" without endtime means from starttime to forever");<a name="line.446"></a>
+<span class="sourceLineNo">447</span> System.err.println(" endtime end of the time range");<a name="line.447"></a>
+<span class="sourceLineNo">448</span> System.err.println(" versions number of cell versions to verify");<a name="line.448"></a>
+<span class="sourceLineNo">449</span> System.err.println(" families comma-separated list of families to copy");<a name="line.449"></a>
+<span class="sourceLineNo">450</span> System.err.println(" row-prefixes comma-separated list of row key prefixes to filter on ");<a name="line.450"></a>
<span class="sourceLineNo">451</span> System.err.println();<a name="line.451"></a>
-<span class="sourceLineNo">452</span> System.err.println("Examples:");<a name="line.452"></a>
-<span class="sourceLineNo">453</span> System.err.println(" To verify the data replicated from TestTable for a 1 hour window with peer #5 ");<a name="line.453"></a>
-<span class="sourceLineNo">454</span> System.err.println(" $ bin/hbase " +<a name="line.454"></a>
-<span class="sourceLineNo">455</span> "org.apache.hadoop.hbase.mapreduce.replication.VerifyReplication" +<a name="line.455"></a>
-<span class="sourceLineNo">456</span> " --starttime=1265875194289 --endtime=1265878794289 5 TestTable ");<a name="line.456"></a>
-<span class="sourceLineNo">457</span> }<a name="line.457"></a>
-<span class="sourceLineNo">458</span><a name="line.458"></a>
-<span class="sourceLineNo">459</span> @Override<a name="line.459"></a>
-<span class="sourceLineNo">460</span> public int run(String[] args) throws Exception {<a name="line.460"></a>
-<span class="sourceLineNo">461</span> Configuration conf = this.getConf();<a name="line.461"></a>
-<span class="sourceLineNo">462</span> Job job = createSubmittableJob(conf, args);<a name="line.462"></a>
-<span class="sourceLineNo">463</span> if (job != null) {<a name="line.463"></a>
-<span class="sourceLineNo">464</span> return job.waitForCompletion(true) ? 0 : 1;<a name="line.464"></a>
-<span class="sourceLineNo">465</span> } <a name="line.465"></a>
-<span class="sourceLineNo">466</span> return 1;<a name="line.466"></a>
-<span class="sourceLineNo">467</span> }<a name="line.467"></a>
-<span class="sourceLineNo">468</span><a name="line.468"></a>
-<span class="sourceLineNo">469</span> /**<a name="line.469"></a>
-<span class="sourceLineNo">470</span> * Main entry point.<a name="line.470"></a>
-<span class="sourceLineNo">471</span> *<a name="line.471"></a>
-<span class="sourceLineNo">472</span> * @param args The command line parameters.<a name="line.472"></a>
-<span class="sourceLineNo">473</span> * @throws Exception When running the job fails.<a name="line.473"></a>
-<span class="sourceLineNo">474</span> */<a name="line.474"></a>
-<span class="sourceLineNo">475</span> public static void main(String[] args) throws Exception {<a name="line.475"></a>
-<span class="sourceLineNo">476</span> int res = ToolRunner.run(HBaseConfiguration.create(), new VerifyReplication(), args);<a name="line.476"></a>
-<span class="sourceLineNo">477</span> System.exit(res);<a name="line.477"></a>
-<span class="sourceLineNo">478</span> }<a name="line.478"></a>
-<span class="sourceLineNo">479</span>}<a name="line.479"></a>
+<span class="sourceLineNo">452</span> System.err.println("Args:");<a name="line.452"></a>
+<span class="sourceLineNo">453</span> System.err.println(" peerid Id of the peer used for verification, must match the one given for replication");<a name="line.453"></a>
+<span class="sourceLineNo">454</span> System.err.println(" tablename Name of the table to verify");<a name="line.454"></a>
+<span class="sourceLineNo">455</span> System.err.println();<a name="line.455"></a>
+<span class="sourceLineNo">456</span> System.err.println("Examples:");<a name="line.456"></a>
+<span class="sourceLineNo">457</span> System.err.println(" To verify the data replicated from TestTable for a 1 hour window with peer #5 ");<a name="line.457"></a>
+<span class="sourceLineNo">458</span> System.err.println(" $ bin/hbase " +<a name="line.458"></a>
+<span class="sourceLineNo">459</span> "org.apache.hadoop.hbase.mapreduce.replication.VerifyReplication" +<a name="line.459"></a>
+<span class="sourceLineNo">460</span> " --starttime=1265875194289 --endtime=1265878794289 5 TestTable ");<a name="line.460"></a>
+<span class="sourceLineNo">461</span> }<a name="line.461"></a>
+<span class="sourceLineNo">462</span><a name="line.462"></a>
+<span class="sourceLineNo">463</span> @Override<a name="line.463"></a>
+<span class="sourceLineNo">464</span> public int run(String[] args) throws Exception {<a name="line.464"></a>
+<span class="sourceLineNo">465</span> Configuration conf = this.getConf();<a name="line.465"></a>
+<span class="sourceLineNo">466</span> Job job = createSubmittableJob(conf, args);<a name="line.466"></a>
+<span class="sourceLineNo">467</span> if (job != null) {<a name="line.467"></a>
+<span class="sourceLineNo">468</span> return job.waitForCompletion(true) ? 0 : 1;<a name="line.468"></a>
+<span class="sourceLineNo">469</span> } <a name="line.469"></a>
+<span class="sourceLineNo">470</span> return 1;<a name="line.470"></a>
+<span class="sourceLineNo">471</span> }<a name="line.471"></a>
+<span class="sourceLineNo">472</span><a name="line.472"></a>
+<span class="sourceLineNo">473</span> /**<a name="line.473"></a>
+<span class="sourceLineNo">474</span> * Main entry point.<a name="line.474"></a>
+<span class="sourceLineNo">475</span> *<a name="line.475"></a>
+<span class="sourceLineNo">476</span> * @param args The command line parameters.<a name="line.476"></a>
+<span class="sourceLineNo">477</span> * @throws Exception When running the job fails.<a name="line.477"></a>
+<span class="sourceLineNo">478</span> */<a name="line.478"></a>
+<span class="sourceLineNo">479</span> public static void main(String[] args) throws Exception {<a name="line.479"></a>
+<span class="sourceLineNo">480</span> int res = ToolRunner.run(HBaseConfiguration.create(), new VerifyReplication(), args);<a name="line.480"></a>
+<span class="sourceLineNo">481</span> System.exit(res);<a name="line.481"></a>
+<span class="sourceLineNo">482</span> }<a name="line.482"></a>
+<span class="sourceLineNo">483</span>}<a name="line.483"></a>