You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2015/11/22 23:40:12 UTC
[02/51] [partial] hbase git commit: Published site at
86be690b0723e814a655ad0ae8a6577d7111c1f2.
http://git-wip-us.apache.org/repos/asf/hbase/blob/155d5cd0/devapidocs/src-html/org/apache/hadoop/hbase/security/visibility/VisibilityScanDeleteTracker.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/security/visibility/VisibilityScanDeleteTracker.html b/devapidocs/src-html/org/apache/hadoop/hbase/security/visibility/VisibilityScanDeleteTracker.html
index 2df1bb3..321be6a 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/security/visibility/VisibilityScanDeleteTracker.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/security/visibility/VisibilityScanDeleteTracker.html
@@ -124,124 +124,124 @@
<span class="sourceLineNo">116</span> // If tag is present in the delete<a name="line.116"></a>
<span class="sourceLineNo">117</span> boolean hasVisTag = false;<a name="line.117"></a>
<span class="sourceLineNo">118</span> if (delCell.getTagsLength() > 0) {<a name="line.118"></a>
-<span class="sourceLineNo">119</span> switch (type) {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> case DeleteFamily:<a name="line.120"></a>
-<span class="sourceLineNo">121</span> List<Tag> delTags = new ArrayList<Tag>();<a name="line.121"></a>
-<span class="sourceLineNo">122</span> if (visibilityTagsDeleteFamily != null) {<a name="line.122"></a>
-<span class="sourceLineNo">123</span> Byte deleteCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(delCell, delTags);<a name="line.123"></a>
-<span class="sourceLineNo">124</span> if (!delTags.isEmpty()) {<a name="line.124"></a>
-<span class="sourceLineNo">125</span> visibilityTagsDeleteFamily.add(new Triple<List<Tag>, Byte, Long>(<a name="line.125"></a>
-<span class="sourceLineNo">126</span> delTags, deleteCellVisTagsFormat, delCell.getTimestamp()));<a name="line.126"></a>
-<span class="sourceLineNo">127</span> hasVisTag = true;<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> break;<a name="line.130"></a>
-<span class="sourceLineNo">131</span> case DeleteFamilyVersion:<a name="line.131"></a>
-<span class="sourceLineNo">132</span> delTags = new ArrayList<Tag>();<a name="line.132"></a>
-<span class="sourceLineNo">133</span> Byte deleteCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(delCell, delTags);<a name="line.133"></a>
-<span class="sourceLineNo">134</span> if (!delTags.isEmpty()) {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> visibilityTagsDeleteFamilyVersion.add(new Triple<List<Tag>, Byte, Long>(delTags,<a name="line.135"></a>
-<span class="sourceLineNo">136</span> deleteCellVisTagsFormat, delCell.getTimestamp()));<a name="line.136"></a>
-<span class="sourceLineNo">137</span> hasVisTag = true;<a name="line.137"></a>
-<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span> break;<a name="line.139"></a>
-<span class="sourceLineNo">140</span> case DeleteColumn:<a name="line.140"></a>
-<span class="sourceLineNo">141</span> if (visibilityTagsDeleteColumns == null) {<a name="line.141"></a>
-<span class="sourceLineNo">142</span> visibilityTagsDeleteColumns = new ArrayList<Pair<List<Tag>, Byte>>();<a name="line.142"></a>
+<span class="sourceLineNo">119</span> Byte deleteCellVisTagsFormat = null;<a name="line.119"></a>
+<span class="sourceLineNo">120</span> switch (type) {<a name="line.120"></a>
+<span class="sourceLineNo">121</span> case DeleteFamily:<a name="line.121"></a>
+<span class="sourceLineNo">122</span> List<Tag> delTags = new ArrayList<Tag>();<a name="line.122"></a>
+<span class="sourceLineNo">123</span> if (visibilityTagsDeleteFamily == null) {<a name="line.123"></a>
+<span class="sourceLineNo">124</span> visibilityTagsDeleteFamily = new ArrayList<Triple<List<Tag>, Byte, Long>>();<a name="line.124"></a>
+<span class="sourceLineNo">125</span> }<a name="line.125"></a>
+<span class="sourceLineNo">126</span> deleteCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(delCell, delTags);<a name="line.126"></a>
+<span class="sourceLineNo">127</span> if (!delTags.isEmpty()) {<a name="line.127"></a>
+<span class="sourceLineNo">128</span> visibilityTagsDeleteFamily.add(new Triple<List<Tag>, Byte, Long>(delTags,<a name="line.128"></a>
+<span class="sourceLineNo">129</span> deleteCellVisTagsFormat, delCell.getTimestamp()));<a name="line.129"></a>
+<span class="sourceLineNo">130</span> hasVisTag = true;<a name="line.130"></a>
+<span class="sourceLineNo">131</span> }<a name="line.131"></a>
+<span class="sourceLineNo">132</span> break;<a name="line.132"></a>
+<span class="sourceLineNo">133</span> case DeleteFamilyVersion:<a name="line.133"></a>
+<span class="sourceLineNo">134</span> if(visibilityTagsDeleteFamilyVersion == null) {<a name="line.134"></a>
+<span class="sourceLineNo">135</span> visibilityTagsDeleteFamilyVersion = new ArrayList<Triple<List<Tag>, Byte, Long>>();<a name="line.135"></a>
+<span class="sourceLineNo">136</span> }<a name="line.136"></a>
+<span class="sourceLineNo">137</span> delTags = new ArrayList<Tag>();<a name="line.137"></a>
+<span class="sourceLineNo">138</span> deleteCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(delCell, delTags);<a name="line.138"></a>
+<span class="sourceLineNo">139</span> if (!delTags.isEmpty()) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span> visibilityTagsDeleteFamilyVersion.add(new Triple<List<Tag>, Byte, Long>(delTags,<a name="line.140"></a>
+<span class="sourceLineNo">141</span> deleteCellVisTagsFormat, delCell.getTimestamp()));<a name="line.141"></a>
+<span class="sourceLineNo">142</span> hasVisTag = true;<a name="line.142"></a>
<span class="sourceLineNo">143</span> }<a name="line.143"></a>
-<span class="sourceLineNo">144</span> delTags = new ArrayList<Tag>();<a name="line.144"></a>
-<span class="sourceLineNo">145</span> deleteCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(delCell, delTags);<a name="line.145"></a>
-<span class="sourceLineNo">146</span> if (!delTags.isEmpty()) {<a name="line.146"></a>
-<span class="sourceLineNo">147</span> visibilityTagsDeleteColumns.add(new Pair<List<Tag>, Byte>(delTags,<a name="line.147"></a>
-<span class="sourceLineNo">148</span> deleteCellVisTagsFormat));<a name="line.148"></a>
-<span class="sourceLineNo">149</span> hasVisTag = true;<a name="line.149"></a>
-<span class="sourceLineNo">150</span> }<a name="line.150"></a>
-<span class="sourceLineNo">151</span> break;<a name="line.151"></a>
-<span class="sourceLineNo">152</span> case Delete:<a name="line.152"></a>
-<span class="sourceLineNo">153</span> if (visiblityTagsDeleteColumnVersion == null) {<a name="line.153"></a>
-<span class="sourceLineNo">154</span> visiblityTagsDeleteColumnVersion = new ArrayList<Pair<List<Tag>, Byte>>();<a name="line.154"></a>
+<span class="sourceLineNo">144</span> break;<a name="line.144"></a>
+<span class="sourceLineNo">145</span> case DeleteColumn:<a name="line.145"></a>
+<span class="sourceLineNo">146</span> if (visibilityTagsDeleteColumns == null) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span> visibilityTagsDeleteColumns = new ArrayList<Pair<List<Tag>, Byte>>();<a name="line.147"></a>
+<span class="sourceLineNo">148</span> }<a name="line.148"></a>
+<span class="sourceLineNo">149</span> delTags = new ArrayList<Tag>();<a name="line.149"></a>
+<span class="sourceLineNo">150</span> deleteCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(delCell, delTags);<a name="line.150"></a>
+<span class="sourceLineNo">151</span> if (!delTags.isEmpty()) {<a name="line.151"></a>
+<span class="sourceLineNo">152</span> visibilityTagsDeleteColumns.add(new Pair<List<Tag>, Byte>(delTags,<a name="line.152"></a>
+<span class="sourceLineNo">153</span> deleteCellVisTagsFormat));<a name="line.153"></a>
+<span class="sourceLineNo">154</span> hasVisTag = true;<a name="line.154"></a>
<span class="sourceLineNo">155</span> }<a name="line.155"></a>
-<span class="sourceLineNo">156</span> delTags = new ArrayList<Tag>();<a name="line.156"></a>
-<span class="sourceLineNo">157</span> deleteCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(delCell, delTags);<a name="line.157"></a>
-<span class="sourceLineNo">158</span> if (!delTags.isEmpty()) {<a name="line.158"></a>
-<span class="sourceLineNo">159</span> visiblityTagsDeleteColumnVersion.add(new Pair<List<Tag>, Byte>(delTags,<a name="line.159"></a>
-<span class="sourceLineNo">160</span> deleteCellVisTagsFormat));<a name="line.160"></a>
-<span class="sourceLineNo">161</span> hasVisTag = true;<a name="line.161"></a>
-<span class="sourceLineNo">162</span> }<a name="line.162"></a>
-<span class="sourceLineNo">163</span> break;<a name="line.163"></a>
-<span class="sourceLineNo">164</span> default:<a name="line.164"></a>
-<span class="sourceLineNo">165</span> throw new IllegalArgumentException("Invalid delete type");<a name="line.165"></a>
-<span class="sourceLineNo">166</span> }<a name="line.166"></a>
-<span class="sourceLineNo">167</span> } else {<a name="line.167"></a>
-<span class="sourceLineNo">168</span> switch (type) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span> case DeleteFamily:<a name="line.169"></a>
-<span class="sourceLineNo">170</span> visibilityTagsDeleteFamily = null;<a name="line.170"></a>
-<span class="sourceLineNo">171</span> break;<a name="line.171"></a>
-<span class="sourceLineNo">172</span> case DeleteFamilyVersion:<a name="line.172"></a>
-<span class="sourceLineNo">173</span> visibilityTagsDeleteFamilyVersion = null;<a name="line.173"></a>
-<span class="sourceLineNo">174</span> break;<a name="line.174"></a>
-<span class="sourceLineNo">175</span> case DeleteColumn:<a name="line.175"></a>
-<span class="sourceLineNo">176</span> visibilityTagsDeleteColumns = null;<a name="line.176"></a>
-<span class="sourceLineNo">177</span> break;<a name="line.177"></a>
-<span class="sourceLineNo">178</span> case Delete:<a name="line.178"></a>
-<span class="sourceLineNo">179</span> visiblityTagsDeleteColumnVersion = null;<a name="line.179"></a>
-<span class="sourceLineNo">180</span> break;<a name="line.180"></a>
-<span class="sourceLineNo">181</span> default:<a name="line.181"></a>
-<span class="sourceLineNo">182</span> throw new IllegalArgumentException("Invalid delete type");<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> return hasVisTag;<a name="line.185"></a>
-<span class="sourceLineNo">186</span> }<a name="line.186"></a>
-<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span> @Override<a name="line.188"></a>
-<span class="sourceLineNo">189</span> public DeleteResult isDeleted(Cell cell) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> long timestamp = cell.getTimestamp();<a name="line.190"></a>
-<span class="sourceLineNo">191</span> try {<a name="line.191"></a>
-<span class="sourceLineNo">192</span> if (hasFamilyStamp) {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> if (visibilityTagsDeleteFamily != null) {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> for (int i = 0; i < visibilityTagsDeleteFamily.size(); i++) {<a name="line.194"></a>
-<span class="sourceLineNo">195</span> // visibilityTagsDeleteFamily is ArrayList<a name="line.195"></a>
-<span class="sourceLineNo">196</span> Triple<List<Tag>, Byte, Long> triple = visibilityTagsDeleteFamily.get(i);<a name="line.196"></a>
-<span class="sourceLineNo">197</span> if (timestamp <= triple.getThird()) {<a name="line.197"></a>
-<span class="sourceLineNo">198</span> List<Tag> putVisTags = new ArrayList<Tag>();<a name="line.198"></a>
-<span class="sourceLineNo">199</span> Byte putCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(cell, putVisTags);<a name="line.199"></a>
-<span class="sourceLineNo">200</span> boolean matchFound = VisibilityLabelServiceManager<a name="line.200"></a>
-<span class="sourceLineNo">201</span> .getInstance()<a name="line.201"></a>
-<span class="sourceLineNo">202</span> .getVisibilityLabelService()<a name="line.202"></a>
-<span class="sourceLineNo">203</span> .matchVisibility(putVisTags, putCellVisTagsFormat, triple.getFirst(),<a name="line.203"></a>
-<span class="sourceLineNo">204</span> triple.getSecond());<a name="line.204"></a>
-<span class="sourceLineNo">205</span> if (matchFound) {<a name="line.205"></a>
-<span class="sourceLineNo">206</span> // A return type of FAMILY_DELETED will cause skip for all remaining cells from this<a name="line.206"></a>
-<span class="sourceLineNo">207</span> // family. We would like to match visibility expression on every put cells after<a name="line.207"></a>
-<span class="sourceLineNo">208</span> // this and only remove those matching with the family delete visibility. So we are<a name="line.208"></a>
-<span class="sourceLineNo">209</span> // returning FAMILY_VERSION_DELETED from here.<a name="line.209"></a>
-<span class="sourceLineNo">210</span> return DeleteResult.FAMILY_VERSION_DELETED;<a name="line.210"></a>
-<span class="sourceLineNo">211</span> }<a name="line.211"></a>
-<span class="sourceLineNo">212</span> }<a name="line.212"></a>
+<span class="sourceLineNo">156</span> break;<a name="line.156"></a>
+<span class="sourceLineNo">157</span> case Delete:<a name="line.157"></a>
+<span class="sourceLineNo">158</span> if (visiblityTagsDeleteColumnVersion == null) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> visiblityTagsDeleteColumnVersion = new ArrayList<Pair<List<Tag>, Byte>>();<a name="line.159"></a>
+<span class="sourceLineNo">160</span> }<a name="line.160"></a>
+<span class="sourceLineNo">161</span> delTags = new ArrayList<Tag>();<a name="line.161"></a>
+<span class="sourceLineNo">162</span> deleteCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(delCell, delTags);<a name="line.162"></a>
+<span class="sourceLineNo">163</span> if (!delTags.isEmpty()) {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> visiblityTagsDeleteColumnVersion.add(new Pair<List<Tag>, Byte>(delTags,<a name="line.164"></a>
+<span class="sourceLineNo">165</span> deleteCellVisTagsFormat));<a name="line.165"></a>
+<span class="sourceLineNo">166</span> hasVisTag = true;<a name="line.166"></a>
+<span class="sourceLineNo">167</span> }<a name="line.167"></a>
+<span class="sourceLineNo">168</span> break;<a name="line.168"></a>
+<span class="sourceLineNo">169</span> default:<a name="line.169"></a>
+<span class="sourceLineNo">170</span> throw new IllegalArgumentException("Invalid delete type");<a name="line.170"></a>
+<span class="sourceLineNo">171</span> }<a name="line.171"></a>
+<span class="sourceLineNo">172</span> }<a name="line.172"></a>
+<span class="sourceLineNo">173</span> return hasVisTag;<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> @Override<a name="line.176"></a>
+<span class="sourceLineNo">177</span> public DeleteResult isDeleted(Cell cell) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span> long timestamp = cell.getTimestamp();<a name="line.178"></a>
+<span class="sourceLineNo">179</span> try {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> if (hasFamilyStamp) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> if (visibilityTagsDeleteFamily != null) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span> if (!visibilityTagsDeleteFamily.isEmpty()) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> for (int i = 0; i < visibilityTagsDeleteFamily.size(); i++) {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> // visibilityTagsDeleteFamily is ArrayList<a name="line.184"></a>
+<span class="sourceLineNo">185</span> Triple<List<Tag>, Byte, Long> triple = visibilityTagsDeleteFamily.get(i);<a name="line.185"></a>
+<span class="sourceLineNo">186</span> if (timestamp <= triple.getThird()) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span> List<Tag> putVisTags = new ArrayList<Tag>();<a name="line.187"></a>
+<span class="sourceLineNo">188</span> Byte putCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(cell, putVisTags);<a name="line.188"></a>
+<span class="sourceLineNo">189</span> boolean matchFound = VisibilityLabelServiceManager.getInstance()<a name="line.189"></a>
+<span class="sourceLineNo">190</span> .getVisibilityLabelService().matchVisibility(putVisTags, putCellVisTagsFormat,<a name="line.190"></a>
+<span class="sourceLineNo">191</span> triple.getFirst(), triple.getSecond());<a name="line.191"></a>
+<span class="sourceLineNo">192</span> if (matchFound) {<a name="line.192"></a>
+<span class="sourceLineNo">193</span> // A return type of FAMILY_DELETED will cause skip for all remaining cells from<a name="line.193"></a>
+<span class="sourceLineNo">194</span> // this<a name="line.194"></a>
+<span class="sourceLineNo">195</span> // family. We would like to match visibility expression on every put cells after<a name="line.195"></a>
+<span class="sourceLineNo">196</span> // this and only remove those matching with the family delete visibility. So we<a name="line.196"></a>
+<span class="sourceLineNo">197</span> // are<a name="line.197"></a>
+<span class="sourceLineNo">198</span> // returning FAMILY_VERSION_DELETED from here.<a name="line.198"></a>
+<span class="sourceLineNo">199</span> return DeleteResult.FAMILY_VERSION_DELETED;<a name="line.199"></a>
+<span class="sourceLineNo">200</span> }<a name="line.200"></a>
+<span class="sourceLineNo">201</span> }<a name="line.201"></a>
+<span class="sourceLineNo">202</span> }<a name="line.202"></a>
+<span class="sourceLineNo">203</span> } else {<a name="line.203"></a>
+<span class="sourceLineNo">204</span> if (!VisibilityUtils.isVisibilityTagsPresent(cell) && timestamp <= familyStamp) {<a name="line.204"></a>
+<span class="sourceLineNo">205</span> // No tags<a name="line.205"></a>
+<span class="sourceLineNo">206</span> return DeleteResult.FAMILY_VERSION_DELETED;<a name="line.206"></a>
+<span class="sourceLineNo">207</span> }<a name="line.207"></a>
+<span class="sourceLineNo">208</span> }<a name="line.208"></a>
+<span class="sourceLineNo">209</span> } else {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> if (!VisibilityUtils.isVisibilityTagsPresent(cell) && timestamp <= familyStamp) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> // No tags<a name="line.211"></a>
+<span class="sourceLineNo">212</span> return DeleteResult.FAMILY_VERSION_DELETED;<a name="line.212"></a>
<span class="sourceLineNo">213</span> }<a name="line.213"></a>
-<span class="sourceLineNo">214</span> } else {<a name="line.214"></a>
-<span class="sourceLineNo">215</span> if (!VisibilityUtils.isVisibilityTagsPresent(cell) && timestamp<=familyStamp) {<a name="line.215"></a>
-<span class="sourceLineNo">216</span> // No tags<a name="line.216"></a>
-<span class="sourceLineNo">217</span> return DeleteResult.FAMILY_VERSION_DELETED;<a name="line.217"></a>
-<span class="sourceLineNo">218</span> }<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> if (familyVersionStamps.contains(Long.valueOf(timestamp))) {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> if (visibilityTagsDeleteFamilyVersion != null) {<a name="line.222"></a>
-<span class="sourceLineNo">223</span> for (int i = 0; i < visibilityTagsDeleteFamilyVersion.size(); i++) {<a name="line.223"></a>
-<span class="sourceLineNo">224</span> // visibilityTagsDeleteFamilyVersion is ArrayList<a name="line.224"></a>
-<span class="sourceLineNo">225</span> Triple<List<Tag>, Byte, Long> triple = visibilityTagsDeleteFamilyVersion.get(i);<a name="line.225"></a>
-<span class="sourceLineNo">226</span> if (timestamp == triple.getThird()) {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> List<Tag> putVisTags = new ArrayList<Tag>();<a name="line.227"></a>
-<span class="sourceLineNo">228</span> Byte putCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(cell, putVisTags);<a name="line.228"></a>
-<span class="sourceLineNo">229</span> boolean matchFound = VisibilityLabelServiceManager<a name="line.229"></a>
-<span class="sourceLineNo">230</span> .getInstance()<a name="line.230"></a>
-<span class="sourceLineNo">231</span> .getVisibilityLabelService()<a name="line.231"></a>
-<span class="sourceLineNo">232</span> .matchVisibility(putVisTags, putCellVisTagsFormat, triple.getFirst(),<a name="line.232"></a>
-<span class="sourceLineNo">233</span> triple.getSecond());<a name="line.233"></a>
-<span class="sourceLineNo">234</span> if (matchFound) {<a name="line.234"></a>
-<span class="sourceLineNo">235</span> return DeleteResult.FAMILY_VERSION_DELETED;<a name="line.235"></a>
-<span class="sourceLineNo">236</span> }<a name="line.236"></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> if (familyVersionStamps.contains(Long.valueOf(timestamp))) {<a name="line.216"></a>
+<span class="sourceLineNo">217</span> if (visibilityTagsDeleteFamilyVersion != null) {<a name="line.217"></a>
+<span class="sourceLineNo">218</span> if (!visibilityTagsDeleteFamilyVersion.isEmpty()) {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> for (int i = 0; i < visibilityTagsDeleteFamilyVersion.size(); i++) {<a name="line.219"></a>
+<span class="sourceLineNo">220</span> // visibilityTagsDeleteFamilyVersion is ArrayList<a name="line.220"></a>
+<span class="sourceLineNo">221</span> Triple<List<Tag>, Byte, Long> triple = visibilityTagsDeleteFamilyVersion.get(i);<a name="line.221"></a>
+<span class="sourceLineNo">222</span> if (timestamp == triple.getThird()) {<a name="line.222"></a>
+<span class="sourceLineNo">223</span> List<Tag> putVisTags = new ArrayList<Tag>();<a name="line.223"></a>
+<span class="sourceLineNo">224</span> Byte putCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(cell, putVisTags);<a name="line.224"></a>
+<span class="sourceLineNo">225</span> boolean matchFound = VisibilityLabelServiceManager.getInstance()<a name="line.225"></a>
+<span class="sourceLineNo">226</span> .getVisibilityLabelService().matchVisibility(putVisTags, putCellVisTagsFormat,<a name="line.226"></a>
+<span class="sourceLineNo">227</span> triple.getFirst(), triple.getSecond());<a name="line.227"></a>
+<span class="sourceLineNo">228</span> if (matchFound) {<a name="line.228"></a>
+<span class="sourceLineNo">229</span> return DeleteResult.FAMILY_VERSION_DELETED;<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> }<a name="line.232"></a>
+<span class="sourceLineNo">233</span> } else {<a name="line.233"></a>
+<span class="sourceLineNo">234</span> if (!VisibilityUtils.isVisibilityTagsPresent(cell)) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> // No tags<a name="line.235"></a>
+<span class="sourceLineNo">236</span> return DeleteResult.FAMILY_VERSION_DELETED;<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> } else {<a name="line.239"></a>
@@ -256,76 +256,90 @@
<span class="sourceLineNo">248</span> if (ret == 0) {<a name="line.248"></a>
<span class="sourceLineNo">249</span> if (deleteType == KeyValue.Type.DeleteColumn.getCode()) {<a name="line.249"></a>
<span class="sourceLineNo">250</span> if (visibilityTagsDeleteColumns != null) {<a name="line.250"></a>
-<span class="sourceLineNo">251</span> for (Pair<List<Tag>, Byte> tags : visibilityTagsDeleteColumns) {<a name="line.251"></a>
-<span class="sourceLineNo">252</span> List<Tag> putVisTags = new ArrayList<Tag>();<a name="line.252"></a>
-<span class="sourceLineNo">253</span> Byte putCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(cell, putVisTags);<a name="line.253"></a>
-<span class="sourceLineNo">254</span> boolean matchFound = VisibilityLabelServiceManager<a name="line.254"></a>
-<span class="sourceLineNo">255</span> .getInstance()<a name="line.255"></a>
-<span class="sourceLineNo">256</span> .getVisibilityLabelService()<a name="line.256"></a>
-<span class="sourceLineNo">257</span> .matchVisibility(putVisTags, putCellVisTagsFormat, tags.getFirst(),<a name="line.257"></a>
-<span class="sourceLineNo">258</span> tags.getSecond());<a name="line.258"></a>
-<span class="sourceLineNo">259</span> if (matchFound) {<a name="line.259"></a>
-<span class="sourceLineNo">260</span> return DeleteResult.VERSION_DELETED;<a name="line.260"></a>
-<span class="sourceLineNo">261</span> }<a name="line.261"></a>
-<span class="sourceLineNo">262</span> }<a name="line.262"></a>
-<span class="sourceLineNo">263</span> } else {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> if (!VisibilityUtils.isVisibilityTagsPresent(cell)) {<a name="line.264"></a>
-<span class="sourceLineNo">265</span> // No tags<a name="line.265"></a>
-<span class="sourceLineNo">266</span> return DeleteResult.VERSION_DELETED;<a name="line.266"></a>
-<span class="sourceLineNo">267</span> }<a name="line.267"></a>
-<span class="sourceLineNo">268</span> }<a name="line.268"></a>
-<span class="sourceLineNo">269</span> }<a name="line.269"></a>
-<span class="sourceLineNo">270</span> // Delete (aka DeleteVersion)<a name="line.270"></a>
-<span class="sourceLineNo">271</span> // If the timestamp is the same, keep this one<a name="line.271"></a>
-<span class="sourceLineNo">272</span> if (timestamp == deleteTimestamp) {<a name="line.272"></a>
-<span class="sourceLineNo">273</span> if (visiblityTagsDeleteColumnVersion != null) {<a name="line.273"></a>
-<span class="sourceLineNo">274</span> for (Pair<List<Tag>, Byte> tags : visiblityTagsDeleteColumnVersion) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> List<Tag> putVisTags = new ArrayList<Tag>();<a name="line.275"></a>
-<span class="sourceLineNo">276</span> Byte putCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(cell, putVisTags);<a name="line.276"></a>
-<span class="sourceLineNo">277</span> boolean matchFound = VisibilityLabelServiceManager<a name="line.277"></a>
-<span class="sourceLineNo">278</span> .getInstance()<a name="line.278"></a>
-<span class="sourceLineNo">279</span> .getVisibilityLabelService()<a name="line.279"></a>
-<span class="sourceLineNo">280</span> .matchVisibility(putVisTags, putCellVisTagsFormat, tags.getFirst(),<a name="line.280"></a>
-<span class="sourceLineNo">281</span> tags.getSecond());<a name="line.281"></a>
-<span class="sourceLineNo">282</span> if (matchFound) {<a name="line.282"></a>
-<span class="sourceLineNo">283</span> return DeleteResult.VERSION_DELETED;<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> } else {<a name="line.286"></a>
-<span class="sourceLineNo">287</span> if (!VisibilityUtils.isVisibilityTagsPresent(cell)) {<a name="line.287"></a>
-<span class="sourceLineNo">288</span> // No tags<a name="line.288"></a>
-<span class="sourceLineNo">289</span> return DeleteResult.VERSION_DELETED;<a name="line.289"></a>
-<span class="sourceLineNo">290</span> }<a name="line.290"></a>
-<span class="sourceLineNo">291</span> }<a name="line.291"></a>
-<span class="sourceLineNo">292</span> }<a name="line.292"></a>
-<span class="sourceLineNo">293</span> } else if (ret > 0) {<a name="line.293"></a>
-<span class="sourceLineNo">294</span> // Next column case.<a name="line.294"></a>
-<span class="sourceLineNo">295</span> deleteBuffer = null;<a name="line.295"></a>
-<span class="sourceLineNo">296</span> visibilityTagsDeleteColumns = null;<a name="line.296"></a>
-<span class="sourceLineNo">297</span> visiblityTagsDeleteColumnVersion = null;<a name="line.297"></a>
-<span class="sourceLineNo">298</span> } else {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> throw new IllegalStateException("isDeleted failed: deleteBuffer="<a name="line.299"></a>
-<span class="sourceLineNo">300</span> + Bytes.toStringBinary(deleteBuffer, deleteOffset, deleteLength) + ", qualifier="<a name="line.300"></a>
-<span class="sourceLineNo">301</span> + Bytes.toStringBinary(cell.getQualifierArray(), cell.getQualifierOffset(),<a name="line.301"></a>
-<span class="sourceLineNo">302</span> cell.getQualifierLength())<a name="line.302"></a>
-<span class="sourceLineNo">303</span> + ", timestamp=" + timestamp + ", comparison result: " + ret);<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> } catch (IOException e) {<a name="line.306"></a>
-<span class="sourceLineNo">307</span> LOG.error("Error in isDeleted() check! Will treat cell as not deleted", e);<a name="line.307"></a>
-<span class="sourceLineNo">308</span> }<a name="line.308"></a>
-<span class="sourceLineNo">309</span> return DeleteResult.NOT_DELETED;<a name="line.309"></a>
-<span class="sourceLineNo">310</span> }<a name="line.310"></a>
-<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span> @Override<a name="line.312"></a>
-<span class="sourceLineNo">313</span> public void reset() {<a name="line.313"></a>
-<span class="sourceLineNo">314</span> super.reset();<a name="line.314"></a>
-<span class="sourceLineNo">315</span> visibilityTagsDeleteColumns = null;<a name="line.315"></a>
-<span class="sourceLineNo">316</span> visibilityTagsDeleteFamily = new ArrayList<Triple<List<Tag>, Byte, Long>>();<a name="line.316"></a>
-<span class="sourceLineNo">317</span> visibilityTagsDeleteFamilyVersion = new ArrayList<Triple<List<Tag>, Byte, Long>>();<a name="line.317"></a>
-<span class="sourceLineNo">318</span> visiblityTagsDeleteColumnVersion = null;<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">251</span> if (!visibilityTagsDeleteColumns.isEmpty()) {<a name="line.251"></a>
+<span class="sourceLineNo">252</span> for (Pair<List<Tag>, Byte> tags : visibilityTagsDeleteColumns) {<a name="line.252"></a>
+<span class="sourceLineNo">253</span> List<Tag> putVisTags = new ArrayList<Tag>();<a name="line.253"></a>
+<span class="sourceLineNo">254</span> Byte putCellVisTagsFormat =<a name="line.254"></a>
+<span class="sourceLineNo">255</span> VisibilityUtils.extractVisibilityTags(cell, putVisTags);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> boolean matchFound = VisibilityLabelServiceManager.getInstance()<a name="line.256"></a>
+<span class="sourceLineNo">257</span> .getVisibilityLabelService().matchVisibility(putVisTags, putCellVisTagsFormat,<a name="line.257"></a>
+<span class="sourceLineNo">258</span> tags.getFirst(), tags.getSecond());<a name="line.258"></a>
+<span class="sourceLineNo">259</span> if (matchFound) {<a name="line.259"></a>
+<span class="sourceLineNo">260</span> return DeleteResult.VERSION_DELETED;<a name="line.260"></a>
+<span class="sourceLineNo">261</span> }<a name="line.261"></a>
+<span class="sourceLineNo">262</span> }<a name="line.262"></a>
+<span class="sourceLineNo">263</span> } else {<a name="line.263"></a>
+<span class="sourceLineNo">264</span> if (!VisibilityUtils.isVisibilityTagsPresent(cell)) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> // No tags<a name="line.265"></a>
+<span class="sourceLineNo">266</span> return DeleteResult.VERSION_DELETED;<a name="line.266"></a>
+<span class="sourceLineNo">267</span> }<a name="line.267"></a>
+<span class="sourceLineNo">268</span> }<a name="line.268"></a>
+<span class="sourceLineNo">269</span> } else {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> if (!VisibilityUtils.isVisibilityTagsPresent(cell)) {<a name="line.270"></a>
+<span class="sourceLineNo">271</span> // No tags<a name="line.271"></a>
+<span class="sourceLineNo">272</span> return DeleteResult.VERSION_DELETED;<a name="line.272"></a>
+<span class="sourceLineNo">273</span> }<a name="line.273"></a>
+<span class="sourceLineNo">274</span> }<a name="line.274"></a>
+<span class="sourceLineNo">275</span> }<a name="line.275"></a>
+<span class="sourceLineNo">276</span> // Delete (aka DeleteVersion)<a name="line.276"></a>
+<span class="sourceLineNo">277</span> // If the timestamp is the same, keep this one<a name="line.277"></a>
+<span class="sourceLineNo">278</span> if (timestamp == deleteTimestamp) {<a name="line.278"></a>
+<span class="sourceLineNo">279</span> if (visiblityTagsDeleteColumnVersion != null) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> if (!visiblityTagsDeleteColumnVersion.isEmpty()) {<a name="line.280"></a>
+<span class="sourceLineNo">281</span> for (Pair<List<Tag>, Byte> tags : visiblityTagsDeleteColumnVersion) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span> List<Tag> putVisTags = new ArrayList<Tag>();<a name="line.282"></a>
+<span class="sourceLineNo">283</span> Byte putCellVisTagsFormat =<a name="line.283"></a>
+<span class="sourceLineNo">284</span> VisibilityUtils.extractVisibilityTags(cell, putVisTags);<a name="line.284"></a>
+<span class="sourceLineNo">285</span> boolean matchFound = VisibilityLabelServiceManager.getInstance()<a name="line.285"></a>
+<span class="sourceLineNo">286</span> .getVisibilityLabelService().matchVisibility(putVisTags, putCellVisTagsFormat,<a name="line.286"></a>
+<span class="sourceLineNo">287</span> tags.getFirst(), tags.getSecond());<a name="line.287"></a>
+<span class="sourceLineNo">288</span> if (matchFound) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> return DeleteResult.VERSION_DELETED;<a name="line.289"></a>
+<span class="sourceLineNo">290</span> }<a name="line.290"></a>
+<span class="sourceLineNo">291</span> }<a name="line.291"></a>
+<span class="sourceLineNo">292</span> } else {<a name="line.292"></a>
+<span class="sourceLineNo">293</span> if (!VisibilityUtils.isVisibilityTagsPresent(cell)) {<a name="line.293"></a>
+<span class="sourceLineNo">294</span> // No tags<a name="line.294"></a>
+<span class="sourceLineNo">295</span> return DeleteResult.VERSION_DELETED;<a name="line.295"></a>
+<span class="sourceLineNo">296</span> }<a name="line.296"></a>
+<span class="sourceLineNo">297</span> }<a name="line.297"></a>
+<span class="sourceLineNo">298</span> } else {<a name="line.298"></a>
+<span class="sourceLineNo">299</span> if (!VisibilityUtils.isVisibilityTagsPresent(cell)) {<a name="line.299"></a>
+<span class="sourceLineNo">300</span> // No tags<a name="line.300"></a>
+<span class="sourceLineNo">301</span> return DeleteResult.VERSION_DELETED;<a name="line.301"></a>
+<span class="sourceLineNo">302</span> }<a name="line.302"></a>
+<span class="sourceLineNo">303</span> }<a name="line.303"></a>
+<span class="sourceLineNo">304</span> }<a name="line.304"></a>
+<span class="sourceLineNo">305</span> } else if (ret > 0) {<a name="line.305"></a>
+<span class="sourceLineNo">306</span> // Next column case.<a name="line.306"></a>
+<span class="sourceLineNo">307</span> deleteBuffer = null;<a name="line.307"></a>
+<span class="sourceLineNo">308</span> // Can nullify this because we are moving to the next column<a name="line.308"></a>
+<span class="sourceLineNo">309</span> visibilityTagsDeleteColumns = null;<a name="line.309"></a>
+<span class="sourceLineNo">310</span> visiblityTagsDeleteColumnVersion = null;<a name="line.310"></a>
+<span class="sourceLineNo">311</span> } else {<a name="line.311"></a>
+<span class="sourceLineNo">312</span> throw new IllegalStateException("isDeleted failed: deleteBuffer="<a name="line.312"></a>
+<span class="sourceLineNo">313</span> + Bytes.toStringBinary(deleteBuffer, deleteOffset, deleteLength) + ", qualifier="<a name="line.313"></a>
+<span class="sourceLineNo">314</span> + Bytes.toStringBinary(cell.getQualifierArray(), cell.getQualifierOffset(),<a name="line.314"></a>
+<span class="sourceLineNo">315</span> cell.getQualifierLength())<a name="line.315"></a>
+<span class="sourceLineNo">316</span> + ", timestamp=" + timestamp + ", comparison result: " + ret);<a name="line.316"></a>
+<span class="sourceLineNo">317</span> }<a name="line.317"></a>
+<span class="sourceLineNo">318</span> }<a name="line.318"></a>
+<span class="sourceLineNo">319</span> } catch (IOException e) {<a name="line.319"></a>
+<span class="sourceLineNo">320</span> LOG.error("Error in isDeleted() check! Will treat cell as not deleted", e);<a name="line.320"></a>
+<span class="sourceLineNo">321</span> }<a name="line.321"></a>
+<span class="sourceLineNo">322</span> return DeleteResult.NOT_DELETED;<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 void reset() {<a name="line.326"></a>
+<span class="sourceLineNo">327</span> super.reset();<a name="line.327"></a>
+<span class="sourceLineNo">328</span> // clear only here<a name="line.328"></a>
+<span class="sourceLineNo">329</span> visibilityTagsDeleteColumns = null;<a name="line.329"></a>
+<span class="sourceLineNo">330</span> visibilityTagsDeleteFamily = null;<a name="line.330"></a>
+<span class="sourceLineNo">331</span> visibilityTagsDeleteFamilyVersion = null;<a name="line.331"></a>
+<span class="sourceLineNo">332</span> visiblityTagsDeleteColumnVersion = null;<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>
http://git-wip-us.apache.org/repos/asf/hbase/blob/155d5cd0/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html
index d9dfda1..13c4c88 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html
@@ -547,7 +547,7 @@
<span class="sourceLineNo">539</span> CallQueue callQueue =<a name="line.539"></a>
<span class="sourceLineNo">540</span> new CallQueue(new LinkedBlockingQueue<Call>(), metrics);<a name="line.540"></a>
<span class="sourceLineNo">541</span> ExecutorService executorService = createExecutor(<a name="line.541"></a>
-<span class="sourceLineNo">542</span> callQueue, serverArgs.getWorkerThreads());<a name="line.542"></a>
+<span class="sourceLineNo">542</span> callQueue, serverArgs.getMinWorkerThreads(), serverArgs.getMaxWorkerThreads());<a name="line.542"></a>
<span class="sourceLineNo">543</span> serverArgs.executorService(executorService)<a name="line.543"></a>
<span class="sourceLineNo">544</span> .processor(processor)<a name="line.544"></a>
<span class="sourceLineNo">545</span> .transportFactory(transportFactory)<a name="line.545"></a>
@@ -559,7 +559,7 @@
<span class="sourceLineNo">551</span> CallQueue callQueue =<a name="line.551"></a>
<span class="sourceLineNo">552</span> new CallQueue(new LinkedBlockingQueue<Call>(), metrics);<a name="line.552"></a>
<span class="sourceLineNo">553</span> ExecutorService executorService = createExecutor(<a name="line.553"></a>
-<span class="sourceLineNo">554</span> callQueue, serverArgs.getWorkerThreads());<a name="line.554"></a>
+<span class="sourceLineNo">554</span> callQueue, serverArgs.getWorkerThreads(), serverArgs.getWorkerThreads());<a name="line.554"></a>
<span class="sourceLineNo">555</span> serverArgs.executorService(executorService)<a name="line.555"></a>
<span class="sourceLineNo">556</span> .processor(processor)<a name="line.556"></a>
<span class="sourceLineNo">557</span> .transportFactory(transportFactory)<a name="line.557"></a>
@@ -605,11 +605,11 @@
<span class="sourceLineNo">597</span> }<a name="line.597"></a>
<span class="sourceLineNo">598</span><a name="line.598"></a>
<span class="sourceLineNo">599</span> ExecutorService createExecutor(BlockingQueue<Runnable> callQueue,<a name="line.599"></a>
-<span class="sourceLineNo">600</span> int workerThreads) {<a name="line.600"></a>
+<span class="sourceLineNo">600</span> int minWorkers, int maxWorkers) {<a name="line.600"></a>
<span class="sourceLineNo">601</span> ThreadFactoryBuilder tfb = new ThreadFactoryBuilder();<a name="line.601"></a>
<span class="sourceLineNo">602</span> tfb.setDaemon(true);<a name="line.602"></a>
<span class="sourceLineNo">603</span> tfb.setNameFormat("thrift-worker-%d");<a name="line.603"></a>
-<span class="sourceLineNo">604</span> return new ThreadPoolExecutor(workerThreads, workerThreads,<a name="line.604"></a>
+<span class="sourceLineNo">604</span> return new ThreadPoolExecutor(minWorkers, maxWorkers,<a name="line.604"></a>
<span class="sourceLineNo">605</span> Long.MAX_VALUE, TimeUnit.SECONDS, callQueue, tfb.build());<a name="line.605"></a>
<span class="sourceLineNo">606</span> }<a name="line.606"></a>
<span class="sourceLineNo">607</span><a name="line.607"></a>
http://git-wip-us.apache.org/repos/asf/hbase/blob/155d5cd0/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html
index d9dfda1..13c4c88 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html
@@ -547,7 +547,7 @@
<span class="sourceLineNo">539</span> CallQueue callQueue =<a name="line.539"></a>
<span class="sourceLineNo">540</span> new CallQueue(new LinkedBlockingQueue<Call>(), metrics);<a name="line.540"></a>
<span class="sourceLineNo">541</span> ExecutorService executorService = createExecutor(<a name="line.541"></a>
-<span class="sourceLineNo">542</span> callQueue, serverArgs.getWorkerThreads());<a name="line.542"></a>
+<span class="sourceLineNo">542</span> callQueue, serverArgs.getMinWorkerThreads(), serverArgs.getMaxWorkerThreads());<a name="line.542"></a>
<span class="sourceLineNo">543</span> serverArgs.executorService(executorService)<a name="line.543"></a>
<span class="sourceLineNo">544</span> .processor(processor)<a name="line.544"></a>
<span class="sourceLineNo">545</span> .transportFactory(transportFactory)<a name="line.545"></a>
@@ -559,7 +559,7 @@
<span class="sourceLineNo">551</span> CallQueue callQueue =<a name="line.551"></a>
<span class="sourceLineNo">552</span> new CallQueue(new LinkedBlockingQueue<Call>(), metrics);<a name="line.552"></a>
<span class="sourceLineNo">553</span> ExecutorService executorService = createExecutor(<a name="line.553"></a>
-<span class="sourceLineNo">554</span> callQueue, serverArgs.getWorkerThreads());<a name="line.554"></a>
+<span class="sourceLineNo">554</span> callQueue, serverArgs.getWorkerThreads(), serverArgs.getWorkerThreads());<a name="line.554"></a>
<span class="sourceLineNo">555</span> serverArgs.executorService(executorService)<a name="line.555"></a>
<span class="sourceLineNo">556</span> .processor(processor)<a name="line.556"></a>
<span class="sourceLineNo">557</span> .transportFactory(transportFactory)<a name="line.557"></a>
@@ -605,11 +605,11 @@
<span class="sourceLineNo">597</span> }<a name="line.597"></a>
<span class="sourceLineNo">598</span><a name="line.598"></a>
<span class="sourceLineNo">599</span> ExecutorService createExecutor(BlockingQueue<Runnable> callQueue,<a name="line.599"></a>
-<span class="sourceLineNo">600</span> int workerThreads) {<a name="line.600"></a>
+<span class="sourceLineNo">600</span> int minWorkers, int maxWorkers) {<a name="line.600"></a>
<span class="sourceLineNo">601</span> ThreadFactoryBuilder tfb = new ThreadFactoryBuilder();<a name="line.601"></a>
<span class="sourceLineNo">602</span> tfb.setDaemon(true);<a name="line.602"></a>
<span class="sourceLineNo">603</span> tfb.setNameFormat("thrift-worker-%d");<a name="line.603"></a>
-<span class="sourceLineNo">604</span> return new ThreadPoolExecutor(workerThreads, workerThreads,<a name="line.604"></a>
+<span class="sourceLineNo">604</span> return new ThreadPoolExecutor(minWorkers, maxWorkers,<a name="line.604"></a>
<span class="sourceLineNo">605</span> Long.MAX_VALUE, TimeUnit.SECONDS, callQueue, tfb.build());<a name="line.605"></a>
<span class="sourceLineNo">606</span> }<a name="line.606"></a>
<span class="sourceLineNo">607</span><a name="line.607"></a>
http://git-wip-us.apache.org/repos/asf/hbase/blob/155d5cd0/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html
index d9dfda1..13c4c88 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html
@@ -547,7 +547,7 @@
<span class="sourceLineNo">539</span> CallQueue callQueue =<a name="line.539"></a>
<span class="sourceLineNo">540</span> new CallQueue(new LinkedBlockingQueue<Call>(), metrics);<a name="line.540"></a>
<span class="sourceLineNo">541</span> ExecutorService executorService = createExecutor(<a name="line.541"></a>
-<span class="sourceLineNo">542</span> callQueue, serverArgs.getWorkerThreads());<a name="line.542"></a>
+<span class="sourceLineNo">542</span> callQueue, serverArgs.getMinWorkerThreads(), serverArgs.getMaxWorkerThreads());<a name="line.542"></a>
<span class="sourceLineNo">543</span> serverArgs.executorService(executorService)<a name="line.543"></a>
<span class="sourceLineNo">544</span> .processor(processor)<a name="line.544"></a>
<span class="sourceLineNo">545</span> .transportFactory(transportFactory)<a name="line.545"></a>
@@ -559,7 +559,7 @@
<span class="sourceLineNo">551</span> CallQueue callQueue =<a name="line.551"></a>
<span class="sourceLineNo">552</span> new CallQueue(new LinkedBlockingQueue<Call>(), metrics);<a name="line.552"></a>
<span class="sourceLineNo">553</span> ExecutorService executorService = createExecutor(<a name="line.553"></a>
-<span class="sourceLineNo">554</span> callQueue, serverArgs.getWorkerThreads());<a name="line.554"></a>
+<span class="sourceLineNo">554</span> callQueue, serverArgs.getWorkerThreads(), serverArgs.getWorkerThreads());<a name="line.554"></a>
<span class="sourceLineNo">555</span> serverArgs.executorService(executorService)<a name="line.555"></a>
<span class="sourceLineNo">556</span> .processor(processor)<a name="line.556"></a>
<span class="sourceLineNo">557</span> .transportFactory(transportFactory)<a name="line.557"></a>
@@ -605,11 +605,11 @@
<span class="sourceLineNo">597</span> }<a name="line.597"></a>
<span class="sourceLineNo">598</span><a name="line.598"></a>
<span class="sourceLineNo">599</span> ExecutorService createExecutor(BlockingQueue<Runnable> callQueue,<a name="line.599"></a>
-<span class="sourceLineNo">600</span> int workerThreads) {<a name="line.600"></a>
+<span class="sourceLineNo">600</span> int minWorkers, int maxWorkers) {<a name="line.600"></a>
<span class="sourceLineNo">601</span> ThreadFactoryBuilder tfb = new ThreadFactoryBuilder();<a name="line.601"></a>
<span class="sourceLineNo">602</span> tfb.setDaemon(true);<a name="line.602"></a>
<span class="sourceLineNo">603</span> tfb.setNameFormat("thrift-worker-%d");<a name="line.603"></a>
-<span class="sourceLineNo">604</span> return new ThreadPoolExecutor(workerThreads, workerThreads,<a name="line.604"></a>
+<span class="sourceLineNo">604</span> return new ThreadPoolExecutor(minWorkers, maxWorkers,<a name="line.604"></a>
<span class="sourceLineNo">605</span> Long.MAX_VALUE, TimeUnit.SECONDS, callQueue, tfb.build());<a name="line.605"></a>
<span class="sourceLineNo">606</span> }<a name="line.606"></a>
<span class="sourceLineNo">607</span><a name="line.607"></a>
http://git-wip-us.apache.org/repos/asf/hbase/blob/155d5cd0/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html
index d9dfda1..13c4c88 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html
@@ -547,7 +547,7 @@
<span class="sourceLineNo">539</span> CallQueue callQueue =<a name="line.539"></a>
<span class="sourceLineNo">540</span> new CallQueue(new LinkedBlockingQueue<Call>(), metrics);<a name="line.540"></a>
<span class="sourceLineNo">541</span> ExecutorService executorService = createExecutor(<a name="line.541"></a>
-<span class="sourceLineNo">542</span> callQueue, serverArgs.getWorkerThreads());<a name="line.542"></a>
+<span class="sourceLineNo">542</span> callQueue, serverArgs.getMinWorkerThreads(), serverArgs.getMaxWorkerThreads());<a name="line.542"></a>
<span class="sourceLineNo">543</span> serverArgs.executorService(executorService)<a name="line.543"></a>
<span class="sourceLineNo">544</span> .processor(processor)<a name="line.544"></a>
<span class="sourceLineNo">545</span> .transportFactory(transportFactory)<a name="line.545"></a>
@@ -559,7 +559,7 @@
<span class="sourceLineNo">551</span> CallQueue callQueue =<a name="line.551"></a>
<span class="sourceLineNo">552</span> new CallQueue(new LinkedBlockingQueue<Call>(), metrics);<a name="line.552"></a>
<span class="sourceLineNo">553</span> ExecutorService executorService = createExecutor(<a name="line.553"></a>
-<span class="sourceLineNo">554</span> callQueue, serverArgs.getWorkerThreads());<a name="line.554"></a>
+<span class="sourceLineNo">554</span> callQueue, serverArgs.getWorkerThreads(), serverArgs.getWorkerThreads());<a name="line.554"></a>
<span class="sourceLineNo">555</span> serverArgs.executorService(executorService)<a name="line.555"></a>
<span class="sourceLineNo">556</span> .processor(processor)<a name="line.556"></a>
<span class="sourceLineNo">557</span> .transportFactory(transportFactory)<a name="line.557"></a>
@@ -605,11 +605,11 @@
<span class="sourceLineNo">597</span> }<a name="line.597"></a>
<span class="sourceLineNo">598</span><a name="line.598"></a>
<span class="sourceLineNo">599</span> ExecutorService createExecutor(BlockingQueue<Runnable> callQueue,<a name="line.599"></a>
-<span class="sourceLineNo">600</span> int workerThreads) {<a name="line.600"></a>
+<span class="sourceLineNo">600</span> int minWorkers, int maxWorkers) {<a name="line.600"></a>
<span class="sourceLineNo">601</span> ThreadFactoryBuilder tfb = new ThreadFactoryBuilder();<a name="line.601"></a>
<span class="sourceLineNo">602</span> tfb.setDaemon(true);<a name="line.602"></a>
<span class="sourceLineNo">603</span> tfb.setNameFormat("thrift-worker-%d");<a name="line.603"></a>
-<span class="sourceLineNo">604</span> return new ThreadPoolExecutor(workerThreads, workerThreads,<a name="line.604"></a>
+<span class="sourceLineNo">604</span> return new ThreadPoolExecutor(minWorkers, maxWorkers,<a name="line.604"></a>
<span class="sourceLineNo">605</span> Long.MAX_VALUE, TimeUnit.SECONDS, callQueue, tfb.build());<a name="line.605"></a>
<span class="sourceLineNo">606</span> }<a name="line.606"></a>
<span class="sourceLineNo">607</span><a name="line.607"></a>