http://git-wip-us.apache.org/repos/asf/hbase-site/blob/2aec596e/apidocs/src-html/org/apache/hadoop/hbase/client/Delete.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/client/Delete.html 
b/apidocs/src-html/org/apache/hadoop/hbase/client/Delete.html
index 498db42..d18ceec 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/client/Delete.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/client/Delete.html
@@ -159,231 +159,241 @@
 <span class="sourceLineNo">151</span>  }<a name="line.151"></a>
 <span class="sourceLineNo">152</span><a name="line.152"></a>
 <span class="sourceLineNo">153</span>  /**<a name="line.153"></a>
-<span class="sourceLineNo">154</span>   * Advanced use only.<a 
name="line.154"></a>
-<span class="sourceLineNo">155</span>   * Add an existing delete marker to 
this Delete object.<a name="line.155"></a>
-<span class="sourceLineNo">156</span>   * @param kv An existing KeyValue of 
type "delete".<a name="line.156"></a>
-<span class="sourceLineNo">157</span>   * @return this for invocation 
chaining<a name="line.157"></a>
-<span class="sourceLineNo">158</span>   * @throws IOException<a 
name="line.158"></a>
-<span class="sourceLineNo">159</span>   */<a name="line.159"></a>
-<span class="sourceLineNo">160</span>  @SuppressWarnings("unchecked")<a 
name="line.160"></a>
-<span class="sourceLineNo">161</span>  public Delete addDeleteMarker(Cell kv) 
throws IOException {<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    // TODO: Deprecate and rename 'add' 
so it matches how we add KVs to Puts.<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    if (!CellUtil.isDelete(kv)) {<a 
name="line.163"></a>
-<span class="sourceLineNo">164</span>      throw new IOException("The recently 
added KeyValue is not of type "<a name="line.164"></a>
-<span class="sourceLineNo">165</span>          + "delete. Rowkey: " + 
Bytes.toStringBinary(this.row));<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    }<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    if (!CellUtil.matchingRow(kv, 
this.row)) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span>      throw new WrongRowIOException("The 
row in " + kv.toString() +<a name="line.168"></a>
-<span class="sourceLineNo">169</span>        " doesn't match the original one 
" +  Bytes.toStringBinary(this.row));<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    }<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    byte [] family = 
CellUtil.cloneFamily(kv);<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    List&lt;Cell&gt; list = 
familyMap.get(family);<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    if (list == null) {<a 
name="line.173"></a>
-<span class="sourceLineNo">174</span>      list = new ArrayList&lt;&gt;(1);<a 
name="line.174"></a>
-<span class="sourceLineNo">175</span>    }<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    list.add(kv);<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    familyMap.put(family, list);<a 
name="line.177"></a>
-<span class="sourceLineNo">178</span>    return this;<a name="line.178"></a>
-<span class="sourceLineNo">179</span>  }<a name="line.179"></a>
-<span class="sourceLineNo">180</span><a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span>  /**<a name="line.182"></a>
-<span class="sourceLineNo">183</span>   * Delete all versions of all columns 
of the specified family.<a name="line.183"></a>
-<span class="sourceLineNo">184</span>   * &lt;p&gt;<a name="line.184"></a>
-<span class="sourceLineNo">185</span>   * Overrides previous calls to 
deleteColumn and deleteColumns for the<a name="line.185"></a>
-<span class="sourceLineNo">186</span>   * specified family.<a 
name="line.186"></a>
-<span class="sourceLineNo">187</span>   * @param family family name<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>   * @return this for invocation 
chaining<a name="line.188"></a>
-<span class="sourceLineNo">189</span>   */<a name="line.189"></a>
-<span class="sourceLineNo">190</span>  public Delete addFamily(final byte [] 
family) {<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    this.addFamily(family, this.ts);<a 
name="line.191"></a>
-<span class="sourceLineNo">192</span>    return this;<a name="line.192"></a>
-<span class="sourceLineNo">193</span>  }<a name="line.193"></a>
-<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span>  /**<a name="line.195"></a>
-<span class="sourceLineNo">196</span>   * Delete all columns of the specified 
family with a timestamp less than<a name="line.196"></a>
-<span class="sourceLineNo">197</span>   * or equal to the specified 
timestamp.<a name="line.197"></a>
-<span class="sourceLineNo">198</span>   * &lt;p&gt;<a name="line.198"></a>
-<span class="sourceLineNo">199</span>   * Overrides previous calls to 
deleteColumn and deleteColumns for the<a name="line.199"></a>
-<span class="sourceLineNo">200</span>   * specified family.<a 
name="line.200"></a>
-<span class="sourceLineNo">201</span>   * @param family family name<a 
name="line.201"></a>
-<span class="sourceLineNo">202</span>   * @param timestamp maximum version 
timestamp<a name="line.202"></a>
-<span class="sourceLineNo">203</span>   * @return this for invocation 
chaining<a name="line.203"></a>
-<span class="sourceLineNo">204</span>   */<a name="line.204"></a>
-<span class="sourceLineNo">205</span>  public Delete addFamily(final byte [] 
family, final long timestamp) {<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    if (timestamp &lt; 0) {<a 
name="line.206"></a>
-<span class="sourceLineNo">207</span>      throw new 
IllegalArgumentException("Timestamp cannot be negative. ts=" + timestamp);<a 
name="line.207"></a>
-<span class="sourceLineNo">208</span>    }<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    List&lt;Cell&gt; list = 
familyMap.get(family);<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    if(list == null) {<a 
name="line.210"></a>
-<span class="sourceLineNo">211</span>      list = new ArrayList&lt;&gt;(1);<a 
name="line.211"></a>
-<span class="sourceLineNo">212</span>    } else if(!list.isEmpty()) {<a 
name="line.212"></a>
-<span class="sourceLineNo">213</span>      list.clear();<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    }<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    KeyValue kv = new KeyValue(row, 
family, null, timestamp, KeyValue.Type.DeleteFamily);<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    list.add(kv);<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    familyMap.put(family, list);<a 
name="line.217"></a>
-<span class="sourceLineNo">218</span>    return this;<a name="line.218"></a>
-<span class="sourceLineNo">219</span>  }<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span>  /**<a name="line.221"></a>
-<span class="sourceLineNo">222</span>   * Delete all columns of the specified 
family with a timestamp equal to<a name="line.222"></a>
-<span class="sourceLineNo">223</span>   * the specified timestamp.<a 
name="line.223"></a>
-<span class="sourceLineNo">224</span>   * @param family family name<a 
name="line.224"></a>
-<span class="sourceLineNo">225</span>   * @param timestamp version timestamp<a 
name="line.225"></a>
-<span class="sourceLineNo">226</span>   * @return this for invocation 
chaining<a name="line.226"></a>
-<span class="sourceLineNo">227</span>   */<a name="line.227"></a>
-<span class="sourceLineNo">228</span>  public Delete addFamilyVersion(final 
byte [] family, final long timestamp) {<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    List&lt;Cell&gt; list = 
familyMap.get(family);<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    if(list == null) {<a 
name="line.230"></a>
-<span class="sourceLineNo">231</span>      list = new ArrayList&lt;&gt;(1);<a 
name="line.231"></a>
-<span class="sourceLineNo">232</span>    }<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    list.add(new KeyValue(row, family, 
null, timestamp,<a name="line.233"></a>
-<span class="sourceLineNo">234</span>          
KeyValue.Type.DeleteFamilyVersion));<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    familyMap.put(family, list);<a 
name="line.235"></a>
-<span class="sourceLineNo">236</span>    return this;<a name="line.236"></a>
-<span class="sourceLineNo">237</span>  }<a name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span>  /**<a name="line.239"></a>
-<span class="sourceLineNo">240</span>   * Delete all versions of the specified 
column.<a name="line.240"></a>
-<span class="sourceLineNo">241</span>   * @param family family name<a 
name="line.241"></a>
-<span class="sourceLineNo">242</span>   * @param qualifier column qualifier<a 
name="line.242"></a>
-<span class="sourceLineNo">243</span>   * @return this for invocation 
chaining<a name="line.243"></a>
-<span class="sourceLineNo">244</span>   */<a name="line.244"></a>
-<span class="sourceLineNo">245</span>  public Delete addColumns(final byte [] 
family, final byte [] qualifier) {<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    addColumns(family, qualifier, 
this.ts);<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    return this;<a name="line.247"></a>
-<span class="sourceLineNo">248</span>  }<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span>  /**<a name="line.250"></a>
-<span class="sourceLineNo">251</span>   * Delete all versions of the specified 
column with a timestamp less than<a name="line.251"></a>
-<span class="sourceLineNo">252</span>   * or equal to the specified 
timestamp.<a name="line.252"></a>
-<span class="sourceLineNo">253</span>   * @param family family name<a 
name="line.253"></a>
-<span class="sourceLineNo">254</span>   * @param qualifier column qualifier<a 
name="line.254"></a>
-<span class="sourceLineNo">255</span>   * @param timestamp maximum version 
timestamp<a name="line.255"></a>
-<span class="sourceLineNo">256</span>   * @return this for invocation 
chaining<a name="line.256"></a>
-<span class="sourceLineNo">257</span>   */<a name="line.257"></a>
-<span class="sourceLineNo">258</span>  public Delete addColumns(final byte [] 
family, final byte [] qualifier, final long timestamp) {<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    if (timestamp &lt; 0) {<a 
name="line.259"></a>
-<span class="sourceLineNo">260</span>      throw new 
IllegalArgumentException("Timestamp cannot be negative. ts=" + timestamp);<a 
name="line.260"></a>
-<span class="sourceLineNo">261</span>    }<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    List&lt;Cell&gt; list = 
familyMap.get(family);<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    if (list == null) {<a 
name="line.263"></a>
-<span class="sourceLineNo">264</span>      list = new ArrayList&lt;&gt;(1);<a 
name="line.264"></a>
-<span class="sourceLineNo">265</span>    }<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    list.add(new KeyValue(this.row, 
family, qualifier, timestamp,<a name="line.266"></a>
-<span class="sourceLineNo">267</span>        KeyValue.Type.DeleteColumn));<a 
name="line.267"></a>
-<span class="sourceLineNo">268</span>    familyMap.put(family, list);<a 
name="line.268"></a>
-<span class="sourceLineNo">269</span>    return this;<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>  /**<a name="line.272"></a>
-<span class="sourceLineNo">273</span>   * Delete the latest version of the 
specified column.<a name="line.273"></a>
-<span class="sourceLineNo">274</span>   * This is an expensive call in that on 
the server-side, it first does a<a name="line.274"></a>
-<span class="sourceLineNo">275</span>   * get to find the latest versions 
timestamp.  Then it adds a delete using<a name="line.275"></a>
-<span class="sourceLineNo">276</span>   * the fetched cells timestamp.<a 
name="line.276"></a>
-<span class="sourceLineNo">277</span>   * @param family family name<a 
name="line.277"></a>
-<span class="sourceLineNo">278</span>   * @param qualifier column qualifier<a 
name="line.278"></a>
-<span class="sourceLineNo">279</span>   * @return this for invocation 
chaining<a name="line.279"></a>
-<span class="sourceLineNo">280</span>   */<a name="line.280"></a>
-<span class="sourceLineNo">281</span>  public Delete addColumn(final byte [] 
family, final byte [] qualifier) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    this.addColumn(family, qualifier, 
this.ts);<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    return this;<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>  /**<a name="line.286"></a>
-<span class="sourceLineNo">287</span>   * Delete the specified version of the 
specified column.<a name="line.287"></a>
-<span class="sourceLineNo">288</span>   * @param family family name<a 
name="line.288"></a>
-<span class="sourceLineNo">289</span>   * @param qualifier column qualifier<a 
name="line.289"></a>
-<span class="sourceLineNo">290</span>   * @param timestamp version timestamp<a 
name="line.290"></a>
-<span class="sourceLineNo">291</span>   * @return this for invocation 
chaining<a name="line.291"></a>
-<span class="sourceLineNo">292</span>   */<a name="line.292"></a>
-<span class="sourceLineNo">293</span>  public Delete addColumn(byte [] family, 
byte [] qualifier, long timestamp) {<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    if (timestamp &lt; 0) {<a 
name="line.294"></a>
-<span class="sourceLineNo">295</span>      throw new 
IllegalArgumentException("Timestamp cannot be negative. ts=" + timestamp);<a 
name="line.295"></a>
-<span class="sourceLineNo">296</span>    }<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    List&lt;Cell&gt; list = 
familyMap.get(family);<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    if(list == null) {<a 
name="line.298"></a>
-<span class="sourceLineNo">299</span>      list = new ArrayList&lt;&gt;(1);<a 
name="line.299"></a>
-<span class="sourceLineNo">300</span>    }<a name="line.300"></a>
-<span class="sourceLineNo">301</span>    KeyValue kv = new KeyValue(this.row, 
family, qualifier, timestamp, KeyValue.Type.Delete);<a name="line.301"></a>
-<span class="sourceLineNo">302</span>    list.add(kv);<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    familyMap.put(family, list);<a 
name="line.303"></a>
-<span class="sourceLineNo">304</span>    return this;<a name="line.304"></a>
-<span class="sourceLineNo">305</span>  }<a name="line.305"></a>
-<span class="sourceLineNo">306</span><a name="line.306"></a>
-<span class="sourceLineNo">307</span>  /**<a name="line.307"></a>
-<span class="sourceLineNo">308</span>   * Set the timestamp of the delete.<a 
name="line.308"></a>
-<span class="sourceLineNo">309</span>   *<a name="line.309"></a>
-<span class="sourceLineNo">310</span>   * @param timestamp<a 
name="line.310"></a>
-<span class="sourceLineNo">311</span>   */<a name="line.311"></a>
-<span class="sourceLineNo">312</span>  public Delete setTimestamp(long 
timestamp) {<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    if (timestamp &lt; 0) {<a 
name="line.313"></a>
-<span class="sourceLineNo">314</span>      throw new 
IllegalArgumentException("Timestamp cannot be negative. ts=" + timestamp);<a 
name="line.314"></a>
-<span class="sourceLineNo">315</span>    }<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    this.ts = timestamp;<a 
name="line.316"></a>
-<span class="sourceLineNo">317</span>    return this;<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 Map&lt;String, Object&gt; 
toMap(int maxCols) {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    // we start with the fingerprint map 
and build on top of it.<a name="line.322"></a>
-<span class="sourceLineNo">323</span>    Map&lt;String, Object&gt; map = 
super.toMap(maxCols);<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    // why is put not doing this?<a 
name="line.324"></a>
-<span class="sourceLineNo">325</span>    map.put("ts", this.ts);<a 
name="line.325"></a>
-<span class="sourceLineNo">326</span>    return map;<a name="line.326"></a>
-<span class="sourceLineNo">327</span>  }<a name="line.327"></a>
-<span class="sourceLineNo">328</span><a name="line.328"></a>
-<span class="sourceLineNo">329</span>  @Override<a name="line.329"></a>
-<span class="sourceLineNo">330</span>  public Delete setAttribute(String name, 
byte[] value) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    return (Delete) 
super.setAttribute(name, value);<a name="line.331"></a>
-<span class="sourceLineNo">332</span>  }<a name="line.332"></a>
-<span class="sourceLineNo">333</span><a name="line.333"></a>
-<span class="sourceLineNo">334</span>  @Override<a name="line.334"></a>
-<span class="sourceLineNo">335</span>  public Delete setId(String id) {<a 
name="line.335"></a>
-<span class="sourceLineNo">336</span>    return (Delete) super.setId(id);<a 
name="line.336"></a>
+<span class="sourceLineNo">154</span>   * Advanced use only. Add an existing 
delete marker to this Delete object.<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   * @param kv An existing KeyValue of 
type "delete".<a name="line.155"></a>
+<span class="sourceLineNo">156</span>   * @return this for invocation 
chaining<a name="line.156"></a>
+<span class="sourceLineNo">157</span>   * @throws IOException<a 
name="line.157"></a>
+<span class="sourceLineNo">158</span>   * @deprecated As of release 2.0.0, 
this will be removed in HBase 3.0.0. Use {@link #add(Cell)}<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>   *             instead<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span>   */<a name="line.160"></a>
+<span class="sourceLineNo">161</span>  @SuppressWarnings("unchecked")<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>  @Deprecated<a name="line.162"></a>
+<span class="sourceLineNo">163</span>  public Delete addDeleteMarker(Cell kv) 
throws IOException {<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    return this.add(kv);<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>   * Add an existing delete marker to 
this Delete object.<a name="line.168"></a>
+<span class="sourceLineNo">169</span>   * @param kv An existing KeyValue of 
type "delete".<a name="line.169"></a>
+<span class="sourceLineNo">170</span>   * @return this for invocation 
chaining<a name="line.170"></a>
+<span class="sourceLineNo">171</span>   * @throws IOException<a 
name="line.171"></a>
+<span class="sourceLineNo">172</span>   */<a name="line.172"></a>
+<span class="sourceLineNo">173</span>  public Delete add(Cell kv) throws 
IOException {<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    if (!CellUtil.isDelete(kv)) {<a 
name="line.174"></a>
+<span class="sourceLineNo">175</span>      throw new IOException("The recently 
added KeyValue is not of type "<a name="line.175"></a>
+<span class="sourceLineNo">176</span>          + "delete. Rowkey: " + 
Bytes.toStringBinary(this.row));<a name="line.176"></a>
+<span class="sourceLineNo">177</span>    }<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    if (!CellUtil.matchingRow(kv, 
this.row)) {<a name="line.178"></a>
+<span class="sourceLineNo">179</span>      throw new WrongRowIOException("The 
row in " + kv.toString() +<a name="line.179"></a>
+<span class="sourceLineNo">180</span>        " doesn't match the original one 
" +  Bytes.toStringBinary(this.row));<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    }<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    byte [] family = 
CellUtil.cloneFamily(kv);<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    List&lt;Cell&gt; list = 
familyMap.get(family);<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    if (list == null) {<a 
name="line.184"></a>
+<span class="sourceLineNo">185</span>      list = new ArrayList&lt;&gt;(1);<a 
name="line.185"></a>
+<span class="sourceLineNo">186</span>    }<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    list.add(kv);<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    familyMap.put(family, list);<a 
name="line.188"></a>
+<span class="sourceLineNo">189</span>    return this;<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>   * Delete all versions of all columns 
of the specified family.<a name="line.193"></a>
+<span class="sourceLineNo">194</span>   * &lt;p&gt;<a name="line.194"></a>
+<span class="sourceLineNo">195</span>   * Overrides previous calls to 
deleteColumn and deleteColumns for the<a name="line.195"></a>
+<span class="sourceLineNo">196</span>   * specified family.<a 
name="line.196"></a>
+<span class="sourceLineNo">197</span>   * @param family family name<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span>   * @return this for invocation 
chaining<a name="line.198"></a>
+<span class="sourceLineNo">199</span>   */<a name="line.199"></a>
+<span class="sourceLineNo">200</span>  public Delete addFamily(final byte [] 
family) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    this.addFamily(family, this.ts);<a 
name="line.201"></a>
+<span class="sourceLineNo">202</span>    return this;<a name="line.202"></a>
+<span class="sourceLineNo">203</span>  }<a name="line.203"></a>
+<span class="sourceLineNo">204</span><a name="line.204"></a>
+<span class="sourceLineNo">205</span>  /**<a name="line.205"></a>
+<span class="sourceLineNo">206</span>   * Delete all columns of the specified 
family with a timestamp less than<a name="line.206"></a>
+<span class="sourceLineNo">207</span>   * or equal to the specified 
timestamp.<a name="line.207"></a>
+<span class="sourceLineNo">208</span>   * &lt;p&gt;<a name="line.208"></a>
+<span class="sourceLineNo">209</span>   * Overrides previous calls to 
deleteColumn and deleteColumns for the<a name="line.209"></a>
+<span class="sourceLineNo">210</span>   * specified family.<a 
name="line.210"></a>
+<span class="sourceLineNo">211</span>   * @param family family name<a 
name="line.211"></a>
+<span class="sourceLineNo">212</span>   * @param timestamp maximum version 
timestamp<a name="line.212"></a>
+<span class="sourceLineNo">213</span>   * @return this for invocation 
chaining<a name="line.213"></a>
+<span class="sourceLineNo">214</span>   */<a name="line.214"></a>
+<span class="sourceLineNo">215</span>  public Delete addFamily(final byte [] 
family, final long timestamp) {<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    if (timestamp &lt; 0) {<a 
name="line.216"></a>
+<span class="sourceLineNo">217</span>      throw new 
IllegalArgumentException("Timestamp cannot be negative. ts=" + timestamp);<a 
name="line.217"></a>
+<span class="sourceLineNo">218</span>    }<a name="line.218"></a>
+<span class="sourceLineNo">219</span>    List&lt;Cell&gt; list = 
familyMap.get(family);<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    if(list == null) {<a 
name="line.220"></a>
+<span class="sourceLineNo">221</span>      list = new ArrayList&lt;&gt;(1);<a 
name="line.221"></a>
+<span class="sourceLineNo">222</span>    } else if(!list.isEmpty()) {<a 
name="line.222"></a>
+<span class="sourceLineNo">223</span>      list.clear();<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    }<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    KeyValue kv = new KeyValue(row, 
family, null, timestamp, KeyValue.Type.DeleteFamily);<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    list.add(kv);<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    familyMap.put(family, list);<a 
name="line.227"></a>
+<span class="sourceLineNo">228</span>    return this;<a name="line.228"></a>
+<span class="sourceLineNo">229</span>  }<a name="line.229"></a>
+<span class="sourceLineNo">230</span><a name="line.230"></a>
+<span class="sourceLineNo">231</span>  /**<a name="line.231"></a>
+<span class="sourceLineNo">232</span>   * Delete all columns of the specified 
family with a timestamp equal to<a name="line.232"></a>
+<span class="sourceLineNo">233</span>   * the specified timestamp.<a 
name="line.233"></a>
+<span class="sourceLineNo">234</span>   * @param family family name<a 
name="line.234"></a>
+<span class="sourceLineNo">235</span>   * @param timestamp version timestamp<a 
name="line.235"></a>
+<span class="sourceLineNo">236</span>   * @return this for invocation 
chaining<a name="line.236"></a>
+<span class="sourceLineNo">237</span>   */<a name="line.237"></a>
+<span class="sourceLineNo">238</span>  public Delete addFamilyVersion(final 
byte [] family, final long timestamp) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    List&lt;Cell&gt; list = 
familyMap.get(family);<a name="line.239"></a>
+<span class="sourceLineNo">240</span>    if(list == null) {<a 
name="line.240"></a>
+<span class="sourceLineNo">241</span>      list = new ArrayList&lt;&gt;(1);<a 
name="line.241"></a>
+<span class="sourceLineNo">242</span>    }<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    list.add(new KeyValue(row, family, 
null, timestamp,<a name="line.243"></a>
+<span class="sourceLineNo">244</span>          
KeyValue.Type.DeleteFamilyVersion));<a name="line.244"></a>
+<span class="sourceLineNo">245</span>    familyMap.put(family, list);<a 
name="line.245"></a>
+<span class="sourceLineNo">246</span>    return this;<a name="line.246"></a>
+<span class="sourceLineNo">247</span>  }<a name="line.247"></a>
+<span class="sourceLineNo">248</span><a name="line.248"></a>
+<span class="sourceLineNo">249</span>  /**<a name="line.249"></a>
+<span class="sourceLineNo">250</span>   * Delete all versions of the specified 
column.<a name="line.250"></a>
+<span class="sourceLineNo">251</span>   * @param family family name<a 
name="line.251"></a>
+<span class="sourceLineNo">252</span>   * @param qualifier column qualifier<a 
name="line.252"></a>
+<span class="sourceLineNo">253</span>   * @return this for invocation 
chaining<a name="line.253"></a>
+<span class="sourceLineNo">254</span>   */<a name="line.254"></a>
+<span class="sourceLineNo">255</span>  public Delete addColumns(final byte [] 
family, final byte [] qualifier) {<a name="line.255"></a>
+<span class="sourceLineNo">256</span>    addColumns(family, qualifier, 
this.ts);<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    return this;<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>  /**<a name="line.260"></a>
+<span class="sourceLineNo">261</span>   * Delete all versions of the specified 
column with a timestamp less than<a name="line.261"></a>
+<span class="sourceLineNo">262</span>   * or equal to the specified 
timestamp.<a name="line.262"></a>
+<span class="sourceLineNo">263</span>   * @param family family name<a 
name="line.263"></a>
+<span class="sourceLineNo">264</span>   * @param qualifier column qualifier<a 
name="line.264"></a>
+<span class="sourceLineNo">265</span>   * @param timestamp maximum version 
timestamp<a name="line.265"></a>
+<span class="sourceLineNo">266</span>   * @return this for invocation 
chaining<a name="line.266"></a>
+<span class="sourceLineNo">267</span>   */<a name="line.267"></a>
+<span class="sourceLineNo">268</span>  public Delete addColumns(final byte [] 
family, final byte [] qualifier, final long timestamp) {<a name="line.268"></a>
+<span class="sourceLineNo">269</span>    if (timestamp &lt; 0) {<a 
name="line.269"></a>
+<span class="sourceLineNo">270</span>      throw new 
IllegalArgumentException("Timestamp cannot be negative. ts=" + timestamp);<a 
name="line.270"></a>
+<span class="sourceLineNo">271</span>    }<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    List&lt;Cell&gt; list = 
familyMap.get(family);<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    if (list == null) {<a 
name="line.273"></a>
+<span class="sourceLineNo">274</span>      list = new ArrayList&lt;&gt;(1);<a 
name="line.274"></a>
+<span class="sourceLineNo">275</span>    }<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    list.add(new KeyValue(this.row, 
family, qualifier, timestamp,<a name="line.276"></a>
+<span class="sourceLineNo">277</span>        KeyValue.Type.DeleteColumn));<a 
name="line.277"></a>
+<span class="sourceLineNo">278</span>    familyMap.put(family, list);<a 
name="line.278"></a>
+<span class="sourceLineNo">279</span>    return this;<a name="line.279"></a>
+<span class="sourceLineNo">280</span>  }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span>  /**<a name="line.282"></a>
+<span class="sourceLineNo">283</span>   * Delete the latest version of the 
specified column.<a name="line.283"></a>
+<span class="sourceLineNo">284</span>   * This is an expensive call in that on 
the server-side, it first does a<a name="line.284"></a>
+<span class="sourceLineNo">285</span>   * get to find the latest versions 
timestamp.  Then it adds a delete using<a name="line.285"></a>
+<span class="sourceLineNo">286</span>   * the fetched cells timestamp.<a 
name="line.286"></a>
+<span class="sourceLineNo">287</span>   * @param family family name<a 
name="line.287"></a>
+<span class="sourceLineNo">288</span>   * @param qualifier column qualifier<a 
name="line.288"></a>
+<span class="sourceLineNo">289</span>   * @return this for invocation 
chaining<a name="line.289"></a>
+<span class="sourceLineNo">290</span>   */<a name="line.290"></a>
+<span class="sourceLineNo">291</span>  public Delete addColumn(final byte [] 
family, final byte [] qualifier) {<a name="line.291"></a>
+<span class="sourceLineNo">292</span>    this.addColumn(family, qualifier, 
this.ts);<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    return this;<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>  /**<a name="line.296"></a>
+<span class="sourceLineNo">297</span>   * Delete the specified version of the 
specified column.<a name="line.297"></a>
+<span class="sourceLineNo">298</span>   * @param family family name<a 
name="line.298"></a>
+<span class="sourceLineNo">299</span>   * @param qualifier column qualifier<a 
name="line.299"></a>
+<span class="sourceLineNo">300</span>   * @param timestamp version timestamp<a 
name="line.300"></a>
+<span class="sourceLineNo">301</span>   * @return this for invocation 
chaining<a name="line.301"></a>
+<span class="sourceLineNo">302</span>   */<a name="line.302"></a>
+<span class="sourceLineNo">303</span>  public Delete addColumn(byte [] family, 
byte [] qualifier, long timestamp) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    if (timestamp &lt; 0) {<a 
name="line.304"></a>
+<span class="sourceLineNo">305</span>      throw new 
IllegalArgumentException("Timestamp cannot be negative. ts=" + timestamp);<a 
name="line.305"></a>
+<span class="sourceLineNo">306</span>    }<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    List&lt;Cell&gt; list = 
familyMap.get(family);<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    if(list == null) {<a 
name="line.308"></a>
+<span class="sourceLineNo">309</span>      list = new ArrayList&lt;&gt;(1);<a 
name="line.309"></a>
+<span class="sourceLineNo">310</span>    }<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    KeyValue kv = new KeyValue(this.row, 
family, qualifier, timestamp, KeyValue.Type.Delete);<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    list.add(kv);<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    familyMap.put(family, list);<a 
name="line.313"></a>
+<span class="sourceLineNo">314</span>    return this;<a name="line.314"></a>
+<span class="sourceLineNo">315</span>  }<a name="line.315"></a>
+<span class="sourceLineNo">316</span><a name="line.316"></a>
+<span class="sourceLineNo">317</span>  /**<a name="line.317"></a>
+<span class="sourceLineNo">318</span>   * Set the timestamp of the delete.<a 
name="line.318"></a>
+<span class="sourceLineNo">319</span>   *<a name="line.319"></a>
+<span class="sourceLineNo">320</span>   * @param timestamp<a 
name="line.320"></a>
+<span class="sourceLineNo">321</span>   */<a name="line.321"></a>
+<span class="sourceLineNo">322</span>  public Delete setTimestamp(long 
timestamp) {<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    if (timestamp &lt; 0) {<a 
name="line.323"></a>
+<span class="sourceLineNo">324</span>      throw new 
IllegalArgumentException("Timestamp cannot be negative. ts=" + timestamp);<a 
name="line.324"></a>
+<span class="sourceLineNo">325</span>    }<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    this.ts = timestamp;<a 
name="line.326"></a>
+<span class="sourceLineNo">327</span>    return this;<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 Map&lt;String, Object&gt; 
toMap(int maxCols) {<a name="line.331"></a>
+<span class="sourceLineNo">332</span>    // we start with the fingerprint map 
and build on top of it.<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    Map&lt;String, Object&gt; map = 
super.toMap(maxCols);<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    // why is put not doing this?<a 
name="line.334"></a>
+<span class="sourceLineNo">335</span>    map.put("ts", this.ts);<a 
name="line.335"></a>
+<span class="sourceLineNo">336</span>    return map;<a name="line.336"></a>
 <span class="sourceLineNo">337</span>  }<a name="line.337"></a>
 <span class="sourceLineNo">338</span><a name="line.338"></a>
 <span class="sourceLineNo">339</span>  @Override<a name="line.339"></a>
-<span class="sourceLineNo">340</span>  public Delete setDurability(Durability 
d) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span>    return (Delete) 
super.setDurability(d);<a name="line.341"></a>
+<span class="sourceLineNo">340</span>  public Delete setAttribute(String name, 
byte[] value) {<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    return (Delete) 
super.setAttribute(name, value);<a name="line.341"></a>
 <span class="sourceLineNo">342</span>  }<a name="line.342"></a>
 <span class="sourceLineNo">343</span><a name="line.343"></a>
 <span class="sourceLineNo">344</span>  @Override<a name="line.344"></a>
-<span class="sourceLineNo">345</span>  public Delete 
setFamilyCellMap(NavigableMap&lt;byte[], List&lt;Cell&gt;&gt; map) {<a 
name="line.345"></a>
-<span class="sourceLineNo">346</span>    return (Delete) 
super.setFamilyCellMap(map);<a name="line.346"></a>
+<span class="sourceLineNo">345</span>  public Delete setId(String id) {<a 
name="line.345"></a>
+<span class="sourceLineNo">346</span>    return (Delete) super.setId(id);<a 
name="line.346"></a>
 <span class="sourceLineNo">347</span>  }<a name="line.347"></a>
 <span class="sourceLineNo">348</span><a name="line.348"></a>
 <span class="sourceLineNo">349</span>  @Override<a name="line.349"></a>
-<span class="sourceLineNo">350</span>  public Delete 
setClusterIds(List&lt;UUID&gt; clusterIds) {<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    return (Delete) 
super.setClusterIds(clusterIds);<a name="line.351"></a>
+<span class="sourceLineNo">350</span>  public Delete setDurability(Durability 
d) {<a name="line.350"></a>
+<span class="sourceLineNo">351</span>    return (Delete) 
super.setDurability(d);<a name="line.351"></a>
 <span class="sourceLineNo">352</span>  }<a name="line.352"></a>
 <span class="sourceLineNo">353</span><a name="line.353"></a>
 <span class="sourceLineNo">354</span>  @Override<a name="line.354"></a>
-<span class="sourceLineNo">355</span>  public Delete 
setCellVisibility(CellVisibility expression) {<a name="line.355"></a>
-<span class="sourceLineNo">356</span>    return (Delete) 
super.setCellVisibility(expression);<a name="line.356"></a>
+<span class="sourceLineNo">355</span>  public Delete 
setFamilyCellMap(NavigableMap&lt;byte[], List&lt;Cell&gt;&gt; map) {<a 
name="line.355"></a>
+<span class="sourceLineNo">356</span>    return (Delete) 
super.setFamilyCellMap(map);<a name="line.356"></a>
 <span class="sourceLineNo">357</span>  }<a name="line.357"></a>
 <span class="sourceLineNo">358</span><a name="line.358"></a>
 <span class="sourceLineNo">359</span>  @Override<a name="line.359"></a>
-<span class="sourceLineNo">360</span>  public Delete setACL(String user, 
Permission perms) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>    return (Delete) super.setACL(user, 
perms);<a name="line.361"></a>
+<span class="sourceLineNo">360</span>  public Delete 
setClusterIds(List&lt;UUID&gt; clusterIds) {<a name="line.360"></a>
+<span class="sourceLineNo">361</span>    return (Delete) 
super.setClusterIds(clusterIds);<a name="line.361"></a>
 <span class="sourceLineNo">362</span>  }<a name="line.362"></a>
 <span class="sourceLineNo">363</span><a name="line.363"></a>
 <span class="sourceLineNo">364</span>  @Override<a name="line.364"></a>
-<span class="sourceLineNo">365</span>  public Delete setACL(Map&lt;String, 
Permission&gt; perms) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span>    return (Delete) 
super.setACL(perms);<a name="line.366"></a>
+<span class="sourceLineNo">365</span>  public Delete 
setCellVisibility(CellVisibility expression) {<a name="line.365"></a>
+<span class="sourceLineNo">366</span>    return (Delete) 
super.setCellVisibility(expression);<a name="line.366"></a>
 <span class="sourceLineNo">367</span>  }<a name="line.367"></a>
 <span class="sourceLineNo">368</span><a name="line.368"></a>
 <span class="sourceLineNo">369</span>  @Override<a name="line.369"></a>
-<span class="sourceLineNo">370</span>  public Delete setTTL(long ttl) {<a 
name="line.370"></a>
-<span class="sourceLineNo">371</span>    throw new 
UnsupportedOperationException("Setting TTLs on Deletes is not supported");<a 
name="line.371"></a>
+<span class="sourceLineNo">370</span>  public Delete setACL(String user, 
Permission perms) {<a name="line.370"></a>
+<span class="sourceLineNo">371</span>    return (Delete) super.setACL(user, 
perms);<a name="line.371"></a>
 <span class="sourceLineNo">372</span>  }<a name="line.372"></a>
 <span class="sourceLineNo">373</span><a name="line.373"></a>
 <span class="sourceLineNo">374</span>  @Override<a name="line.374"></a>
-<span class="sourceLineNo">375</span>  public Delete setPriority(int priority) 
{<a name="line.375"></a>
-<span class="sourceLineNo">376</span>    return (Delete) 
super.setPriority(priority);<a name="line.376"></a>
+<span class="sourceLineNo">375</span>  public Delete setACL(Map&lt;String, 
Permission&gt; perms) {<a name="line.375"></a>
+<span class="sourceLineNo">376</span>    return (Delete) 
super.setACL(perms);<a name="line.376"></a>
 <span class="sourceLineNo">377</span>  }<a name="line.377"></a>
-<span class="sourceLineNo">378</span>}<a name="line.378"></a>
+<span class="sourceLineNo">378</span><a name="line.378"></a>
+<span class="sourceLineNo">379</span>  @Override<a name="line.379"></a>
+<span class="sourceLineNo">380</span>  public Delete setTTL(long ttl) {<a 
name="line.380"></a>
+<span class="sourceLineNo">381</span>    throw new 
UnsupportedOperationException("Setting TTLs on Deletes is not supported");<a 
name="line.381"></a>
+<span class="sourceLineNo">382</span>  }<a name="line.382"></a>
+<span class="sourceLineNo">383</span><a name="line.383"></a>
+<span class="sourceLineNo">384</span>  @Override<a name="line.384"></a>
+<span class="sourceLineNo">385</span>  public Delete setPriority(int priority) 
{<a name="line.385"></a>
+<span class="sourceLineNo">386</span>    return (Delete) 
super.setPriority(priority);<a name="line.386"></a>
+<span class="sourceLineNo">387</span>  }<a name="line.387"></a>
+<span class="sourceLineNo">388</span>}<a name="line.388"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/2aec596e/apidocs/src-html/org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.html
 
b/apidocs/src-html/org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.html
index 07d8428..9503913 100644
--- 
a/apidocs/src-html/org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.html
+++ 
b/apidocs/src-html/org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.html
@@ -119,10 +119,10 @@
 <span class="sourceLineNo">111</span>    Set&lt;String&gt; uniqAddr = new 
HashSet&lt;&gt;();<a name="line.111"></a>
 <span class="sourceLineNo">112</span>    uniqAddr.addAll(hostnamePort);<a 
name="line.112"></a>
 <span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span>    for(String addr : uniqAddr) {<a 
name="line.114"></a>
+<span class="sourceLineNo">114</span>    for (String addr : uniqAddr) {<a 
name="line.114"></a>
 <span class="sourceLineNo">115</span>      addrs.append(addr).append(", ");<a 
name="line.115"></a>
 <span class="sourceLineNo">116</span>    }<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    return addrs.toString();<a 
name="line.117"></a>
+<span class="sourceLineNo">117</span>    return uniqAddr.isEmpty() ? 
addrs.toString() : addrs.substring(0, addrs.length() - 2);<a 
name="line.117"></a>
 <span class="sourceLineNo">118</span>  }<a name="line.118"></a>
 <span class="sourceLineNo">119</span><a name="line.119"></a>
 <span class="sourceLineNo">120</span>  public String 
getExhaustiveDescription() {<a name="line.120"></a>

Reply via email to