You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2017/09/24 15:13:41 UTC
[15/49] hbase-site git commit: Published site at .

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e6bd0774/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html
index f6e5737..7c465b8 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html
@@ -25,341 +25,370 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.quotas;<a name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import java.util.ArrayList;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import java.util.List;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import java.util.concurrent.TimeUnit;<a name="line.22"></a>
-<span class="sourceLineNo">023</span><a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.TableName;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaRequest;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Quotas;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota;<a name="line.30"></a>
-<span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span>@InterfaceAudience.Public<a name="line.32"></a>
-<span class="sourceLineNo">033</span>public class QuotaSettingsFactory {<a name="line.33"></a>
-<span class="sourceLineNo">034</span>  static class QuotaGlobalsSettingsBypass extends QuotaSettings {<a name="line.34"></a>
-<span class="sourceLineNo">035</span>    private final boolean bypassGlobals;<a name="line.35"></a>
-<span class="sourceLineNo">036</span><a name="line.36"></a>
-<span class="sourceLineNo">037</span>    QuotaGlobalsSettingsBypass(final String userName, final TableName tableName,<a name="line.37"></a>
-<span class="sourceLineNo">038</span>      final String namespace, final boolean bypassGlobals) {<a name="line.38"></a>
-<span class="sourceLineNo">039</span>      super(userName, tableName, namespace);<a name="line.39"></a>
-<span class="sourceLineNo">040</span>      this.bypassGlobals = bypassGlobals;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>    }<a name="line.41"></a>
-<span class="sourceLineNo">042</span><a name="line.42"></a>
-<span class="sourceLineNo">043</span>    @Override<a name="line.43"></a>
-<span class="sourceLineNo">044</span>    public QuotaType getQuotaType() {<a name="line.44"></a>
-<span class="sourceLineNo">045</span>      return QuotaType.GLOBAL_BYPASS;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>    }<a name="line.46"></a>
-<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span>    @Override<a name="line.48"></a>
-<span class="sourceLineNo">049</span>    protected void setupSetQuotaRequest(SetQuotaRequest.Builder builder) {<a name="line.49"></a>
-<span class="sourceLineNo">050</span>      builder.setBypassGlobals(bypassGlobals);<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    }<a name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span>    @Override<a name="line.53"></a>
-<span class="sourceLineNo">054</span>    public String toString() {<a name="line.54"></a>
-<span class="sourceLineNo">055</span>      return "GLOBAL_BYPASS =&gt; " + bypassGlobals;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    }<a name="line.56"></a>
-<span class="sourceLineNo">057</span>  }<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span>  /* ==========================================================================<a name="line.59"></a>
-<span class="sourceLineNo">060</span>   *  QuotaSettings from the Quotas object<a name="line.60"></a>
-<span class="sourceLineNo">061</span>   */<a name="line.61"></a>
-<span class="sourceLineNo">062</span>  static List&lt;QuotaSettings&gt; fromUserQuotas(final String userName, final Quotas quotas) {<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    return fromQuotas(userName, null, null, quotas);<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  }<a name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span>  static List&lt;QuotaSettings&gt; fromUserQuotas(final String userName, final TableName tableName,<a name="line.66"></a>
-<span class="sourceLineNo">067</span>      final Quotas quotas) {<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    return fromQuotas(userName, tableName, null, quotas);<a name="line.68"></a>
-<span class="sourceLineNo">069</span>  }<a name="line.69"></a>
+<span class="sourceLineNo">020</span>import java.io.IOException;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import java.util.ArrayList;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.util.List;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import java.util.concurrent.TimeUnit;<a name="line.23"></a>
+<span class="sourceLineNo">024</span><a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.TableName;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.26"></a>
+<span class="sourceLineNo">027</span><a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaRequest;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Quotas;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota;<a name="line.32"></a>
+<span class="sourceLineNo">033</span><a name="line.33"></a>
+<span class="sourceLineNo">034</span>@InterfaceAudience.Public<a name="line.34"></a>
+<span class="sourceLineNo">035</span>public class QuotaSettingsFactory {<a name="line.35"></a>
+<span class="sourceLineNo">036</span>  static class QuotaGlobalsSettingsBypass extends QuotaSettings {<a name="line.36"></a>
+<span class="sourceLineNo">037</span>    private final boolean bypassGlobals;<a name="line.37"></a>
+<span class="sourceLineNo">038</span><a name="line.38"></a>
+<span class="sourceLineNo">039</span>    QuotaGlobalsSettingsBypass(final String userName, final TableName tableName,<a name="line.39"></a>
+<span class="sourceLineNo">040</span>      final String namespace, final boolean bypassGlobals) {<a name="line.40"></a>
+<span class="sourceLineNo">041</span>      super(userName, tableName, namespace);<a name="line.41"></a>
+<span class="sourceLineNo">042</span>      this.bypassGlobals = bypassGlobals;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>    }<a name="line.43"></a>
+<span class="sourceLineNo">044</span><a name="line.44"></a>
+<span class="sourceLineNo">045</span>    @Override<a name="line.45"></a>
+<span class="sourceLineNo">046</span>    public QuotaType getQuotaType() {<a name="line.46"></a>
+<span class="sourceLineNo">047</span>      return QuotaType.GLOBAL_BYPASS;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>    }<a name="line.48"></a>
+<span class="sourceLineNo">049</span><a name="line.49"></a>
+<span class="sourceLineNo">050</span>    @Override<a name="line.50"></a>
+<span class="sourceLineNo">051</span>    protected void setupSetQuotaRequest(SetQuotaRequest.Builder builder) {<a name="line.51"></a>
+<span class="sourceLineNo">052</span>      builder.setBypassGlobals(bypassGlobals);<a name="line.52"></a>
+<span class="sourceLineNo">053</span>    }<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span>    @Override<a name="line.55"></a>
+<span class="sourceLineNo">056</span>    public String toString() {<a name="line.56"></a>
+<span class="sourceLineNo">057</span>      return "GLOBAL_BYPASS =&gt; " + bypassGlobals;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    }<a name="line.58"></a>
+<span class="sourceLineNo">059</span><a name="line.59"></a>
+<span class="sourceLineNo">060</span>    protected boolean getBypass() {<a name="line.60"></a>
+<span class="sourceLineNo">061</span>      return bypassGlobals;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    }<a name="line.62"></a>
+<span class="sourceLineNo">063</span><a name="line.63"></a>
+<span class="sourceLineNo">064</span>    @Override<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    protected QuotaGlobalsSettingsBypass merge(QuotaSettings newSettings) throws IOException {<a name="line.65"></a>
+<span class="sourceLineNo">066</span>      if (newSettings instanceof QuotaGlobalsSettingsBypass) {<a name="line.66"></a>
+<span class="sourceLineNo">067</span>        QuotaGlobalsSettingsBypass other = (QuotaGlobalsSettingsBypass) newSettings;<a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span>        validateQuotaTarget(other);<a name="line.69"></a>
 <span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span>  static List&lt;QuotaSettings&gt; fromUserQuotas(final String userName, final String namespace,<a name="line.71"></a>
-<span class="sourceLineNo">072</span>      final Quotas quotas) {<a name="line.72"></a>
-<span class="sourceLineNo">073</span>    return fromQuotas(userName, null, namespace, quotas);<a name="line.73"></a>
-<span class="sourceLineNo">074</span>  }<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span>  static List&lt;QuotaSettings&gt; fromTableQuotas(final TableName tableName, final Quotas quotas) {<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    return fromQuotas(null, tableName, null, quotas);<a name="line.77"></a>
-<span class="sourceLineNo">078</span>  }<a name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span>  static List&lt;QuotaSettings&gt; fromNamespaceQuotas(final String namespace, final Quotas quotas) {<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    return fromQuotas(null, null, namespace, quotas);<a name="line.81"></a>
-<span class="sourceLineNo">082</span>  }<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span>  private static List&lt;QuotaSettings&gt; fromQuotas(final String userName, final TableName tableName,<a name="line.84"></a>
-<span class="sourceLineNo">085</span>      final String namespace, final Quotas quotas) {<a name="line.85"></a>
-<span class="sourceLineNo">086</span>    List&lt;QuotaSettings&gt; settings = new ArrayList&lt;&gt;();<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    if (quotas.hasThrottle()) {<a name="line.87"></a>
-<span class="sourceLineNo">088</span>      settings.addAll(fromThrottle(userName, tableName, namespace, quotas.getThrottle()));<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    }<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    if (quotas.getBypassGlobals() == true) {<a name="line.90"></a>
-<span class="sourceLineNo">091</span>      settings.add(new QuotaGlobalsSettingsBypass(userName, tableName, namespace, true));<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    }<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    if (quotas.hasSpace()) {<a name="line.93"></a>
-<span class="sourceLineNo">094</span>      settings.add(fromSpace(tableName, namespace, quotas.getSpace()));<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    }<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    return settings;<a name="line.96"></a>
-<span class="sourceLineNo">097</span>  }<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span>  private static List&lt;QuotaSettings&gt; fromThrottle(final String userName, final TableName tableName,<a name="line.99"></a>
-<span class="sourceLineNo">100</span>      final String namespace, final QuotaProtos.Throttle throttle) {<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    List&lt;QuotaSettings&gt; settings = new ArrayList&lt;&gt;();<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    if (throttle.hasReqNum()) {<a name="line.102"></a>
-<span class="sourceLineNo">103</span>      settings.add(ThrottleSettings.fromTimedQuota(userName, tableName, namespace,<a name="line.103"></a>
-<span class="sourceLineNo">104</span>          ThrottleType.REQUEST_NUMBER, throttle.getReqNum()));<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    }<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    if (throttle.hasReqSize()) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>      settings.add(ThrottleSettings.fromTimedQuota(userName, tableName, namespace,<a name="line.107"></a>
-<span class="sourceLineNo">108</span>          ThrottleType.REQUEST_SIZE, throttle.getReqSize()));<a name="line.108"></a>
+<span class="sourceLineNo">071</span>        if (getBypass() != other.getBypass()) {<a name="line.71"></a>
+<span class="sourceLineNo">072</span>          return other;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>        }<a name="line.73"></a>
+<span class="sourceLineNo">074</span>      }<a name="line.74"></a>
+<span class="sourceLineNo">075</span>      return this;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    }<a name="line.76"></a>
+<span class="sourceLineNo">077</span>  }<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span>  /* ==========================================================================<a name="line.79"></a>
+<span class="sourceLineNo">080</span>   *  QuotaSettings from the Quotas object<a name="line.80"></a>
+<span class="sourceLineNo">081</span>   */<a name="line.81"></a>
+<span class="sourceLineNo">082</span>  static List&lt;QuotaSettings&gt; fromUserQuotas(final String userName, final Quotas quotas) {<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    return fromQuotas(userName, null, null, quotas);<a name="line.83"></a>
+<span class="sourceLineNo">084</span>  }<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span>  static List&lt;QuotaSettings&gt; fromUserQuotas(final String userName, final TableName tableName,<a name="line.86"></a>
+<span class="sourceLineNo">087</span>      final Quotas quotas) {<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    return fromQuotas(userName, tableName, null, quotas);<a name="line.88"></a>
+<span class="sourceLineNo">089</span>  }<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span>  static List&lt;QuotaSettings&gt; fromUserQuotas(final String userName, final String namespace,<a name="line.91"></a>
+<span class="sourceLineNo">092</span>      final Quotas quotas) {<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    return fromQuotas(userName, null, namespace, quotas);<a name="line.93"></a>
+<span class="sourceLineNo">094</span>  }<a name="line.94"></a>
+<span class="sourceLineNo">095</span><a name="line.95"></a>
+<span class="sourceLineNo">096</span>  static List&lt;QuotaSettings&gt; fromTableQuotas(final TableName tableName, final Quotas quotas) {<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    return fromQuotas(null, tableName, null, quotas);<a name="line.97"></a>
+<span class="sourceLineNo">098</span>  }<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span>  static List&lt;QuotaSettings&gt; fromNamespaceQuotas(final String namespace, final Quotas quotas) {<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    return fromQuotas(null, null, namespace, quotas);<a name="line.101"></a>
+<span class="sourceLineNo">102</span>  }<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span>  private static List&lt;QuotaSettings&gt; fromQuotas(final String userName, final TableName tableName,<a name="line.104"></a>
+<span class="sourceLineNo">105</span>      final String namespace, final Quotas quotas) {<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    List&lt;QuotaSettings&gt; settings = new ArrayList&lt;&gt;();<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    if (quotas.hasThrottle()) {<a name="line.107"></a>
+<span class="sourceLineNo">108</span>      settings.addAll(fromThrottle(userName, tableName, namespace, quotas.getThrottle()));<a name="line.108"></a>
 <span class="sourceLineNo">109</span>    }<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    if (throttle.hasWriteNum()) {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      settings.add(ThrottleSettings.fromTimedQuota(userName, tableName, namespace,<a name="line.111"></a>
-<span class="sourceLineNo">112</span>          ThrottleType.WRITE_NUMBER, throttle.getWriteNum()));<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    }<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    if (throttle.hasWriteSize()) {<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      settings.add(ThrottleSettings.fromTimedQuota(userName, tableName, namespace,<a name="line.115"></a>
-<span class="sourceLineNo">116</span>          ThrottleType.WRITE_SIZE, throttle.getWriteSize()));<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    }<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    if (throttle.hasReadNum()) {<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      settings.add(ThrottleSettings.fromTimedQuota(userName, tableName, namespace,<a name="line.119"></a>
-<span class="sourceLineNo">120</span>          ThrottleType.READ_NUMBER, throttle.getReadNum()));<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    }<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    if (throttle.hasReadSize()) {<a name="line.122"></a>
+<span class="sourceLineNo">110</span>    if (quotas.getBypassGlobals() == true) {<a name="line.110"></a>
+<span class="sourceLineNo">111</span>      settings.add(new QuotaGlobalsSettingsBypass(userName, tableName, namespace, true));<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    }<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    if (quotas.hasSpace()) {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>      settings.add(fromSpace(tableName, namespace, quotas.getSpace()));<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    }<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    return settings;<a name="line.116"></a>
+<span class="sourceLineNo">117</span>  }<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span>  private static List&lt;QuotaSettings&gt; fromThrottle(final String userName, final TableName tableName,<a name="line.119"></a>
+<span class="sourceLineNo">120</span>      final String namespace, final QuotaProtos.Throttle throttle) {<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    List&lt;QuotaSettings&gt; settings = new ArrayList&lt;&gt;();<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    if (throttle.hasReqNum()) {<a name="line.122"></a>
 <span class="sourceLineNo">123</span>      settings.add(ThrottleSettings.fromTimedQuota(userName, tableName, namespace,<a name="line.123"></a>
-<span class="sourceLineNo">124</span>          ThrottleType.READ_SIZE, throttle.getReadSize()));<a name="line.124"></a>
+<span class="sourceLineNo">124</span>          ThrottleType.REQUEST_NUMBER, throttle.getReqNum()));<a name="line.124"></a>
 <span class="sourceLineNo">125</span>    }<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    return settings;<a name="line.126"></a>
-<span class="sourceLineNo">127</span>  }<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span>  static QuotaSettings fromSpace(TableName table, String namespace, SpaceQuota protoQuota) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    if ((table == null &amp;&amp; namespace == null) || (table != null &amp;&amp; namespace != null)) {<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      throw new IllegalArgumentException(<a name="line.131"></a>
-<span class="sourceLineNo">132</span>          "Can only construct SpaceLimitSettings for a table or namespace.");<a name="line.132"></a>
+<span class="sourceLineNo">126</span>    if (throttle.hasReqSize()) {<a name="line.126"></a>
+<span class="sourceLineNo">127</span>      settings.add(ThrottleSettings.fromTimedQuota(userName, tableName, namespace,<a name="line.127"></a>
+<span class="sourceLineNo">128</span>          ThrottleType.REQUEST_SIZE, throttle.getReqSize()));<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    }<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    if (throttle.hasWriteNum()) {<a name="line.130"></a>
+<span class="sourceLineNo">131</span>      settings.add(ThrottleSettings.fromTimedQuota(userName, tableName, namespace,<a name="line.131"></a>
+<span class="sourceLineNo">132</span>          ThrottleType.WRITE_NUMBER, throttle.getWriteNum()));<a name="line.132"></a>
 <span class="sourceLineNo">133</span>    }<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    if (table != null) {<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      return SpaceLimitSettings.fromSpaceQuota(table, protoQuota);<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    } else {<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      // namespace must be non-null<a name="line.137"></a>
-<span class="sourceLineNo">138</span>      return SpaceLimitSettings.fromSpaceQuota(namespace, protoQuota);<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    }<a name="line.139"></a>
-<span class="sourceLineNo">140</span>  }<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span>  /* ==========================================================================<a name="line.142"></a>
-<span class="sourceLineNo">143</span>   *  RPC Throttle<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>  /**<a name="line.146"></a>
-<span class="sourceLineNo">147</span>   * Throttle the specified user.<a name="line.147"></a>
-<span class="sourceLineNo">148</span>   *<a name="line.148"></a>
-<span class="sourceLineNo">149</span>   * @param userName the user to throttle<a name="line.149"></a>
-<span class="sourceLineNo">150</span>   * @param type the type of throttling<a name="line.150"></a>
-<span class="sourceLineNo">151</span>   * @param limit the allowed number of request/data per timeUnit<a name="line.151"></a>
-<span class="sourceLineNo">152</span>   * @param timeUnit the limit time unit<a name="line.152"></a>
-<span class="sourceLineNo">153</span>   * @return the quota settings<a name="line.153"></a>
-<span class="sourceLineNo">154</span>   */<a name="line.154"></a>
-<span class="sourceLineNo">155</span>  public static QuotaSettings throttleUser(final String userName, final ThrottleType type,<a name="line.155"></a>
-<span class="sourceLineNo">156</span>      final long limit, final TimeUnit timeUnit) {<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    return throttle(userName, null, null, type, limit, timeUnit);<a name="line.157"></a>
-<span class="sourceLineNo">158</span>  }<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span>  /**<a name="line.160"></a>
-<span class="sourceLineNo">161</span>   * Throttle the specified user on the specified table.<a name="line.161"></a>
-<span class="sourceLineNo">162</span>   *<a name="line.162"></a>
-<span class="sourceLineNo">163</span>   * @param userName the user to throttle<a name="line.163"></a>
-<span class="sourceLineNo">164</span>   * @param tableName the table to throttle<a name="line.164"></a>
-<span class="sourceLineNo">165</span>   * @param type the type of throttling<a name="line.165"></a>
-<span class="sourceLineNo">166</span>   * @param limit the allowed number of request/data per timeUnit<a name="line.166"></a>
-<span class="sourceLineNo">167</span>   * @param timeUnit the limit time unit<a name="line.167"></a>
-<span class="sourceLineNo">168</span>   * @return the quota settings<a name="line.168"></a>
-<span class="sourceLineNo">169</span>   */<a name="line.169"></a>
-<span class="sourceLineNo">170</span>  public static QuotaSettings throttleUser(final String userName, final TableName tableName,<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      final ThrottleType type, final long limit, final TimeUnit timeUnit) {<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    return throttle(userName, tableName, null, type, limit, timeUnit);<a name="line.172"></a>
-<span class="sourceLineNo">173</span>  }<a name="line.173"></a>
+<span class="sourceLineNo">134</span>    if (throttle.hasWriteSize()) {<a name="line.134"></a>
+<span class="sourceLineNo">135</span>      settings.add(ThrottleSettings.fromTimedQuota(userName, tableName, namespace,<a name="line.135"></a>
+<span class="sourceLineNo">136</span>          ThrottleType.WRITE_SIZE, throttle.getWriteSize()));<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    }<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    if (throttle.hasReadNum()) {<a name="line.138"></a>
+<span class="sourceLineNo">139</span>      settings.add(ThrottleSettings.fromTimedQuota(userName, tableName, namespace,<a name="line.139"></a>
+<span class="sourceLineNo">140</span>          ThrottleType.READ_NUMBER, throttle.getReadNum()));<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    }<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    if (throttle.hasReadSize()) {<a name="line.142"></a>
+<span class="sourceLineNo">143</span>      settings.add(ThrottleSettings.fromTimedQuota(userName, tableName, namespace,<a name="line.143"></a>
+<span class="sourceLineNo">144</span>          ThrottleType.READ_SIZE, throttle.getReadSize()));<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    }<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    return settings;<a name="line.146"></a>
+<span class="sourceLineNo">147</span>  }<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span>  static QuotaSettings fromSpace(TableName table, String namespace, SpaceQuota protoQuota) {<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    if (protoQuota == null) {<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      return null;<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    }<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    if ((table == null &amp;&amp; namespace == null) || (table != null &amp;&amp; namespace != null)) {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>      throw new IllegalArgumentException(<a name="line.154"></a>
+<span class="sourceLineNo">155</span>          "Can only construct SpaceLimitSettings for a table or namespace.");<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    }<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    if (table != null) {<a name="line.157"></a>
+<span class="sourceLineNo">158</span>      if (protoQuota.getRemove()) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span>        return new SpaceLimitSettings(table);<a name="line.159"></a>
+<span class="sourceLineNo">160</span>      }<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      return SpaceLimitSettings.fromSpaceQuota(table, protoQuota);<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    } else {<a name="line.162"></a>
+<span class="sourceLineNo">163</span>      if (protoQuota.getRemove()) {<a name="line.163"></a>
+<span class="sourceLineNo">164</span>        return new SpaceLimitSettings(namespace);<a name="line.164"></a>
+<span class="sourceLineNo">165</span>      }<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      // namespace must be non-null<a name="line.166"></a>
+<span class="sourceLineNo">167</span>      return SpaceLimitSettings.fromSpaceQuota(namespace, protoQuota);<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    }<a name="line.168"></a>
+<span class="sourceLineNo">169</span>  }<a name="line.169"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span>  /* ==========================================================================<a name="line.171"></a>
+<span class="sourceLineNo">172</span>   *  RPC Throttle<a name="line.172"></a>
+<span class="sourceLineNo">173</span>   */<a name="line.173"></a>
 <span class="sourceLineNo">174</span><a name="line.174"></a>
 <span class="sourceLineNo">175</span>  /**<a name="line.175"></a>
-<span class="sourceLineNo">176</span>   * Throttle the specified user on the specified namespace.<a name="line.176"></a>
+<span class="sourceLineNo">176</span>   * Throttle the specified user.<a name="line.176"></a>
 <span class="sourceLineNo">177</span>   *<a name="line.177"></a>
 <span class="sourceLineNo">178</span>   * @param userName the user to throttle<a name="line.178"></a>
-<span class="sourceLineNo">179</span>   * @param namespace the namespace to throttle<a name="line.179"></a>
-<span class="sourceLineNo">180</span>   * @param type the type of throttling<a name="line.180"></a>
-<span class="sourceLineNo">181</span>   * @param limit the allowed number of request/data per timeUnit<a name="line.181"></a>
-<span class="sourceLineNo">182</span>   * @param timeUnit the limit time unit<a name="line.182"></a>
-<span class="sourceLineNo">183</span>   * @return the quota settings<a name="line.183"></a>
-<span class="sourceLineNo">184</span>   */<a name="line.184"></a>
-<span class="sourceLineNo">185</span>  public static QuotaSettings throttleUser(final String userName, final String namespace,<a name="line.185"></a>
-<span class="sourceLineNo">186</span>      final ThrottleType type, final long limit, final TimeUnit timeUnit) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    return throttle(userName, null, namespace, type, limit, timeUnit);<a name="line.187"></a>
-<span class="sourceLineNo">188</span>  }<a name="line.188"></a>
-<span class="sourceLineNo">189</span><a name="line.189"></a>
-<span class="sourceLineNo">190</span>  /**<a name="line.190"></a>
-<span class="sourceLineNo">191</span>   * Remove the throttling for the specified user.<a name="line.191"></a>
-<span class="sourceLineNo">192</span>   *<a name="line.192"></a>
-<span class="sourceLineNo">193</span>   * @param userName the user<a name="line.193"></a>
-<span class="sourceLineNo">194</span>   * @return the quota settings<a name="line.194"></a>
-<span class="sourceLineNo">195</span>   */<a name="line.195"></a>
-<span class="sourceLineNo">196</span>  public static QuotaSettings unthrottleUser(final String userName) {<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    return throttle(userName, null, null, null, 0, null);<a name="line.197"></a>
-<span class="sourceLineNo">198</span>  }<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span>  /**<a name="line.200"></a>
-<span class="sourceLineNo">201</span>   * Remove the throttling for the specified user on the specified table.<a name="line.201"></a>
-<span class="sourceLineNo">202</span>   *<a name="line.202"></a>
-<span class="sourceLineNo">203</span>   * @param userName the user<a name="line.203"></a>
-<span class="sourceLineNo">204</span>   * @param tableName the table<a name="line.204"></a>
-<span class="sourceLineNo">205</span>   * @return the quota settings<a name="line.205"></a>
-<span class="sourceLineNo">206</span>   */<a name="line.206"></a>
-<span class="sourceLineNo">207</span>  public static QuotaSettings unthrottleUser(final String userName, final TableName tableName) {<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    return throttle(userName, tableName, null, null, 0, null);<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>   * Remove the throttling for the specified user on the specified namespace.<a name="line.212"></a>
-<span class="sourceLineNo">213</span>   *<a name="line.213"></a>
-<span class="sourceLineNo">214</span>   * @param userName the user<a name="line.214"></a>
-<span class="sourceLineNo">215</span>   * @param namespace the namespace<a name="line.215"></a>
-<span class="sourceLineNo">216</span>   * @return the quota settings<a name="line.216"></a>
-<span class="sourceLineNo">217</span>   */<a name="line.217"></a>
-<span class="sourceLineNo">218</span>  public static QuotaSettings unthrottleUser(final String userName, final String namespace) {<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    return throttle(userName, null, namespace, null, 0, null);<a name="line.219"></a>
-<span class="sourceLineNo">220</span>  }<a name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span>  /**<a name="line.222"></a>
-<span class="sourceLineNo">223</span>   * Throttle the specified table.<a name="line.223"></a>
-<span class="sourceLineNo">224</span>   *<a name="line.224"></a>
-<span class="sourceLineNo">225</span>   * @param tableName the table to throttle<a name="line.225"></a>
-<span class="sourceLineNo">226</span>   * @param type the type of throttling<a name="line.226"></a>
-<span class="sourceLineNo">227</span>   * @param limit the allowed number of request/data per timeUnit<a name="line.227"></a>
-<span class="sourceLineNo">228</span>   * @param timeUnit the limit time unit<a name="line.228"></a>
-<span class="sourceLineNo">229</span>   * @return the quota settings<a name="line.229"></a>
-<span class="sourceLineNo">230</span>   */<a name="line.230"></a>
-<span class="sourceLineNo">231</span>  public static QuotaSettings throttleTable(final TableName tableName, final ThrottleType type,<a name="line.231"></a>
-<span class="sourceLineNo">232</span>      final long limit, final TimeUnit timeUnit) {<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    return throttle(null, tableName, null, type, limit, timeUnit);<a name="line.233"></a>
-<span class="sourceLineNo">234</span>  }<a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span>  /**<a name="line.236"></a>
-<span class="sourceLineNo">237</span>   * Remove the throttling for the specified table.<a name="line.237"></a>
-<span class="sourceLineNo">238</span>   *<a name="line.238"></a>
-<span class="sourceLineNo">239</span>   * @param tableName the table<a name="line.239"></a>
-<span class="sourceLineNo">240</span>   * @return the quota settings<a name="line.240"></a>
-<span class="sourceLineNo">241</span>   */<a name="line.241"></a>
-<span class="sourceLineNo">242</span>  public static QuotaSettings unthrottleTable(final TableName tableName) {<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    return throttle(null, tableName, null, null, 0, null);<a name="line.243"></a>
-<span class="sourceLineNo">244</span>  }<a name="line.244"></a>
-<span class="sourceLineNo">245</span><a name="line.245"></a>
-<span class="sourceLineNo">246</span>  /**<a name="line.246"></a>
-<span class="sourceLineNo">247</span>   * Throttle the specified namespace.<a name="line.247"></a>
-<span class="sourceLineNo">248</span>   *<a name="line.248"></a>
-<span class="sourceLineNo">249</span>   * @param namespace the namespace to throttle<a name="line.249"></a>
-<span class="sourceLineNo">250</span>   * @param type the type of throttling<a name="line.250"></a>
-<span class="sourceLineNo">251</span>   * @param limit the allowed number of request/data per timeUnit<a name="line.251"></a>
-<span class="sourceLineNo">252</span>   * @param timeUnit the limit time unit<a name="line.252"></a>
-<span class="sourceLineNo">253</span>   * @return the quota settings<a name="line.253"></a>
-<span class="sourceLineNo">254</span>   */<a name="line.254"></a>
-<span class="sourceLineNo">255</span>  public static QuotaSettings throttleNamespace(final String namespace, final ThrottleType type,<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      final long limit, final TimeUnit timeUnit) {<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    return throttle(null, null, namespace, type, limit, timeUnit);<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>   * Remove the throttling for the specified namespace.<a name="line.261"></a>
-<span class="sourceLineNo">262</span>   *<a name="line.262"></a>
-<span class="sourceLineNo">263</span>   * @param namespace the namespace<a name="line.263"></a>
-<span class="sourceLineNo">264</span>   * @return the quota settings<a name="line.264"></a>
-<span class="sourceLineNo">265</span>   */<a name="line.265"></a>
-<span class="sourceLineNo">266</span>  public static QuotaSettings unthrottleNamespace(final String namespace) {<a name="line.266"></a>
-<span class="sourceLineNo">267</span>    return throttle(null, null, namespace, null, 0, null);<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>  /* Throttle helper */<a name="line.270"></a>
-<span class="sourceLineNo">271</span>  private static QuotaSettings throttle(final String userName, final TableName tableName,<a name="line.271"></a>
-<span class="sourceLineNo">272</span>      final String namespace, final ThrottleType type, final long limit,<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      final TimeUnit timeUnit) {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    QuotaProtos.ThrottleRequest.Builder builder = QuotaProtos.ThrottleRequest.newBuilder();<a name="line.274"></a>
-<span class="sourceLineNo">275</span>    if (type != null) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      builder.setType(ProtobufUtil.toProtoThrottleType(type));<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    }<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    if (timeUnit != null) {<a name="line.278"></a>
-<span class="sourceLineNo">279</span>      builder.setTimedQuota(ProtobufUtil.toTimedQuota(limit, timeUnit, QuotaScope.MACHINE));<a name="line.279"></a>
-<span class="sourceLineNo">280</span>    }<a name="line.280"></a>
-<span class="sourceLineNo">281</span>    return new ThrottleSettings(userName, tableName, namespace, builder.build());<a name="line.281"></a>
-<span class="sourceLineNo">282</span>  }<a name="line.282"></a>
-<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span>  /* ==========================================================================<a name="line.284"></a>
-<span class="sourceLineNo">285</span>   *  Global Settings<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>   * Set the "bypass global settings" for the specified user<a name="line.289"></a>
-<span class="sourceLineNo">290</span>   *<a name="line.290"></a>
-<span class="sourceLineNo">291</span>   * @param userName the user to throttle<a name="line.291"></a>
-<span class="sourceLineNo">292</span>   * @param bypassGlobals true if the global settings should be bypassed<a name="line.292"></a>
+<span class="sourceLineNo">179</span>   * @param type the type of throttling<a name="line.179"></a>
+<span class="sourceLineNo">180</span>   * @param limit the allowed number of request/data per timeUnit<a name="line.180"></a>
+<span class="sourceLineNo">181</span>   * @param timeUnit the limit time unit<a name="line.181"></a>
+<span class="sourceLineNo">182</span>   * @return the quota settings<a name="line.182"></a>
+<span class="sourceLineNo">183</span>   */<a name="line.183"></a>
+<span class="sourceLineNo">184</span>  public static QuotaSettings throttleUser(final String userName, final ThrottleType type,<a name="line.184"></a>
+<span class="sourceLineNo">185</span>      final long limit, final TimeUnit timeUnit) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    return throttle(userName, null, null, type, limit, timeUnit);<a name="line.186"></a>
+<span class="sourceLineNo">187</span>  }<a name="line.187"></a>
+<span class="sourceLineNo">188</span><a name="line.188"></a>
+<span class="sourceLineNo">189</span>  /**<a name="line.189"></a>
+<span class="sourceLineNo">190</span>   * Throttle the specified user on the specified table.<a name="line.190"></a>
+<span class="sourceLineNo">191</span>   *<a name="line.191"></a>
+<span class="sourceLineNo">192</span>   * @param userName the user to throttle<a name="line.192"></a>
+<span class="sourceLineNo">193</span>   * @param tableName the table to throttle<a name="line.193"></a>
+<span class="sourceLineNo">194</span>   * @param type the type of throttling<a name="line.194"></a>
+<span class="sourceLineNo">195</span>   * @param limit the allowed number of request/data per timeUnit<a name="line.195"></a>
+<span class="sourceLineNo">196</span>   * @param timeUnit the limit time unit<a name="line.196"></a>
+<span class="sourceLineNo">197</span>   * @return the quota settings<a name="line.197"></a>
+<span class="sourceLineNo">198</span>   */<a name="line.198"></a>
+<span class="sourceLineNo">199</span>  public static QuotaSettings throttleUser(final String userName, final TableName tableName,<a name="line.199"></a>
+<span class="sourceLineNo">200</span>      final ThrottleType type, final long limit, final TimeUnit timeUnit) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    return throttle(userName, tableName, null, type, limit, timeUnit);<a name="line.201"></a>
+<span class="sourceLineNo">202</span>  }<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>   * Throttle the specified user on the specified namespace.<a name="line.205"></a>
+<span class="sourceLineNo">206</span>   *<a name="line.206"></a>
+<span class="sourceLineNo">207</span>   * @param userName the user to throttle<a name="line.207"></a>
+<span class="sourceLineNo">208</span>   * @param namespace the namespace to throttle<a name="line.208"></a>
+<span class="sourceLineNo">209</span>   * @param type the type of throttling<a name="line.209"></a>
+<span class="sourceLineNo">210</span>   * @param limit the allowed number of request/data per timeUnit<a name="line.210"></a>
+<span class="sourceLineNo">211</span>   * @param timeUnit the limit time unit<a name="line.211"></a>
+<span class="sourceLineNo">212</span>   * @return the quota settings<a name="line.212"></a>
+<span class="sourceLineNo">213</span>   */<a name="line.213"></a>
+<span class="sourceLineNo">214</span>  public static QuotaSettings throttleUser(final String userName, final String namespace,<a name="line.214"></a>
+<span class="sourceLineNo">215</span>      final ThrottleType type, final long limit, final TimeUnit timeUnit) {<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    return throttle(userName, null, namespace, type, limit, timeUnit);<a name="line.216"></a>
+<span class="sourceLineNo">217</span>  }<a name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span>  /**<a name="line.219"></a>
+<span class="sourceLineNo">220</span>   * Remove the throttling for the specified user.<a name="line.220"></a>
+<span class="sourceLineNo">221</span>   *<a name="line.221"></a>
+<span class="sourceLineNo">222</span>   * @param userName the user<a name="line.222"></a>
+<span class="sourceLineNo">223</span>   * @return the quota settings<a name="line.223"></a>
+<span class="sourceLineNo">224</span>   */<a name="line.224"></a>
+<span class="sourceLineNo">225</span>  public static QuotaSettings unthrottleUser(final String userName) {<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    return throttle(userName, null, null, null, 0, null);<a name="line.226"></a>
+<span class="sourceLineNo">227</span>  }<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span>  /**<a name="line.229"></a>
+<span class="sourceLineNo">230</span>   * Remove the throttling for the specified user on the specified table.<a name="line.230"></a>
+<span class="sourceLineNo">231</span>   *<a name="line.231"></a>
+<span class="sourceLineNo">232</span>   * @param userName the user<a name="line.232"></a>
+<span class="sourceLineNo">233</span>   * @param tableName the table<a name="line.233"></a>
+<span class="sourceLineNo">234</span>   * @return the quota settings<a name="line.234"></a>
+<span class="sourceLineNo">235</span>   */<a name="line.235"></a>
+<span class="sourceLineNo">236</span>  public static QuotaSettings unthrottleUser(final String userName, final TableName tableName) {<a name="line.236"></a>
+<span class="sourceLineNo">237</span>    return throttle(userName, tableName, null, null, 0, null);<a name="line.237"></a>
+<span class="sourceLineNo">238</span>  }<a name="line.238"></a>
+<span class="sourceLineNo">239</span><a name="line.239"></a>
+<span class="sourceLineNo">240</span>  /**<a name="line.240"></a>
+<span class="sourceLineNo">241</span>   * Remove the throttling for the specified user on the specified namespace.<a name="line.241"></a>
+<span class="sourceLineNo">242</span>   *<a name="line.242"></a>
+<span class="sourceLineNo">243</span>   * @param userName the user<a name="line.243"></a>
+<span class="sourceLineNo">244</span>   * @param namespace the namespace<a name="line.244"></a>
+<span class="sourceLineNo">245</span>   * @return the quota settings<a name="line.245"></a>
+<span class="sourceLineNo">246</span>   */<a name="line.246"></a>
+<span class="sourceLineNo">247</span>  public static QuotaSettings unthrottleUser(final String userName, final String namespace) {<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    return throttle(userName, null, namespace, null, 0, null);<a name="line.248"></a>
+<span class="sourceLineNo">249</span>  }<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span>  /**<a name="line.251"></a>
+<span class="sourceLineNo">252</span>   * Throttle the specified table.<a name="line.252"></a>
+<span class="sourceLineNo">253</span>   *<a name="line.253"></a>
+<span class="sourceLineNo">254</span>   * @param tableName the table to throttle<a name="line.254"></a>
+<span class="sourceLineNo">255</span>   * @param type the type of throttling<a name="line.255"></a>
+<span class="sourceLineNo">256</span>   * @param limit the allowed number of request/data per timeUnit<a name="line.256"></a>
+<span class="sourceLineNo">257</span>   * @param timeUnit the limit time unit<a name="line.257"></a>
+<span class="sourceLineNo">258</span>   * @return the quota settings<a name="line.258"></a>
+<span class="sourceLineNo">259</span>   */<a name="line.259"></a>
+<span class="sourceLineNo">260</span>  public static QuotaSettings throttleTable(final TableName tableName, final ThrottleType type,<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      final long limit, final TimeUnit timeUnit) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    return throttle(null, tableName, null, type, limit, timeUnit);<a name="line.262"></a>
+<span class="sourceLineNo">263</span>  }<a name="line.263"></a>
+<span class="sourceLineNo">264</span><a name="line.264"></a>
+<span class="sourceLineNo">265</span>  /**<a name="line.265"></a>
+<span class="sourceLineNo">266</span>   * Remove the throttling for the specified table.<a name="line.266"></a>
+<span class="sourceLineNo">267</span>   *<a name="line.267"></a>
+<span class="sourceLineNo">268</span>   * @param tableName the table<a name="line.268"></a>
+<span class="sourceLineNo">269</span>   * @return the quota settings<a name="line.269"></a>
+<span class="sourceLineNo">270</span>   */<a name="line.270"></a>
+<span class="sourceLineNo">271</span>  public static QuotaSettings unthrottleTable(final TableName tableName) {<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    return throttle(null, tableName, null, null, 0, null);<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>   * Throttle the specified namespace.<a name="line.276"></a>
+<span class="sourceLineNo">277</span>   *<a name="line.277"></a>
+<span class="sourceLineNo">278</span>   * @param namespace the namespace to throttle<a name="line.278"></a>
+<span class="sourceLineNo">279</span>   * @param type the type of throttling<a name="line.279"></a>
+<span class="sourceLineNo">280</span>   * @param limit the allowed number of request/data per timeUnit<a name="line.280"></a>
+<span class="sourceLineNo">281</span>   * @param timeUnit the limit time unit<a name="line.281"></a>
+<span class="sourceLineNo">282</span>   * @return the quota settings<a name="line.282"></a>
+<span class="sourceLineNo">283</span>   */<a name="line.283"></a>
+<span class="sourceLineNo">284</span>  public static QuotaSettings throttleNamespace(final String namespace, final ThrottleType type,<a name="line.284"></a>
+<span class="sourceLineNo">285</span>      final long limit, final TimeUnit timeUnit) {<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    return throttle(null, null, namespace, type, limit, timeUnit);<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 the throttling for the specified namespace.<a name="line.290"></a>
+<span class="sourceLineNo">291</span>   *<a name="line.291"></a>
+<span class="sourceLineNo">292</span>   * @param namespace the namespace<a name="line.292"></a>
 <span class="sourceLineNo">293</span>   * @return the quota settings<a name="line.293"></a>
 <span class="sourceLineNo">294</span>   */<a name="line.294"></a>
-<span class="sourceLineNo">295</span>  public static QuotaSettings bypassGlobals(final String userName, final boolean bypassGlobals) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span>    return new QuotaGlobalsSettingsBypass(userName, null, null, bypassGlobals);<a name="line.296"></a>
+<span class="sourceLineNo">295</span>  public static QuotaSettings unthrottleNamespace(final String namespace) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    return throttle(null, null, namespace, null, 0, null);<a name="line.296"></a>
 <span class="sourceLineNo">297</span>  }<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>   *  FileSystem Space Settings<a name="line.300"></a>
-<span class="sourceLineNo">301</span>   */<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>   * Creates a {@link QuotaSettings} object to limit the FileSystem space usage for the given table<a name="line.304"></a>
-<span class="sourceLineNo">305</span>   * to the given size in bytes. When the space usage is exceeded by the table, the provided<a name="line.305"></a>
-<span class="sourceLineNo">306</span>   * {@link SpaceViolationPolicy} is enacted on the table.<a name="line.306"></a>
-<span class="sourceLineNo">307</span>   *<a name="line.307"></a>
-<span class="sourceLineNo">308</span>   * @param tableName The name of the table on which the quota should be applied.<a name="line.308"></a>
-<span class="sourceLineNo">309</span>   * @param sizeLimit The limit of a table's size in bytes.<a name="line.309"></a>
-<span class="sourceLineNo">310</span>   * @param violationPolicy The action to take when the quota is exceeded.<a name="line.310"></a>
-<span class="sourceLineNo">311</span>   * @return An {@link QuotaSettings} object.<a name="line.311"></a>
-<span class="sourceLineNo">312</span>   */<a name="line.312"></a>
-<span class="sourceLineNo">313</span>  public static QuotaSettings limitTableSpace(<a name="line.313"></a>
-<span class="sourceLineNo">314</span>      final TableName tableName, long sizeLimit, final SpaceViolationPolicy violationPolicy) {<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    return new SpaceLimitSettings(tableName, sizeLimit, violationPolicy);<a name="line.315"></a>
-<span class="sourceLineNo">316</span>  }<a name="line.316"></a>
-<span class="sourceLineNo">317</span><a name="line.317"></a>
-<span class="sourceLineNo">318</span>  /**<a name="line.318"></a>
-<span class="sourceLineNo">319</span>   * Creates a {@link QuotaSettings} object to remove the FileSystem space quota for the given<a name="line.319"></a>
-<span class="sourceLineNo">320</span>   * table.<a name="line.320"></a>
-<span class="sourceLineNo">321</span>   *<a name="line.321"></a>
-<span class="sourceLineNo">322</span>   * @param tableName The name of the table to remove the quota for.<a name="line.322"></a>
-<span class="sourceLineNo">323</span>   * @return A {@link QuotaSettings} object.<a name="line.323"></a>
-<span class="sourceLineNo">324</span>   */<a name="line.324"></a>
-<span class="sourceLineNo">325</span>  public static QuotaSettings removeTableSpaceLimit(TableName tableName) {<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    return new SpaceLimitSettings(tableName);<a name="line.326"></a>
-<span class="sourceLineNo">327</span>  }<a name="line.327"></a>
-<span class="sourceLineNo">328</span><a name="line.328"></a>
-<span class="sourceLineNo">329</span>  /**<a name="line.329"></a>
-<span class="sourceLineNo">330</span>   * Creates a {@link QuotaSettings} object to limit the FileSystem space usage for the given<a name="line.330"></a>
-<span class="sourceLineNo">331</span>   * namespace to the given size in bytes. When the space usage is exceeded by all tables in the<a name="line.331"></a>
-<span class="sourceLineNo">332</span>   * namespace, the provided {@link SpaceViolationPolicy} is enacted on all tables in the namespace.<a name="line.332"></a>
-<span class="sourceLineNo">333</span>   *<a name="line.333"></a>
-<span class="sourceLineNo">334</span>   * @param namespace The namespace on which the quota should be applied.<a name="line.334"></a>
-<span class="sourceLineNo">335</span>   * @param sizeLimit The limit of the namespace's size in bytes.<a name="line.335"></a>
-<span class="sourceLineNo">336</span>   * @param violationPolicy The action to take when the the quota is exceeded.<a name="line.336"></a>
-<span class="sourceLineNo">337</span>   * @return An {@link QuotaSettings} object.<a name="line.337"></a>
-<span class="sourceLineNo">338</span>   */<a name="line.338"></a>
-<span class="sourceLineNo">339</span>  public static QuotaSettings limitNamespaceSpace(<a name="line.339"></a>
-<span class="sourceLineNo">340</span>      final String namespace, long sizeLimit, final SpaceViolationPolicy violationPolicy) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span>    return new SpaceLimitSettings(namespace, sizeLimit, violationPolicy);<a name="line.341"></a>
-<span class="sourceLineNo">342</span>  }<a name="line.342"></a>
-<span class="sourceLineNo">343</span><a name="line.343"></a>
-<span class="sourceLineNo">344</span>  /**<a name="line.344"></a>
-<span class="sourceLineNo">345</span>   * Creates a {@link QuotaSettings} object to remove the FileSystem space quota for the given<a name="line.345"></a>
-<span class="sourceLineNo">346</span>   * namespace.<a name="line.346"></a>
-<span class="sourceLineNo">347</span>   *<a name="line.347"></a>
-<span class="sourceLineNo">348</span>   * @param namespace The namespace to remove the quota on.<a name="line.348"></a>
-<span class="sourceLineNo">349</span>   * @return A {@link QuotaSettings} object.<a name="line.349"></a>
-<span class="sourceLineNo">350</span>   */<a name="line.350"></a>
-<span class="sourceLineNo">351</span>  public static QuotaSettings removeNamespaceSpaceLimit(String namespace) {<a name="line.351"></a>
-<span class="sourceLineNo">352</span>    return new SpaceLimitSettings(namespace);<a name="line.352"></a>
-<span class="sourceLineNo">353</span>  }<a name="line.353"></a>
-<span class="sourceLineNo">354</span>}<a name="line.354"></a>
+<span class="sourceLineNo">299</span>  /* Throttle helper */<a name="line.299"></a>
+<span class="sourceLineNo">300</span>  private static QuotaSettings throttle(final String userName, final TableName tableName,<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      final String namespace, final ThrottleType type, final long limit,<a name="line.301"></a>
+<span class="sourceLineNo">302</span>      final TimeUnit timeUnit) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    QuotaProtos.ThrottleRequest.Builder builder = QuotaProtos.ThrottleRequest.newBuilder();<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    if (type != null) {<a name="line.304"></a>
+<span class="sourceLineNo">305</span>      builder.setType(ProtobufUtil.toProtoThrottleType(type));<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    }<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    if (timeUnit != null) {<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      builder.setTimedQuota(ProtobufUtil.toTimedQuota(limit, timeUnit, QuotaScope.MACHINE));<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    }<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    return new ThrottleSettings(userName, tableName, namespace, builder.build());<a name="line.310"></a>
+<span class="sourceLineNo">311</span>  }<a name="line.311"></a>
+<span class="sourceLineNo">312</span><a name="line.312"></a>
+<span class="sourceLineNo">313</span>  /* ==========================================================================<a name="line.313"></a>
+<span class="sourceLineNo">314</span>   *  Global Settings<a name="line.314"></a>
+<span class="sourceLineNo">315</span>   */<a name="line.315"></a>
+<span class="sourceLineNo">316</span><a name="line.316"></a>
+<span class="sourceLineNo">317</span>  /**<a name="line.317"></a>
+<span class="sourceLineNo">318</span>   * Set the "bypass global settings" for the specified user<a name="line.318"></a>
+<span class="sourceLineNo">319</span>   *<a name="line.319"></a>
+<span class="sourceLineNo">320</span>   * @param userName the user to throttle<a name="line.320"></a>
+<span class="sourceLineNo">321</span>   * @param bypassGlobals true if the global settings should be bypassed<a name="line.321"></a>
+<span class="sourceLineNo">322</span>   * @return the quota settings<a name="line.322"></a>
+<span class="sourceLineNo">323</span>   */<a name="line.323"></a>
+<span class="sourceLineNo">324</span>  public static QuotaSettings bypassGlobals(final String userName, final boolean bypassGlobals) {<a name="line.324"></a>
+<span class="sourceLineNo">325</span>    return new QuotaGlobalsSettingsBypass(userName, null, null, bypassGlobals);<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>  /* ==========================================================================<a name="line.328"></a>
+<span class="sourceLineNo">329</span>   *  FileSystem Space Settings<a name="line.329"></a>
+<span class="sourceLineNo">330</span>   */<a name="line.330"></a>
+<span class="sourceLineNo">331</span><a name="line.331"></a>
+<span class="sourceLineNo">332</span>  /**<a name="line.332"></a>
+<span class="sourceLineNo">333</span>   * Creates a {@link QuotaSettings} object to limit the FileSystem space usage for the given table<a name="line.333"></a>
+<span class="sourceLineNo">334</span>   * to the given size in bytes. When the space usage is exceeded by the table, the provided<a name="line.334"></a>
+<span class="sourceLineNo">335</span>   * {@link SpaceViolationPolicy} is enacted on the table.<a name="line.335"></a>
+<span class="sourceLineNo">336</span>   *<a name="line.336"></a>
+<span class="sourceLineNo">337</span>   * @param tableName The name of the table on which the quota should be applied.<a name="line.337"></a>
+<span class="sourceLineNo">338</span>   * @param sizeLimit The limit of a table's size in bytes.<a name="line.338"></a>
+<span class="sourceLineNo">339</span>   * @param violationPolicy The action to take when the quota is exceeded.<a name="line.339"></a>
+<span class="sourceLineNo">340</span>   * @return An {@link QuotaSettings} object.<a name="line.340"></a>
+<span class="sourceLineNo">341</span>   */<a name="line.341"></a>
+<span class="sourceLineNo">342</span>  public static QuotaSettings limitTableSpace(<a name="line.342"></a>
+<span class="sourceLineNo">343</span>      final TableName tableName, long sizeLimit, final SpaceViolationPolicy violationPolicy) {<a name="line.343"></a>
+<span class="sourceLineNo">344</span>    return new SpaceLimitSettings(tableName, sizeLimit, violationPolicy);<a name="line.344"></a>
+<span class="sourceLineNo">345</span>  }<a name="line.345"></a>
+<span class="sourceLineNo">346</span><a name="line.346"></a>
+<span class="sourceLineNo">347</span>  /**<a name="line.347"></a>
+<span class="sourceLineNo">348</span>   * Creates a {@link QuotaSettings} object to remove the FileSystem space quota for the given<a name="line.348"></a>
+<span class="sourceLineNo">349</span>   * table.<a name="line.349"></a>
+<span class="sourceLineNo">350</span>   *<a name="line.350"></a>
+<span class="sourceLineNo">351</span>   * @param tableName The name of the table to remove the quota for.<a name="line.351"></a>
+<span class="sourceLineNo">352</span>   * @return A {@link QuotaSettings} object.<a name="line.352"></a>
+<span class="sourceLineNo">353</span>   */<a name="line.353"></a>
+<span class="sourceLineNo">354</span>  public static QuotaSettings removeTableSpaceLimit(TableName tableName) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    return new SpaceLimitSettings(tableName);<a name="line.355"></a>
+<span class="sourceLineNo">356</span>  }<a name="line.356"></a>
+<span class="sourceLineNo">357</span><a name="line.357"></a>
+<span class="sourceLineNo">358</span>  /**<a name="line.358"></a>
+<span class="sourceLineNo">359</span>   * Creates a {@link QuotaSettings} object to limit the FileSystem space usage for the given<a name="line.359"></a>
+<span class="sourceLineNo">360</span>   * namespace to the given size in bytes. When the space usage is exceeded by all tables in the<a name="line.360"></a>
+<span class="sourceLineNo">361</span>   * namespace, the provided {@link SpaceViolationPolicy} is enacted on all tables in the namespace.<a name="line.361"></a>
+<span class="sourceLineNo">362</span>   *<a name="line.362"></a>
+<span class="sourceLineNo">363</span>   * @param namespace The namespace on which the quota should be applied.<a name="line.363"></a>
+<span class="sourceLineNo">364</span>   * @param sizeLimit The limit of the namespace's size in bytes.<a name="line.364"></a>
+<span class="sourceLineNo">365</span>   * @param violationPolicy The action to take when the the quota is exceeded.<a name="line.365"></a>
+<span class="sourceLineNo">366</span>   * @return An {@link QuotaSettings} object.<a name="line.366"></a>
+<span class="sourceLineNo">367</span>   */<a name="line.367"></a>
+<span class="sourceLineNo">368</span>  public static QuotaSettings limitNamespaceSpace(<a name="line.368"></a>
+<span class="sourceLineNo">369</span>      final String namespace, long sizeLimit, final SpaceViolationPolicy violationPolicy) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    return new SpaceLimitSettings(namespace, sizeLimit, violationPolicy);<a name="line.370"></a>
+<span class="sourceLineNo">371</span>  }<a name="line.371"></a>
+<span class="sourceLineNo">372</span><a name="line.372"></a>
+<span class="sourceLineNo">373</span>  /**<a name="line.373"></a>
+<span class="sourceLineNo">374</span>   * Creates a {@link QuotaSettings} object to remove the FileSystem space quota for the given<a name="line.374"></a>
+<span class="sourceLineNo">375</span>   * namespace.<a name="line.375"></a>
+<span class="sourceLineNo">376</span>   *<a name="line.376"></a>
+<span class="sourceLineNo">377</span>   * @param namespace The namespace to remove the quota on.<a name="line.377"></a>
+<span class="sourceLineNo">378</span>   * @return A {@link QuotaSettings} object.<a name="line.378"></a>
+<span class="sourceLineNo">379</span>   */<a name="line.379"></a>
+<span class="sourceLineNo">380</span>  public static QuotaSettings removeNamespaceSpaceLimit(String namespace) {<a name="line.380"></a>
+<span class="sourceLineNo">381</span>    return new SpaceLimitSettings(namespace);<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e6bd0774/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaTableUtil.NamespaceQuotasVisitor.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaTableUtil.NamespaceQuotasVisitor.html b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaTableUtil.NamespaceQuotasVisitor.html
index be849ad..b01644b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaTableUtil.NamespaceQuotasVisitor.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaTableUtil.NamespaceQuotasVisitor.html
@@ -56,15 +56,15 @@
 <span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.48"></a>
 <span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.client.Table;<a name="line.49"></a>
 <span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.filter.ColumnPrefixFilter;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.filter.CompareFilter;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.filter.Filter;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.filter.FilterList;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.filter.QualifierFilter;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.filter.RegexStringComparator;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.filter.RowFilter;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.protobuf.ProtobufMagic;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;<a name="line.59"></a>
+<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.filter.Filter;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.filter.FilterList;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.filter.QualifierFilter;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.filter.RegexStringComparator;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.filter.RowFilter;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.protobuf.ProtobufMagic;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.TextFormat;<a name="line.59"></a>
 <span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.UnsafeByteOperations;<a name="line.60"></a>
 <span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.61"></a>
 <span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;<a name="line.62"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e6bd0774/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaTableUtil.QuotasVisitor.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaTableUtil.QuotasVisitor.html b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaTableUtil.QuotasVisitor.html
index be849ad..b01644b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaTableUtil.QuotasVisitor.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaTableUtil.QuotasVisitor.html
@@ -56,15 +56,15 @@
 <span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.48"></a>
 <span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.client.Table;<a name="line.49"></a>
 <span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.filter.ColumnPrefixFilter;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.filter.CompareFilter;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.filter.Filter;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.filter.FilterList;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.filter.QualifierFilter;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.filter.RegexStringComparator;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.filter.RowFilter;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.protobuf.ProtobufMagic;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;<a name="line.59"></a>
+<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.filter.Filter;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.filter.FilterList;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.filter.QualifierFilter;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.filter.RegexStringComparator;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.filter.RowFilter;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.protobuf.ProtobufMagic;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.TextFormat;<a name="line.59"></a>
 <span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.UnsafeByteOperations;<a name="line.60"></a>
 <span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.61"></a>
 <span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;<a name="line.62"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e6bd0774/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaTableUtil.TableQuotasVisitor.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaTableUtil.TableQuotasVisitor.html b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaTableUtil.TableQuotasVisitor.html
index be849ad..b01644b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaTableUtil.TableQuotasVisitor.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaTableUtil.TableQuotasVisitor.html
@@ -56,15 +56,15 @@
 <span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.48"></a>
 <span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.client.Table;<a name="line.49"></a>
 <span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.filter.ColumnPrefixFilter;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.filter.CompareFilter;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.filter.Filter;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.filter.FilterList;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.filter.QualifierFilter;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.filter.RegexStringComparator;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.filter.RowFilter;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.protobuf.ProtobufMagic;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;<a name="line.59"></a>
+<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.filter.Filter;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.filter.FilterList;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.filter.QualifierFilter;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.filter.RegexStringComparator;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.filter.RowFilter;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.protobuf.ProtobufMagic;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.TextFormat;<a name="line.59"></a>
 <span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.UnsafeByteOperations;<a name="line.60"></a>
 <span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.61"></a>
 <span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;<a name="line.62"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e6bd0774/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaTableUtil.UserQuotasVisitor.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaTableUtil.UserQuotasVisitor.html b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaTableUtil.UserQuotasVisitor.html
index be849ad..b01644b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaTableUtil.UserQuotasVisitor.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaTableUtil.UserQuotasVisitor.html
@@ -56,15 +56,15 @@
 <span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.48"></a>
 <span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.client.Table;<a name="line.49"></a>
 <span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.filter.ColumnPrefixFilter;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.filter.CompareFilter;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.filter.Filter;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.filter.FilterList;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.filter.QualifierFilter;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.filter.RegexStringComparator;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.filter.RowFilter;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.protobuf.ProtobufMagic;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;<a name="line.59"></a>
+<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.filter.Filter;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.filter.FilterList;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.filter.QualifierFilter;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.filter.RegexStringComparator;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.filter.RowFilter;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.protobuf.ProtobufMagic;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.TextFormat;<a name="line.59"></a>
 <span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.UnsafeByteOperations;<a name="line.60"></a>
 <span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.61"></a>
 <span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;<a name="line.62"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e6bd0774/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaTableUtil.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaTableUtil.html b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaTableUtil.html
index be849ad..b01644b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaTableUtil.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaTableUtil.html
@@ -56,15 +56,15 @@
 <span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.48"></a>
 <span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.client.Table;<a name="line.49"></a>
 <span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.filter.ColumnPrefixFilter;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.filter.CompareFilter;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.filter.Filter;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.filter.FilterList;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.filter.QualifierFilter;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.filter.RegexStringComparator;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.filter.RowFilter;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.protobuf.ProtobufMagic;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;<a name="line.59"></a>
+<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.filter.Filter;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.filter.FilterList;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.filter.QualifierFilter;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.filter.RegexStringComparator;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.filter.RowFilter;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.protobuf.ProtobufMagic;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.TextFormat;<a name="line.59"></a>
 <span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.UnsafeByteOperations;<a name="line.60"></a>
 <span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.61"></a>
 <span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;<a name="line.62"></a>