http://git-wip-us.apache.org/repos/asf/hbase-site/blob/68eae623/devapidocs/src-html/org/apache/hadoop/hbase/security/access/AccessControlLists.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/security/access/AccessControlLists.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/security/access/AccessControlLists.html
index e1f2ceb..78cac0b 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/security/access/AccessControlLists.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/security/access/AccessControlLists.html
@@ -139,503 +139,503 @@
 <span class="sourceLineNo">131</span>   * @throws IOException in the case of 
an error accessing the metadata table<a name="line.131"></a>
 <span class="sourceLineNo">132</span>   */<a name="line.132"></a>
 <span class="sourceLineNo">133</span>  static void 
addUserPermission(Configuration conf, UserPermission userPerm, Table t,<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span>                                boolean 
mergeExistingPermissions) throws IOException {<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    Permission.Action[] actions = 
userPerm.getActions();<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    byte[] rowKey = 
userPermissionRowKey(userPerm);<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    Put p = new Put(rowKey);<a 
name="line.137"></a>
-<span class="sourceLineNo">138</span>    byte[] key = 
userPermissionKey(userPerm);<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span>    if ((actions == null) || 
(actions.length == 0)) {<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      String msg = "No actions associated 
with user '" + Bytes.toString(userPerm.getUser()) + "'";<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      LOG.warn(msg);<a 
name="line.142"></a>
-<span class="sourceLineNo">143</span>      throw new IOException(msg);<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>    }<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span>    Set&lt;Permission.Action&gt; 
actionSet = new TreeSet&lt;Permission.Action&gt;();<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    if(mergeExistingPermissions){<a 
name="line.147"></a>
-<span class="sourceLineNo">148</span>      List&lt;UserPermission&gt; perms = 
getUserPermissions(conf, rowKey, null, null, null, false);<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>      UserPermission currentPerm = 
null;<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      for (UserPermission perm : perms) 
{<a name="line.150"></a>
-<span class="sourceLineNo">151</span>        if (Bytes.equals(perm.getUser(), 
userPerm.getUser())<a name="line.151"></a>
-<span class="sourceLineNo">152</span>                &amp;&amp; 
((userPerm.isGlobal() &amp;&amp; ACL_TABLE_NAME.equals(perm.getTableName()))<a 
name="line.152"></a>
-<span class="sourceLineNo">153</span>                || 
perm.tableFieldsEqual(userPerm))) {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>          currentPerm = perm;<a 
name="line.154"></a>
-<span class="sourceLineNo">155</span>          break;<a name="line.155"></a>
-<span class="sourceLineNo">156</span>        }<a name="line.156"></a>
-<span class="sourceLineNo">157</span>      }<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span>      if(currentPerm != null &amp;&amp; 
currentPerm.getActions() != null){<a name="line.159"></a>
-<span class="sourceLineNo">160</span>        
actionSet.addAll(Arrays.asList(currentPerm.getActions()));<a 
name="line.160"></a>
-<span class="sourceLineNo">161</span>      }<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    }<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>    // merge current action with new 
action.<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    
actionSet.addAll(Arrays.asList(actions));<a name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span>    // serialize to byte array.<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span>    byte[] value = new 
byte[actionSet.size()];<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    int index = 0;<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    for (Permission.Action action : 
actionSet) {<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      value[index++] = action.code();<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span>    }<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    
p.add(CellBuilderFactory.create(CellBuilderType.SHALLOW_COPY)<a 
name="line.173"></a>
-<span class="sourceLineNo">174</span>        .setRow(p.getRow())<a 
name="line.174"></a>
-<span class="sourceLineNo">175</span>        .setFamily(ACL_LIST_FAMILY)<a 
name="line.175"></a>
-<span class="sourceLineNo">176</span>        .setQualifier(key)<a 
name="line.176"></a>
-<span class="sourceLineNo">177</span>        .setTimestamp(p.getTimestamp())<a 
name="line.177"></a>
-<span class="sourceLineNo">178</span>        .setType(Type.Put)<a 
name="line.178"></a>
-<span class="sourceLineNo">179</span>        .setValue(value)<a 
name="line.179"></a>
-<span class="sourceLineNo">180</span>        .build());<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    if (LOG.isDebugEnabled()) {<a 
name="line.181"></a>
-<span class="sourceLineNo">182</span>      LOG.debug("Writing permission with 
rowKey "+<a name="line.182"></a>
-<span class="sourceLineNo">183</span>          Bytes.toString(rowKey)+" "+<a 
name="line.183"></a>
-<span class="sourceLineNo">184</span>          Bytes.toString(key)+": 
"+Bytes.toStringBinary(value)<a name="line.184"></a>
-<span class="sourceLineNo">185</span>          );<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    }<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    try {<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      /**<a name="line.188"></a>
-<span class="sourceLineNo">189</span>       * TODO: Use Table.put(Put) 
instead. This Table.put() happens within the RS. We are already in<a 
name="line.189"></a>
-<span class="sourceLineNo">190</span>       * AccessController. Means already 
there was an RPC happened to server (Actual grant call from<a 
name="line.190"></a>
-<span class="sourceLineNo">191</span>       * client side). At RpcServer we 
have a ThreadLocal where we keep the CallContext and inside<a 
name="line.191"></a>
-<span class="sourceLineNo">192</span>       * that the current RPC called user 
info is set. The table on which put was called is created<a name="line.192"></a>
-<span class="sourceLineNo">193</span>       * via the RegionCP env and that 
uses a special Connection. The normal RPC channel will be by<a 
name="line.193"></a>
-<span class="sourceLineNo">194</span>       * passed here means there would 
have no further contact on to the RpcServer. So the<a name="line.194"></a>
-<span class="sourceLineNo">195</span>       * ThreadLocal is never getting 
reset. We ran the new put as a super user (User.runAsLoginUser<a 
name="line.195"></a>
-<span class="sourceLineNo">196</span>       * where the login user is the user 
who started RS process) but still as per the RPC context<a name="line.196"></a>
-<span class="sourceLineNo">197</span>       * it is the old user. When 
AsyncProcess was used, the execute happen via another thread from<a 
name="line.197"></a>
-<span class="sourceLineNo">198</span>       * pool and so old ThreadLocal 
variable is not accessible and so it looks as if no Rpc context<a 
name="line.198"></a>
-<span class="sourceLineNo">199</span>       * and we were relying on the super 
user who starts the RS process.<a name="line.199"></a>
-<span class="sourceLineNo">200</span>       */<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      
t.put(Collections.singletonList(p));<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    } finally {<a name="line.202"></a>
-<span class="sourceLineNo">203</span>      t.close();<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><a name="line.206"></a>
-<span class="sourceLineNo">207</span>  static void 
addUserPermission(Configuration conf, UserPermission userPerm, Table t)<a 
name="line.207"></a>
-<span class="sourceLineNo">208</span>          throws IOException{<a 
name="line.208"></a>
-<span class="sourceLineNo">209</span>    addUserPermission(conf, userPerm, t, 
false);<a name="line.209"></a>
-<span class="sourceLineNo">210</span>  }<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">213</span>   * Removes a previously granted 
permission from the stored access control<a name="line.213"></a>
-<span class="sourceLineNo">214</span>   * lists.  The {@link TablePermission} 
being removed must exactly match what<a name="line.214"></a>
-<span class="sourceLineNo">215</span>   * is stored -- no wildcard matching is 
attempted.  Ie, if user "bob" has<a name="line.215"></a>
-<span class="sourceLineNo">216</span>   * been granted "READ" access to the 
"data" table, but only to column family<a name="line.216"></a>
-<span class="sourceLineNo">217</span>   * plus qualifier "info:colA", then 
trying to call this method with only<a name="line.217"></a>
-<span class="sourceLineNo">218</span>   * user "bob" and the table name "data" 
(but without specifying the<a name="line.218"></a>
-<span class="sourceLineNo">219</span>   * column qualifier "info:colA") will 
have no effect.<a name="line.219"></a>
-<span class="sourceLineNo">220</span>   *<a name="line.220"></a>
-<span class="sourceLineNo">221</span>   * @param conf the configuration<a 
name="line.221"></a>
-<span class="sourceLineNo">222</span>   * @param userPerm the details of the 
permission to be revoked<a name="line.222"></a>
-<span class="sourceLineNo">223</span>   * @param t acl table<a 
name="line.223"></a>
-<span class="sourceLineNo">224</span>   * @throws IOException if there is an 
error accessing the metadata table<a name="line.224"></a>
-<span class="sourceLineNo">225</span>   */<a name="line.225"></a>
-<span class="sourceLineNo">226</span>  static void 
removeUserPermission(Configuration conf, UserPermission userPerm, Table t)<a 
name="line.226"></a>
-<span class="sourceLineNo">227</span>      throws IOException {<a 
name="line.227"></a>
-<span class="sourceLineNo">228</span>    if (null == userPerm.getActions()) 
{<a name="line.228"></a>
+<span class="sourceLineNo">134</span>      boolean mergeExistingPermissions) 
throws IOException {<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    Permission permission = 
userPerm.getPermission();<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    Permission.Action[] actions = 
permission.getActions();<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    byte[] rowKey = 
userPermissionRowKey(permission);<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    Put p = new Put(rowKey);<a 
name="line.138"></a>
+<span class="sourceLineNo">139</span>    byte[] key = 
userPermissionKey(userPerm);<a name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span>    if ((actions == null) || 
(actions.length == 0)) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span>      String msg = "No actions associated 
with user '" + userPerm.getUser() + "'";<a name="line.142"></a>
+<span class="sourceLineNo">143</span>      LOG.warn(msg);<a 
name="line.143"></a>
+<span class="sourceLineNo">144</span>      throw new IOException(msg);<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>    }<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span>    Set&lt;Permission.Action&gt; 
actionSet = new TreeSet&lt;Permission.Action&gt;();<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    if(mergeExistingPermissions){<a 
name="line.148"></a>
+<span class="sourceLineNo">149</span>      List&lt;UserPermission&gt; perms = 
getUserPermissions(conf, rowKey, null, null, null, false);<a 
name="line.149"></a>
+<span class="sourceLineNo">150</span>      UserPermission currentPerm = 
null;<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      for (UserPermission perm : perms) 
{<a name="line.151"></a>
+<span class="sourceLineNo">152</span>        if 
(userPerm.equalsExceptActions(perm)) {<a name="line.152"></a>
+<span class="sourceLineNo">153</span>          currentPerm = perm;<a 
name="line.153"></a>
+<span class="sourceLineNo">154</span>          break;<a name="line.154"></a>
+<span class="sourceLineNo">155</span>        }<a name="line.155"></a>
+<span class="sourceLineNo">156</span>      }<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span>      if (currentPerm != null &amp;&amp; 
currentPerm.getPermission().getActions() != null){<a name="line.158"></a>
+<span class="sourceLineNo">159</span>        
actionSet.addAll(Arrays.asList(currentPerm.getPermission().getActions()));<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span>      }<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    }<a name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span>    // merge current action with new 
action.<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    
actionSet.addAll(Arrays.asList(actions));<a name="line.164"></a>
+<span class="sourceLineNo">165</span><a name="line.165"></a>
+<span class="sourceLineNo">166</span>    // serialize to byte array.<a 
name="line.166"></a>
+<span class="sourceLineNo">167</span>    byte[] value = new 
byte[actionSet.size()];<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    int index = 0;<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    for (Permission.Action action : 
actionSet) {<a name="line.169"></a>
+<span class="sourceLineNo">170</span>      value[index++] = action.code();<a 
name="line.170"></a>
+<span class="sourceLineNo">171</span>    }<a name="line.171"></a>
+<span class="sourceLineNo">172</span>    
p.add(CellBuilderFactory.create(CellBuilderType.SHALLOW_COPY)<a 
name="line.172"></a>
+<span class="sourceLineNo">173</span>        .setRow(p.getRow())<a 
name="line.173"></a>
+<span class="sourceLineNo">174</span>        .setFamily(ACL_LIST_FAMILY)<a 
name="line.174"></a>
+<span class="sourceLineNo">175</span>        .setQualifier(key)<a 
name="line.175"></a>
+<span class="sourceLineNo">176</span>        .setTimestamp(p.getTimestamp())<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span>        .setType(Type.Put)<a 
name="line.177"></a>
+<span class="sourceLineNo">178</span>        .setValue(value)<a 
name="line.178"></a>
+<span class="sourceLineNo">179</span>        .build());<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    if (LOG.isDebugEnabled()) {<a 
name="line.180"></a>
+<span class="sourceLineNo">181</span>      LOG.debug("Writing permission with 
rowKey "+<a name="line.181"></a>
+<span class="sourceLineNo">182</span>          Bytes.toString(rowKey)+" "+<a 
name="line.182"></a>
+<span class="sourceLineNo">183</span>          Bytes.toString(key)+": 
"+Bytes.toStringBinary(value)<a name="line.183"></a>
+<span class="sourceLineNo">184</span>          );<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    }<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    try {<a name="line.186"></a>
+<span class="sourceLineNo">187</span>      /**<a name="line.187"></a>
+<span class="sourceLineNo">188</span>       * TODO: Use Table.put(Put) 
instead. This Table.put() happens within the RS. We are already in<a 
name="line.188"></a>
+<span class="sourceLineNo">189</span>       * AccessController. Means already 
there was an RPC happened to server (Actual grant call from<a 
name="line.189"></a>
+<span class="sourceLineNo">190</span>       * client side). At RpcServer we 
have a ThreadLocal where we keep the CallContext and inside<a 
name="line.190"></a>
+<span class="sourceLineNo">191</span>       * that the current RPC called user 
info is set. The table on which put was called is created<a name="line.191"></a>
+<span class="sourceLineNo">192</span>       * via the RegionCP env and that 
uses a special Connection. The normal RPC channel will be by<a 
name="line.192"></a>
+<span class="sourceLineNo">193</span>       * passed here means there would 
have no further contact on to the RpcServer. So the<a name="line.193"></a>
+<span class="sourceLineNo">194</span>       * ThreadLocal is never getting 
reset. We ran the new put as a super user (User.runAsLoginUser<a 
name="line.194"></a>
+<span class="sourceLineNo">195</span>       * where the login user is the user 
who started RS process) but still as per the RPC context<a name="line.195"></a>
+<span class="sourceLineNo">196</span>       * it is the old user. When 
AsyncProcess was used, the execute happen via another thread from<a 
name="line.196"></a>
+<span class="sourceLineNo">197</span>       * pool and so old ThreadLocal 
variable is not accessible and so it looks as if no Rpc context<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span>       * and we were relying on the super 
user who starts the RS process.<a name="line.198"></a>
+<span class="sourceLineNo">199</span>       */<a name="line.199"></a>
+<span class="sourceLineNo">200</span>      
t.put(Collections.singletonList(p));<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    } finally {<a name="line.201"></a>
+<span class="sourceLineNo">202</span>      t.close();<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>  static void 
addUserPermission(Configuration conf, UserPermission userPerm, Table t)<a 
name="line.206"></a>
+<span class="sourceLineNo">207</span>          throws IOException{<a 
name="line.207"></a>
+<span class="sourceLineNo">208</span>    addUserPermission(conf, userPerm, t, 
false);<a name="line.208"></a>
+<span class="sourceLineNo">209</span>  }<a name="line.209"></a>
+<span class="sourceLineNo">210</span><a name="line.210"></a>
+<span class="sourceLineNo">211</span>  /**<a name="line.211"></a>
+<span class="sourceLineNo">212</span>   * Removes a previously granted 
permission from the stored access control<a name="line.212"></a>
+<span class="sourceLineNo">213</span>   * lists.  The {@link TablePermission} 
being removed must exactly match what<a name="line.213"></a>
+<span class="sourceLineNo">214</span>   * is stored -- no wildcard matching is 
attempted.  Ie, if user "bob" has<a name="line.214"></a>
+<span class="sourceLineNo">215</span>   * been granted "READ" access to the 
"data" table, but only to column family<a name="line.215"></a>
+<span class="sourceLineNo">216</span>   * plus qualifier "info:colA", then 
trying to call this method with only<a name="line.216"></a>
+<span class="sourceLineNo">217</span>   * user "bob" and the table name "data" 
(but without specifying the<a name="line.217"></a>
+<span class="sourceLineNo">218</span>   * column qualifier "info:colA") will 
have no effect.<a name="line.218"></a>
+<span class="sourceLineNo">219</span>   *<a name="line.219"></a>
+<span class="sourceLineNo">220</span>   * @param conf the configuration<a 
name="line.220"></a>
+<span class="sourceLineNo">221</span>   * @param userPerm the details of the 
permission to be revoked<a name="line.221"></a>
+<span class="sourceLineNo">222</span>   * @param t acl table<a 
name="line.222"></a>
+<span class="sourceLineNo">223</span>   * @throws IOException if there is an 
error accessing the metadata table<a name="line.223"></a>
+<span class="sourceLineNo">224</span>   */<a name="line.224"></a>
+<span class="sourceLineNo">225</span>  static void 
removeUserPermission(Configuration conf, UserPermission userPerm, Table t)<a 
name="line.225"></a>
+<span class="sourceLineNo">226</span>      throws IOException {<a 
name="line.226"></a>
+<span class="sourceLineNo">227</span>    if (null == 
userPerm.getPermission().getActions() ||<a name="line.227"></a>
+<span class="sourceLineNo">228</span>        
userPerm.getPermission().getActions().length == 0) {<a name="line.228"></a>
 <span class="sourceLineNo">229</span>      removePermissionRecord(conf, 
userPerm, t);<a name="line.229"></a>
 <span class="sourceLineNo">230</span>    } else {<a name="line.230"></a>
 <span class="sourceLineNo">231</span>      // Get all the global user 
permissions from the acl table<a name="line.231"></a>
 <span class="sourceLineNo">232</span>      List&lt;UserPermission&gt; 
permsList =<a name="line.232"></a>
-<span class="sourceLineNo">233</span>          getUserPermissions(conf, 
userPermissionRowKey(userPerm), null, null, null, false);<a name="line.233"></a>
-<span class="sourceLineNo">234</span>      List&lt;Permission.Action&gt; 
remainingActions = new ArrayList&lt;&gt;();<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      List&lt;Permission.Action&gt; 
dropActions = Arrays.asList(userPerm.getActions());<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      for (UserPermission perm : 
permsList) {<a name="line.236"></a>
-<span class="sourceLineNo">237</span>        // Find the user and remove only 
the requested permissions<a name="line.237"></a>
-<span class="sourceLineNo">238</span>        if 
(Bytes.toString(perm.getUser()).equals(Bytes.toString(userPerm.getUser()))) {<a 
name="line.238"></a>
-<span class="sourceLineNo">239</span>          for (Permission.Action 
oldAction : perm.getActions()) {<a name="line.239"></a>
-<span class="sourceLineNo">240</span>            if 
(!dropActions.contains(oldAction)) {<a name="line.240"></a>
-<span class="sourceLineNo">241</span>              
remainingActions.add(oldAction);<a name="line.241"></a>
-<span class="sourceLineNo">242</span>            }<a name="line.242"></a>
-<span class="sourceLineNo">243</span>          }<a name="line.243"></a>
-<span class="sourceLineNo">244</span>          if 
(!remainingActions.isEmpty()) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span>            
perm.setActions(remainingActions.toArray(new 
Permission.Action[remainingActions.size()]));<a name="line.245"></a>
-<span class="sourceLineNo">246</span>            addUserPermission(conf, perm, 
t);<a name="line.246"></a>
-<span class="sourceLineNo">247</span>          } else {<a name="line.247"></a>
-<span class="sourceLineNo">248</span>            removePermissionRecord(conf, 
userPerm, t);<a name="line.248"></a>
-<span class="sourceLineNo">249</span>          }<a name="line.249"></a>
-<span class="sourceLineNo">250</span>          break;<a name="line.250"></a>
-<span class="sourceLineNo">251</span>        }<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      }<a name="line.252"></a>
-<span class="sourceLineNo">253</span>    }<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    if (LOG.isDebugEnabled()) {<a 
name="line.254"></a>
-<span class="sourceLineNo">255</span>      LOG.debug("Removed permission "+ 
userPerm.toString());<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    }<a name="line.256"></a>
-<span class="sourceLineNo">257</span>  }<a name="line.257"></a>
-<span class="sourceLineNo">258</span><a name="line.258"></a>
-<span class="sourceLineNo">259</span>  private static void 
removePermissionRecord(Configuration conf, UserPermission userPerm, Table t)<a 
name="line.259"></a>
-<span class="sourceLineNo">260</span>      throws IOException {<a 
name="line.260"></a>
-<span class="sourceLineNo">261</span>    Delete d = new 
Delete(userPermissionRowKey(userPerm));<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    d.addColumns(ACL_LIST_FAMILY, 
userPermissionKey(userPerm));<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    try {<a name="line.263"></a>
-<span class="sourceLineNo">264</span>      t.delete(d);<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    } finally {<a name="line.265"></a>
-<span class="sourceLineNo">266</span>      t.close();<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>  /**<a name="line.270"></a>
-<span class="sourceLineNo">271</span>   * Remove specified table from the 
_acl_ table.<a name="line.271"></a>
-<span class="sourceLineNo">272</span>   */<a name="line.272"></a>
-<span class="sourceLineNo">273</span>  static void 
removeTablePermissions(Configuration conf, TableName tableName, Table t)<a 
name="line.273"></a>
-<span class="sourceLineNo">274</span>      throws IOException{<a 
name="line.274"></a>
-<span class="sourceLineNo">275</span>    Delete d = new 
Delete(tableName.getName());<a name="line.275"></a>
-<span class="sourceLineNo">276</span><a name="line.276"></a>
-<span class="sourceLineNo">277</span>    if (LOG.isDebugEnabled()) {<a 
name="line.277"></a>
-<span class="sourceLineNo">278</span>      LOG.debug("Removing permissions of 
removed table "+ tableName);<a name="line.278"></a>
-<span class="sourceLineNo">279</span>    }<a name="line.279"></a>
-<span class="sourceLineNo">280</span>    try {<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      t.delete(d);<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    } finally {<a name="line.282"></a>
-<span class="sourceLineNo">283</span>      t.close();<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>  /**<a name="line.287"></a>
-<span class="sourceLineNo">288</span>   * Remove specified namespace from the 
acl table.<a name="line.288"></a>
-<span class="sourceLineNo">289</span>   */<a name="line.289"></a>
-<span class="sourceLineNo">290</span>  static void 
removeNamespacePermissions(Configuration conf, String namespace, Table t)<a 
name="line.290"></a>
-<span class="sourceLineNo">291</span>      throws IOException{<a 
name="line.291"></a>
-<span class="sourceLineNo">292</span>    Delete d = new 
Delete(Bytes.toBytes(toNamespaceEntry(namespace)));<a name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span>    if (LOG.isDebugEnabled()) {<a 
name="line.294"></a>
-<span class="sourceLineNo">295</span>      LOG.debug("Removing permissions of 
removed namespace "+ namespace);<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>    try {<a name="line.298"></a>
-<span class="sourceLineNo">299</span>      t.delete(d);<a name="line.299"></a>
-<span class="sourceLineNo">300</span>    } finally {<a name="line.300"></a>
-<span class="sourceLineNo">301</span>      t.close();<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>  static private void 
removeTablePermissions(TableName tableName, byte[] column, Table table,<a 
name="line.305"></a>
-<span class="sourceLineNo">306</span>      boolean closeTable) throws 
IOException {<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    Scan scan = new Scan();<a 
name="line.307"></a>
-<span class="sourceLineNo">308</span>    scan.addFamily(ACL_LIST_FAMILY);<a 
name="line.308"></a>
-<span class="sourceLineNo">309</span><a name="line.309"></a>
-<span class="sourceLineNo">310</span>    String columnName = 
Bytes.toString(column);<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    scan.setFilter(new 
QualifierFilter(CompareOperator.EQUAL, new RegexStringComparator(<a 
name="line.311"></a>
-<span class="sourceLineNo">312</span>        
String.format("(%s%s%s)|(%s%s)$",<a name="line.312"></a>
-<span class="sourceLineNo">313</span>            ACL_KEY_DELIMITER, 
columnName, ACL_KEY_DELIMITER,<a name="line.313"></a>
-<span class="sourceLineNo">314</span>            ACL_KEY_DELIMITER, 
columnName))));<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span>    Set&lt;byte[]&gt; qualifierSet = new 
TreeSet&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    ResultScanner scanner = null;<a 
name="line.317"></a>
-<span class="sourceLineNo">318</span>    try {<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      scanner = table.getScanner(scan);<a 
name="line.319"></a>
-<span class="sourceLineNo">320</span>      for (Result res : scanner) {<a 
name="line.320"></a>
-<span class="sourceLineNo">321</span>        for (byte[] q : 
res.getFamilyMap(ACL_LIST_FAMILY).navigableKeySet()) {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>          qualifierSet.add(q);<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><a name="line.325"></a>
-<span class="sourceLineNo">326</span>      if (qualifierSet.size() &gt; 0) {<a 
name="line.326"></a>
-<span class="sourceLineNo">327</span>        Delete d = new 
Delete(tableName.getName());<a name="line.327"></a>
-<span class="sourceLineNo">328</span>        for (byte[] qualifier : 
qualifierSet) {<a name="line.328"></a>
-<span class="sourceLineNo">329</span>          d.addColumns(ACL_LIST_FAMILY, 
qualifier);<a name="line.329"></a>
-<span class="sourceLineNo">330</span>        }<a name="line.330"></a>
-<span class="sourceLineNo">331</span>        table.delete(d);<a 
name="line.331"></a>
-<span class="sourceLineNo">332</span>      }<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    } finally {<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      if (scanner != null) 
scanner.close();<a name="line.334"></a>
-<span class="sourceLineNo">335</span>      if (closeTable) table.close();<a 
name="line.335"></a>
-<span class="sourceLineNo">336</span>    }<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>  /**<a name="line.339"></a>
-<span class="sourceLineNo">340</span>   * Remove specified table column from 
the acl table.<a name="line.340"></a>
-<span class="sourceLineNo">341</span>   */<a name="line.341"></a>
-<span class="sourceLineNo">342</span>  static void 
removeTablePermissions(Configuration conf, TableName tableName, byte[] 
column,<a name="line.342"></a>
-<span class="sourceLineNo">343</span>      Table t) throws IOException {<a 
name="line.343"></a>
-<span class="sourceLineNo">344</span>    if (LOG.isDebugEnabled()) {<a 
name="line.344"></a>
-<span class="sourceLineNo">345</span>      LOG.debug("Removing permissions of 
removed column " + Bytes.toString(column) +<a name="line.345"></a>
-<span class="sourceLineNo">346</span>          " from table "+ tableName);<a 
name="line.346"></a>
-<span class="sourceLineNo">347</span>    }<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    removeTablePermissions(tableName, 
column, t, true);<a name="line.348"></a>
-<span class="sourceLineNo">349</span>  }<a name="line.349"></a>
-<span class="sourceLineNo">350</span><a name="line.350"></a>
-<span class="sourceLineNo">351</span>  static byte[] 
userPermissionRowKey(UserPermission userPerm) {<a name="line.351"></a>
-<span class="sourceLineNo">352</span>    byte[] row;<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    if(userPerm.hasNamespace()) {<a 
name="line.353"></a>
-<span class="sourceLineNo">354</span>      row = 
Bytes.toBytes(toNamespaceEntry(userPerm.getNamespace()));<a name="line.354"></a>
-<span class="sourceLineNo">355</span>    } else if(userPerm.isGlobal()) {<a 
name="line.355"></a>
-<span class="sourceLineNo">356</span>      row = ACL_GLOBAL_NAME;<a 
name="line.356"></a>
-<span class="sourceLineNo">357</span>    } else {<a name="line.357"></a>
-<span class="sourceLineNo">358</span>      row = 
userPerm.getTableName().getName();<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    }<a name="line.359"></a>
-<span class="sourceLineNo">360</span>    return row;<a name="line.360"></a>
-<span class="sourceLineNo">361</span>  }<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>   * Build qualifier key from user 
permission:<a name="line.364"></a>
-<span class="sourceLineNo">365</span>   *  username<a name="line.365"></a>
-<span class="sourceLineNo">366</span>   *  username,family<a 
name="line.366"></a>
-<span class="sourceLineNo">367</span>   *  username,family,qualifier<a 
name="line.367"></a>
-<span class="sourceLineNo">368</span>   */<a name="line.368"></a>
-<span class="sourceLineNo">369</span>  static byte[] 
userPermissionKey(UserPermission userPerm) {<a name="line.369"></a>
-<span class="sourceLineNo">370</span>    byte[] qualifier = 
userPerm.getQualifier();<a name="line.370"></a>
-<span class="sourceLineNo">371</span>    byte[] family = 
userPerm.getFamily();<a name="line.371"></a>
-<span class="sourceLineNo">372</span>    byte[] key = userPerm.getUser();<a 
name="line.372"></a>
-<span class="sourceLineNo">373</span><a name="line.373"></a>
-<span class="sourceLineNo">374</span>    if (family != null &amp;&amp; 
family.length &gt; 0) {<a name="line.374"></a>
-<span class="sourceLineNo">375</span>      key = Bytes.add(key, Bytes.add(new 
byte[]{ACL_KEY_DELIMITER}, family));<a name="line.375"></a>
-<span class="sourceLineNo">376</span>      if (qualifier != null &amp;&amp; 
qualifier.length &gt; 0) {<a name="line.376"></a>
-<span class="sourceLineNo">377</span>        key = Bytes.add(key, 
Bytes.add(new byte[]{ACL_KEY_DELIMITER}, qualifier));<a name="line.377"></a>
-<span class="sourceLineNo">378</span>      }<a name="line.378"></a>
-<span class="sourceLineNo">379</span>    }<a name="line.379"></a>
-<span class="sourceLineNo">380</span><a name="line.380"></a>
-<span class="sourceLineNo">381</span>    return key;<a name="line.381"></a>
-<span class="sourceLineNo">382</span>  }<a name="line.382"></a>
+<span class="sourceLineNo">233</span>        getUserPermissions(conf, 
userPermissionRowKey(userPerm.getPermission()),<a name="line.233"></a>
+<span class="sourceLineNo">234</span>          null, null, null, false);<a 
name="line.234"></a>
+<span class="sourceLineNo">235</span>      List&lt;Permission.Action&gt; 
remainingActions = new ArrayList&lt;&gt;();<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      List&lt;Permission.Action&gt; 
dropActions = Arrays.asList(userPerm.getPermission().getActions());<a 
name="line.236"></a>
+<span class="sourceLineNo">237</span>      for (UserPermission perm : 
permsList) {<a name="line.237"></a>
+<span class="sourceLineNo">238</span>        // Find the user and remove only 
the requested permissions<a name="line.238"></a>
+<span class="sourceLineNo">239</span>        if 
(perm.getUser().equals(userPerm.getUser())) {<a name="line.239"></a>
+<span class="sourceLineNo">240</span>          for (Permission.Action 
oldAction : perm.getPermission().getActions()) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span>            if 
(!dropActions.contains(oldAction)) {<a name="line.241"></a>
+<span class="sourceLineNo">242</span>              
remainingActions.add(oldAction);<a name="line.242"></a>
+<span class="sourceLineNo">243</span>            }<a name="line.243"></a>
+<span class="sourceLineNo">244</span>          }<a name="line.244"></a>
+<span class="sourceLineNo">245</span>          if 
(!remainingActions.isEmpty()) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span>            
perm.getPermission().setActions(<a name="line.246"></a>
+<span class="sourceLineNo">247</span>              
remainingActions.toArray(new Permission.Action[remainingActions.size()]));<a 
name="line.247"></a>
+<span class="sourceLineNo">248</span>            addUserPermission(conf, perm, 
t);<a name="line.248"></a>
+<span class="sourceLineNo">249</span>          } else {<a name="line.249"></a>
+<span class="sourceLineNo">250</span>            removePermissionRecord(conf, 
userPerm, t);<a name="line.250"></a>
+<span class="sourceLineNo">251</span>          }<a name="line.251"></a>
+<span class="sourceLineNo">252</span>          break;<a name="line.252"></a>
+<span class="sourceLineNo">253</span>        }<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      }<a name="line.254"></a>
+<span class="sourceLineNo">255</span>    }<a name="line.255"></a>
+<span class="sourceLineNo">256</span>    if (LOG.isDebugEnabled()) {<a 
name="line.256"></a>
+<span class="sourceLineNo">257</span>      LOG.debug("Removed permission "+ 
userPerm.toString());<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    }<a name="line.258"></a>
+<span class="sourceLineNo">259</span>  }<a name="line.259"></a>
+<span class="sourceLineNo">260</span><a name="line.260"></a>
+<span class="sourceLineNo">261</span>  private static void 
removePermissionRecord(Configuration conf, UserPermission userPerm, Table t)<a 
name="line.261"></a>
+<span class="sourceLineNo">262</span>      throws IOException {<a 
name="line.262"></a>
+<span class="sourceLineNo">263</span>    Delete d = new 
Delete(userPermissionRowKey(userPerm.getPermission()));<a name="line.263"></a>
+<span class="sourceLineNo">264</span>    d.addColumns(ACL_LIST_FAMILY, 
userPermissionKey(userPerm));<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    try {<a name="line.265"></a>
+<span class="sourceLineNo">266</span>      t.delete(d);<a name="line.266"></a>
+<span class="sourceLineNo">267</span>    } finally {<a name="line.267"></a>
+<span class="sourceLineNo">268</span>      t.close();<a name="line.268"></a>
+<span class="sourceLineNo">269</span>    }<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>   * Remove specified table from the 
_acl_ table.<a name="line.273"></a>
+<span class="sourceLineNo">274</span>   */<a name="line.274"></a>
+<span class="sourceLineNo">275</span>  static void 
removeTablePermissions(Configuration conf, TableName tableName, Table t)<a 
name="line.275"></a>
+<span class="sourceLineNo">276</span>      throws IOException{<a 
name="line.276"></a>
+<span class="sourceLineNo">277</span>    Delete d = new 
Delete(tableName.getName());<a name="line.277"></a>
+<span class="sourceLineNo">278</span><a name="line.278"></a>
+<span class="sourceLineNo">279</span>    if (LOG.isDebugEnabled()) {<a 
name="line.279"></a>
+<span class="sourceLineNo">280</span>      LOG.debug("Removing permissions of 
removed table "+ tableName);<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    }<a name="line.281"></a>
+<span class="sourceLineNo">282</span>    try {<a name="line.282"></a>
+<span class="sourceLineNo">283</span>      t.delete(d);<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    } finally {<a name="line.284"></a>
+<span class="sourceLineNo">285</span>      t.close();<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    }<a name="line.286"></a>
+<span class="sourceLineNo">287</span>  }<a name="line.287"></a>
+<span class="sourceLineNo">288</span><a name="line.288"></a>
+<span class="sourceLineNo">289</span>  /**<a name="line.289"></a>
+<span class="sourceLineNo">290</span>   * Remove specified namespace from the 
acl table.<a name="line.290"></a>
+<span class="sourceLineNo">291</span>   */<a name="line.291"></a>
+<span class="sourceLineNo">292</span>  static void 
removeNamespacePermissions(Configuration conf, String namespace, Table t)<a 
name="line.292"></a>
+<span class="sourceLineNo">293</span>      throws IOException{<a 
name="line.293"></a>
+<span class="sourceLineNo">294</span>    Delete d = new 
Delete(Bytes.toBytes(toNamespaceEntry(namespace)));<a name="line.294"></a>
+<span class="sourceLineNo">295</span><a name="line.295"></a>
+<span class="sourceLineNo">296</span>    if (LOG.isDebugEnabled()) {<a 
name="line.296"></a>
+<span class="sourceLineNo">297</span>      LOG.debug("Removing permissions of 
removed namespace "+ namespace);<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    }<a name="line.298"></a>
+<span class="sourceLineNo">299</span><a name="line.299"></a>
+<span class="sourceLineNo">300</span>    try {<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      t.delete(d);<a name="line.301"></a>
+<span class="sourceLineNo">302</span>    } finally {<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      t.close();<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><a name="line.306"></a>
+<span class="sourceLineNo">307</span>  static private void 
removeTablePermissions(TableName tableName, byte[] column, Table table,<a 
name="line.307"></a>
+<span class="sourceLineNo">308</span>      boolean closeTable) throws 
IOException {<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    Scan scan = new Scan();<a 
name="line.309"></a>
+<span class="sourceLineNo">310</span>    scan.addFamily(ACL_LIST_FAMILY);<a 
name="line.310"></a>
+<span class="sourceLineNo">311</span><a name="line.311"></a>
+<span class="sourceLineNo">312</span>    String columnName = 
Bytes.toString(column);<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    scan.setFilter(new 
QualifierFilter(CompareOperator.EQUAL, new RegexStringComparator(<a 
name="line.313"></a>
+<span class="sourceLineNo">314</span>        
String.format("(%s%s%s)|(%s%s)$",<a name="line.314"></a>
+<span class="sourceLineNo">315</span>            ACL_KEY_DELIMITER, 
columnName, ACL_KEY_DELIMITER,<a name="line.315"></a>
+<span class="sourceLineNo">316</span>            ACL_KEY_DELIMITER, 
columnName))));<a name="line.316"></a>
+<span class="sourceLineNo">317</span><a name="line.317"></a>
+<span class="sourceLineNo">318</span>    Set&lt;byte[]&gt; qualifierSet = new 
TreeSet&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    ResultScanner scanner = null;<a 
name="line.319"></a>
+<span class="sourceLineNo">320</span>    try {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      scanner = table.getScanner(scan);<a 
name="line.321"></a>
+<span class="sourceLineNo">322</span>      for (Result res : scanner) {<a 
name="line.322"></a>
+<span class="sourceLineNo">323</span>        for (byte[] q : 
res.getFamilyMap(ACL_LIST_FAMILY).navigableKeySet()) {<a name="line.323"></a>
+<span class="sourceLineNo">324</span>          qualifierSet.add(q);<a 
name="line.324"></a>
+<span class="sourceLineNo">325</span>        }<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      }<a name="line.326"></a>
+<span class="sourceLineNo">327</span><a name="line.327"></a>
+<span class="sourceLineNo">328</span>      if (qualifierSet.size() &gt; 0) {<a 
name="line.328"></a>
+<span class="sourceLineNo">329</span>        Delete d = new 
Delete(tableName.getName());<a name="line.329"></a>
+<span class="sourceLineNo">330</span>        for (byte[] qualifier : 
qualifierSet) {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>          d.addColumns(ACL_LIST_FAMILY, 
qualifier);<a name="line.331"></a>
+<span class="sourceLineNo">332</span>        }<a name="line.332"></a>
+<span class="sourceLineNo">333</span>        table.delete(d);<a 
name="line.333"></a>
+<span class="sourceLineNo">334</span>      }<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    } finally {<a name="line.335"></a>
+<span class="sourceLineNo">336</span>      if (scanner != null) 
scanner.close();<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      if (closeTable) table.close();<a 
name="line.337"></a>
+<span class="sourceLineNo">338</span>    }<a name="line.338"></a>
+<span class="sourceLineNo">339</span>  }<a name="line.339"></a>
+<span class="sourceLineNo">340</span><a name="line.340"></a>
+<span class="sourceLineNo">341</span>  /**<a name="line.341"></a>
+<span class="sourceLineNo">342</span>   * Remove specified table column from 
the acl table.<a name="line.342"></a>
+<span class="sourceLineNo">343</span>   */<a name="line.343"></a>
+<span class="sourceLineNo">344</span>  static void 
removeTablePermissions(Configuration conf, TableName tableName, byte[] 
column,<a name="line.344"></a>
+<span class="sourceLineNo">345</span>      Table t) throws IOException {<a 
name="line.345"></a>
+<span class="sourceLineNo">346</span>    if (LOG.isDebugEnabled()) {<a 
name="line.346"></a>
+<span class="sourceLineNo">347</span>      LOG.debug("Removing permissions of 
removed column " + Bytes.toString(column) +<a name="line.347"></a>
+<span class="sourceLineNo">348</span>          " from table "+ tableName);<a 
name="line.348"></a>
+<span class="sourceLineNo">349</span>    }<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    removeTablePermissions(tableName, 
column, t, true);<a name="line.350"></a>
+<span class="sourceLineNo">351</span>  }<a name="line.351"></a>
+<span class="sourceLineNo">352</span><a name="line.352"></a>
+<span class="sourceLineNo">353</span>  static byte[] 
userPermissionRowKey(Permission permission) {<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    byte[] row;<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    if (permission instanceof 
TablePermission) {<a name="line.355"></a>
+<span class="sourceLineNo">356</span>      TablePermission tablePerm = 
(TablePermission) permission;<a name="line.356"></a>
+<span class="sourceLineNo">357</span>      row = 
tablePerm.getTableName().getName();<a name="line.357"></a>
+<span class="sourceLineNo">358</span>    } else if (permission instanceof 
NamespacePermission) {<a name="line.358"></a>
+<span class="sourceLineNo">359</span>      NamespacePermission nsPerm = 
(NamespacePermission) permission;<a name="line.359"></a>
+<span class="sourceLineNo">360</span>      row = 
Bytes.toBytes(toNamespaceEntry(nsPerm.getNamespace()));<a name="line.360"></a>
+<span class="sourceLineNo">361</span>    } else {<a name="line.361"></a>
+<span class="sourceLineNo">362</span>      // permission instanceof 
TablePermission<a name="line.362"></a>
+<span class="sourceLineNo">363</span>      row = ACL_GLOBAL_NAME;<a 
name="line.363"></a>
+<span class="sourceLineNo">364</span>    }<a name="line.364"></a>
+<span class="sourceLineNo">365</span>    return row;<a name="line.365"></a>
+<span class="sourceLineNo">366</span>  }<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>   * Build qualifier key from user 
permission:<a name="line.369"></a>
+<span class="sourceLineNo">370</span>   *  username<a name="line.370"></a>
+<span class="sourceLineNo">371</span>   *  username,family<a 
name="line.371"></a>
+<span class="sourceLineNo">372</span>   *  username,family,qualifier<a 
name="line.372"></a>
+<span class="sourceLineNo">373</span>   */<a name="line.373"></a>
+<span class="sourceLineNo">374</span>  static byte[] 
userPermissionKey(UserPermission permission) {<a name="line.374"></a>
+<span class="sourceLineNo">375</span>    byte[] key = 
Bytes.toBytes(permission.getUser());<a name="line.375"></a>
+<span class="sourceLineNo">376</span>    byte[] qualifier = null;<a 
name="line.376"></a>
+<span class="sourceLineNo">377</span>    byte[] family = null;<a 
name="line.377"></a>
+<span class="sourceLineNo">378</span>    if 
(permission.getPermission().getAccessScope() == Permission.Scope.TABLE) {<a 
name="line.378"></a>
+<span class="sourceLineNo">379</span>      TablePermission tablePermission = 
(TablePermission) permission.getPermission();<a name="line.379"></a>
+<span class="sourceLineNo">380</span>      family = 
tablePermission.getFamily();<a name="line.380"></a>
+<span class="sourceLineNo">381</span>      qualifier = 
tablePermission.getQualifier();<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>  /**<a name="line.384"></a>
-<span class="sourceLineNo">385</span>   * Returns {@code true} if the given 
region is part of the {@code _acl_}<a name="line.385"></a>
-<span class="sourceLineNo">386</span>   * metadata table.<a 
name="line.386"></a>
-<span class="sourceLineNo">387</span>   */<a name="line.387"></a>
-<span class="sourceLineNo">388</span>  static boolean isAclRegion(Region 
region) {<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    return 
ACL_TABLE_NAME.equals(region.getTableDescriptor().getTableName());<a 
name="line.389"></a>
-<span class="sourceLineNo">390</span>  }<a name="line.390"></a>
-<span class="sourceLineNo">391</span><a name="line.391"></a>
-<span class="sourceLineNo">392</span>  /**<a name="line.392"></a>
-<span class="sourceLineNo">393</span>   * Returns {@code true} if the given 
table is {@code _acl_} metadata table.<a name="line.393"></a>
-<span class="sourceLineNo">394</span>   */<a name="line.394"></a>
-<span class="sourceLineNo">395</span>  static boolean 
isAclTable(TableDescriptor desc) {<a name="line.395"></a>
-<span class="sourceLineNo">396</span>    return 
ACL_TABLE_NAME.equals(desc.getTableName());<a name="line.396"></a>
-<span class="sourceLineNo">397</span>  }<a name="line.397"></a>
-<span class="sourceLineNo">398</span><a name="line.398"></a>
-<span class="sourceLineNo">399</span>  /**<a name="line.399"></a>
-<span class="sourceLineNo">400</span>   * Loads all of the permission grants 
stored in a region of the {@code _acl_}<a name="line.400"></a>
-<span class="sourceLineNo">401</span>   * table.<a name="line.401"></a>
-<span class="sourceLineNo">402</span>   *<a name="line.402"></a>
-<span class="sourceLineNo">403</span>   * @param aclRegion<a 
name="line.403"></a>
-<span class="sourceLineNo">404</span>   * @return a map of the permissions for 
this table.<a name="line.404"></a>
-<span class="sourceLineNo">405</span>   * @throws IOException<a 
name="line.405"></a>
-<span class="sourceLineNo">406</span>   */<a name="line.406"></a>
-<span class="sourceLineNo">407</span>  static Map&lt;byte[], 
ListMultimap&lt;String,TablePermission&gt;&gt; loadAll(Region aclRegion)<a 
name="line.407"></a>
-<span class="sourceLineNo">408</span>      throws IOException {<a 
name="line.408"></a>
-<span class="sourceLineNo">409</span><a name="line.409"></a>
-<span class="sourceLineNo">410</span>    if (!isAclRegion(aclRegion)) {<a 
name="line.410"></a>
-<span class="sourceLineNo">411</span>      throw new IOException("Can only 
load permissions from "+ACL_TABLE_NAME);<a name="line.411"></a>
-<span class="sourceLineNo">412</span>    }<a name="line.412"></a>
-<span class="sourceLineNo">413</span><a name="line.413"></a>
-<span class="sourceLineNo">414</span>    Map&lt;byte[], 
ListMultimap&lt;String, TablePermission&gt;&gt; allPerms = new 
TreeMap&lt;&gt;(Bytes.BYTES_RAWCOMPARATOR);<a name="line.414"></a>
-<span class="sourceLineNo">415</span><a name="line.415"></a>
-<span class="sourceLineNo">416</span>    // do a full scan of _acl_ table<a 
name="line.416"></a>
-<span class="sourceLineNo">417</span><a name="line.417"></a>
-<span class="sourceLineNo">418</span>    Scan scan = new Scan();<a 
name="line.418"></a>
-<span class="sourceLineNo">419</span>    scan.addFamily(ACL_LIST_FAMILY);<a 
name="line.419"></a>
-<span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span>    InternalScanner iScanner = null;<a 
name="line.421"></a>
-<span class="sourceLineNo">422</span>    try {<a name="line.422"></a>
-<span class="sourceLineNo">423</span>      iScanner = 
aclRegion.getScanner(scan);<a name="line.423"></a>
-<span class="sourceLineNo">424</span><a name="line.424"></a>
-<span class="sourceLineNo">425</span>      while (true) {<a 
name="line.425"></a>
-<span class="sourceLineNo">426</span>        List&lt;Cell&gt; row = new 
ArrayList&lt;&gt;();<a name="line.426"></a>
-<span class="sourceLineNo">427</span><a name="line.427"></a>
-<span class="sourceLineNo">428</span>        boolean hasNext = 
iScanner.next(row);<a name="line.428"></a>
-<span class="sourceLineNo">429</span>        
ListMultimap&lt;String,TablePermission&gt; perms = 
ArrayListMultimap.create();<a name="line.429"></a>
-<span class="sourceLineNo">430</span>        byte[] entry = null;<a 
name="line.430"></a>
-<span class="sourceLineNo">431</span>        for (Cell kv : row) {<a 
name="line.431"></a>
-<span class="sourceLineNo">432</span>          if (entry == null) {<a 
name="line.432"></a>
-<span class="sourceLineNo">433</span>            entry = 
CellUtil.cloneRow(kv);<a name="line.433"></a>
-<span class="sourceLineNo">434</span>          }<a name="line.434"></a>
-<span class="sourceLineNo">435</span>          Pair&lt;String, 
TablePermission&gt; permissionsOfUserOnTable =<a name="line.435"></a>
-<span class="sourceLineNo">436</span>              
parsePermissionRecord(entry, kv, null, null, false, null);<a 
name="line.436"></a>
-<span class="sourceLineNo">437</span>          if (permissionsOfUserOnTable != 
null) {<a name="line.437"></a>
-<span class="sourceLineNo">438</span>            String username = 
permissionsOfUserOnTable.getFirst();<a name="line.438"></a>
-<span class="sourceLineNo">439</span>            TablePermission permissions = 
permissionsOfUserOnTable.getSecond();<a name="line.439"></a>
-<span class="sourceLineNo">440</span>            perms.put(username, 
permissions);<a name="line.440"></a>
-<span class="sourceLineNo">441</span>          }<a name="line.441"></a>
-<span class="sourceLineNo">442</span>        }<a name="line.442"></a>
-<span class="sourceLineNo">443</span>        if (entry != null) {<a 
name="line.443"></a>
-<span class="sourceLineNo">444</span>          allPerms.put(entry, perms);<a 
name="line.444"></a>
-<span class="sourceLineNo">445</span>        }<a name="line.445"></a>
-<span class="sourceLineNo">446</span>        if (!hasNext) {<a 
name="line.446"></a>
-<span class="sourceLineNo">447</span>          break;<a name="line.447"></a>
-<span class="sourceLineNo">448</span>        }<a name="line.448"></a>
-<span class="sourceLineNo">449</span>      }<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    } finally {<a name="line.450"></a>
-<span class="sourceLineNo">451</span>      if (iScanner != null) {<a 
name="line.451"></a>
-<span class="sourceLineNo">452</span>        iScanner.close();<a 
name="line.452"></a>
-<span class="sourceLineNo">453</span>      }<a name="line.453"></a>
-<span class="sourceLineNo">454</span>    }<a name="line.454"></a>
-<span class="sourceLineNo">455</span><a name="line.455"></a>
-<span class="sourceLineNo">456</span>    return allPerms;<a 
name="line.456"></a>
-<span class="sourceLineNo">457</span>  }<a name="line.457"></a>
-<span class="sourceLineNo">458</span><a name="line.458"></a>
-<span class="sourceLineNo">459</span>  /**<a name="line.459"></a>
-<span class="sourceLineNo">460</span>   * Load all permissions from the region 
server holding {@code _acl_},<a name="line.460"></a>
-<span class="sourceLineNo">461</span>   * primarily intended for testing 
purposes.<a name="line.461"></a>
-<span class="sourceLineNo">462</span>   */<a name="line.462"></a>
-<span class="sourceLineNo">463</span>  static Map&lt;byte[], 
ListMultimap&lt;String,TablePermission&gt;&gt; loadAll(<a name="line.463"></a>
-<span class="sourceLineNo">464</span>      Configuration conf) throws 
IOException {<a name="line.464"></a>
-<span class="sourceLineNo">465</span>    Map&lt;byte[], 
ListMultimap&lt;String,TablePermission&gt;&gt; allPerms = new 
TreeMap&lt;&gt;(Bytes.BYTES_RAWCOMPARATOR);<a name="line.465"></a>
+<span class="sourceLineNo">384</span>    if (family != null &amp;&amp; 
family.length &gt; 0) {<a name="line.384"></a>
+<span class="sourceLineNo">385</span>      key = Bytes.add(key, Bytes.add(new 
byte[]{ACL_KEY_DELIMITER}, family));<a name="line.385"></a>
+<span class="sourceLineNo">386</span>      if (qualifier != null &amp;&amp; 
qualifier.length &gt; 0) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span>        key = Bytes.add(key, 
Bytes.add(new byte[]{ACL_KEY_DELIMITER}, qualifier));<a name="line.387"></a>
+<span class="sourceLineNo">388</span>      }<a name="line.388"></a>
+<span class="sourceLineNo">389</span>    }<a name="line.389"></a>
+<span class="sourceLineNo">390</span><a name="line.390"></a>
+<span class="sourceLineNo">391</span>    return key;<a name="line.391"></a>
+<span class="sourceLineNo">392</span>  }<a name="line.392"></a>
+<span class="sourceLineNo">393</span><a name="line.393"></a>
+<span class="sourceLineNo">394</span>  /**<a name="line.394"></a>
+<span class="sourceLineNo">395</span>   * Returns {@code true} if the given 
region is part of the {@code _acl_}<a name="line.395"></a>
+<span class="sourceLineNo">396</span>   * metadata table.<a 
name="line.396"></a>
+<span class="sourceLineNo">397</span>   */<a name="line.397"></a>
+<span class="sourceLineNo">398</span>  static boolean isAclRegion(Region 
region) {<a name="line.398"></a>
+<span class="sourceLineNo">399</span>    return 
ACL_TABLE_NAME.equals(region.getTableDescriptor().getTableName());<a 
name="line.399"></a>
+<span class="sourceLineNo">400</span>  }<a name="line.400"></a>
+<span class="sourceLineNo">401</span><a name="line.401"></a>
+<span class="sourceLineNo">402</span>  /**<a name="line.402"></a>
+<span class="sourceLineNo">403</span>   * Returns {@code true} if the given 
table is {@code _acl_} metadata table.<a name="line.403"></a>
+<span class="sourceLineNo">404</span>   */<a name="line.404"></a>
+<span class="sourceLineNo">405</span>  static boolean 
isAclTable(TableDescriptor desc) {<a name="line.405"></a>
+<span class="sourceLineNo">406</span>    return 
ACL_TABLE_NAME.equals(desc.getTableName());<a name="line.406"></a>
+<span class="sourceLineNo">407</span>  }<a name="line.407"></a>
+<span class="sourceLineNo">408</span><a name="line.408"></a>
+<span class="sourceLineNo">409</span>  /**<a name="line.409"></a>
+<span class="sourceLineNo">410</span>   * Loads all of the permission grants 
stored in a region of the {@code _acl_}<a name="line.410"></a>
+<span class="sourceLineNo">411</span>   * table.<a name="line.411"></a>
+<span class="sourceLineNo">412</span>   *<a name="line.412"></a>
+<span class="sourceLineNo">413</span>   * @param aclRegion<a 
name="line.413"></a>
+<span class="sourceLineNo">414</span>   * @return a map of the permissions for 
this table.<a name="line.414"></a>
+<span class="sourceLineNo">415</span>   * @throws IOException<a 
name="line.415"></a>
+<span class="sourceLineNo">416</span>   */<a name="line.416"></a>
+<span class="sourceLineNo">417</span>  static Map&lt;byte[], 
ListMultimap&lt;String, UserPermission&gt;&gt; loadAll(Region aclRegion)<a 
name="line.417"></a>
+<span class="sourceLineNo">418</span>      throws IOException {<a 
name="line.418"></a>
+<span class="sourceLineNo">419</span><a name="line.419"></a>
+<span class="sourceLineNo">420</span>    if (!isAclRegion(aclRegion)) {<a 
name="line.420"></a>
+<span class="sourceLineNo">421</span>      throw new IOException("Can only 
load permissions from "+ACL_TABLE_NAME);<a name="line.421"></a>
+<span class="sourceLineNo">422</span>    }<a name="line.422"></a>
+<span class="sourceLineNo">423</span><a name="line.423"></a>
+<span class="sourceLineNo">424</span>    Map&lt;byte[], 
ListMultimap&lt;String, UserPermission&gt;&gt; allPerms =<a name="line.424"></a>
+<span class="sourceLineNo">425</span>      new 
TreeMap&lt;&gt;(Bytes.BYTES_RAWCOMPARATOR);<a name="line.425"></a>
+<span class="sourceLineNo">426</span><a name="line.426"></a>
+<span class="sourceLineNo">427</span>    // do a full scan of _acl_ table<a 
name="line.427"></a>
+<span class="sourceLineNo">428</span><a name="line.428"></a>
+<span class="sourceLineNo">429</span>    Scan scan = new Scan();<a 
name="line.429"></a>
+<span class="sourceLineNo">430</span>    scan.addFamily(ACL_LIST_FAMILY);<a 
name="line.430"></a>
+<span class="sourceLineNo">431</span><a name="line.431"></a>
+<span class="sourceLineNo">432</span>    InternalScanner iScanner = null;<a 
name="line.432"></a>
+<span class="sourceLineNo">433</span>    try {<a name="line.433"></a>
+<span class="sourceLineNo">434</span>      iScanner = 
aclRegion.getScanner(scan);<a name="line.434"></a>
+<span class="sourceLineNo">435</span><a name="line.435"></a>
+<span class="sourceLineNo">436</span>      while (true) {<a 
name="line.436"></a>
+<span class="sourceLineNo">437</span>        List&lt;Cell&gt; row = new 
ArrayList&lt;&gt;();<a name="line.437"></a>
+<span class="sourceLineNo">438</span><a name="line.438"></a>
+<span class="sourceLineNo">439</span>        boolean hasNext = 
iScanner.next(row);<a name="line.439"></a>
+<span class="sourceLineNo">440</span>        ListMultimap&lt;String, 
UserPermission&gt; perms = ArrayListMultimap.create();<a name="line.440"></a>
+<span class="sourceLineNo">441</span>        byte[] entry = null;<a 
name="line.441"></a>
+<span class="sourceLineNo">442</span>        for (Cell kv : row) {<a 
name="line.442"></a>
+<span class="sourceLineNo">443</span>          if (entry == null) {<a 
name="line.443"></a>
+<span class="sourceLineNo">444</span>            entry = 
CellUtil.cloneRow(kv);<a name="line.444"></a>
+<span class="sourceLineNo">445</span>          }<a name="line.445"></a>
+<span class="sourceLineNo">446</span>          Pair&lt;String, Permission&gt; 
permissionsOfUserOnTable =<a name="line.446"></a>
+<span class="sourceLineNo">447</span>              
parsePermissionRecord(entry, kv, null, null, false, null);<a 
name="line.447"></a>
+<span class="sourceLineNo">448</span>          if (permissionsOfUserOnTable != 
null) {<a name="line.448"></a>
+<span class="sourceLineNo">449</span>            String username = 
permissionsOfUserOnTable.getFirst();<a name="line.449"></a>
+<span class="sourceLineNo">450</span>            Permission permission = 
permissionsOfUserOnTable.getSecond();<a name="line.450"></a>
+<span class="sourceLineNo">451</span>            perms.put(username, new 
UserPermission(username, permission));<a name="line.451"></a>
+<span class="sourceLineNo">452</span>          }<a name="line.452"></a>
+<span class="sourceLineNo">453</span>        }<a name="line.453"></a>
+<span class="sourceLineNo">454</span>        if (entry != null) {<a 
name="line.454"></a>
+<span class="sourceLineNo">455</span>          allPerms.put(entry, perms);<a 
name="line.455"></a>
+<span class="sourceLineNo">456</span>        }<a name="line.456"></a>
+<span class="sourceLineNo">457</span>        if (!hasNext) {<a 
name="line.457"></a>
+<span class="sourceLineNo">458</span>          break;<a name="line.458"></a>
+<span class="sourceLineNo">459</span>        }<a name="line.459"></a>
+<span class="sourceLineNo">460</span>      }<a name="line.460"></a>
+<span class="sourceLineNo">461</span>    } finally {<a name="line.461"></a>
+<span class="sourceLineNo">462</span>      if (iScanner != null) {<a 
name="line.462"></a>
+<span class="sourceLineNo">463</span>        iScanner.close();<a 
name="line.463"></a>
+<span class="sourceLineNo">464</span>      }<a name="line.464"></a>
+<span class="sourceLineNo">465</span>    }<a name="line.465"></a>
 <span class="sourceLineNo">466</span><a name="line.466"></a>
-<span class="sourceLineNo">467</span>    // do a full scan of _acl_, filtering 
on only first table region rows<a name="line.467"></a>
-<span class="sourceLineNo">468</span><a name="line.468"></a>
-<span class="sourceLineNo">469</span>    Scan scan = new Scan();<a 
name="line.469"></a>
-<span class="sourceLineNo">470</span>    scan.addFamily(ACL_LIST_FAMILY);<a 
name="line.470"></a>
-<span class="sourceLineNo">471</span><a name="line.471"></a>
-<span class="sourceLineNo">472</span>    ResultScanner scanner = null;<a 
name="line.472"></a>
-<span class="sourceLineNo">473</span>    // TODO: Pass in a Connection rather 
than create one each time.<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    try (Connection connection = 
ConnectionFactory.createConnection(conf)) {<a name="line.474"></a>
-<span class="sourceLineNo">475</span>      try (Table table = 
connection.getTable(ACL_TABLE_NAME)) {<a name="line.475"></a>
-<span class="sourceLineNo">476</span>        scanner = 
table.getScanner(scan);<a name="line.476"></a>
-<span class="sourceLineNo">477</span>        try {<a name="line.477"></a>
-<span class="sourceLineNo">478</span>          for (Result row : scanner) {<a 
name="line.478"></a>
-<span class="sourceLineNo">479</span>            ListMultimap&lt;String, 
TablePermission&gt; resultPerms =<a name="line.479"></a>
-<span class="sourceLineNo">480</span>                
parsePermissions(row.getRow(), row, null, null, null, false);<a 
name="line.480"></a>
-<span class="sourceLineNo">481</span>            allPerms.put(row.getRow(), 
resultPerms);<a name="line.481"></a>
-<span class="sourceLineNo">482</span>          }<a name="line.482"></a>
-<span class="sourceLineNo">483</span>        } finally {<a name="line.483"></a>
-<span class="sourceLineNo">484</span>          if (scanner != null) 
scanner.close();<a name="line.484"></a>
-<span class="sourceLineNo">485</span>        }<a name="line.485"></a>
-<span class="sourceLineNo">486</span>      }<a name="line.486"></a>
-<span class="sourceLineNo">487</span>    }<a name="line.487"></a>
-<span class="sourceLineNo">488</span><a name="line.488"></a>
-<span class="sourceLineNo">489</span>    return allPerms;<a 
name="line.489"></a>
-<span class="sourceLineNo">490</span>  }<a name="line.490"></a>
-<span class="sourceLineNo">491</span><a name="line.491"></a>
-<span class="sourceLineNo">492</span>  public static ListMultimap&lt;String, 
TablePermission&gt; getTablePermissions(Configuration conf,<a 
name="line.492"></a>
-<span class="sourceLineNo">493</span>      TableName tableName) throws 
IOException {<a name="line.493"></a>
-<span class="sourceLineNo">494</span>    return getPermissions(conf, tableName 
!= null ? tableName.getName() : null, null, null, null,<a name="line.494"></a>
-<span class="sourceLineNo">495</span>      null, false);<a name="line.495"></a>
-<span class="sourceLineNo">496</span>  }<a name="line.496"></a>
-<span class="sourceLineNo">497</span><a name="line.497"></a>
-<span class="sourceLineNo">498</span>  @VisibleForTesting<a 
name="line.498"></a>
-<span class="sourceLineNo">499</span>  public static ListMultimap&lt;String, 
TablePermission&gt; getNamespacePermissions(Configuration conf,<a 
name="line.499"></a>
-<span class="sourceLineNo">500</span>      String namespace) throws 
IOException {<a name="line.500"></a>
-<span class="sourceLineNo">501</span>    return getPermissions(conf, 
Bytes.toBytes(toNamespaceEntry(namespace)), null, null, null, null,<a 
name="line.501"></a>
-<span class="sourceLineNo">502</span>      false);<a name="line.502"></a>
-<span class="sourceLineNo">503</span>  }<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span>  /**<a name="line.505"></a>
-<span class="sourceLineNo">506</span>   * Reads user permission assignments 
stored in the &lt;code&gt;l:&lt;/code&gt; column family of the first<a 
name="line.506"></a>
-<span class="sourceLineNo">507</span>   * table row in 
&lt;code&gt;_acl_&lt;/code&gt;.<a name="line.507"></a>
-<span class="sourceLineNo">508</span>   * &lt;p&gt;<a name="line.508"></a>
-<span class="sourceLineNo">509</span>   * See {@link AccessControlLists class 
documentation} for the key structure used for storage.<a name="line.509"></a>
-<span class="sourceLineNo">510</span>   * &lt;/p&gt;<a name="line.510"></a>
-<span class="sourceLineNo">511</span>   */<a name="line.511"></a>
-<span class="sourceLineNo">512</span>  static ListMultimap&lt;String, 
TablePermission&gt; getPermissions(Configuration conf, byte[] entryName,<a 
name="line.512"></a>
-<span class="sourceLineNo">513</span>      Table t, byte[] cf, byte[] cq, 
String user, boolean hasFilterUser) throws IOException {<a name="line.513"></a>
-<span class="sourceLineNo">514</span>    if (entryName == null) entryName = 
ACL_GLOBAL_NAME;<a name="line.514"></a>
-<span class="sourceLineNo">515</span>    // for normal user tables, we just 
read the table row from _acl_<a name="line.515"></a>
-<span class="sourceLineNo">516</span>    ListMultimap&lt;String, 
TablePermission&gt; perms = ArrayListMultimap.create();<a name="line.516"></a>
-<span class="sourceLineNo">517</span>    Get get = new Get(entryName);<a 
name="line.517"></a>
-<span class="sourceLineNo">518</span>    get.addFamily(ACL_LIST_FAMILY);<a 
name="line.518"></a>
-<span class="sourceLineNo">519</span>    Result row = null;<a 
name="line.519"></a>
-<span class="sourceLineNo">520</span>    if (t == null) {<a 
name="line.520"></a>
-<span class="sourceLineNo">521</span>      try (Connection connection = 
ConnectionFactory.createConnection(conf)) {<a name="line.521"></a>
-<span class="sourceLineNo">522</span>        try (Table table = 
connection.getTable(ACL_TABLE_NAME)) {<a name="line.522"></a>
-<span class="sourceLineNo">523</span>          row = table.get(get);<a 
name="line.523"></a>
-<span class="sourceLineNo">524</span>        }<a name="line.524"></a>
-<span class="sourceLineNo">525</span>      }<a name="line.525"></a>
-<span class="sourceLineNo">526</span>    } else {<a name="line.526"></a>
-<span class="sourceLineNo">527</span>      row = t.get(get);<a 
name="line.527"></a>
-<span class="sourceLineNo">528</span>    }<a name="line.528"></a>
-<span class="sourceLineNo">529</span>    if (!row.isEmpty()) {<a 
name="line.529"></a>
-<span class="sourceLineNo">530</span>      perms = parsePermissions(entryName, 
row, cf, cq, user, hasFilterUser);<a name="line.530"></a>
-<span class="sourceLineNo">531</span>    } else {<a name="line.531"></a>
-<span class="sourceLineNo">532</span>      LOG.info("No permissions found in " 
+ ACL_TABLE_NAME + " for acl entry "<a name="line.532"></a>
-<span class="sourceLineNo">533</span>          + Bytes.toString(entryName));<a 
name="line.533"></a>
-<span class="sourceLineNo">534</span>    }<a name="line.534"></a>
-<span class="sourceLineNo">535</span><a name="line.535"></a>
-<span class="sourceLineNo">536</span>    return perms;<a name="line.536"></a>
-<span class="sourceLineNo">537</span>  }<a name="line.537"></a>
-<span class="sourceLineNo">538</span><a name="line.538"></a>
-<span class="sourceLineNo">539</span>  /**<a name="line.539"></a>
-<span class="sourceLineNo">540</span>   * Returns the currently granted 
permissions for a given table as the specified user plus<a name="line.540"></a>
-<span class="sourceLineNo">541</span>   * associated permissions.<a 
name="line.541"></a>
-<span class="sourceLineNo">542</span>   */<a name="line.542"></a>
-<span class="sourceLineNo">543</span>  static List&lt;UserPermission&gt; 
getUserTablePermissions(Configuration conf, TableName tableName,<a 
name="line.543"></a>
-<span class="sourceLineNo">544</span>      byte[] cf, byte[] cq, String 
userName, boolean hasFilterUser) throws IOException {<a name="line.544"></a>
-<span class="sourceLineNo">545</span>    return getUserPermissions(conf, 
tableName == null ? null : tableName.getName(), cf, cq,<a name="line.545"></a>
-<span class="sourceLineNo">546</span>      userName, hasFilterUser);<a 
name="line.546"></a>
-<span class="sourceLineNo">547</span>  }<a name="line.547"></a>
-<span class="sourceLineNo">548</span><a name="line.548"></a>
-<span class="sourceLineNo">549</span>  /**<a name="line.549"></a>
-<span class="sourceLineNo">550</span>   * Returns the currently granted 
permissions for a given namespace as the specified user plus<a 
name="line.550"></a>
-<span class="sourceLineNo">551</span>   * associated permissions.<a 
name="line.551"></a>
-<span class="sourceLineNo">552</span>   */<a name="line.552"></a>
-<span class="sourceLineNo">553</span>  static List&lt;UserPermission&gt; 
getUserNamespacePermissions(Configuration conf, String namespace,<a 
name="line.553"></a>
-<span class="sourceLineNo">554</span>      String user, boolean hasFilterUser) 
throws IOException {<a name="line.554"></a>
-<span class="sourceLineNo">555</span>    return getUserPermissions(conf, 
Bytes.toBytes(toNamespaceEntry(namespace)), null, null, user,<a 
name="line.555"></a>
-<span class="sourceLineNo">556</span>      hasFilterUser);<a 
name="line.556"></a>
-<span class="sourceLineNo">557</span>  }<a name="line.557"></a>
-<span class="sourceLineNo">558</span><a name="line.558"></a>
-<span class="sourceLineNo">559</span>  /**<a name="line.559"></a>
-<span class="sourceLineNo">560</span>   * Returns the currently granted 
permissions for a given table/namespace with associated<a name="line.560"></a>
-<span class="sourceLineNo">561</span>   * permissions based on the specified 
column family, column qualifier and user name.<a name="line.561"></a>
-<span class="sourceLineNo">562</span>   * @param conf the configuration<a 
name="line.562"></a>
-<span class="sourceLineNo">563</span>   * @param entryName Table name or the 
namespace<a name="line.563"></a>
-<span class="sourceLineNo">564</span>   * @param cf Column family<a 
name="line.564"></a>
-<span class="sourceLineNo">565</span>   * @param cq Column qualifier<a 
name="line.565"></a>
-<span class="sourceLineNo">566</span>   * @param user User name to be filtered 
from permission as requested<a name="line.566"></a>
-<span class="sourceLineNo">567</span>   * @param hasFilterUser true if filter 
user is provided, otherwise false.<a name="line.567"></a>
-<span class="sourceLineNo">568</span>   * @return List of UserPermissions<a 
name="line.568"></a>
-<span class="sourceLineNo">569</span>   * @throws IOException on failure<a 
name="line.569"></a>
-<span class="sourceLineNo">570</span>   */<a name="line.570"></a>
-<span class="sourceLineNo">571</span>  static List&lt;UserPermission&gt; 
getUserPermissions(Configuration conf, byte[] entryName, byte[] cf,<a 
name="line.571"></a>
-<span class="sourceLineNo">572</span>      byte[] cq, String user, boolean 
hasFilterUser) throws IOException {<a name="line.572"></a>
-<span class="sourceLineNo">573</span>    ListMultimap&lt;String, 
TablePermission&gt; allPerms =<a name="line.573"></a>
-<span class="sourceLineNo">574</span>        getPermissions(conf, entryName, 
null, cf, cq, user, hasFilterUser);<a name="line.574"></a>
-<span class="sourceLineNo">575</span><a name="line.575"></a>
-<span class="sourceLineNo">576</span>    List&lt;UserPermission&gt; perms = 
new ArrayList&lt;&gt;();<a name="line.576"></a>
-<span class="sourceLineNo">577</span>    if (isNamespaceEntry(entryName)) { // 
Namespace<a name="line.577"></a>
-<span class="sourceLineNo">578</span>      for (Map.Entry&lt;String, 
TablePermission&gt; entry : allPerms.entries()) {<a name="line.578"></a>
-<span class="sourceLineNo">579</span>        UserPermission up = new 
UserPermission(Bytes.toBytes(entry.getKey()),<a name="line.579"></a>
-<span class="sourceLineNo">580</span>            
entry.getValue().getNamespace(), entry.getValue().getActions());<a 
name="line.580"></a>
-<span class="sourceLineNo">581</span>        perms.add(up);<a 
name="line.581"></a>
-<span class="sourceLineNo">582</span>      }<a name="line.582"></a>
-<span class="sourceLineNo">583</span>    } else { // Table<a 
name="line.583"></a>
-<span class="sourceLineNo">584</span>      for (Map.Entry&lt;String, 
TablePermission&gt; entry : allPerms.entries()) {<a name="line.584"></a>
-<span class="sourceLineNo">585</span>        UserPermission up = new 
UserPermission(Bytes.toBytes(entry.getKey()),<a name="line.585"></a>
-<span class="sourceLineNo">586</span>            
entry.getValue().getTableName(), entry.getValue().getFamily(),<a 
name="line.586"></a>
-<span class="sourceLineNo">587</span>            
entry.getValue().getQualifier(), entry.getValue().getActions());<a 
name="line.587"></a>
-<span class="sourceLineNo">588</span>        perms.add(up);<a 
name="line.588"></a>
-<span class="sourceLineNo">589</span>      }<a name="line.589"></a>
+<span class="sourceLineNo">467</span>    return allPerms;<a 
name="line.467"></a>
+<span class="sourceLineNo">468</span>  }<a name="line.468"></a>
+<span class="sourceLineNo">469</span><a name="line.469"></a>
+<span class="sourceLineNo">470</span>  /**<a name="line.470"></a>
+<span class="sourceLineNo">471</span>   * Load all permissions from the region 
server holding {@code _acl_},<a name="line.471"></a>
+<span class="sourceLineNo">472</span>   * primarily intended for testing 
purposes.<a name="line.472"></a>
+<span class="sourceLineNo">473</span>   */<a name="line.473"></a>
+<span class="sourceLineNo">474</span>  static Map&lt;byte[], 
ListMultimap&lt;String, UserPermission&gt;&gt; loadAll(<a name="line.474"></a>
+<span class="sourceLineNo">475</span>      Configuration conf) throws 
IOException {<a name="line.475"></a>
+<span class="sourceLineNo">476</span>    Map&lt;byte[], 
ListMultimap&lt;String, UserPermission&gt;&gt; allPerms =<a name="line.476"></a>
+<span class="sourceLineNo">477</span>      new 
TreeMap&lt;&gt;(Bytes.BYTES_RAWCOMPARATOR);<a name="line.477"></a>
+<span class="sourceLineNo">478</span><a name="line.478"></a>
+<span class="sourceLineNo">479</span>    // do a full scan of _acl_, filtering 
on only first table region rows<a name="line.479"></a>
+<span class="sourceLineNo">480</span><a name="line.480"></a>
+<span class="sourceLineNo">481</span>    Scan scan = new Scan();<a 
name="line.481"></a>
+<span class="sourceLineNo">482</span>    scan.addFamily(ACL_LIST_FAMILY);<a 
name="line.482"></a>
+<span class="sourceLineNo">483</span><a name="line.483"></a>
+<span class="sourceLineNo">484</span>    ResultScanner scanner = null;<a 
name="line.484"></a>
+<span class="sourceLineNo">485</span>    // TODO: Pass in a Connection rather 
than create one each time.<a name="line.485"></a>
+<span class="sourceLineNo">486</span>    try (Connection connection = 
ConnectionFactory.createConnection(conf)) {<a name="line.486"></a>
+<span class="sourceLineNo">487</span>      try (Table table = 
connection.getTable(ACL_TABLE_NAME)) {<a name="line.487"></a>
+<span class="sourceLineNo">488</span>        scanner = 
table.getScanner(scan);<a name="line.488"></a>
+<span class="sourceLineNo">489</span>        try {<a name="line.489"></a>
+<span class="sourceLineNo">490</span>          for (Result row : scanner) {<a 
name="line.490"></a>
+<span class="sourceLineNo">491</span>            ListMultimap&lt;String, 
UserPermission&gt; resultPerms =<a name="line.491"></a>
+<span class="sourceLineNo">492</span>                
parsePermissions(row.getRow(), row, null, null, null, false);<a 
name="line.492"></a>
+<span class="sourceLineNo">493</span>            allPerms.put(row.getRow(), 
resultPerms);<a name="line.493"></a>
+<span class="sourceLineNo">494</span>          }<a name="line.494"></a>
+<span class="sourceLineNo">495</span>        } finally {<a name="line.495"></a>
+<span class="sourceLineNo">496</span>          if (scanner != null) 
scanner.close();<a name="line.496"></a>
+<span class="sourceLineNo">497</span>        }<a name="line.497"></a>
+<span class="sourceLineNo">498</span>      }<a name="line.498"></a>
+<span class="sourceLineNo">499</span>    }<a name="line.499"></a>
+<span class="sourceLineNo">500</span><a name="line.500"></a>
+<span class="sourceLineNo">501</span>    return allPerms;<a 
name="line.501"></a>
+<span class="sourceLineNo">502</span>  }<a name="line.502"></a>
+<span class="sourceLineNo">503</span><a name="line.503"></a>
+<span class="sourceLineNo">504</span>  public static ListMultimap&lt;String, 
UserPermission&gt; getTablePermissions(Configuration conf,<a 
name="line.504"></a>
+<span class="sourceLineNo">505</span>      TableName tableName) throws 
IOException {<a name="line.505"></a>
+<span class="sourceLineNo">506</span>    return getPermissions(conf, tableName 
!= null ? tableName.getName() : null, null, null, null,<a name="line.506"></a>
+<span class="sourceLineNo">507</span>      null, false);<a name="line.507"></a>
+<span class="sourceLineNo">508</span>  }<a name="line.508"></a>
+<span class="sourceLineNo">509</span><a name="line.509"></a>
+<span class="sourceLineNo">510</span>  @VisibleForTesting<a 
name="line.510"></a>
+<span class="sourceLineNo">511</span>  public static ListMultimap&lt;String, 
UserPermission&gt; getNamespacePermissions(Configuration conf,<a 
name="line.511"></a>
+<span class="sourceLineNo">512</span>      String namespace) throws 
IOException {<a name="line.512"></a>
+<span class="sourceLineNo">513</span>    return getPermissions(conf, 
Bytes.toBytes(toNamespaceEntry(namespace)), null, null, null, null,<a 
name="line.513"></a>
+<span class="sourceLineNo">514</span>      false);<a name="line.514"></a>
+<span class="sourceLineNo">515</span>  }<a name="line.515"></a>
+<span class="sourceLineNo">516</span><a name="line.516"></a>
+<span class="sourceLineNo">517</span>  /**<a name="line.517"></a>
+<span class="sourceLineNo">518</span>   * Reads user permission assignments 
stored in the &lt;code&gt;l:&lt;/code&gt; column family of the first<a 
name="line.518"></a>
+<span class="sourceLineNo">519</span>   * table row in 
&lt;code&gt;_acl_&lt;/code&gt;.<a name="line.519"></a>
+<span class="sourceLineNo">520</span>   * &lt;p&gt;<a name="line.520"></a>
+<span class="sourceLineNo">521</span>   * See {@link AccessControlLists class 
documentation} for the key structure used for storage.<a name="line.521"></a>
+<span class="sourceLineNo">522</span>   * &lt;/p&gt;<a name="line.522"></a>
+<span class="sourceLineNo">523</span>   */<a name="line.523"></a>
+<span class="sourceLineNo">524</span>  static ListMultimap&lt;String, 
UserPermission&gt; getPermissions(Configuration conf, byte[] entryName,<a 
name="line.524"></a>
+<span class="sourceLineNo">525</span>      Table t, byte[] cf, byte[] cq, 
String user, boolean hasFilterUser) throws IOException {<a name="line.525"></a>
+<span class="sourceLineNo">526</span>    if (entryName == null) entryName = 
ACL_GLOBAL_NAME;<a name="line.526"></a>
+<span class="sourceLineNo">527</span>    // for normal user tables, we just 
read the table row from _acl_<a name="line.527"></a>
+<span class="sourceLineNo">528</span>    ListMultimap&lt;String, 
UserPermission&gt; perms = ArrayListMultimap.create();<a name="line.528"></a>
+<span class="sourceLineNo">529</span>    Get get = new Get(entryName);<a 
name="line.529"></a>
+<span class="sourceLineNo">530</span>    get.addFamily(ACL_LIST_FAMILY);<a 
name="line.530"></a>
+<span class="sourceLineNo">531</span>    Result row = null;<a 
name="line.531"></a>
+<span class="sourceLineNo">532</span>    if (t == null) {<a 
name="line.532"></a>
+<span class="sourceLineNo">533</span>      try (Connection connection = 
ConnectionFactory.createConnection(conf)) {<a name="line.533"></a>
+<span class="sourceLineNo">534</span>        try (Table table = 
connection.getTable(ACL_TABLE_NAME)) {<a name="line.534"></a>
+<span class="sourceLineNo">535</span>          row = table.get(get);<a 
name="line.535"></a>
+<span class="sourceLineNo">536</span>        }<a name="line.536"></a>
+<span class="sourceLineNo">537</span>      }<a name="line.537"></a>
+<span class="sourceLineNo">538</span>    } else {<a name="line.538"></a>
+<span class="sourceLineNo">539</span>      row = t.get(get);<a 
name="line.539"></a>
+<span class="sourceLineNo">540</span>    }<a name="line.540"></a>
+<span class="sourceLineNo">541</span>    if (!row.isEmpty()) {<a 
name="line.541"></a>
+<span class="sourceLineNo">542</span>      perms = parsePermissions(entryName, 
row, cf, cq, user, hasFilterUser);<a name="line.542"></a>
+<span class="sourceLineNo">543</span>    } else {<a name="line.543"></a>
+<span class="sourceLineNo">544</span>      LOG.info("No permissions found in " 
+ ACL_TABLE_NAME + " for acl entry "<a name="line.544"></a>
+<span class="sourceLineNo">545</span>          + Bytes.toString(entryName));<a 
name="line.545"></a>
+<span class="sourceLineNo">546</span>    }<a name="line.546"></a>
+<span class="sourceLineNo">547</span><a name="line.547"></a>
+<span class="sourceLineNo">548</span>    return perms;<a name="line.548"></a>
+<span class="sourceLineNo">549</span>  }<a name="line.549"></a>
+<span class="sourceLineNo">550</span><a name="line.550"></a>
+<span class="sourceLineNo">551</span>  /**<a name="line.551"></a>
+<span class="sourceLineNo">552</span>   * Returns the currently granted 
permissions for a given table as the specified user plus<a name="line.552"></a>
+<span class="sourceLineNo">553</span>   * associated permissions.<a 
name="line.553"></a>
+<span class="sourceLineNo">554</span>   */<a name="line.554"></a>
+<span class="sourceLineNo">555</span>  static List&lt;UserPermission&gt; 
getUserTablePermissions(Configuration conf, TableName tableName,<a 
name="line.555"></a>
+<span class="sourceLineNo">556</span>      byte[] cf, byte[] cq, String 
userName, boolean hasFilterUser) throws IOException {<a name="line.556"></a>
+<span class="sourceLineNo">557</span>    return getUserPermissions(conf, 
tableName == null ? null : tableName.getName(), cf, cq,<a name="line.557"></a>
+<span class="sourceLineNo">558</span>      userName, hasFilterUser);<a 
name="line.558"></a>
+<span class="sourceLineNo">559</span>  }<a name="line.559"></a>
+<span class="sourceLineNo">560</span><a name="line.560"></a>
+<span class="sourceLineNo">561</span>  /**<a name="line.561"></a>
+<span class="sourceLineNo">562</span>   * Returns the currently granted 
permissions for a given namespace as the specified user plus<a 
name="line.562"></a>
+<span class="sourceLineNo">563</span>   * associated permissions.<a 
name="line.563"></a>
+<span class="sourceLineNo">564</span>   */<a name="line.564"></a>
+<span class="sourceLineNo">565</span>  static List&lt;UserPermission&gt; 
getUserNamespacePermissions(Configuration conf, String namespace,<a 
name="line.565"></a>
+<span class="sourceLineNo">566</span>      String user, boolean hasFilterUser) 
throws IOException {<a name="line.566"></a>
+<span class="sourceLineNo">567</span>    return getUserPermissions(conf, 
Bytes.toBytes(toNamespaceEntry(namespace)), null, null, user,<a 
name="line.567"></a>
+<span class="sourceLineNo">568</span>      hasFilterUser);<a 
name="line.568"></a>
+<span class="sourceLineNo">569</span>  }<a name="line.569"></a>
+<span class="sourceLineNo">570</span><a name="line.570"></a>
+<span class="sourceLineNo">571</span>  /**<a name="line.571"></a>
+<span class="sourceLineNo">572</span>   * Returns the currently granted 
permissions for a given table/namespace with associated<a name="line.572"></a>
+<span class="sourceLineNo">573</span>   * permissions based on the specified 
column family, column qualifier and user name.<a name="line.573"></a>
+<span class="sourceLineNo">574</span>   * @param conf the configuration<a 
name="line.574"></a>
+<span class="sourceLineNo">575</span>   * @param entryName Table name or the 
namespace<a name="line.575"></a>
+<span class="sourceLineNo">576</span>   * @param cf Column family<a 
name="line.576"></a>
+<span class="sourceLineNo">577</span>   * @param cq Column qualifier<a 
name="line.577"></a>
+<span class="sourceLineNo">578</span>   * @param user User name to be filtered 
from permission as requested<a name="line.578"></a>
+<span class="sourceLineNo">579</span>   * @param hasFilterUser true if filter 
user is provided, otherwise false.<a name="line.579"></a>
+<span class="sourceLineNo">580</span>   * @return List of UserPermissions<a 
name="line.580"></a>
+<span class="sourceLineNo">581</span>   * @throws IOException on failure<a 
name="line.581"></a>
+<span class="sourceLineNo">582</span>   */<a name="line.582"></a>
+<span class="sourceLineNo">583</span>  static List&lt;UserPermission&gt; 
getUserPermissions(Configuration conf, byte[] entryName, byte[] cf,<a 
name="line.583"></a>
+<span class="sourceLineNo">584</span>      byte[] cq, String user, boolean 
hasFilterUser) throws IOException {<a name="line.584"></a>
+<span class="sourceLineNo">585</span>    ListMultimap&lt;Str

<TRUNCATED>

Reply via email to