http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f391bcef/devapidocs/src-html/org/apache/hadoop/hbase/client/Increment.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/Increment.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/Increment.html
index 366fcc2..a49bc05 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/Increment.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/Increment.html
@@ -92,254 +92,260 @@
 <span class="sourceLineNo">084</span>    for (Map.Entry&lt;String, byte[]&gt; 
entry : i.getAttributesMap().entrySet()) {<a name="line.84"></a>
 <span class="sourceLineNo">085</span>      this.setAttribute(entry.getKey(), 
entry.getValue());<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><a name="line.88"></a>
-<span class="sourceLineNo">089</span>  /**<a name="line.89"></a>
-<span class="sourceLineNo">090</span>   * Add the specified KeyValue to this 
operation.<a name="line.90"></a>
-<span class="sourceLineNo">091</span>   * @param cell individual Cell<a 
name="line.91"></a>
-<span class="sourceLineNo">092</span>   * @return this<a name="line.92"></a>
-<span class="sourceLineNo">093</span>   * @throws java.io.IOException e<a 
name="line.93"></a>
-<span class="sourceLineNo">094</span>   */<a name="line.94"></a>
-<span class="sourceLineNo">095</span>  public Increment add(Cell cell) throws 
IOException{<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    byte [] family = 
CellUtil.cloneFamily(cell);<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    List&lt;Cell&gt; list = 
getCellList(family);<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    //Checking that the row of the kv is 
the same as the put<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    if (!CellUtil.matchingRow(cell, 
this.row)) {<a name="line.99"></a>
-<span class="sourceLineNo">100</span>      throw new WrongRowIOException("The 
row in " + cell +<a name="line.100"></a>
-<span class="sourceLineNo">101</span>        " doesn't match the original one 
" +  Bytes.toStringBinary(this.row));<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    }<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    list.add(cell);<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    familyMap.put(family, list);<a 
name="line.104"></a>
-<span class="sourceLineNo">105</span>    return this;<a name="line.105"></a>
-<span class="sourceLineNo">106</span>  }<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>   * Increment the column from the 
specific family with the specified qualifier<a name="line.109"></a>
-<span class="sourceLineNo">110</span>   * by the specified amount.<a 
name="line.110"></a>
-<span class="sourceLineNo">111</span>   * &lt;p&gt;<a name="line.111"></a>
-<span class="sourceLineNo">112</span>   * Overrides previous calls to 
addColumn for this family and qualifier.<a name="line.112"></a>
-<span class="sourceLineNo">113</span>   * @param family family name<a 
name="line.113"></a>
-<span class="sourceLineNo">114</span>   * @param qualifier column qualifier<a 
name="line.114"></a>
-<span class="sourceLineNo">115</span>   * @param amount amount to increment 
by<a name="line.115"></a>
-<span class="sourceLineNo">116</span>   * @return the Increment object<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>   */<a name="line.117"></a>
-<span class="sourceLineNo">118</span>  public Increment addColumn(byte [] 
family, byte [] qualifier, long amount) {<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    if (family == null) {<a 
name="line.119"></a>
-<span class="sourceLineNo">120</span>      throw new 
IllegalArgumentException("family cannot be null");<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    }<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    List&lt;Cell&gt; list = 
getCellList(family);<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    KeyValue kv = 
createPutKeyValue(family, qualifier, ts, Bytes.toBytes(amount));<a 
name="line.123"></a>
-<span class="sourceLineNo">124</span>    list.add(kv);<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    
familyMap.put(CellUtil.cloneFamily(kv), list);<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    return this;<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>  /**<a name="line.129"></a>
-<span class="sourceLineNo">130</span>   * Gets the TimeRange used for this 
increment.<a name="line.130"></a>
-<span class="sourceLineNo">131</span>   * @return TimeRange<a 
name="line.131"></a>
-<span class="sourceLineNo">132</span>   */<a name="line.132"></a>
-<span class="sourceLineNo">133</span>  public TimeRange getTimeRange() {<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span>    return this.tr;<a name="line.134"></a>
-<span class="sourceLineNo">135</span>  }<a name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span>  /**<a name="line.137"></a>
-<span class="sourceLineNo">138</span>   * Sets the TimeRange to be used on the 
Get for this increment.<a name="line.138"></a>
-<span class="sourceLineNo">139</span>   * &lt;p&gt;<a name="line.139"></a>
-<span class="sourceLineNo">140</span>   * This is useful for when you have 
counters that only last for specific<a name="line.140"></a>
-<span class="sourceLineNo">141</span>   * periods of time (ie. counters that 
are partitioned by time).  By setting<a name="line.141"></a>
-<span class="sourceLineNo">142</span>   * the range of valid times for this 
increment, you can potentially gain<a name="line.142"></a>
-<span class="sourceLineNo">143</span>   * some performance with a more optimal 
Get operation.<a name="line.143"></a>
-<span class="sourceLineNo">144</span>   * &lt;p&gt;<a name="line.144"></a>
-<span class="sourceLineNo">145</span>   * This range is used as [minStamp, 
maxStamp).<a name="line.145"></a>
-<span class="sourceLineNo">146</span>   * @param minStamp minimum timestamp 
value, inclusive<a name="line.146"></a>
-<span class="sourceLineNo">147</span>   * @param maxStamp maximum timestamp 
value, exclusive<a name="line.147"></a>
-<span class="sourceLineNo">148</span>   * @throws IOException if invalid time 
range<a name="line.148"></a>
-<span class="sourceLineNo">149</span>   * @return this<a name="line.149"></a>
-<span class="sourceLineNo">150</span>   */<a name="line.150"></a>
-<span class="sourceLineNo">151</span>  public Increment setTimeRange(long 
minStamp, long maxStamp)<a name="line.151"></a>
-<span class="sourceLineNo">152</span>  throws IOException {<a 
name="line.152"></a>
-<span class="sourceLineNo">153</span>    tr = new TimeRange(minStamp, 
maxStamp);<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    return this;<a name="line.154"></a>
-<span class="sourceLineNo">155</span>  }<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>   * @param returnResults True (default) 
if the increment operation should return the results. A<a name="line.158"></a>
-<span class="sourceLineNo">159</span>   *          client that is not 
interested in the result can save network bandwidth setting this<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>   *          to false.<a 
name="line.160"></a>
-<span class="sourceLineNo">161</span>   */<a name="line.161"></a>
-<span class="sourceLineNo">162</span>  public Increment 
setReturnResults(boolean returnResults) {<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    
super.setReturnResults(returnResults);<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    return this;<a name="line.164"></a>
-<span class="sourceLineNo">165</span>  }<a name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span>  /**<a name="line.167"></a>
-<span class="sourceLineNo">168</span>   * @return current setting for 
returnResults<a name="line.168"></a>
-<span class="sourceLineNo">169</span>   */<a name="line.169"></a>
-<span class="sourceLineNo">170</span>  // This method makes public the 
superclasses's protected method.<a name="line.170"></a>
-<span class="sourceLineNo">171</span>  public boolean isReturnResults() {<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span>    return super.isReturnResults();<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>   * Method for retrieving the number of 
families to increment from<a name="line.176"></a>
-<span class="sourceLineNo">177</span>   * @return number of families<a 
name="line.177"></a>
-<span class="sourceLineNo">178</span>   */<a name="line.178"></a>
-<span class="sourceLineNo">179</span>  @Override<a name="line.179"></a>
-<span class="sourceLineNo">180</span>  public int numFamilies() {<a 
name="line.180"></a>
-<span class="sourceLineNo">181</span>    return this.familyMap.size();<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>  /**<a name="line.184"></a>
-<span class="sourceLineNo">185</span>   * Method for checking if any families 
have been inserted into this Increment<a name="line.185"></a>
-<span class="sourceLineNo">186</span>   * @return true if familyMap is non 
empty false otherwise<a name="line.186"></a>
-<span class="sourceLineNo">187</span>   */<a name="line.187"></a>
-<span class="sourceLineNo">188</span>  public boolean hasFamilies() {<a 
name="line.188"></a>
-<span class="sourceLineNo">189</span>    return !this.familyMap.isEmpty();<a 
name="line.189"></a>
-<span class="sourceLineNo">190</span>  }<a name="line.190"></a>
-<span class="sourceLineNo">191</span><a name="line.191"></a>
-<span class="sourceLineNo">192</span>  /**<a name="line.192"></a>
-<span class="sourceLineNo">193</span>   * Before 0.95, when you called 
Increment#getFamilyMap(), you got back<a name="line.193"></a>
-<span class="sourceLineNo">194</span>   * a map of families to a list of 
Longs.  Now, {@link #getFamilyCellMap()} returns<a name="line.194"></a>
-<span class="sourceLineNo">195</span>   * families by list of Cells.  This 
method has been added so you can have the<a name="line.195"></a>
-<span class="sourceLineNo">196</span>   * old behavior.<a name="line.196"></a>
-<span class="sourceLineNo">197</span>   * @return Map of families to a Map of 
qualifiers and their Long increments.<a name="line.197"></a>
-<span class="sourceLineNo">198</span>   * @since 0.95.0<a name="line.198"></a>
-<span class="sourceLineNo">199</span>   */<a name="line.199"></a>
-<span class="sourceLineNo">200</span>  public Map&lt;byte[], 
NavigableMap&lt;byte [], Long&gt;&gt; getFamilyMapOfLongs() {<a 
name="line.200"></a>
-<span class="sourceLineNo">201</span>    NavigableMap&lt;byte[], 
List&lt;Cell&gt;&gt; map = super.getFamilyCellMap();<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    Map&lt;byte [], 
NavigableMap&lt;byte[], Long&gt;&gt; results = new 
TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.202"></a>
-<span class="sourceLineNo">203</span>    for (Map.Entry&lt;byte [], 
List&lt;Cell&gt;&gt; entry: map.entrySet()) {<a name="line.203"></a>
-<span class="sourceLineNo">204</span>      NavigableMap&lt;byte [], Long&gt; 
longs = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      for (Cell cell: entry.getValue()) 
{<a name="line.205"></a>
-<span class="sourceLineNo">206</span>        
longs.put(CellUtil.cloneQualifier(cell),<a name="line.206"></a>
-<span class="sourceLineNo">207</span>            
Bytes.toLong(cell.getValueArray(), cell.getValueOffset(), 
cell.getValueLength()));<a name="line.207"></a>
-<span class="sourceLineNo">208</span>      }<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      results.put(entry.getKey(), 
longs);<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    }<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    return results;<a name="line.211"></a>
-<span class="sourceLineNo">212</span>  }<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span>  /**<a name="line.214"></a>
-<span class="sourceLineNo">215</span>   * @return String<a name="line.215"></a>
-<span class="sourceLineNo">216</span>   */<a name="line.216"></a>
-<span class="sourceLineNo">217</span>  @Override<a name="line.217"></a>
-<span class="sourceLineNo">218</span>  public String toString() {<a 
name="line.218"></a>
-<span class="sourceLineNo">219</span>    StringBuilder sb = new 
StringBuilder();<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    sb.append("row=");<a 
name="line.220"></a>
-<span class="sourceLineNo">221</span>    
sb.append(Bytes.toStringBinary(this.row));<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    if(this.familyMap.isEmpty()) {<a 
name="line.222"></a>
-<span class="sourceLineNo">223</span>      sb.append(", no columns set to be 
incremented");<a name="line.223"></a>
-<span class="sourceLineNo">224</span>      return sb.toString();<a 
name="line.224"></a>
-<span class="sourceLineNo">225</span>    }<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    sb.append(", families=");<a 
name="line.226"></a>
-<span class="sourceLineNo">227</span>    boolean moreThanOne = false;<a 
name="line.227"></a>
-<span class="sourceLineNo">228</span>    for(Map.Entry&lt;byte [], 
List&lt;Cell&gt;&gt; entry: this.familyMap.entrySet()) {<a name="line.228"></a>
-<span class="sourceLineNo">229</span>      if(moreThanOne) {<a 
name="line.229"></a>
-<span class="sourceLineNo">230</span>        sb.append("), ");<a 
name="line.230"></a>
-<span class="sourceLineNo">231</span>      } else {<a name="line.231"></a>
-<span class="sourceLineNo">232</span>        moreThanOne = true;<a 
name="line.232"></a>
-<span class="sourceLineNo">233</span>        sb.append("{");<a 
name="line.233"></a>
-<span class="sourceLineNo">234</span>      }<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      sb.append("(family=");<a 
name="line.235"></a>
-<span class="sourceLineNo">236</span>      
sb.append(Bytes.toString(entry.getKey()));<a name="line.236"></a>
-<span class="sourceLineNo">237</span>      sb.append(", columns=");<a 
name="line.237"></a>
-<span class="sourceLineNo">238</span>      if(entry.getValue() == null) {<a 
name="line.238"></a>
-<span class="sourceLineNo">239</span>        sb.append("NONE");<a 
name="line.239"></a>
-<span class="sourceLineNo">240</span>      } else {<a name="line.240"></a>
-<span class="sourceLineNo">241</span>        sb.append("{");<a 
name="line.241"></a>
-<span class="sourceLineNo">242</span>        boolean moreThanOneB = false;<a 
name="line.242"></a>
-<span class="sourceLineNo">243</span>        for(Cell cell : entry.getValue()) 
{<a name="line.243"></a>
-<span class="sourceLineNo">244</span>          if(moreThanOneB) {<a 
name="line.244"></a>
-<span class="sourceLineNo">245</span>            sb.append(", ");<a 
name="line.245"></a>
-<span class="sourceLineNo">246</span>          } else {<a name="line.246"></a>
-<span class="sourceLineNo">247</span>            moreThanOneB = true;<a 
name="line.247"></a>
-<span class="sourceLineNo">248</span>          }<a name="line.248"></a>
-<span class="sourceLineNo">249</span>          
sb.append(CellUtil.getCellKeyAsString(cell) + "+=" +<a name="line.249"></a>
-<span class="sourceLineNo">250</span>              
Bytes.toLong(cell.getValueArray(), cell.getValueOffset(), 
cell.getValueLength()));<a name="line.250"></a>
-<span class="sourceLineNo">251</span>        }<a name="line.251"></a>
-<span class="sourceLineNo">252</span>        sb.append("}");<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>    sb.append("}");<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    return sb.toString();<a 
name="line.256"></a>
-<span class="sourceLineNo">257</span>  }<a name="line.257"></a>
-<span class="sourceLineNo">258</span><a name="line.258"></a>
-<span class="sourceLineNo">259</span>  @Override<a name="line.259"></a>
-<span class="sourceLineNo">260</span>  public int compareTo(Row i) {<a 
name="line.260"></a>
-<span class="sourceLineNo">261</span>    // TODO: This is wrong.  Can't have 
two the same just because on same row.<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    return Bytes.compareTo(this.getRow(), 
i.getRow());<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>  @Override<a name="line.265"></a>
-<span class="sourceLineNo">266</span>  public int hashCode() {<a 
name="line.266"></a>
-<span class="sourceLineNo">267</span>    // TODO: This is wrong.  Can't have 
two gets the same just because on same row.  But it<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    // matches how equals works currently 
and gets rid of the findbugs warning.<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    return 
Bytes.hashCode(this.getRow());<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 boolean equals(Object obj) {<a 
name="line.273"></a>
-<span class="sourceLineNo">274</span>    // TODO: This is wrong.  Can't have 
two the same just because on same row.<a name="line.274"></a>
-<span class="sourceLineNo">275</span>    if (this == obj) {<a 
name="line.275"></a>
-<span class="sourceLineNo">276</span>      return true;<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    }<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    if (obj == null || getClass() != 
obj.getClass()) {<a name="line.278"></a>
-<span class="sourceLineNo">279</span>      return false;<a name="line.279"></a>
-<span class="sourceLineNo">280</span>    }<a name="line.280"></a>
-<span class="sourceLineNo">281</span>    Row other = (Row) obj;<a 
name="line.281"></a>
-<span class="sourceLineNo">282</span>    return compareTo(other) == 0;<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>  @Override<a name="line.285"></a>
-<span class="sourceLineNo">286</span>  protected long extraHeapSize(){<a 
name="line.286"></a>
-<span class="sourceLineNo">287</span>    return HEAP_OVERHEAD;<a 
name="line.287"></a>
-<span class="sourceLineNo">288</span>  }<a name="line.288"></a>
-<span class="sourceLineNo">289</span><a name="line.289"></a>
-<span class="sourceLineNo">290</span>  @Override<a name="line.290"></a>
-<span class="sourceLineNo">291</span>  public Increment setAttribute(String 
name, byte[] value) {<a name="line.291"></a>
-<span class="sourceLineNo">292</span>    return (Increment) 
super.setAttribute(name, value);<a name="line.292"></a>
-<span class="sourceLineNo">293</span>  }<a name="line.293"></a>
-<span class="sourceLineNo">294</span><a name="line.294"></a>
-<span class="sourceLineNo">295</span>  @Override<a name="line.295"></a>
-<span class="sourceLineNo">296</span>  public Increment setId(String id) {<a 
name="line.296"></a>
-<span class="sourceLineNo">297</span>    return (Increment) super.setId(id);<a 
name="line.297"></a>
-<span class="sourceLineNo">298</span>  }<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span>  @Override<a name="line.300"></a>
-<span class="sourceLineNo">301</span>  public Increment 
setDurability(Durability d) {<a name="line.301"></a>
-<span class="sourceLineNo">302</span>    return (Increment) 
super.setDurability(d);<a name="line.302"></a>
-<span class="sourceLineNo">303</span>  }<a name="line.303"></a>
-<span class="sourceLineNo">304</span><a name="line.304"></a>
-<span class="sourceLineNo">305</span>  @Override<a name="line.305"></a>
-<span class="sourceLineNo">306</span>  public Increment 
setFamilyCellMap(NavigableMap&lt;byte[], List&lt;Cell&gt;&gt; map) {<a 
name="line.306"></a>
-<span class="sourceLineNo">307</span>    return (Increment) 
super.setFamilyCellMap(map);<a name="line.307"></a>
-<span class="sourceLineNo">308</span>  }<a name="line.308"></a>
-<span class="sourceLineNo">309</span><a name="line.309"></a>
-<span class="sourceLineNo">310</span>  @Override<a name="line.310"></a>
-<span class="sourceLineNo">311</span>  public Increment 
setClusterIds(List&lt;UUID&gt; clusterIds) {<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    return (Increment) 
super.setClusterIds(clusterIds);<a name="line.312"></a>
-<span class="sourceLineNo">313</span>  }<a name="line.313"></a>
-<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span>  @Override<a name="line.315"></a>
-<span class="sourceLineNo">316</span>  public Increment 
setCellVisibility(CellVisibility expression) {<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    return (Increment) 
super.setCellVisibility(expression);<a name="line.317"></a>
-<span class="sourceLineNo">318</span>  }<a name="line.318"></a>
-<span class="sourceLineNo">319</span><a name="line.319"></a>
-<span class="sourceLineNo">320</span>  @Override<a name="line.320"></a>
-<span class="sourceLineNo">321</span>  public Increment setACL(String user, 
Permission perms) {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    return (Increment) super.setACL(user, 
perms);<a name="line.322"></a>
-<span class="sourceLineNo">323</span>  }<a name="line.323"></a>
-<span class="sourceLineNo">324</span><a name="line.324"></a>
-<span class="sourceLineNo">325</span>  @Override<a name="line.325"></a>
-<span class="sourceLineNo">326</span>  public Increment setACL(Map&lt;String, 
Permission&gt; perms) {<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    return (Increment) 
super.setACL(perms);<a name="line.327"></a>
-<span class="sourceLineNo">328</span>  }<a name="line.328"></a>
-<span class="sourceLineNo">329</span><a name="line.329"></a>
-<span class="sourceLineNo">330</span>  @Override<a name="line.330"></a>
-<span class="sourceLineNo">331</span>  public Increment setTTL(long ttl) {<a 
name="line.331"></a>
-<span class="sourceLineNo">332</span>    return (Increment) 
super.setTTL(ttl);<a name="line.332"></a>
-<span class="sourceLineNo">333</span>  }<a name="line.333"></a>
-<span class="sourceLineNo">334</span>}<a name="line.334"></a>
+<span class="sourceLineNo">087</span>    super.setPriority(i.getPriority());<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>  /**<a name="line.90"></a>
+<span class="sourceLineNo">091</span>   * Add the specified KeyValue to this 
operation.<a name="line.91"></a>
+<span class="sourceLineNo">092</span>   * @param cell individual Cell<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>   * @return this<a name="line.93"></a>
+<span class="sourceLineNo">094</span>   * @throws java.io.IOException e<a 
name="line.94"></a>
+<span class="sourceLineNo">095</span>   */<a name="line.95"></a>
+<span class="sourceLineNo">096</span>  public Increment add(Cell cell) throws 
IOException{<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    byte [] family = 
CellUtil.cloneFamily(cell);<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    List&lt;Cell&gt; list = 
getCellList(family);<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    //Checking that the row of the kv is 
the same as the put<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    if (!CellUtil.matchingRow(cell, 
this.row)) {<a name="line.100"></a>
+<span class="sourceLineNo">101</span>      throw new WrongRowIOException("The 
row in " + cell +<a name="line.101"></a>
+<span class="sourceLineNo">102</span>        " doesn't match the original one 
" +  Bytes.toStringBinary(this.row));<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    }<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    list.add(cell);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    familyMap.put(family, list);<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span>    return this;<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>  /**<a name="line.109"></a>
+<span class="sourceLineNo">110</span>   * Increment the column from the 
specific family with the specified qualifier<a name="line.110"></a>
+<span class="sourceLineNo">111</span>   * by the specified amount.<a 
name="line.111"></a>
+<span class="sourceLineNo">112</span>   * &lt;p&gt;<a name="line.112"></a>
+<span class="sourceLineNo">113</span>   * Overrides previous calls to 
addColumn for this family and qualifier.<a name="line.113"></a>
+<span class="sourceLineNo">114</span>   * @param family family name<a 
name="line.114"></a>
+<span class="sourceLineNo">115</span>   * @param qualifier column qualifier<a 
name="line.115"></a>
+<span class="sourceLineNo">116</span>   * @param amount amount to increment 
by<a name="line.116"></a>
+<span class="sourceLineNo">117</span>   * @return the Increment object<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>   */<a name="line.118"></a>
+<span class="sourceLineNo">119</span>  public Increment addColumn(byte [] 
family, byte [] qualifier, long amount) {<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    if (family == null) {<a 
name="line.120"></a>
+<span class="sourceLineNo">121</span>      throw new 
IllegalArgumentException("family cannot be null");<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    }<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    List&lt;Cell&gt; list = 
getCellList(family);<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    KeyValue kv = 
createPutKeyValue(family, qualifier, ts, Bytes.toBytes(amount));<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>    list.add(kv);<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    
familyMap.put(CellUtil.cloneFamily(kv), list);<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    return this;<a name="line.127"></a>
+<span class="sourceLineNo">128</span>  }<a name="line.128"></a>
+<span class="sourceLineNo">129</span><a name="line.129"></a>
+<span class="sourceLineNo">130</span>  /**<a name="line.130"></a>
+<span class="sourceLineNo">131</span>   * Gets the TimeRange used for this 
increment.<a name="line.131"></a>
+<span class="sourceLineNo">132</span>   * @return TimeRange<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>   */<a name="line.133"></a>
+<span class="sourceLineNo">134</span>  public TimeRange getTimeRange() {<a 
name="line.134"></a>
+<span class="sourceLineNo">135</span>    return this.tr;<a name="line.135"></a>
+<span class="sourceLineNo">136</span>  }<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span>  /**<a name="line.138"></a>
+<span class="sourceLineNo">139</span>   * Sets the TimeRange to be used on the 
Get for this increment.<a name="line.139"></a>
+<span class="sourceLineNo">140</span>   * &lt;p&gt;<a name="line.140"></a>
+<span class="sourceLineNo">141</span>   * This is useful for when you have 
counters that only last for specific<a name="line.141"></a>
+<span class="sourceLineNo">142</span>   * periods of time (ie. counters that 
are partitioned by time).  By setting<a name="line.142"></a>
+<span class="sourceLineNo">143</span>   * the range of valid times for this 
increment, you can potentially gain<a name="line.143"></a>
+<span class="sourceLineNo">144</span>   * some performance with a more optimal 
Get operation.<a name="line.144"></a>
+<span class="sourceLineNo">145</span>   * &lt;p&gt;<a name="line.145"></a>
+<span class="sourceLineNo">146</span>   * This range is used as [minStamp, 
maxStamp).<a name="line.146"></a>
+<span class="sourceLineNo">147</span>   * @param minStamp minimum timestamp 
value, inclusive<a name="line.147"></a>
+<span class="sourceLineNo">148</span>   * @param maxStamp maximum timestamp 
value, exclusive<a name="line.148"></a>
+<span class="sourceLineNo">149</span>   * @throws IOException if invalid time 
range<a name="line.149"></a>
+<span class="sourceLineNo">150</span>   * @return this<a name="line.150"></a>
+<span class="sourceLineNo">151</span>   */<a name="line.151"></a>
+<span class="sourceLineNo">152</span>  public Increment setTimeRange(long 
minStamp, long maxStamp)<a name="line.152"></a>
+<span class="sourceLineNo">153</span>  throws IOException {<a 
name="line.153"></a>
+<span class="sourceLineNo">154</span>    tr = new TimeRange(minStamp, 
maxStamp);<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    return this;<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>   * @param returnResults True (default) 
if the increment operation should return the results. A<a name="line.159"></a>
+<span class="sourceLineNo">160</span>   *          client that is not 
interested in the result can save network bandwidth setting this<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>   *          to false.<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>   */<a name="line.162"></a>
+<span class="sourceLineNo">163</span>  public Increment 
setReturnResults(boolean returnResults) {<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    
super.setReturnResults(returnResults);<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    return this;<a name="line.165"></a>
+<span class="sourceLineNo">166</span>  }<a name="line.166"></a>
+<span class="sourceLineNo">167</span><a name="line.167"></a>
+<span class="sourceLineNo">168</span>  /**<a name="line.168"></a>
+<span class="sourceLineNo">169</span>   * @return current setting for 
returnResults<a name="line.169"></a>
+<span class="sourceLineNo">170</span>   */<a name="line.170"></a>
+<span class="sourceLineNo">171</span>  // This method makes public the 
superclasses's protected method.<a name="line.171"></a>
+<span class="sourceLineNo">172</span>  public boolean isReturnResults() {<a 
name="line.172"></a>
+<span class="sourceLineNo">173</span>    return super.isReturnResults();<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>   * Method for retrieving the number of 
families to increment from<a name="line.177"></a>
+<span class="sourceLineNo">178</span>   * @return number of families<a 
name="line.178"></a>
+<span class="sourceLineNo">179</span>   */<a name="line.179"></a>
+<span class="sourceLineNo">180</span>  @Override<a name="line.180"></a>
+<span class="sourceLineNo">181</span>  public int numFamilies() {<a 
name="line.181"></a>
+<span class="sourceLineNo">182</span>    return this.familyMap.size();<a 
name="line.182"></a>
+<span class="sourceLineNo">183</span>  }<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span>  /**<a name="line.185"></a>
+<span class="sourceLineNo">186</span>   * Method for checking if any families 
have been inserted into this Increment<a name="line.186"></a>
+<span class="sourceLineNo">187</span>   * @return true if familyMap is non 
empty false otherwise<a name="line.187"></a>
+<span class="sourceLineNo">188</span>   */<a name="line.188"></a>
+<span class="sourceLineNo">189</span>  public boolean hasFamilies() {<a 
name="line.189"></a>
+<span class="sourceLineNo">190</span>    return !this.familyMap.isEmpty();<a 
name="line.190"></a>
+<span class="sourceLineNo">191</span>  }<a name="line.191"></a>
+<span class="sourceLineNo">192</span><a name="line.192"></a>
+<span class="sourceLineNo">193</span>  /**<a name="line.193"></a>
+<span class="sourceLineNo">194</span>   * Before 0.95, when you called 
Increment#getFamilyMap(), you got back<a name="line.194"></a>
+<span class="sourceLineNo">195</span>   * a map of families to a list of 
Longs.  Now, {@link #getFamilyCellMap()} returns<a name="line.195"></a>
+<span class="sourceLineNo">196</span>   * families by list of Cells.  This 
method has been added so you can have the<a name="line.196"></a>
+<span class="sourceLineNo">197</span>   * old behavior.<a name="line.197"></a>
+<span class="sourceLineNo">198</span>   * @return Map of families to a Map of 
qualifiers and their Long increments.<a name="line.198"></a>
+<span class="sourceLineNo">199</span>   * @since 0.95.0<a name="line.199"></a>
+<span class="sourceLineNo">200</span>   */<a name="line.200"></a>
+<span class="sourceLineNo">201</span>  public Map&lt;byte[], 
NavigableMap&lt;byte [], Long&gt;&gt; getFamilyMapOfLongs() {<a 
name="line.201"></a>
+<span class="sourceLineNo">202</span>    NavigableMap&lt;byte[], 
List&lt;Cell&gt;&gt; map = super.getFamilyCellMap();<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    Map&lt;byte [], 
NavigableMap&lt;byte[], Long&gt;&gt; results = new 
TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.203"></a>
+<span class="sourceLineNo">204</span>    for (Map.Entry&lt;byte [], 
List&lt;Cell&gt;&gt; entry: map.entrySet()) {<a name="line.204"></a>
+<span class="sourceLineNo">205</span>      NavigableMap&lt;byte [], Long&gt; 
longs = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      for (Cell cell: entry.getValue()) 
{<a name="line.206"></a>
+<span class="sourceLineNo">207</span>        
longs.put(CellUtil.cloneQualifier(cell),<a name="line.207"></a>
+<span class="sourceLineNo">208</span>            
Bytes.toLong(cell.getValueArray(), cell.getValueOffset(), 
cell.getValueLength()));<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      }<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      results.put(entry.getKey(), 
longs);<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    }<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    return results;<a name="line.212"></a>
+<span class="sourceLineNo">213</span>  }<a name="line.213"></a>
+<span class="sourceLineNo">214</span><a name="line.214"></a>
+<span class="sourceLineNo">215</span>  /**<a name="line.215"></a>
+<span class="sourceLineNo">216</span>   * @return String<a name="line.216"></a>
+<span class="sourceLineNo">217</span>   */<a name="line.217"></a>
+<span class="sourceLineNo">218</span>  @Override<a name="line.218"></a>
+<span class="sourceLineNo">219</span>  public String toString() {<a 
name="line.219"></a>
+<span class="sourceLineNo">220</span>    StringBuilder sb = new 
StringBuilder();<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    sb.append("row=");<a 
name="line.221"></a>
+<span class="sourceLineNo">222</span>    
sb.append(Bytes.toStringBinary(this.row));<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    if(this.familyMap.isEmpty()) {<a 
name="line.223"></a>
+<span class="sourceLineNo">224</span>      sb.append(", no columns set to be 
incremented");<a name="line.224"></a>
+<span class="sourceLineNo">225</span>      return sb.toString();<a 
name="line.225"></a>
+<span class="sourceLineNo">226</span>    }<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    sb.append(", families=");<a 
name="line.227"></a>
+<span class="sourceLineNo">228</span>    boolean moreThanOne = false;<a 
name="line.228"></a>
+<span class="sourceLineNo">229</span>    for(Map.Entry&lt;byte [], 
List&lt;Cell&gt;&gt; entry: this.familyMap.entrySet()) {<a name="line.229"></a>
+<span class="sourceLineNo">230</span>      if(moreThanOne) {<a 
name="line.230"></a>
+<span class="sourceLineNo">231</span>        sb.append("), ");<a 
name="line.231"></a>
+<span class="sourceLineNo">232</span>      } else {<a name="line.232"></a>
+<span class="sourceLineNo">233</span>        moreThanOne = true;<a 
name="line.233"></a>
+<span class="sourceLineNo">234</span>        sb.append("{");<a 
name="line.234"></a>
+<span class="sourceLineNo">235</span>      }<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      sb.append("(family=");<a 
name="line.236"></a>
+<span class="sourceLineNo">237</span>      
sb.append(Bytes.toString(entry.getKey()));<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      sb.append(", columns=");<a 
name="line.238"></a>
+<span class="sourceLineNo">239</span>      if(entry.getValue() == null) {<a 
name="line.239"></a>
+<span class="sourceLineNo">240</span>        sb.append("NONE");<a 
name="line.240"></a>
+<span class="sourceLineNo">241</span>      } else {<a name="line.241"></a>
+<span class="sourceLineNo">242</span>        sb.append("{");<a 
name="line.242"></a>
+<span class="sourceLineNo">243</span>        boolean moreThanOneB = false;<a 
name="line.243"></a>
+<span class="sourceLineNo">244</span>        for(Cell cell : entry.getValue()) 
{<a name="line.244"></a>
+<span class="sourceLineNo">245</span>          if(moreThanOneB) {<a 
name="line.245"></a>
+<span class="sourceLineNo">246</span>            sb.append(", ");<a 
name="line.246"></a>
+<span class="sourceLineNo">247</span>          } else {<a name="line.247"></a>
+<span class="sourceLineNo">248</span>            moreThanOneB = true;<a 
name="line.248"></a>
+<span class="sourceLineNo">249</span>          }<a name="line.249"></a>
+<span class="sourceLineNo">250</span>          
sb.append(CellUtil.getCellKeyAsString(cell) + "+=" +<a name="line.250"></a>
+<span class="sourceLineNo">251</span>              
Bytes.toLong(cell.getValueArray(), cell.getValueOffset(), 
cell.getValueLength()));<a name="line.251"></a>
+<span class="sourceLineNo">252</span>        }<a name="line.252"></a>
+<span class="sourceLineNo">253</span>        sb.append("}");<a 
name="line.253"></a>
+<span class="sourceLineNo">254</span>      }<a name="line.254"></a>
+<span class="sourceLineNo">255</span>    }<a name="line.255"></a>
+<span class="sourceLineNo">256</span>    sb.append("}");<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    return sb.toString();<a 
name="line.257"></a>
+<span class="sourceLineNo">258</span>  }<a name="line.258"></a>
+<span class="sourceLineNo">259</span><a name="line.259"></a>
+<span class="sourceLineNo">260</span>  @Override<a name="line.260"></a>
+<span class="sourceLineNo">261</span>  public int compareTo(Row i) {<a 
name="line.261"></a>
+<span class="sourceLineNo">262</span>    // TODO: This is wrong.  Can't have 
two the same just because on same row.<a name="line.262"></a>
+<span class="sourceLineNo">263</span>    return Bytes.compareTo(this.getRow(), 
i.getRow());<a name="line.263"></a>
+<span class="sourceLineNo">264</span>  }<a name="line.264"></a>
+<span class="sourceLineNo">265</span><a name="line.265"></a>
+<span class="sourceLineNo">266</span>  @Override<a name="line.266"></a>
+<span class="sourceLineNo">267</span>  public int hashCode() {<a 
name="line.267"></a>
+<span class="sourceLineNo">268</span>    // TODO: This is wrong.  Can't have 
two gets the same just because on same row.  But it<a name="line.268"></a>
+<span class="sourceLineNo">269</span>    // matches how equals works currently 
and gets rid of the findbugs warning.<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    return 
Bytes.hashCode(this.getRow());<a name="line.270"></a>
+<span class="sourceLineNo">271</span>  }<a name="line.271"></a>
+<span class="sourceLineNo">272</span><a name="line.272"></a>
+<span class="sourceLineNo">273</span>  @Override<a name="line.273"></a>
+<span class="sourceLineNo">274</span>  public boolean equals(Object obj) {<a 
name="line.274"></a>
+<span class="sourceLineNo">275</span>    // TODO: This is wrong.  Can't have 
two the same just because on same row.<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    if (this == obj) {<a 
name="line.276"></a>
+<span class="sourceLineNo">277</span>      return true;<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    }<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    if (obj == null || getClass() != 
obj.getClass()) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span>      return false;<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    }<a name="line.281"></a>
+<span class="sourceLineNo">282</span>    Row other = (Row) obj;<a 
name="line.282"></a>
+<span class="sourceLineNo">283</span>    return compareTo(other) == 0;<a 
name="line.283"></a>
+<span class="sourceLineNo">284</span>  }<a name="line.284"></a>
+<span class="sourceLineNo">285</span><a name="line.285"></a>
+<span class="sourceLineNo">286</span>  @Override<a name="line.286"></a>
+<span class="sourceLineNo">287</span>  protected long extraHeapSize(){<a 
name="line.287"></a>
+<span class="sourceLineNo">288</span>    return HEAP_OVERHEAD;<a 
name="line.288"></a>
+<span class="sourceLineNo">289</span>  }<a name="line.289"></a>
+<span class="sourceLineNo">290</span><a name="line.290"></a>
+<span class="sourceLineNo">291</span>  @Override<a name="line.291"></a>
+<span class="sourceLineNo">292</span>  public Increment setAttribute(String 
name, byte[] value) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    return (Increment) 
super.setAttribute(name, value);<a name="line.293"></a>
+<span class="sourceLineNo">294</span>  }<a name="line.294"></a>
+<span class="sourceLineNo">295</span><a name="line.295"></a>
+<span class="sourceLineNo">296</span>  @Override<a name="line.296"></a>
+<span class="sourceLineNo">297</span>  public Increment setId(String id) {<a 
name="line.297"></a>
+<span class="sourceLineNo">298</span>    return (Increment) super.setId(id);<a 
name="line.298"></a>
+<span class="sourceLineNo">299</span>  }<a name="line.299"></a>
+<span class="sourceLineNo">300</span><a name="line.300"></a>
+<span class="sourceLineNo">301</span>  @Override<a name="line.301"></a>
+<span class="sourceLineNo">302</span>  public Increment 
setDurability(Durability d) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    return (Increment) 
super.setDurability(d);<a name="line.303"></a>
+<span class="sourceLineNo">304</span>  }<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span>  @Override<a name="line.306"></a>
+<span class="sourceLineNo">307</span>  public Increment 
setFamilyCellMap(NavigableMap&lt;byte[], List&lt;Cell&gt;&gt; map) {<a 
name="line.307"></a>
+<span class="sourceLineNo">308</span>    return (Increment) 
super.setFamilyCellMap(map);<a name="line.308"></a>
+<span class="sourceLineNo">309</span>  }<a name="line.309"></a>
+<span class="sourceLineNo">310</span><a name="line.310"></a>
+<span class="sourceLineNo">311</span>  @Override<a name="line.311"></a>
+<span class="sourceLineNo">312</span>  public Increment 
setClusterIds(List&lt;UUID&gt; clusterIds) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    return (Increment) 
super.setClusterIds(clusterIds);<a name="line.313"></a>
+<span class="sourceLineNo">314</span>  }<a name="line.314"></a>
+<span class="sourceLineNo">315</span><a name="line.315"></a>
+<span class="sourceLineNo">316</span>  @Override<a name="line.316"></a>
+<span class="sourceLineNo">317</span>  public Increment 
setCellVisibility(CellVisibility expression) {<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    return (Increment) 
super.setCellVisibility(expression);<a name="line.318"></a>
+<span class="sourceLineNo">319</span>  }<a name="line.319"></a>
+<span class="sourceLineNo">320</span><a name="line.320"></a>
+<span class="sourceLineNo">321</span>  @Override<a name="line.321"></a>
+<span class="sourceLineNo">322</span>  public Increment setACL(String user, 
Permission perms) {<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    return (Increment) super.setACL(user, 
perms);<a name="line.323"></a>
+<span class="sourceLineNo">324</span>  }<a name="line.324"></a>
+<span class="sourceLineNo">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span>  @Override<a name="line.326"></a>
+<span class="sourceLineNo">327</span>  public Increment setACL(Map&lt;String, 
Permission&gt; perms) {<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    return (Increment) 
super.setACL(perms);<a name="line.328"></a>
+<span class="sourceLineNo">329</span>  }<a name="line.329"></a>
+<span class="sourceLineNo">330</span><a name="line.330"></a>
+<span class="sourceLineNo">331</span>  @Override<a name="line.331"></a>
+<span class="sourceLineNo">332</span>  public Increment setTTL(long ttl) {<a 
name="line.332"></a>
+<span class="sourceLineNo">333</span>    return (Increment) 
super.setTTL(ttl);<a name="line.333"></a>
+<span class="sourceLineNo">334</span>  }<a name="line.334"></a>
+<span class="sourceLineNo">335</span><a name="line.335"></a>
+<span class="sourceLineNo">336</span>  @Override<a name="line.336"></a>
+<span class="sourceLineNo">337</span>  public Increment setPriority(int 
priority) {<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    return (Increment) 
super.setPriority(priority);<a name="line.338"></a>
+<span class="sourceLineNo">339</span>  }<a name="line.339"></a>
+<span class="sourceLineNo">340</span>}<a name="line.340"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f391bcef/devapidocs/src-html/org/apache/hadoop/hbase/client/MultiAction.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/MultiAction.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/MultiAction.html
index a27771f..983f7fc 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/MultiAction.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/MultiAction.html
@@ -28,90 +28,102 @@
 <span class="sourceLineNo">020</span><a name="line.20"></a>
 <span class="sourceLineNo">021</span>import java.util.ArrayList;<a 
name="line.21"></a>
 <span class="sourceLineNo">022</span>import java.util.Collections;<a 
name="line.22"></a>
-<span class="sourceLineNo">023</span>import java.util.List;<a 
name="line.23"></a>
-<span class="sourceLineNo">024</span>import java.util.Map;<a 
name="line.24"></a>
-<span class="sourceLineNo">025</span>import java.util.Set;<a 
name="line.25"></a>
-<span class="sourceLineNo">026</span>import java.util.TreeMap;<a 
name="line.26"></a>
-<span class="sourceLineNo">027</span><a name="line.27"></a>
-<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.30"></a>
+<span class="sourceLineNo">023</span>import java.util.Comparator;<a 
name="line.23"></a>
+<span class="sourceLineNo">024</span>import java.util.List;<a 
name="line.24"></a>
+<span class="sourceLineNo">025</span>import java.util.Map;<a 
name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.util.Optional;<a 
name="line.26"></a>
+<span class="sourceLineNo">027</span>import java.util.Set;<a 
name="line.27"></a>
+<span class="sourceLineNo">028</span>import java.util.TreeMap;<a 
name="line.28"></a>
+<span class="sourceLineNo">029</span>import java.util.function.Consumer;<a 
name="line.29"></a>
+<span class="sourceLineNo">030</span>import java.util.function.Predicate;<a 
name="line.30"></a>
 <span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span>/**<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * Container for Actions (i.e. Get, 
Delete, or Put), which are grouped by<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * regionName. Intended to be used with 
{@link AsyncProcess}.<a name="line.34"></a>
-<span class="sourceLineNo">035</span> */<a name="line.35"></a>
-<span class="sourceLineNo">036</span>@InterfaceAudience.Private<a 
name="line.36"></a>
-<span class="sourceLineNo">037</span>public final class MultiAction {<a 
name="line.37"></a>
-<span class="sourceLineNo">038</span>  // TODO: This class should not be 
visible outside of the client package.<a name="line.38"></a>
-<span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span>  // map of regions to lists of 
puts/gets/deletes for that region.<a name="line.40"></a>
-<span class="sourceLineNo">041</span>  protected Map&lt;byte[], 
List&lt;Action&gt;&gt; actions = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a 
name="line.41"></a>
-<span class="sourceLineNo">042</span><a name="line.42"></a>
-<span class="sourceLineNo">043</span>  private long nonceGroup = 
HConstants.NO_NONCE;<a name="line.43"></a>
+<span class="sourceLineNo">032</span>import 
com.google.common.collect.Iterables;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.util.Bytes;<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> * Container for Actions (i.e. Get, 
Delete, or Put), which are grouped by<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * regionName. Intended to be used with 
{@link AsyncProcess}.<a name="line.39"></a>
+<span class="sourceLineNo">040</span> */<a name="line.40"></a>
+<span class="sourceLineNo">041</span>@InterfaceAudience.Private<a 
name="line.41"></a>
+<span class="sourceLineNo">042</span>public final class MultiAction {<a 
name="line.42"></a>
+<span class="sourceLineNo">043</span>  // TODO: This class should not be 
visible outside of the client package.<a name="line.43"></a>
 <span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>  public MultiAction() {<a 
name="line.45"></a>
-<span class="sourceLineNo">046</span>    super();<a name="line.46"></a>
-<span class="sourceLineNo">047</span>  }<a name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span>  /**<a name="line.49"></a>
-<span class="sourceLineNo">050</span>   * Get the total number of Actions<a 
name="line.50"></a>
-<span class="sourceLineNo">051</span>   *<a name="line.51"></a>
-<span class="sourceLineNo">052</span>   * @return total number of Actions for 
all groups in this container.<a name="line.52"></a>
-<span class="sourceLineNo">053</span>   */<a name="line.53"></a>
-<span class="sourceLineNo">054</span>  public int size() {<a 
name="line.54"></a>
-<span class="sourceLineNo">055</span>    int size = 0;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    for (List&lt;?&gt; l : 
actions.values()) {<a name="line.56"></a>
-<span class="sourceLineNo">057</span>      size += l.size();<a 
name="line.57"></a>
-<span class="sourceLineNo">058</span>    }<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    return size;<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>   * Add an Action to this container 
based on it's regionName. If the regionName<a name="line.63"></a>
-<span class="sourceLineNo">064</span>   * is wrong, the initial execution will 
fail, but will be automatically<a name="line.64"></a>
-<span class="sourceLineNo">065</span>   * retried after looking up the correct 
region.<a name="line.65"></a>
-<span class="sourceLineNo">066</span>   *<a name="line.66"></a>
-<span class="sourceLineNo">067</span>   * @param regionName<a 
name="line.67"></a>
-<span class="sourceLineNo">068</span>   * @param a<a name="line.68"></a>
-<span class="sourceLineNo">069</span>   */<a name="line.69"></a>
-<span class="sourceLineNo">070</span>  public void add(byte[] regionName, 
Action a) {<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    add(regionName, 
Collections.singletonList(a));<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>  /**<a name="line.74"></a>
-<span class="sourceLineNo">075</span>   * Add an Action to this container 
based on it's regionName. If the regionName<a name="line.75"></a>
-<span class="sourceLineNo">076</span>   * is wrong, the initial execution will 
fail, but will be automatically<a name="line.76"></a>
-<span class="sourceLineNo">077</span>   * retried after looking up the correct 
region.<a name="line.77"></a>
-<span class="sourceLineNo">078</span>   *<a name="line.78"></a>
-<span class="sourceLineNo">079</span>   * @param regionName<a 
name="line.79"></a>
-<span class="sourceLineNo">080</span>   * @param actionList list of actions to 
add for the region<a name="line.80"></a>
-<span class="sourceLineNo">081</span>   */<a name="line.81"></a>
-<span class="sourceLineNo">082</span>  public void add(byte[] regionName, 
List&lt;Action&gt; actionList){<a name="line.82"></a>
-<span class="sourceLineNo">083</span>    List&lt;Action&gt; rsActions = 
actions.get(regionName);<a name="line.83"></a>
-<span class="sourceLineNo">084</span>    if (rsActions == null) {<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>      rsActions = new 
ArrayList&lt;&gt;(actionList.size());<a name="line.85"></a>
-<span class="sourceLineNo">086</span>      actions.put(regionName, 
rsActions);<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    }<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    rsActions.addAll(actionList);<a 
name="line.88"></a>
-<span class="sourceLineNo">089</span>  }<a name="line.89"></a>
-<span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span>  public void setNonceGroup(long 
nonceGroup) {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    this.nonceGroup = nonceGroup;<a 
name="line.92"></a>
-<span class="sourceLineNo">093</span>  }<a name="line.93"></a>
-<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span>  public Set&lt;byte[]&gt; getRegions() 
{<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    return actions.keySet();<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>  public boolean hasNonceGroup() {<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>    return nonceGroup != 
HConstants.NO_NONCE;<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>  public long getNonceGroup() {<a 
name="line.103"></a>
-<span class="sourceLineNo">104</span>    return this.nonceGroup;<a 
name="line.104"></a>
-<span class="sourceLineNo">105</span>  }<a name="line.105"></a>
-<span class="sourceLineNo">106</span>}<a name="line.106"></a>
+<span class="sourceLineNo">045</span>  // map of regions to lists of 
puts/gets/deletes for that region.<a name="line.45"></a>
+<span class="sourceLineNo">046</span>  protected Map&lt;byte[], 
List&lt;Action&gt;&gt; actions = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a 
name="line.46"></a>
+<span class="sourceLineNo">047</span><a name="line.47"></a>
+<span class="sourceLineNo">048</span>  private long nonceGroup = 
HConstants.NO_NONCE;<a name="line.48"></a>
+<span class="sourceLineNo">049</span><a name="line.49"></a>
+<span class="sourceLineNo">050</span>  public MultiAction() {<a 
name="line.50"></a>
+<span class="sourceLineNo">051</span>    super();<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>  /**<a name="line.54"></a>
+<span class="sourceLineNo">055</span>   * Get the total number of Actions<a 
name="line.55"></a>
+<span class="sourceLineNo">056</span>   *<a name="line.56"></a>
+<span class="sourceLineNo">057</span>   * @return total number of Actions for 
all groups in this container.<a name="line.57"></a>
+<span class="sourceLineNo">058</span>   */<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  public int size() {<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>    int size = 0;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    for (List&lt;?&gt; l : 
actions.values()) {<a name="line.61"></a>
+<span class="sourceLineNo">062</span>      size += l.size();<a 
name="line.62"></a>
+<span class="sourceLineNo">063</span>    }<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    return size;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>  }<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>   * Add an Action to this container 
based on it's regionName. If the regionName<a name="line.68"></a>
+<span class="sourceLineNo">069</span>   * is wrong, the initial execution will 
fail, but will be automatically<a name="line.69"></a>
+<span class="sourceLineNo">070</span>   * retried after looking up the correct 
region.<a name="line.70"></a>
+<span class="sourceLineNo">071</span>   *<a name="line.71"></a>
+<span class="sourceLineNo">072</span>   * @param regionName<a 
name="line.72"></a>
+<span class="sourceLineNo">073</span>   * @param a<a name="line.73"></a>
+<span class="sourceLineNo">074</span>   */<a name="line.74"></a>
+<span class="sourceLineNo">075</span>  public void add(byte[] regionName, 
Action a) {<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    add(regionName, 
Collections.singletonList(a));<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>  /**<a name="line.79"></a>
+<span class="sourceLineNo">080</span>   * Add an Action to this container 
based on it's regionName. If the regionName<a name="line.80"></a>
+<span class="sourceLineNo">081</span>   * is wrong, the initial execution will 
fail, but will be automatically<a name="line.81"></a>
+<span class="sourceLineNo">082</span>   * retried after looking up the correct 
region.<a name="line.82"></a>
+<span class="sourceLineNo">083</span>   *<a name="line.83"></a>
+<span class="sourceLineNo">084</span>   * @param regionName<a 
name="line.84"></a>
+<span class="sourceLineNo">085</span>   * @param actionList list of actions to 
add for the region<a name="line.85"></a>
+<span class="sourceLineNo">086</span>   */<a name="line.86"></a>
+<span class="sourceLineNo">087</span>  public void add(byte[] regionName, 
List&lt;Action&gt; actionList){<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    List&lt;Action&gt; rsActions = 
actions.get(regionName);<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    if (rsActions == null) {<a 
name="line.89"></a>
+<span class="sourceLineNo">090</span>      rsActions = new 
ArrayList&lt;&gt;(actionList.size());<a name="line.90"></a>
+<span class="sourceLineNo">091</span>      actions.put(regionName, 
rsActions);<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    }<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    rsActions.addAll(actionList);<a 
name="line.93"></a>
+<span class="sourceLineNo">094</span>  }<a name="line.94"></a>
+<span class="sourceLineNo">095</span><a name="line.95"></a>
+<span class="sourceLineNo">096</span>  public void setNonceGroup(long 
nonceGroup) {<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    this.nonceGroup = nonceGroup;<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>  }<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span>  public Set&lt;byte[]&gt; getRegions() 
{<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    return actions.keySet();<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>  public boolean hasNonceGroup() {<a 
name="line.104"></a>
+<span class="sourceLineNo">105</span>    return nonceGroup != 
HConstants.NO_NONCE;<a name="line.105"></a>
+<span class="sourceLineNo">106</span>  }<a name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span>  public long getNonceGroup() {<a 
name="line.108"></a>
+<span class="sourceLineNo">109</span>    return this.nonceGroup;<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>  }<a name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span>  // returns the max priority of all the 
actions<a name="line.112"></a>
+<span class="sourceLineNo">113</span>  public int getPriority() {<a 
name="line.113"></a>
+<span class="sourceLineNo">114</span>    Optional&lt;Action&gt; result = 
actions.values().stream().flatMap(List::stream)<a name="line.114"></a>
+<span class="sourceLineNo">115</span>        .max((action1, action2) -&gt; 
Math.max(action1.getPriority(), action2.getPriority()));<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    return result.isPresent() ? 
result.get().getPriority() : HConstants.PRIORITY_UNSET;<a name="line.116"></a>
+<span class="sourceLineNo">117</span>  }<a name="line.117"></a>
+<span class="sourceLineNo">118</span>}<a name="line.118"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f391bcef/devapidocs/src-html/org/apache/hadoop/hbase/client/MultiServerCallable.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/MultiServerCallable.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/MultiServerCallable.html
index 78a5dc7..5589fef 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/MultiServerCallable.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/MultiServerCallable.html
@@ -63,8 +63,8 @@
 <span class="sourceLineNo">055</span><a name="line.55"></a>
 <span class="sourceLineNo">056</span>  MultiServerCallable(final 
ClusterConnection connection, final TableName tableName,<a name="line.56"></a>
 <span class="sourceLineNo">057</span>      final ServerName location, final 
MultiAction multi, RpcController rpcController,<a name="line.57"></a>
-<span class="sourceLineNo">058</span>      int rpcTimeout, RetryingTimeTracker 
tracker) {<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    super(connection, tableName, null, 
rpcController, rpcTimeout, tracker);<a name="line.59"></a>
+<span class="sourceLineNo">058</span>      int rpcTimeout, RetryingTimeTracker 
tracker, int priority) {<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    super(connection, tableName, null, 
rpcController, rpcTimeout, tracker, priority);<a name="line.59"></a>
 <span class="sourceLineNo">060</span>    this.multiAction = multi;<a 
name="line.60"></a>
 <span class="sourceLineNo">061</span>    // RegionServerCallable has 
HRegionLocation field, but this is a multi-region request.<a name="line.61"></a>
 <span class="sourceLineNo">062</span>    // Using region info from parent 
HRegionLocation would be a mistake for this class; so<a name="line.62"></a>

Reply via email to