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 2018/08/08 14:50:19 UTC
[10/15] hbase-site git commit: Published site at
d921262d389ec7178797b817f0cd8a0a873085ac.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f11959c9/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html
index 073d0d0..81f5178 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html
@@ -166,7 +166,7 @@
<span class="sourceLineNo">158</span>import org.apache.hadoop.hbase.procedure2.RemoteProcedureException;<a name="line.158"></a>
<span class="sourceLineNo">159</span>import org.apache.hadoop.hbase.procedure2.store.wal.WALProcedureStore;<a name="line.159"></a>
<span class="sourceLineNo">160</span>import org.apache.hadoop.hbase.quotas.MasterQuotaManager;<a name="line.160"></a>
-<span class="sourceLineNo">161</span>import org.apache.hadoop.hbase.quotas.MasterSpaceQuotaObserver;<a name="line.161"></a>
+<span class="sourceLineNo">161</span>import org.apache.hadoop.hbase.quotas.MasterQuotasObserver;<a name="line.161"></a>
<span class="sourceLineNo">162</span>import org.apache.hadoop.hbase.quotas.QuotaObserverChore;<a name="line.162"></a>
<span class="sourceLineNo">163</span>import org.apache.hadoop.hbase.quotas.QuotaUtil;<a name="line.163"></a>
<span class="sourceLineNo">164</span>import org.apache.hadoop.hbase.quotas.SnapshotQuotaObserverChore;<a name="line.164"></a>
@@ -918,10 +918,10 @@
<span class="sourceLineNo">910</span> new ReplicationPeerConfigUpgrader(zooKeeper, conf);<a name="line.910"></a>
<span class="sourceLineNo">911</span> tableCFsUpdater.copyTableCFs();<a name="line.911"></a>
<span class="sourceLineNo">912</span><a name="line.912"></a>
-<span class="sourceLineNo">913</span> // Add the Observer to delete space quotas on table deletion before starting all CPs by<a name="line.913"></a>
+<span class="sourceLineNo">913</span> // Add the Observer to delete quotas on table deletion before starting all CPs by<a name="line.913"></a>
<span class="sourceLineNo">914</span> // default with quota support, avoiding if user specifically asks to not load this Observer.<a name="line.914"></a>
<span class="sourceLineNo">915</span> if (QuotaUtil.isQuotaEnabled(conf)) {<a name="line.915"></a>
-<span class="sourceLineNo">916</span> updateConfigurationForSpaceQuotaObserver(conf);<a name="line.916"></a>
+<span class="sourceLineNo">916</span> updateConfigurationForQuotasObserver(conf);<a name="line.916"></a>
<span class="sourceLineNo">917</span> }<a name="line.917"></a>
<span class="sourceLineNo">918</span> // initialize master side coprocessors before we start handling requests<a name="line.918"></a>
<span class="sourceLineNo">919</span> status.setStatus("Initializing master coprocessors");<a name="line.919"></a>
@@ -1077,15 +1077,15 @@
<span class="sourceLineNo">1069</span> }<a name="line.1069"></a>
<span class="sourceLineNo">1070</span><a name="line.1070"></a>
<span class="sourceLineNo">1071</span> /**<a name="line.1071"></a>
-<span class="sourceLineNo">1072</span> * Adds the {@code MasterSpaceQuotaObserver} to the list of configured Master observers to<a name="line.1072"></a>
-<span class="sourceLineNo">1073</span> * automatically remove space quotas for a table when that table is deleted.<a name="line.1073"></a>
+<span class="sourceLineNo">1072</span> * Adds the {@code MasterQuotasObserver} to the list of configured Master observers to<a name="line.1072"></a>
+<span class="sourceLineNo">1073</span> * automatically remove quotas for a table when that table is deleted.<a name="line.1073"></a>
<span class="sourceLineNo">1074</span> */<a name="line.1074"></a>
<span class="sourceLineNo">1075</span> @VisibleForTesting<a name="line.1075"></a>
-<span class="sourceLineNo">1076</span> public void updateConfigurationForSpaceQuotaObserver(Configuration conf) {<a name="line.1076"></a>
+<span class="sourceLineNo">1076</span> public void updateConfigurationForQuotasObserver(Configuration conf) {<a name="line.1076"></a>
<span class="sourceLineNo">1077</span> // We're configured to not delete quotas on table deletion, so we don't need to add the obs.<a name="line.1077"></a>
<span class="sourceLineNo">1078</span> if (!conf.getBoolean(<a name="line.1078"></a>
-<span class="sourceLineNo">1079</span> MasterSpaceQuotaObserver.REMOVE_QUOTA_ON_TABLE_DELETE,<a name="line.1079"></a>
-<span class="sourceLineNo">1080</span> MasterSpaceQuotaObserver.REMOVE_QUOTA_ON_TABLE_DELETE_DEFAULT)) {<a name="line.1080"></a>
+<span class="sourceLineNo">1079</span> MasterQuotasObserver.REMOVE_QUOTA_ON_TABLE_DELETE,<a name="line.1079"></a>
+<span class="sourceLineNo">1080</span> MasterQuotasObserver.REMOVE_QUOTA_ON_TABLE_DELETE_DEFAULT)) {<a name="line.1080"></a>
<span class="sourceLineNo">1081</span> return;<a name="line.1081"></a>
<span class="sourceLineNo">1082</span> }<a name="line.1082"></a>
<span class="sourceLineNo">1083</span> String[] masterCoprocs = conf.getStrings(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY);<a name="line.1083"></a>
@@ -1094,7 +1094,7 @@
<span class="sourceLineNo">1086</span> if (length > 0) {<a name="line.1086"></a>
<span class="sourceLineNo">1087</span> System.arraycopy(masterCoprocs, 0, updatedCoprocs, 0, masterCoprocs.length);<a name="line.1087"></a>
<span class="sourceLineNo">1088</span> }<a name="line.1088"></a>
-<span class="sourceLineNo">1089</span> updatedCoprocs[length] = MasterSpaceQuotaObserver.class.getName();<a name="line.1089"></a>
+<span class="sourceLineNo">1089</span> updatedCoprocs[length] = MasterQuotasObserver.class.getName();<a name="line.1089"></a>
<span class="sourceLineNo">1090</span> conf.setStrings(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY, updatedCoprocs);<a name="line.1090"></a>
<span class="sourceLineNo">1091</span> }<a name="line.1091"></a>
<span class="sourceLineNo">1092</span><a name="line.1092"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f11959c9/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.TableDescriptorGetter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.TableDescriptorGetter.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.TableDescriptorGetter.html
index 073d0d0..81f5178 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.TableDescriptorGetter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.TableDescriptorGetter.html
@@ -166,7 +166,7 @@
<span class="sourceLineNo">158</span>import org.apache.hadoop.hbase.procedure2.RemoteProcedureException;<a name="line.158"></a>
<span class="sourceLineNo">159</span>import org.apache.hadoop.hbase.procedure2.store.wal.WALProcedureStore;<a name="line.159"></a>
<span class="sourceLineNo">160</span>import org.apache.hadoop.hbase.quotas.MasterQuotaManager;<a name="line.160"></a>
-<span class="sourceLineNo">161</span>import org.apache.hadoop.hbase.quotas.MasterSpaceQuotaObserver;<a name="line.161"></a>
+<span class="sourceLineNo">161</span>import org.apache.hadoop.hbase.quotas.MasterQuotasObserver;<a name="line.161"></a>
<span class="sourceLineNo">162</span>import org.apache.hadoop.hbase.quotas.QuotaObserverChore;<a name="line.162"></a>
<span class="sourceLineNo">163</span>import org.apache.hadoop.hbase.quotas.QuotaUtil;<a name="line.163"></a>
<span class="sourceLineNo">164</span>import org.apache.hadoop.hbase.quotas.SnapshotQuotaObserverChore;<a name="line.164"></a>
@@ -918,10 +918,10 @@
<span class="sourceLineNo">910</span> new ReplicationPeerConfigUpgrader(zooKeeper, conf);<a name="line.910"></a>
<span class="sourceLineNo">911</span> tableCFsUpdater.copyTableCFs();<a name="line.911"></a>
<span class="sourceLineNo">912</span><a name="line.912"></a>
-<span class="sourceLineNo">913</span> // Add the Observer to delete space quotas on table deletion before starting all CPs by<a name="line.913"></a>
+<span class="sourceLineNo">913</span> // Add the Observer to delete quotas on table deletion before starting all CPs by<a name="line.913"></a>
<span class="sourceLineNo">914</span> // default with quota support, avoiding if user specifically asks to not load this Observer.<a name="line.914"></a>
<span class="sourceLineNo">915</span> if (QuotaUtil.isQuotaEnabled(conf)) {<a name="line.915"></a>
-<span class="sourceLineNo">916</span> updateConfigurationForSpaceQuotaObserver(conf);<a name="line.916"></a>
+<span class="sourceLineNo">916</span> updateConfigurationForQuotasObserver(conf);<a name="line.916"></a>
<span class="sourceLineNo">917</span> }<a name="line.917"></a>
<span class="sourceLineNo">918</span> // initialize master side coprocessors before we start handling requests<a name="line.918"></a>
<span class="sourceLineNo">919</span> status.setStatus("Initializing master coprocessors");<a name="line.919"></a>
@@ -1077,15 +1077,15 @@
<span class="sourceLineNo">1069</span> }<a name="line.1069"></a>
<span class="sourceLineNo">1070</span><a name="line.1070"></a>
<span class="sourceLineNo">1071</span> /**<a name="line.1071"></a>
-<span class="sourceLineNo">1072</span> * Adds the {@code MasterSpaceQuotaObserver} to the list of configured Master observers to<a name="line.1072"></a>
-<span class="sourceLineNo">1073</span> * automatically remove space quotas for a table when that table is deleted.<a name="line.1073"></a>
+<span class="sourceLineNo">1072</span> * Adds the {@code MasterQuotasObserver} to the list of configured Master observers to<a name="line.1072"></a>
+<span class="sourceLineNo">1073</span> * automatically remove quotas for a table when that table is deleted.<a name="line.1073"></a>
<span class="sourceLineNo">1074</span> */<a name="line.1074"></a>
<span class="sourceLineNo">1075</span> @VisibleForTesting<a name="line.1075"></a>
-<span class="sourceLineNo">1076</span> public void updateConfigurationForSpaceQuotaObserver(Configuration conf) {<a name="line.1076"></a>
+<span class="sourceLineNo">1076</span> public void updateConfigurationForQuotasObserver(Configuration conf) {<a name="line.1076"></a>
<span class="sourceLineNo">1077</span> // We're configured to not delete quotas on table deletion, so we don't need to add the obs.<a name="line.1077"></a>
<span class="sourceLineNo">1078</span> if (!conf.getBoolean(<a name="line.1078"></a>
-<span class="sourceLineNo">1079</span> MasterSpaceQuotaObserver.REMOVE_QUOTA_ON_TABLE_DELETE,<a name="line.1079"></a>
-<span class="sourceLineNo">1080</span> MasterSpaceQuotaObserver.REMOVE_QUOTA_ON_TABLE_DELETE_DEFAULT)) {<a name="line.1080"></a>
+<span class="sourceLineNo">1079</span> MasterQuotasObserver.REMOVE_QUOTA_ON_TABLE_DELETE,<a name="line.1079"></a>
+<span class="sourceLineNo">1080</span> MasterQuotasObserver.REMOVE_QUOTA_ON_TABLE_DELETE_DEFAULT)) {<a name="line.1080"></a>
<span class="sourceLineNo">1081</span> return;<a name="line.1081"></a>
<span class="sourceLineNo">1082</span> }<a name="line.1082"></a>
<span class="sourceLineNo">1083</span> String[] masterCoprocs = conf.getStrings(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY);<a name="line.1083"></a>
@@ -1094,7 +1094,7 @@
<span class="sourceLineNo">1086</span> if (length > 0) {<a name="line.1086"></a>
<span class="sourceLineNo">1087</span> System.arraycopy(masterCoprocs, 0, updatedCoprocs, 0, masterCoprocs.length);<a name="line.1087"></a>
<span class="sourceLineNo">1088</span> }<a name="line.1088"></a>
-<span class="sourceLineNo">1089</span> updatedCoprocs[length] = MasterSpaceQuotaObserver.class.getName();<a name="line.1089"></a>
+<span class="sourceLineNo">1089</span> updatedCoprocs[length] = MasterQuotasObserver.class.getName();<a name="line.1089"></a>
<span class="sourceLineNo">1090</span> conf.setStrings(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY, updatedCoprocs);<a name="line.1090"></a>
<span class="sourceLineNo">1091</span> }<a name="line.1091"></a>
<span class="sourceLineNo">1092</span><a name="line.1092"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f11959c9/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.html
index 073d0d0..81f5178 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.html
@@ -166,7 +166,7 @@
<span class="sourceLineNo">158</span>import org.apache.hadoop.hbase.procedure2.RemoteProcedureException;<a name="line.158"></a>
<span class="sourceLineNo">159</span>import org.apache.hadoop.hbase.procedure2.store.wal.WALProcedureStore;<a name="line.159"></a>
<span class="sourceLineNo">160</span>import org.apache.hadoop.hbase.quotas.MasterQuotaManager;<a name="line.160"></a>
-<span class="sourceLineNo">161</span>import org.apache.hadoop.hbase.quotas.MasterSpaceQuotaObserver;<a name="line.161"></a>
+<span class="sourceLineNo">161</span>import org.apache.hadoop.hbase.quotas.MasterQuotasObserver;<a name="line.161"></a>
<span class="sourceLineNo">162</span>import org.apache.hadoop.hbase.quotas.QuotaObserverChore;<a name="line.162"></a>
<span class="sourceLineNo">163</span>import org.apache.hadoop.hbase.quotas.QuotaUtil;<a name="line.163"></a>
<span class="sourceLineNo">164</span>import org.apache.hadoop.hbase.quotas.SnapshotQuotaObserverChore;<a name="line.164"></a>
@@ -918,10 +918,10 @@
<span class="sourceLineNo">910</span> new ReplicationPeerConfigUpgrader(zooKeeper, conf);<a name="line.910"></a>
<span class="sourceLineNo">911</span> tableCFsUpdater.copyTableCFs();<a name="line.911"></a>
<span class="sourceLineNo">912</span><a name="line.912"></a>
-<span class="sourceLineNo">913</span> // Add the Observer to delete space quotas on table deletion before starting all CPs by<a name="line.913"></a>
+<span class="sourceLineNo">913</span> // Add the Observer to delete quotas on table deletion before starting all CPs by<a name="line.913"></a>
<span class="sourceLineNo">914</span> // default with quota support, avoiding if user specifically asks to not load this Observer.<a name="line.914"></a>
<span class="sourceLineNo">915</span> if (QuotaUtil.isQuotaEnabled(conf)) {<a name="line.915"></a>
-<span class="sourceLineNo">916</span> updateConfigurationForSpaceQuotaObserver(conf);<a name="line.916"></a>
+<span class="sourceLineNo">916</span> updateConfigurationForQuotasObserver(conf);<a name="line.916"></a>
<span class="sourceLineNo">917</span> }<a name="line.917"></a>
<span class="sourceLineNo">918</span> // initialize master side coprocessors before we start handling requests<a name="line.918"></a>
<span class="sourceLineNo">919</span> status.setStatus("Initializing master coprocessors");<a name="line.919"></a>
@@ -1077,15 +1077,15 @@
<span class="sourceLineNo">1069</span> }<a name="line.1069"></a>
<span class="sourceLineNo">1070</span><a name="line.1070"></a>
<span class="sourceLineNo">1071</span> /**<a name="line.1071"></a>
-<span class="sourceLineNo">1072</span> * Adds the {@code MasterSpaceQuotaObserver} to the list of configured Master observers to<a name="line.1072"></a>
-<span class="sourceLineNo">1073</span> * automatically remove space quotas for a table when that table is deleted.<a name="line.1073"></a>
+<span class="sourceLineNo">1072</span> * Adds the {@code MasterQuotasObserver} to the list of configured Master observers to<a name="line.1072"></a>
+<span class="sourceLineNo">1073</span> * automatically remove quotas for a table when that table is deleted.<a name="line.1073"></a>
<span class="sourceLineNo">1074</span> */<a name="line.1074"></a>
<span class="sourceLineNo">1075</span> @VisibleForTesting<a name="line.1075"></a>
-<span class="sourceLineNo">1076</span> public void updateConfigurationForSpaceQuotaObserver(Configuration conf) {<a name="line.1076"></a>
+<span class="sourceLineNo">1076</span> public void updateConfigurationForQuotasObserver(Configuration conf) {<a name="line.1076"></a>
<span class="sourceLineNo">1077</span> // We're configured to not delete quotas on table deletion, so we don't need to add the obs.<a name="line.1077"></a>
<span class="sourceLineNo">1078</span> if (!conf.getBoolean(<a name="line.1078"></a>
-<span class="sourceLineNo">1079</span> MasterSpaceQuotaObserver.REMOVE_QUOTA_ON_TABLE_DELETE,<a name="line.1079"></a>
-<span class="sourceLineNo">1080</span> MasterSpaceQuotaObserver.REMOVE_QUOTA_ON_TABLE_DELETE_DEFAULT)) {<a name="line.1080"></a>
+<span class="sourceLineNo">1079</span> MasterQuotasObserver.REMOVE_QUOTA_ON_TABLE_DELETE,<a name="line.1079"></a>
+<span class="sourceLineNo">1080</span> MasterQuotasObserver.REMOVE_QUOTA_ON_TABLE_DELETE_DEFAULT)) {<a name="line.1080"></a>
<span class="sourceLineNo">1081</span> return;<a name="line.1081"></a>
<span class="sourceLineNo">1082</span> }<a name="line.1082"></a>
<span class="sourceLineNo">1083</span> String[] masterCoprocs = conf.getStrings(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY);<a name="line.1083"></a>
@@ -1094,7 +1094,7 @@
<span class="sourceLineNo">1086</span> if (length > 0) {<a name="line.1086"></a>
<span class="sourceLineNo">1087</span> System.arraycopy(masterCoprocs, 0, updatedCoprocs, 0, masterCoprocs.length);<a name="line.1087"></a>
<span class="sourceLineNo">1088</span> }<a name="line.1088"></a>
-<span class="sourceLineNo">1089</span> updatedCoprocs[length] = MasterSpaceQuotaObserver.class.getName();<a name="line.1089"></a>
+<span class="sourceLineNo">1089</span> updatedCoprocs[length] = MasterQuotasObserver.class.getName();<a name="line.1089"></a>
<span class="sourceLineNo">1090</span> conf.setStrings(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY, updatedCoprocs);<a name="line.1090"></a>
<span class="sourceLineNo">1091</span> }<a name="line.1091"></a>
<span class="sourceLineNo">1092</span><a name="line.1092"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f11959c9/devapidocs/src-html/org/apache/hadoop/hbase/quotas/MasterQuotasObserver.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/MasterQuotasObserver.html b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/MasterQuotasObserver.html
new file mode 100644
index 0000000..bd63c7a
--- /dev/null
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/MasterQuotasObserver.html
@@ -0,0 +1,180 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+<title>Source code</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+</head>
+<body>
+<div class="sourceContainer">
+<pre><span class="sourceLineNo">001</span>/*<a name="line.1"></a>
+<span class="sourceLineNo">002</span> * Licensed to the Apache Software Foundation (ASF) under one or more<a name="line.2"></a>
+<span class="sourceLineNo">003</span> * contributor license agreements. See the NOTICE file distributed with<a name="line.3"></a>
+<span class="sourceLineNo">004</span> * this work for additional information regarding copyright ownership.<a name="line.4"></a>
+<span class="sourceLineNo">005</span> * The ASF licenses this file to you under the Apache License, Version 2.0<a name="line.5"></a>
+<span class="sourceLineNo">006</span> * (the "License"); you may not use this file except in compliance with<a name="line.6"></a>
+<span class="sourceLineNo">007</span> * the License. You may obtain a copy of the License at<a name="line.7"></a>
+<span class="sourceLineNo">008</span> *<a name="line.8"></a>
+<span class="sourceLineNo">009</span> * http://www.apache.org/licenses/LICENSE-2.0<a name="line.9"></a>
+<span class="sourceLineNo">010</span> *<a name="line.10"></a>
+<span class="sourceLineNo">011</span> * Unless required by applicable law or agreed to in writing, software<a name="line.11"></a>
+<span class="sourceLineNo">012</span> * distributed under the License is distributed on an "AS IS" BASIS,<a name="line.12"></a>
+<span class="sourceLineNo">013</span> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.<a name="line.13"></a>
+<span class="sourceLineNo">014</span> * See the License for the specific language governing permissions and<a name="line.14"></a>
+<span class="sourceLineNo">015</span> * limitations under the License.<a name="line.15"></a>
+<span class="sourceLineNo">016</span> */<a name="line.16"></a>
+<span class="sourceLineNo">017</span>package org.apache.hadoop.hbase.quotas;<a name="line.17"></a>
+<span class="sourceLineNo">018</span><a name="line.18"></a>
+<span class="sourceLineNo">019</span>import java.io.IOException;<a name="line.19"></a>
+<span class="sourceLineNo">020</span>import java.util.Optional;<a name="line.20"></a>
+<span class="sourceLineNo">021</span><a name="line.21"></a>
+<span class="sourceLineNo">022</span>import org.apache.hadoop.conf.Configuration;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.CoprocessorEnvironment;<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.hadoop.hbase.client.Admin;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.coprocessor.MasterCoprocessor;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.coprocessor.MasterCoprocessorEnvironment;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.coprocessor.MasterObserver;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.coprocessor.ObserverContext;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Quotas;<a name="line.32"></a>
+<span class="sourceLineNo">033</span><a name="line.33"></a>
+<span class="sourceLineNo">034</span>/**<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * An observer to automatically delete quotas when a table/namespace<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * is deleted.<a name="line.36"></a>
+<span class="sourceLineNo">037</span> */<a name="line.37"></a>
+<span class="sourceLineNo">038</span>@InterfaceAudience.Private<a name="line.38"></a>
+<span class="sourceLineNo">039</span>public class MasterQuotasObserver implements MasterCoprocessor, MasterObserver {<a name="line.39"></a>
+<span class="sourceLineNo">040</span> public static final String REMOVE_QUOTA_ON_TABLE_DELETE = "hbase.quota.remove.on.table.delete";<a name="line.40"></a>
+<span class="sourceLineNo">041</span> public static final boolean REMOVE_QUOTA_ON_TABLE_DELETE_DEFAULT = true;<a name="line.41"></a>
+<span class="sourceLineNo">042</span><a name="line.42"></a>
+<span class="sourceLineNo">043</span> private CoprocessorEnvironment cpEnv;<a name="line.43"></a>
+<span class="sourceLineNo">044</span> private Configuration conf;<a name="line.44"></a>
+<span class="sourceLineNo">045</span> private boolean quotasEnabled = false;<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span> @Override<a name="line.47"></a>
+<span class="sourceLineNo">048</span> public Optional<MasterObserver> getMasterObserver() {<a name="line.48"></a>
+<span class="sourceLineNo">049</span> return Optional.of(this);<a name="line.49"></a>
+<span class="sourceLineNo">050</span> }<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span> @Override<a name="line.52"></a>
+<span class="sourceLineNo">053</span> public void start(CoprocessorEnvironment ctx) throws IOException {<a name="line.53"></a>
+<span class="sourceLineNo">054</span> this.cpEnv = ctx;<a name="line.54"></a>
+<span class="sourceLineNo">055</span> this.conf = cpEnv.getConfiguration();<a name="line.55"></a>
+<span class="sourceLineNo">056</span> this.quotasEnabled = QuotaUtil.isQuotaEnabled(conf);<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> @Override<a name="line.59"></a>
+<span class="sourceLineNo">060</span> public void postDeleteTable(<a name="line.60"></a>
+<span class="sourceLineNo">061</span> ObserverContext<MasterCoprocessorEnvironment> ctx, TableName tableName) throws IOException {<a name="line.61"></a>
+<span class="sourceLineNo">062</span> // Do nothing if quotas aren't enabled<a name="line.62"></a>
+<span class="sourceLineNo">063</span> if (!quotasEnabled) {<a name="line.63"></a>
+<span class="sourceLineNo">064</span> return;<a name="line.64"></a>
+<span class="sourceLineNo">065</span> }<a name="line.65"></a>
+<span class="sourceLineNo">066</span> final Connection conn = ctx.getEnvironment().getConnection();<a name="line.66"></a>
+<span class="sourceLineNo">067</span> Quotas quotas = QuotaUtil.getTableQuota(conn, tableName);<a name="line.67"></a>
+<span class="sourceLineNo">068</span> if (quotas != null){<a name="line.68"></a>
+<span class="sourceLineNo">069</span> if (quotas.hasSpace()){<a name="line.69"></a>
+<span class="sourceLineNo">070</span> QuotaSettings settings = QuotaSettingsFactory.removeTableSpaceLimit(tableName);<a name="line.70"></a>
+<span class="sourceLineNo">071</span> try (Admin admin = conn.getAdmin()) {<a name="line.71"></a>
+<span class="sourceLineNo">072</span> admin.setQuota(settings);<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> if (quotas.hasThrottle()){<a name="line.75"></a>
+<span class="sourceLineNo">076</span> QuotaSettings settings = QuotaSettingsFactory.unthrottleTable(tableName);<a name="line.76"></a>
+<span class="sourceLineNo">077</span> try (Admin admin = conn.getAdmin()) {<a name="line.77"></a>
+<span class="sourceLineNo">078</span> admin.setQuota(settings);<a name="line.78"></a>
+<span class="sourceLineNo">079</span> }<a name="line.79"></a>
+<span class="sourceLineNo">080</span> }<a name="line.80"></a>
+<span class="sourceLineNo">081</span> }<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> @Override<a name="line.84"></a>
+<span class="sourceLineNo">085</span> public void postDeleteNamespace(<a name="line.85"></a>
+<span class="sourceLineNo">086</span> ObserverContext<MasterCoprocessorEnvironment> ctx, String namespace) throws IOException {<a name="line.86"></a>
+<span class="sourceLineNo">087</span> // Do nothing if quotas aren't enabled<a name="line.87"></a>
+<span class="sourceLineNo">088</span> if (!quotasEnabled) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span> return;<a name="line.89"></a>
+<span class="sourceLineNo">090</span> }<a name="line.90"></a>
+<span class="sourceLineNo">091</span> final Connection conn = ctx.getEnvironment().getConnection();<a name="line.91"></a>
+<span class="sourceLineNo">092</span> Quotas quotas = QuotaUtil.getNamespaceQuota(conn, namespace);<a name="line.92"></a>
+<span class="sourceLineNo">093</span> if (quotas != null) {<a name="line.93"></a>
+<span class="sourceLineNo">094</span> if (quotas.hasSpace()) {<a name="line.94"></a>
+<span class="sourceLineNo">095</span> QuotaSettings settings = QuotaSettingsFactory.removeNamespaceSpaceLimit(namespace);<a name="line.95"></a>
+<span class="sourceLineNo">096</span> try (Admin admin = conn.getAdmin()) {<a name="line.96"></a>
+<span class="sourceLineNo">097</span> admin.setQuota(settings);<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> if (quotas.hasThrottle()) {<a name="line.100"></a>
+<span class="sourceLineNo">101</span> QuotaSettings settings = QuotaSettingsFactory.unthrottleNamespace(namespace);<a name="line.101"></a>
+<span class="sourceLineNo">102</span> try (Admin admin = conn.getAdmin()) {<a name="line.102"></a>
+<span class="sourceLineNo">103</span> admin.setQuota(settings);<a name="line.103"></a>
+<span class="sourceLineNo">104</span> }<a name="line.104"></a>
+<span class="sourceLineNo">105</span> }<a name="line.105"></a>
+<span class="sourceLineNo">106</span> }<a name="line.106"></a>
+<span class="sourceLineNo">107</span> }<a name="line.107"></a>
+<span class="sourceLineNo">108</span>}<a name="line.108"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f11959c9/devapidocs/src-html/org/apache/hadoop/hbase/quotas/MasterSpaceQuotaObserver.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/MasterSpaceQuotaObserver.html b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/MasterSpaceQuotaObserver.html
deleted file mode 100644
index 6c120ea..0000000
--- a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/MasterSpaceQuotaObserver.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en">
-<head>
-<title>Source code</title>
-<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
-</head>
-<body>
-<div class="sourceContainer">
-<pre><span class="sourceLineNo">001</span>/*<a name="line.1"></a>
-<span class="sourceLineNo">002</span> * Licensed to the Apache Software Foundation (ASF) under one or more<a name="line.2"></a>
-<span class="sourceLineNo">003</span> * contributor license agreements. See the NOTICE file distributed with<a name="line.3"></a>
-<span class="sourceLineNo">004</span> * this work for additional information regarding copyright ownership.<a name="line.4"></a>
-<span class="sourceLineNo">005</span> * The ASF licenses this file to you under the Apache License, Version 2.0<a name="line.5"></a>
-<span class="sourceLineNo">006</span> * (the "License"); you may not use this file except in compliance with<a name="line.6"></a>
-<span class="sourceLineNo">007</span> * the License. You may obtain a copy of the License at<a name="line.7"></a>
-<span class="sourceLineNo">008</span> *<a name="line.8"></a>
-<span class="sourceLineNo">009</span> * http://www.apache.org/licenses/LICENSE-2.0<a name="line.9"></a>
-<span class="sourceLineNo">010</span> *<a name="line.10"></a>
-<span class="sourceLineNo">011</span> * Unless required by applicable law or agreed to in writing, software<a name="line.11"></a>
-<span class="sourceLineNo">012</span> * distributed under the License is distributed on an "AS IS" BASIS,<a name="line.12"></a>
-<span class="sourceLineNo">013</span> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.<a name="line.13"></a>
-<span class="sourceLineNo">014</span> * See the License for the specific language governing permissions and<a name="line.14"></a>
-<span class="sourceLineNo">015</span> * limitations under the License.<a name="line.15"></a>
-<span class="sourceLineNo">016</span> */<a name="line.16"></a>
-<span class="sourceLineNo">017</span>package org.apache.hadoop.hbase.quotas;<a name="line.17"></a>
-<span class="sourceLineNo">018</span><a name="line.18"></a>
-<span class="sourceLineNo">019</span>import java.io.IOException;<a name="line.19"></a>
-<span class="sourceLineNo">020</span>import java.util.Optional;<a name="line.20"></a>
-<span class="sourceLineNo">021</span><a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.hadoop.conf.Configuration;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.CoprocessorEnvironment;<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.client.Admin;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.coprocessor.MasterCoprocessor;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.coprocessor.MasterCoprocessorEnvironment;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.coprocessor.MasterObserver;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.coprocessor.ObserverContext;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Quotas;<a name="line.32"></a>
-<span class="sourceLineNo">033</span><a name="line.33"></a>
-<span class="sourceLineNo">034</span>/**<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * An observer to automatically delete space quotas when a table/namespace<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * are deleted.<a name="line.36"></a>
-<span class="sourceLineNo">037</span> */<a name="line.37"></a>
-<span class="sourceLineNo">038</span>@InterfaceAudience.Private<a name="line.38"></a>
-<span class="sourceLineNo">039</span>public class MasterSpaceQuotaObserver implements MasterCoprocessor, MasterObserver {<a name="line.39"></a>
-<span class="sourceLineNo">040</span> public static final String REMOVE_QUOTA_ON_TABLE_DELETE = "hbase.quota.remove.on.table.delete";<a name="line.40"></a>
-<span class="sourceLineNo">041</span> public static final boolean REMOVE_QUOTA_ON_TABLE_DELETE_DEFAULT = true;<a name="line.41"></a>
-<span class="sourceLineNo">042</span><a name="line.42"></a>
-<span class="sourceLineNo">043</span> private CoprocessorEnvironment cpEnv;<a name="line.43"></a>
-<span class="sourceLineNo">044</span> private Configuration conf;<a name="line.44"></a>
-<span class="sourceLineNo">045</span> private boolean quotasEnabled = false;<a name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span> @Override<a name="line.47"></a>
-<span class="sourceLineNo">048</span> public Optional<MasterObserver> getMasterObserver() {<a name="line.48"></a>
-<span class="sourceLineNo">049</span> return Optional.of(this);<a name="line.49"></a>
-<span class="sourceLineNo">050</span> }<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span> @Override<a name="line.52"></a>
-<span class="sourceLineNo">053</span> public void start(CoprocessorEnvironment ctx) throws IOException {<a name="line.53"></a>
-<span class="sourceLineNo">054</span> this.cpEnv = ctx;<a name="line.54"></a>
-<span class="sourceLineNo">055</span> this.conf = cpEnv.getConfiguration();<a name="line.55"></a>
-<span class="sourceLineNo">056</span> this.quotasEnabled = QuotaUtil.isQuotaEnabled(conf);<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> @Override<a name="line.59"></a>
-<span class="sourceLineNo">060</span> public void postDeleteTable(<a name="line.60"></a>
-<span class="sourceLineNo">061</span> ObserverContext<MasterCoprocessorEnvironment> ctx, TableName tableName) throws IOException {<a name="line.61"></a>
-<span class="sourceLineNo">062</span> // Do nothing if quotas aren't enabled<a name="line.62"></a>
-<span class="sourceLineNo">063</span> if (!quotasEnabled) {<a name="line.63"></a>
-<span class="sourceLineNo">064</span> return;<a name="line.64"></a>
-<span class="sourceLineNo">065</span> }<a name="line.65"></a>
-<span class="sourceLineNo">066</span> final Connection conn = ctx.getEnvironment().getConnection();<a name="line.66"></a>
-<span class="sourceLineNo">067</span> Quotas quotas = QuotaUtil.getTableQuota(conn, tableName);<a name="line.67"></a>
-<span class="sourceLineNo">068</span> if (quotas != null && quotas.hasSpace()) {<a name="line.68"></a>
-<span class="sourceLineNo">069</span> QuotaSettings settings = QuotaSettingsFactory.removeTableSpaceLimit(tableName);<a name="line.69"></a>
-<span class="sourceLineNo">070</span> try (Admin admin = conn.getAdmin()) {<a name="line.70"></a>
-<span class="sourceLineNo">071</span> admin.setQuota(settings);<a name="line.71"></a>
-<span class="sourceLineNo">072</span> }<a name="line.72"></a>
-<span class="sourceLineNo">073</span> }<a name="line.73"></a>
-<span class="sourceLineNo">074</span> }<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span> @Override<a name="line.76"></a>
-<span class="sourceLineNo">077</span> public void postDeleteNamespace(<a name="line.77"></a>
-<span class="sourceLineNo">078</span> ObserverContext<MasterCoprocessorEnvironment> ctx, String namespace) throws IOException {<a name="line.78"></a>
-<span class="sourceLineNo">079</span> // Do nothing if quotas aren't enabled<a name="line.79"></a>
-<span class="sourceLineNo">080</span> if (!quotasEnabled) {<a name="line.80"></a>
-<span class="sourceLineNo">081</span> return;<a name="line.81"></a>
-<span class="sourceLineNo">082</span> }<a name="line.82"></a>
-<span class="sourceLineNo">083</span> final Connection conn = ctx.getEnvironment().getConnection();<a name="line.83"></a>
-<span class="sourceLineNo">084</span> Quotas quotas = QuotaUtil.getNamespaceQuota(conn, namespace);<a name="line.84"></a>
-<span class="sourceLineNo">085</span> if (quotas != null && quotas.hasSpace()) {<a name="line.85"></a>
-<span class="sourceLineNo">086</span> QuotaSettings settings = QuotaSettingsFactory.removeNamespaceSpaceLimit(namespace);<a name="line.86"></a>
-<span class="sourceLineNo">087</span> try (Admin admin = conn.getAdmin()) {<a name="line.87"></a>
-<span class="sourceLineNo">088</span> admin.setQuota(settings);<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> }<a name="line.91"></a>
-<span class="sourceLineNo">092</span>}<a name="line.92"></a>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</pre>
-</div>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f11959c9/devapidocs/src-html/org/apache/hadoop/hbase/rest/TableScanResource.CellSetModelStream.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/rest/TableScanResource.CellSetModelStream.html b/devapidocs/src-html/org/apache/hadoop/hbase/rest/TableScanResource.CellSetModelStream.html
index 403d443..949ec8c 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/rest/TableScanResource.CellSetModelStream.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/rest/TableScanResource.CellSetModelStream.html
@@ -106,61 +106,64 @@
<span class="sourceLineNo">098</span> kv.getTimestamp(), CellUtil.cloneValue(kv)));<a name="line.98"></a>
<span class="sourceLineNo">099</span> }<a name="line.99"></a>
<span class="sourceLineNo">100</span> count--;<a name="line.100"></a>
-<span class="sourceLineNo">101</span> return rModel;<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> }<a name="line.104"></a>
-<span class="sourceLineNo">105</span> });<a name="line.105"></a>
-<span class="sourceLineNo">106</span> }<a name="line.106"></a>
-<span class="sourceLineNo">107</span><a name="line.107"></a>
-<span class="sourceLineNo">108</span> @GET<a name="line.108"></a>
-<span class="sourceLineNo">109</span> @Produces({ Constants.MIMETYPE_PROTOBUF, Constants.MIMETYPE_PROTOBUF_IETF })<a name="line.109"></a>
-<span class="sourceLineNo">110</span> public Response getProtobuf(<a name="line.110"></a>
-<span class="sourceLineNo">111</span> final @Context UriInfo uriInfo,<a name="line.111"></a>
-<span class="sourceLineNo">112</span> final @HeaderParam("Accept") String contentType) {<a name="line.112"></a>
-<span class="sourceLineNo">113</span> if (LOG.isTraceEnabled()) {<a name="line.113"></a>
-<span class="sourceLineNo">114</span> LOG.trace("GET " + uriInfo.getAbsolutePath() + " as " +<a name="line.114"></a>
-<span class="sourceLineNo">115</span> MIMETYPE_BINARY);<a name="line.115"></a>
-<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span> servlet.getMetrics().incrementRequests(1);<a name="line.117"></a>
-<span class="sourceLineNo">118</span> try {<a name="line.118"></a>
-<span class="sourceLineNo">119</span> int fetchSize = this.servlet.getConfiguration().getInt(Constants.SCAN_FETCH_SIZE, 10);<a name="line.119"></a>
-<span class="sourceLineNo">120</span> StreamingOutput stream = new ProtobufStreamingOutput(this.results, contentType,<a name="line.120"></a>
-<span class="sourceLineNo">121</span> userRequestedLimit, fetchSize);<a name="line.121"></a>
-<span class="sourceLineNo">122</span> servlet.getMetrics().incrementSucessfulScanRequests(1);<a name="line.122"></a>
-<span class="sourceLineNo">123</span> ResponseBuilder response = Response.ok(stream);<a name="line.123"></a>
-<span class="sourceLineNo">124</span> response.header("content-type", contentType);<a name="line.124"></a>
-<span class="sourceLineNo">125</span> return response.build();<a name="line.125"></a>
-<span class="sourceLineNo">126</span> } catch (Exception exp) {<a name="line.126"></a>
-<span class="sourceLineNo">127</span> servlet.getMetrics().incrementFailedScanRequests(1);<a name="line.127"></a>
-<span class="sourceLineNo">128</span> processException(exp);<a name="line.128"></a>
-<span class="sourceLineNo">129</span> LOG.warn(exp.toString(), exp);<a name="line.129"></a>
-<span class="sourceLineNo">130</span> return null;<a name="line.130"></a>
-<span class="sourceLineNo">131</span> }<a name="line.131"></a>
-<span class="sourceLineNo">132</span> }<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span> @XmlRootElement(name = "CellSet")<a name="line.134"></a>
-<span class="sourceLineNo">135</span> @XmlAccessorType(XmlAccessType.FIELD)<a name="line.135"></a>
-<span class="sourceLineNo">136</span> public static class CellSetModelStream {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> // JAXB needs an arraylist for streaming<a name="line.137"></a>
-<span class="sourceLineNo">138</span> @XmlElement(name = "Row")<a name="line.138"></a>
-<span class="sourceLineNo">139</span> @JsonIgnore<a name="line.139"></a>
-<span class="sourceLineNo">140</span> private ArrayList<RowModel> Row;<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span> public CellSetModelStream() {<a name="line.142"></a>
-<span class="sourceLineNo">143</span> }<a name="line.143"></a>
+<span class="sourceLineNo">101</span> if (count == 0) {<a name="line.101"></a>
+<span class="sourceLineNo">102</span> results.close();<a name="line.102"></a>
+<span class="sourceLineNo">103</span> }<a name="line.103"></a>
+<span class="sourceLineNo">104</span> return rModel;<a name="line.104"></a>
+<span class="sourceLineNo">105</span> }<a name="line.105"></a>
+<span class="sourceLineNo">106</span> };<a name="line.106"></a>
+<span class="sourceLineNo">107</span> }<a name="line.107"></a>
+<span class="sourceLineNo">108</span> });<a name="line.108"></a>
+<span class="sourceLineNo">109</span> }<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span> @GET<a name="line.111"></a>
+<span class="sourceLineNo">112</span> @Produces({ Constants.MIMETYPE_PROTOBUF, Constants.MIMETYPE_PROTOBUF_IETF })<a name="line.112"></a>
+<span class="sourceLineNo">113</span> public Response getProtobuf(<a name="line.113"></a>
+<span class="sourceLineNo">114</span> final @Context UriInfo uriInfo,<a name="line.114"></a>
+<span class="sourceLineNo">115</span> final @HeaderParam("Accept") String contentType) {<a name="line.115"></a>
+<span class="sourceLineNo">116</span> if (LOG.isTraceEnabled()) {<a name="line.116"></a>
+<span class="sourceLineNo">117</span> LOG.trace("GET " + uriInfo.getAbsolutePath() + " as " +<a name="line.117"></a>
+<span class="sourceLineNo">118</span> MIMETYPE_BINARY);<a name="line.118"></a>
+<span class="sourceLineNo">119</span> }<a name="line.119"></a>
+<span class="sourceLineNo">120</span> servlet.getMetrics().incrementRequests(1);<a name="line.120"></a>
+<span class="sourceLineNo">121</span> try {<a name="line.121"></a>
+<span class="sourceLineNo">122</span> int fetchSize = this.servlet.getConfiguration().getInt(Constants.SCAN_FETCH_SIZE, 10);<a name="line.122"></a>
+<span class="sourceLineNo">123</span> StreamingOutput stream = new ProtobufStreamingOutput(this.results, contentType,<a name="line.123"></a>
+<span class="sourceLineNo">124</span> userRequestedLimit, fetchSize);<a name="line.124"></a>
+<span class="sourceLineNo">125</span> servlet.getMetrics().incrementSucessfulScanRequests(1);<a name="line.125"></a>
+<span class="sourceLineNo">126</span> ResponseBuilder response = Response.ok(stream);<a name="line.126"></a>
+<span class="sourceLineNo">127</span> response.header("content-type", contentType);<a name="line.127"></a>
+<span class="sourceLineNo">128</span> return response.build();<a name="line.128"></a>
+<span class="sourceLineNo">129</span> } catch (Exception exp) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> servlet.getMetrics().incrementFailedScanRequests(1);<a name="line.130"></a>
+<span class="sourceLineNo">131</span> processException(exp);<a name="line.131"></a>
+<span class="sourceLineNo">132</span> LOG.warn(exp.toString(), exp);<a name="line.132"></a>
+<span class="sourceLineNo">133</span> return null;<a name="line.133"></a>
+<span class="sourceLineNo">134</span> }<a name="line.134"></a>
+<span class="sourceLineNo">135</span> }<a name="line.135"></a>
+<span class="sourceLineNo">136</span><a name="line.136"></a>
+<span class="sourceLineNo">137</span> @XmlRootElement(name = "CellSet")<a name="line.137"></a>
+<span class="sourceLineNo">138</span> @XmlAccessorType(XmlAccessType.FIELD)<a name="line.138"></a>
+<span class="sourceLineNo">139</span> public static class CellSetModelStream {<a name="line.139"></a>
+<span class="sourceLineNo">140</span> // JAXB needs an arraylist for streaming<a name="line.140"></a>
+<span class="sourceLineNo">141</span> @XmlElement(name = "Row")<a name="line.141"></a>
+<span class="sourceLineNo">142</span> @JsonIgnore<a name="line.142"></a>
+<span class="sourceLineNo">143</span> private ArrayList<RowModel> Row;<a name="line.143"></a>
<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span> public CellSetModelStream(final ArrayList<RowModel> rowList) {<a name="line.145"></a>
-<span class="sourceLineNo">146</span> this.Row = rowList;<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> // jackson needs an iterator for streaming<a name="line.149"></a>
-<span class="sourceLineNo">150</span> @JsonProperty("Row")<a name="line.150"></a>
-<span class="sourceLineNo">151</span> public Iterator<RowModel> getIterator() {<a name="line.151"></a>
-<span class="sourceLineNo">152</span> return Row.iterator();<a name="line.152"></a>
-<span class="sourceLineNo">153</span> }<a name="line.153"></a>
-<span class="sourceLineNo">154</span> }<a name="line.154"></a>
-<span class="sourceLineNo">155</span>}<a name="line.155"></a>
+<span class="sourceLineNo">145</span> public CellSetModelStream() {<a name="line.145"></a>
+<span class="sourceLineNo">146</span> }<a name="line.146"></a>
+<span class="sourceLineNo">147</span><a name="line.147"></a>
+<span class="sourceLineNo">148</span> public CellSetModelStream(final ArrayList<RowModel> rowList) {<a name="line.148"></a>
+<span class="sourceLineNo">149</span> this.Row = rowList;<a name="line.149"></a>
+<span class="sourceLineNo">150</span> }<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span> // jackson needs an iterator for streaming<a name="line.152"></a>
+<span class="sourceLineNo">153</span> @JsonProperty("Row")<a name="line.153"></a>
+<span class="sourceLineNo">154</span> public Iterator<RowModel> getIterator() {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> return Row.iterator();<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>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f11959c9/devapidocs/src-html/org/apache/hadoop/hbase/rest/TableScanResource.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/rest/TableScanResource.html b/devapidocs/src-html/org/apache/hadoop/hbase/rest/TableScanResource.html
index 403d443..949ec8c 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/rest/TableScanResource.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/rest/TableScanResource.html
@@ -106,61 +106,64 @@
<span class="sourceLineNo">098</span> kv.getTimestamp(), CellUtil.cloneValue(kv)));<a name="line.98"></a>
<span class="sourceLineNo">099</span> }<a name="line.99"></a>
<span class="sourceLineNo">100</span> count--;<a name="line.100"></a>
-<span class="sourceLineNo">101</span> return rModel;<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> }<a name="line.104"></a>
-<span class="sourceLineNo">105</span> });<a name="line.105"></a>
-<span class="sourceLineNo">106</span> }<a name="line.106"></a>
-<span class="sourceLineNo">107</span><a name="line.107"></a>
-<span class="sourceLineNo">108</span> @GET<a name="line.108"></a>
-<span class="sourceLineNo">109</span> @Produces({ Constants.MIMETYPE_PROTOBUF, Constants.MIMETYPE_PROTOBUF_IETF })<a name="line.109"></a>
-<span class="sourceLineNo">110</span> public Response getProtobuf(<a name="line.110"></a>
-<span class="sourceLineNo">111</span> final @Context UriInfo uriInfo,<a name="line.111"></a>
-<span class="sourceLineNo">112</span> final @HeaderParam("Accept") String contentType) {<a name="line.112"></a>
-<span class="sourceLineNo">113</span> if (LOG.isTraceEnabled()) {<a name="line.113"></a>
-<span class="sourceLineNo">114</span> LOG.trace("GET " + uriInfo.getAbsolutePath() + " as " +<a name="line.114"></a>
-<span class="sourceLineNo">115</span> MIMETYPE_BINARY);<a name="line.115"></a>
-<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span> servlet.getMetrics().incrementRequests(1);<a name="line.117"></a>
-<span class="sourceLineNo">118</span> try {<a name="line.118"></a>
-<span class="sourceLineNo">119</span> int fetchSize = this.servlet.getConfiguration().getInt(Constants.SCAN_FETCH_SIZE, 10);<a name="line.119"></a>
-<span class="sourceLineNo">120</span> StreamingOutput stream = new ProtobufStreamingOutput(this.results, contentType,<a name="line.120"></a>
-<span class="sourceLineNo">121</span> userRequestedLimit, fetchSize);<a name="line.121"></a>
-<span class="sourceLineNo">122</span> servlet.getMetrics().incrementSucessfulScanRequests(1);<a name="line.122"></a>
-<span class="sourceLineNo">123</span> ResponseBuilder response = Response.ok(stream);<a name="line.123"></a>
-<span class="sourceLineNo">124</span> response.header("content-type", contentType);<a name="line.124"></a>
-<span class="sourceLineNo">125</span> return response.build();<a name="line.125"></a>
-<span class="sourceLineNo">126</span> } catch (Exception exp) {<a name="line.126"></a>
-<span class="sourceLineNo">127</span> servlet.getMetrics().incrementFailedScanRequests(1);<a name="line.127"></a>
-<span class="sourceLineNo">128</span> processException(exp);<a name="line.128"></a>
-<span class="sourceLineNo">129</span> LOG.warn(exp.toString(), exp);<a name="line.129"></a>
-<span class="sourceLineNo">130</span> return null;<a name="line.130"></a>
-<span class="sourceLineNo">131</span> }<a name="line.131"></a>
-<span class="sourceLineNo">132</span> }<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span> @XmlRootElement(name = "CellSet")<a name="line.134"></a>
-<span class="sourceLineNo">135</span> @XmlAccessorType(XmlAccessType.FIELD)<a name="line.135"></a>
-<span class="sourceLineNo">136</span> public static class CellSetModelStream {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> // JAXB needs an arraylist for streaming<a name="line.137"></a>
-<span class="sourceLineNo">138</span> @XmlElement(name = "Row")<a name="line.138"></a>
-<span class="sourceLineNo">139</span> @JsonIgnore<a name="line.139"></a>
-<span class="sourceLineNo">140</span> private ArrayList<RowModel> Row;<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span> public CellSetModelStream() {<a name="line.142"></a>
-<span class="sourceLineNo">143</span> }<a name="line.143"></a>
+<span class="sourceLineNo">101</span> if (count == 0) {<a name="line.101"></a>
+<span class="sourceLineNo">102</span> results.close();<a name="line.102"></a>
+<span class="sourceLineNo">103</span> }<a name="line.103"></a>
+<span class="sourceLineNo">104</span> return rModel;<a name="line.104"></a>
+<span class="sourceLineNo">105</span> }<a name="line.105"></a>
+<span class="sourceLineNo">106</span> };<a name="line.106"></a>
+<span class="sourceLineNo">107</span> }<a name="line.107"></a>
+<span class="sourceLineNo">108</span> });<a name="line.108"></a>
+<span class="sourceLineNo">109</span> }<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span> @GET<a name="line.111"></a>
+<span class="sourceLineNo">112</span> @Produces({ Constants.MIMETYPE_PROTOBUF, Constants.MIMETYPE_PROTOBUF_IETF })<a name="line.112"></a>
+<span class="sourceLineNo">113</span> public Response getProtobuf(<a name="line.113"></a>
+<span class="sourceLineNo">114</span> final @Context UriInfo uriInfo,<a name="line.114"></a>
+<span class="sourceLineNo">115</span> final @HeaderParam("Accept") String contentType) {<a name="line.115"></a>
+<span class="sourceLineNo">116</span> if (LOG.isTraceEnabled()) {<a name="line.116"></a>
+<span class="sourceLineNo">117</span> LOG.trace("GET " + uriInfo.getAbsolutePath() + " as " +<a name="line.117"></a>
+<span class="sourceLineNo">118</span> MIMETYPE_BINARY);<a name="line.118"></a>
+<span class="sourceLineNo">119</span> }<a name="line.119"></a>
+<span class="sourceLineNo">120</span> servlet.getMetrics().incrementRequests(1);<a name="line.120"></a>
+<span class="sourceLineNo">121</span> try {<a name="line.121"></a>
+<span class="sourceLineNo">122</span> int fetchSize = this.servlet.getConfiguration().getInt(Constants.SCAN_FETCH_SIZE, 10);<a name="line.122"></a>
+<span class="sourceLineNo">123</span> StreamingOutput stream = new ProtobufStreamingOutput(this.results, contentType,<a name="line.123"></a>
+<span class="sourceLineNo">124</span> userRequestedLimit, fetchSize);<a name="line.124"></a>
+<span class="sourceLineNo">125</span> servlet.getMetrics().incrementSucessfulScanRequests(1);<a name="line.125"></a>
+<span class="sourceLineNo">126</span> ResponseBuilder response = Response.ok(stream);<a name="line.126"></a>
+<span class="sourceLineNo">127</span> response.header("content-type", contentType);<a name="line.127"></a>
+<span class="sourceLineNo">128</span> return response.build();<a name="line.128"></a>
+<span class="sourceLineNo">129</span> } catch (Exception exp) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> servlet.getMetrics().incrementFailedScanRequests(1);<a name="line.130"></a>
+<span class="sourceLineNo">131</span> processException(exp);<a name="line.131"></a>
+<span class="sourceLineNo">132</span> LOG.warn(exp.toString(), exp);<a name="line.132"></a>
+<span class="sourceLineNo">133</span> return null;<a name="line.133"></a>
+<span class="sourceLineNo">134</span> }<a name="line.134"></a>
+<span class="sourceLineNo">135</span> }<a name="line.135"></a>
+<span class="sourceLineNo">136</span><a name="line.136"></a>
+<span class="sourceLineNo">137</span> @XmlRootElement(name = "CellSet")<a name="line.137"></a>
+<span class="sourceLineNo">138</span> @XmlAccessorType(XmlAccessType.FIELD)<a name="line.138"></a>
+<span class="sourceLineNo">139</span> public static class CellSetModelStream {<a name="line.139"></a>
+<span class="sourceLineNo">140</span> // JAXB needs an arraylist for streaming<a name="line.140"></a>
+<span class="sourceLineNo">141</span> @XmlElement(name = "Row")<a name="line.141"></a>
+<span class="sourceLineNo">142</span> @JsonIgnore<a name="line.142"></a>
+<span class="sourceLineNo">143</span> private ArrayList<RowModel> Row;<a name="line.143"></a>
<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span> public CellSetModelStream(final ArrayList<RowModel> rowList) {<a name="line.145"></a>
-<span class="sourceLineNo">146</span> this.Row = rowList;<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> // jackson needs an iterator for streaming<a name="line.149"></a>
-<span class="sourceLineNo">150</span> @JsonProperty("Row")<a name="line.150"></a>
-<span class="sourceLineNo">151</span> public Iterator<RowModel> getIterator() {<a name="line.151"></a>
-<span class="sourceLineNo">152</span> return Row.iterator();<a name="line.152"></a>
-<span class="sourceLineNo">153</span> }<a name="line.153"></a>
-<span class="sourceLineNo">154</span> }<a name="line.154"></a>
-<span class="sourceLineNo">155</span>}<a name="line.155"></a>
+<span class="sourceLineNo">145</span> public CellSetModelStream() {<a name="line.145"></a>
+<span class="sourceLineNo">146</span> }<a name="line.146"></a>
+<span class="sourceLineNo">147</span><a name="line.147"></a>
+<span class="sourceLineNo">148</span> public CellSetModelStream(final ArrayList<RowModel> rowList) {<a name="line.148"></a>
+<span class="sourceLineNo">149</span> this.Row = rowList;<a name="line.149"></a>
+<span class="sourceLineNo">150</span> }<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span> // jackson needs an iterator for streaming<a name="line.152"></a>
+<span class="sourceLineNo">153</span> @JsonProperty("Row")<a name="line.153"></a>
+<span class="sourceLineNo">154</span> public Iterator<RowModel> getIterator() {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> return Row.iterator();<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>