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/04 14:49:21 UTC

[3/4] hbase-site git commit: Published site at bd30ca62eff05195b9328aca5f33f69ad0198307.

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9623a753/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html b/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
index fe426ae..e90c723 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -704,20 +704,20 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/Region.Operation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">Region.Operation</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/BloomType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">BloomType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/SplitLogWorker.TaskExecutor.Status.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">SplitLogWorker.TaskExecutor.Status</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScannerContext.LimitScope</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">MetricsRegionServerSourceFactoryImpl.FactoryStorage</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TimeRangeTracker.Type.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TimeRangeTracker.Type</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactionStrategy.Action.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">MemStoreCompactionStrategy.Action</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/FlushType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">FlushType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/HRegion.FlushResult.Result.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">HRegion.FlushResult.Result</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.StepDirection.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">DefaultHeapMemoryTuner.StepDirection</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactionStrategy.Action.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">MemStoreCompactionStrategy.Action</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TimeRangeTracker.Type.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TimeRangeTracker.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScanType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/CompactingMemStore.IndexType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">CompactingMemStore.IndexType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/SplitLogWorker.TaskExecutor.Status.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">SplitLogWorker.TaskExecutor.Status</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">MetricsRegionServerSourceFactoryImpl.FactoryStorage</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScannerContext.LimitScope</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScannerContext.NextState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/BloomType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">BloomType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/Region.Operation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">Region.Operation</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ChunkCreator.ChunkType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ChunkCreator.ChunkType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScanType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/HRegion.FlushResult.Result.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">HRegion.FlushResult.Result</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9623a753/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
index 2731576..23060c2 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
@@ -130,9 +130,9 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.MatchCode.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">ScanQueryMatcher.MatchCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">DeleteTracker.DeleteResult</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/StripeCompactionScanQueryMatcher.DropDeletesInOutput.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">StripeCompactionScanQueryMatcher.DropDeletesInOutput</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">DeleteTracker.DeleteResult</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.MatchCode.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">ScanQueryMatcher.MatchCode</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9623a753/devapidocs/org/apache/hadoop/hbase/regionserver/wal/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/wal/package-tree.html b/devapidocs/org/apache/hadoop/hbase/regionserver/wal/package-tree.html
index 46651a5..7eedc5c 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/wal/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/wal/package-tree.html
@@ -248,8 +248,8 @@
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
 <li type="circle">org.apache.hadoop.hbase.regionserver.wal.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrResult.html" title="enum in org.apache.hadoop.hbase.regionserver.wal"><span class="typeNameLink">ProtobufLogReader.WALHdrResult</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.wal.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/wal/CompressionContext.DictionaryIndex.html" title="enum in org.apache.hadoop.hbase.regionserver.wal"><span class="typeNameLink">CompressionContext.DictionaryIndex</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.wal.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/wal/RingBufferTruck.Type.html" title="enum in org.apache.hadoop.hbase.regionserver.wal"><span class="typeNameLink">RingBufferTruck.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.wal.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/wal/CompressionContext.DictionaryIndex.html" title="enum in org.apache.hadoop.hbase.regionserver.wal"><span class="typeNameLink">CompressionContext.DictionaryIndex</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9623a753/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-tree.html b/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-tree.html
index 30c4e73..cd3870f 100644
--- a/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-tree.html
@@ -207,8 +207,8 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.replication.regionserver.<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceFactoryImpl.SourceHolder.html" title="enum in org.apache.hadoop.hbase.replication.regionserver"><span class="typeNameLink">MetricsReplicationSourceFactoryImpl.SourceHolder</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.replication.regionserver.<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.WorkerState.html" title="enum in org.apache.hadoop.hbase.replication.regionserver"><span class="typeNameLink">ReplicationSourceShipper.WorkerState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.replication.regionserver.<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceFactoryImpl.SourceHolder.html" title="enum in org.apache.hadoop.hbase.replication.regionserver"><span class="typeNameLink">MetricsReplicationSourceFactoryImpl.SourceHolder</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9623a753/devapidocs/org/apache/hadoop/hbase/rest/model/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/rest/model/package-tree.html b/devapidocs/org/apache/hadoop/hbase/rest/model/package-tree.html
index 034077c..c20ff47 100644
--- a/devapidocs/org/apache/hadoop/hbase/rest/model/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/rest/model/package-tree.html
@@ -110,8 +110,8 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.rest.model.<a href="../../../../../../org/apache/hadoop/hbase/rest/model/ScannerModel.FilterModel.ByteArrayComparableModel.ComparatorType.html" title="enum in org.apache.hadoop.hbase.rest.model"><span class="typeNameLink">ScannerModel.FilterModel.ByteArrayComparableModel.ComparatorType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.rest.model.<a href="../../../../../../org/apache/hadoop/hbase/rest/model/ScannerModel.FilterModel.FilterType.html" title="enum in org.apache.hadoop.hbase.rest.model"><span class="typeNameLink">ScannerModel.FilterModel.FilterType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.rest.model.<a href="../../../../../../org/apache/hadoop/hbase/rest/model/ScannerModel.FilterModel.ByteArrayComparableModel.ComparatorType.html" title="enum in org.apache.hadoop.hbase.rest.model"><span class="typeNameLink">ScannerModel.FilterModel.ByteArrayComparableModel.ComparatorType</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9623a753/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html b/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
index 8a2815f..eec8680 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
@@ -143,8 +143,8 @@
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
 <li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessControlFilter.Strategy.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">AccessControlFilter.Strategy</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessController.OpType.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">AccessController.OpType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/Permission.Action.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">Permission.Action</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessController.OpType.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">AccessController.OpType</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9623a753/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/security/package-tree.html b/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
index dfa02b5..7ba3a64 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
@@ -191,8 +191,8 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslStatus.html" title="enum in org.apache.hadoop.hbase.security"><span class="typeNameLink">SaslStatus</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/AuthMethod.html" title="enum in org.apache.hadoop.hbase.security"><span class="typeNameLink">AuthMethod</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslStatus.html" title="enum in org.apache.hadoop.hbase.security"><span class="typeNameLink">SaslStatus</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslUtil.QualityOfProtection.html" title="enum in org.apache.hadoop.hbase.security"><span class="typeNameLink">SaslUtil.QualityOfProtection</span></a></li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9623a753/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html b/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
index 03e1383..2cef8bd 100644
--- a/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
@@ -199,9 +199,9 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="typeNameLink">MetricsThriftServerSourceFactoryImpl.FactoryStorage</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftMetrics.ThriftServerType.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="typeNameLink">ThriftMetrics.ThriftServerType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="typeNameLink">ThriftServerRunner.ImplType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftMetrics.ThriftServerType.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="typeNameLink">ThriftMetrics.ThriftServerType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="typeNameLink">MetricsThriftServerSourceFactoryImpl.FactoryStorage</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9623a753/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
index 04cba7d..aa723fb 100644
--- a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
@@ -515,14 +515,14 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PoolMap.PoolType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">PoolMap.PoolType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.UnsafeComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Bytes.LexicographicalComparerHolder.UnsafeComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a>&lt;T&gt;)</li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.PureJavaComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Bytes.LexicographicalComparerHolder.PureJavaComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a>&lt;T&gt;)</li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">HBaseFsck.ErrorReporter.ERROR_CODE</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PrettyPrinter.Unit.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">PrettyPrinter.Unit</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/IdReadWriteLock.ReferenceType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">IdReadWriteLock.ReferenceType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Order.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Order</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PoolMap.PoolType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">PoolMap.PoolType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">HBaseFsck.ErrorReporter.ERROR_CODE</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/ChecksumType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">ChecksumType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Order.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Order</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PrettyPrinter.Unit.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">PrettyPrinter.Unit</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.PureJavaComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Bytes.LexicographicalComparerHolder.PureJavaComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a>&lt;T&gt;)</li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9623a753/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
index f9ad79c..7266641 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
@@ -16,11 +16,11 @@
 <span class="sourceLineNo">008</span>@InterfaceAudience.Private<a name="line.8"></a>
 <span class="sourceLineNo">009</span>public class Version {<a name="line.9"></a>
 <span class="sourceLineNo">010</span>  public static final String version = "3.0.0-SNAPSHOT";<a name="line.10"></a>
-<span class="sourceLineNo">011</span>  public static final String revision = "613d831429960348dc42c3bdb6ea5d31be15c81c";<a name="line.11"></a>
+<span class="sourceLineNo">011</span>  public static final String revision = "bd30ca62eff05195b9328aca5f33f69ad0198307";<a name="line.11"></a>
 <span class="sourceLineNo">012</span>  public static final String user = "jenkins";<a name="line.12"></a>
-<span class="sourceLineNo">013</span>  public static final String date = "Thu Aug  2 19:41:57 UTC 2018";<a name="line.13"></a>
+<span class="sourceLineNo">013</span>  public static final String date = "Sat Aug  4 14:39:50 UTC 2018";<a name="line.13"></a>
 <span class="sourceLineNo">014</span>  public static final String url = "git://jenkins-websites1.apache.org/home/jenkins/jenkins-slave/workspace/hbase_generate_website/hbase";<a name="line.14"></a>
-<span class="sourceLineNo">015</span>  public static final String srcChecksum = "1bde06453e3a7ac1ff5e22617f911b02";<a name="line.15"></a>
+<span class="sourceLineNo">015</span>  public static final String srcChecksum = "4b9c266dc6e02e2fa9cbb2dd33a5f8c4";<a name="line.15"></a>
 <span class="sourceLineNo">016</span>}<a name="line.16"></a>
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9623a753/devapidocs/src-html/org/apache/hadoop/hbase/quotas/GlobalQuotaSettingsImpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/GlobalQuotaSettingsImpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/GlobalQuotaSettingsImpl.html
index 6f7bf45..55e5099 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/GlobalQuotaSettingsImpl.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/GlobalQuotaSettingsImpl.html
@@ -123,221 +123,192 @@
 <span class="sourceLineNo">115</span>    validateQuotaTarget(other);<a name="line.115"></a>
 <span class="sourceLineNo">116</span><a name="line.116"></a>
 <span class="sourceLineNo">117</span>    // Propagate the Throttle<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    QuotaProtos.Throttle.Builder throttleBuilder = (throttleProto == null<a name="line.118"></a>
-<span class="sourceLineNo">119</span>        ? null : throttleProto.toBuilder());<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    if (other instanceof ThrottleSettings) {<a name="line.120"></a>
-<span class="sourceLineNo">121</span>      if (throttleBuilder == null) {<a name="line.121"></a>
-<span class="sourceLineNo">122</span>        throttleBuilder = QuotaProtos.Throttle.newBuilder();<a name="line.122"></a>
-<span class="sourceLineNo">123</span>      }<a name="line.123"></a>
-<span class="sourceLineNo">124</span>      ThrottleSettings otherThrottle = (ThrottleSettings) other;<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span>      if (otherThrottle.proto.hasType()) {<a name="line.126"></a>
+<span class="sourceLineNo">118</span>    QuotaProtos.Throttle.Builder throttleBuilder =<a name="line.118"></a>
+<span class="sourceLineNo">119</span>        throttleProto == null ? null : throttleProto.toBuilder();<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span>    if (other instanceof ThrottleSettings) {<a name="line.121"></a>
+<span class="sourceLineNo">122</span>      ThrottleSettings otherThrottle = (ThrottleSettings) other;<a name="line.122"></a>
+<span class="sourceLineNo">123</span>      if (!otherThrottle.proto.hasType() || !otherThrottle.proto.hasTimedQuota()) {<a name="line.123"></a>
+<span class="sourceLineNo">124</span>        // To prevent the "empty" row in QuotaTableUtil.QUOTA_TABLE_NAME<a name="line.124"></a>
+<span class="sourceLineNo">125</span>        throttleBuilder = null;<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      } else {<a name="line.126"></a>
 <span class="sourceLineNo">127</span>        QuotaProtos.ThrottleRequest otherProto = otherThrottle.proto;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>        if (otherProto.hasTimedQuota()) {<a name="line.128"></a>
-<span class="sourceLineNo">129</span>          if (otherProto.hasTimedQuota()) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span>            validateTimedQuota(otherProto.getTimedQuota());<a name="line.130"></a>
-<span class="sourceLineNo">131</span>          }<a name="line.131"></a>
+<span class="sourceLineNo">128</span>        validateTimedQuota(otherProto.getTimedQuota());<a name="line.128"></a>
+<span class="sourceLineNo">129</span>        if (throttleBuilder == null) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>          throttleBuilder = QuotaProtos.Throttle.newBuilder();<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>          switch (otherProto.getType()) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span>            case REQUEST_NUMBER:<a name="line.134"></a>
-<span class="sourceLineNo">135</span>              if (otherProto.hasTimedQuota()) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>                throttleBuilder.setReqNum(otherProto.getTimedQuota());<a name="line.136"></a>
-<span class="sourceLineNo">137</span>              } else {<a name="line.137"></a>
-<span class="sourceLineNo">138</span>                throttleBuilder.clearReqNum();<a name="line.138"></a>
-<span class="sourceLineNo">139</span>              }<a name="line.139"></a>
-<span class="sourceLineNo">140</span>              break;<a name="line.140"></a>
-<span class="sourceLineNo">141</span>            case REQUEST_SIZE:<a name="line.141"></a>
-<span class="sourceLineNo">142</span>              if (otherProto.hasTimedQuota()) {<a name="line.142"></a>
-<span class="sourceLineNo">143</span>                throttleBuilder.setReqSize(otherProto.getTimedQuota());<a name="line.143"></a>
-<span class="sourceLineNo">144</span>              } else {<a name="line.144"></a>
-<span class="sourceLineNo">145</span>                throttleBuilder.clearReqSize();<a name="line.145"></a>
-<span class="sourceLineNo">146</span>              }<a name="line.146"></a>
-<span class="sourceLineNo">147</span>              break;<a name="line.147"></a>
-<span class="sourceLineNo">148</span>            case WRITE_NUMBER:<a name="line.148"></a>
-<span class="sourceLineNo">149</span>              if (otherProto.hasTimedQuota()) {<a name="line.149"></a>
-<span class="sourceLineNo">150</span>                throttleBuilder.setWriteNum(otherProto.getTimedQuota());<a name="line.150"></a>
-<span class="sourceLineNo">151</span>              } else {<a name="line.151"></a>
-<span class="sourceLineNo">152</span>                throttleBuilder.clearWriteNum();<a name="line.152"></a>
-<span class="sourceLineNo">153</span>              }<a name="line.153"></a>
-<span class="sourceLineNo">154</span>              break;<a name="line.154"></a>
-<span class="sourceLineNo">155</span>            case WRITE_SIZE:<a name="line.155"></a>
-<span class="sourceLineNo">156</span>              if (otherProto.hasTimedQuota()) {<a name="line.156"></a>
-<span class="sourceLineNo">157</span>                throttleBuilder.setWriteSize(otherProto.getTimedQuota());<a name="line.157"></a>
-<span class="sourceLineNo">158</span>              } else {<a name="line.158"></a>
-<span class="sourceLineNo">159</span>                throttleBuilder.clearWriteSize();<a name="line.159"></a>
-<span class="sourceLineNo">160</span>              }<a name="line.160"></a>
-<span class="sourceLineNo">161</span>              break;<a name="line.161"></a>
-<span class="sourceLineNo">162</span>            case READ_NUMBER:<a name="line.162"></a>
-<span class="sourceLineNo">163</span>              if (otherProto.hasTimedQuota()) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span>                throttleBuilder.setReadNum(otherProto.getTimedQuota());<a name="line.164"></a>
-<span class="sourceLineNo">165</span>              } else {<a name="line.165"></a>
-<span class="sourceLineNo">166</span>                throttleBuilder.clearReqNum();<a name="line.166"></a>
-<span class="sourceLineNo">167</span>              }<a name="line.167"></a>
-<span class="sourceLineNo">168</span>              break;<a name="line.168"></a>
-<span class="sourceLineNo">169</span>            case READ_SIZE:<a name="line.169"></a>
-<span class="sourceLineNo">170</span>              if (otherProto.hasTimedQuota()) {<a name="line.170"></a>
-<span class="sourceLineNo">171</span>                throttleBuilder.setReadSize(otherProto.getTimedQuota());<a name="line.171"></a>
-<span class="sourceLineNo">172</span>              } else {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>                throttleBuilder.clearReadSize();<a name="line.173"></a>
-<span class="sourceLineNo">174</span>              }<a name="line.174"></a>
-<span class="sourceLineNo">175</span>              break;<a name="line.175"></a>
-<span class="sourceLineNo">176</span>          }<a name="line.176"></a>
-<span class="sourceLineNo">177</span>        } else {<a name="line.177"></a>
-<span class="sourceLineNo">178</span>          clearThrottleBuilder(throttleBuilder);<a name="line.178"></a>
-<span class="sourceLineNo">179</span>        }<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      } else {<a name="line.180"></a>
-<span class="sourceLineNo">181</span>        clearThrottleBuilder(throttleBuilder);<a name="line.181"></a>
-<span class="sourceLineNo">182</span>      }<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    }<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span>    // Propagate the space quota portion<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    QuotaProtos.SpaceQuota.Builder spaceBuilder = (spaceProto == null<a name="line.186"></a>
-<span class="sourceLineNo">187</span>        ? null : spaceProto.toBuilder());<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    if (other instanceof SpaceLimitSettings) {<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      if (spaceBuilder == null) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span>        spaceBuilder = QuotaProtos.SpaceQuota.newBuilder();<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      }<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      SpaceLimitSettings settingsToMerge = (SpaceLimitSettings) other;<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span>      QuotaProtos.SpaceLimitRequest spaceRequest = settingsToMerge.getProto();<a name="line.194"></a>
-<span class="sourceLineNo">195</span><a name="line.195"></a>
-<span class="sourceLineNo">196</span>      // The message contained the expect SpaceQuota object<a name="line.196"></a>
-<span class="sourceLineNo">197</span>      if (spaceRequest.hasQuota()) {<a name="line.197"></a>
-<span class="sourceLineNo">198</span>        SpaceQuota quotaToMerge = spaceRequest.getQuota();<a name="line.198"></a>
-<span class="sourceLineNo">199</span>        // Validate that the two settings are for the same target.<a name="line.199"></a>
-<span class="sourceLineNo">200</span>        // SpaceQuotas either apply to a table or a namespace (no user spacequota).<a name="line.200"></a>
-<span class="sourceLineNo">201</span>        if (!Objects.equals(getTableName(), settingsToMerge.getTableName())<a name="line.201"></a>
-<span class="sourceLineNo">202</span>            &amp;&amp; !Objects.equals(getNamespace(), settingsToMerge.getNamespace())) {<a name="line.202"></a>
-<span class="sourceLineNo">203</span>          throw new IllegalArgumentException(<a name="line.203"></a>
-<span class="sourceLineNo">204</span>              "Cannot merge " + settingsToMerge + " into " + this);<a name="line.204"></a>
-<span class="sourceLineNo">205</span>        }<a name="line.205"></a>
-<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span>        if (quotaToMerge.getRemove()) {<a name="line.207"></a>
-<span class="sourceLineNo">208</span>          // Update the builder to propagate the removal<a name="line.208"></a>
-<span class="sourceLineNo">209</span>          spaceBuilder.setRemove(true).clearSoftLimit().clearViolationPolicy();<a name="line.209"></a>
-<span class="sourceLineNo">210</span>        } else {<a name="line.210"></a>
-<span class="sourceLineNo">211</span>          // Add the new settings to the existing settings<a name="line.211"></a>
-<span class="sourceLineNo">212</span>          spaceBuilder.mergeFrom(quotaToMerge);<a name="line.212"></a>
-<span class="sourceLineNo">213</span>        }<a name="line.213"></a>
-<span class="sourceLineNo">214</span>      }<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    }<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span>    Boolean bypassGlobals = this.bypassGlobals;<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    if (other instanceof QuotaGlobalsSettingsBypass) {<a name="line.218"></a>
-<span class="sourceLineNo">219</span>      bypassGlobals = ((QuotaGlobalsSettingsBypass) other).getBypass();<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>    if (throttleBuilder == null &amp;&amp;<a name="line.222"></a>
-<span class="sourceLineNo">223</span>        (spaceBuilder == null || (spaceBuilder.hasRemove() &amp;&amp; spaceBuilder.getRemove()))<a name="line.223"></a>
-<span class="sourceLineNo">224</span>        &amp;&amp; bypassGlobals == null) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span>      return null;<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    }<a name="line.226"></a>
-<span class="sourceLineNo">227</span><a name="line.227"></a>
-<span class="sourceLineNo">228</span>    return new GlobalQuotaSettingsImpl(<a name="line.228"></a>
-<span class="sourceLineNo">229</span>        getUserName(), getTableName(), getNamespace(),<a name="line.229"></a>
-<span class="sourceLineNo">230</span>        (throttleBuilder == null ? null : throttleBuilder.build()), bypassGlobals,<a name="line.230"></a>
-<span class="sourceLineNo">231</span>        (spaceBuilder == null ? null : spaceBuilder.build()));<a name="line.231"></a>
-<span class="sourceLineNo">232</span>  }<a name="line.232"></a>
-<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span>  private void validateTimedQuota(final TimedQuota timedQuota) throws IOException {<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    if (timedQuota.getSoftLimit() &lt; 1) {<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      throw new DoNotRetryIOException(new UnsupportedOperationException(<a name="line.236"></a>
-<span class="sourceLineNo">237</span>          "The throttle limit must be greater then 0, got " + timedQuota.getSoftLimit()));<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>  @Override<a name="line.241"></a>
-<span class="sourceLineNo">242</span>  public String toString() {<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    StringBuilder builder = new StringBuilder();<a name="line.243"></a>
-<span class="sourceLineNo">244</span>    builder.append("GlobalQuota: ");<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    if (throttleProto != null) {<a name="line.245"></a>
-<span class="sourceLineNo">246</span>      Map&lt;ThrottleType,TimedQuota&gt; throttleQuotas = buildThrottleQuotas(throttleProto);<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      builder.append(" { TYPE =&gt; THROTTLE ");<a name="line.247"></a>
-<span class="sourceLineNo">248</span>      for (Entry&lt;ThrottleType,TimedQuota&gt; entry : throttleQuotas.entrySet()) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>        final ThrottleType type = entry.getKey();<a name="line.249"></a>
-<span class="sourceLineNo">250</span>        final TimedQuota timedQuota = entry.getValue();<a name="line.250"></a>
-<span class="sourceLineNo">251</span>        builder.append("{THROTTLE_TYPE =&gt; ").append(type.name()).append(", LIMIT =&gt; ");<a name="line.251"></a>
-<span class="sourceLineNo">252</span>        if (timedQuota.hasSoftLimit()) {<a name="line.252"></a>
-<span class="sourceLineNo">253</span>          switch (type) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span>            case REQUEST_NUMBER:<a name="line.254"></a>
-<span class="sourceLineNo">255</span>            case WRITE_NUMBER:<a name="line.255"></a>
-<span class="sourceLineNo">256</span>            case READ_NUMBER:<a name="line.256"></a>
-<span class="sourceLineNo">257</span>              builder.append(String.format("%dreq", timedQuota.getSoftLimit()));<a name="line.257"></a>
-<span class="sourceLineNo">258</span>              break;<a name="line.258"></a>
-<span class="sourceLineNo">259</span>            case REQUEST_SIZE:<a name="line.259"></a>
-<span class="sourceLineNo">260</span>            case WRITE_SIZE:<a name="line.260"></a>
-<span class="sourceLineNo">261</span>            case READ_SIZE:<a name="line.261"></a>
-<span class="sourceLineNo">262</span>              builder.append(sizeToString(timedQuota.getSoftLimit()));<a name="line.262"></a>
-<span class="sourceLineNo">263</span>              break;<a name="line.263"></a>
-<span class="sourceLineNo">264</span>          }<a name="line.264"></a>
-<span class="sourceLineNo">265</span>        } else if (timedQuota.hasShare()) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span>          builder.append(String.format("%.2f%%", timedQuota.getShare()));<a name="line.266"></a>
-<span class="sourceLineNo">267</span>        }<a name="line.267"></a>
-<span class="sourceLineNo">268</span>        builder.append('/');<a name="line.268"></a>
-<span class="sourceLineNo">269</span>        builder.append(timeToString(ProtobufUtil.toTimeUnit(timedQuota.getTimeUnit())));<a name="line.269"></a>
-<span class="sourceLineNo">270</span>        if (timedQuota.hasScope()) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span>          builder.append(", SCOPE =&gt; ");<a name="line.271"></a>
-<span class="sourceLineNo">272</span>          builder.append(timedQuota.getScope().toString());<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>      builder.append( "} } ");<a name="line.275"></a>
-<span class="sourceLineNo">276</span>    } else {<a name="line.276"></a>
-<span class="sourceLineNo">277</span>      builder.append(" {} ");<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    }<a name="line.278"></a>
-<span class="sourceLineNo">279</span>    if (bypassGlobals != null) {<a name="line.279"></a>
-<span class="sourceLineNo">280</span>      builder.append(" { GLOBAL_BYPASS =&gt; " + bypassGlobals + " } ");<a name="line.280"></a>
-<span class="sourceLineNo">281</span>    }<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    if (spaceProto != null) {<a name="line.282"></a>
-<span class="sourceLineNo">283</span>      builder.append(" { TYPE =&gt; SPACE");<a name="line.283"></a>
-<span class="sourceLineNo">284</span>      if (getTableName() != null) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span>        builder.append(", TABLE =&gt; ").append(getTableName());<a name="line.285"></a>
-<span class="sourceLineNo">286</span>      }<a name="line.286"></a>
-<span class="sourceLineNo">287</span>      if (getNamespace() != null) {<a name="line.287"></a>
-<span class="sourceLineNo">288</span>        builder.append(", NAMESPACE =&gt; ").append(getNamespace());<a name="line.288"></a>
-<span class="sourceLineNo">289</span>      }<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      if (spaceProto.getRemove()) {<a name="line.290"></a>
-<span class="sourceLineNo">291</span>        builder.append(", REMOVE =&gt; ").append(spaceProto.getRemove());<a name="line.291"></a>
-<span class="sourceLineNo">292</span>      } else {<a name="line.292"></a>
-<span class="sourceLineNo">293</span>        builder.append(", LIMIT =&gt; ").append(spaceProto.getSoftLimit());<a name="line.293"></a>
-<span class="sourceLineNo">294</span>        builder.append(", VIOLATION_POLICY =&gt; ").append(spaceProto.getViolationPolicy());<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      }<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      builder.append(" } ");<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    }<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    return builder.toString();<a name="line.298"></a>
-<span class="sourceLineNo">299</span>  }<a name="line.299"></a>
-<span class="sourceLineNo">300</span><a name="line.300"></a>
-<span class="sourceLineNo">301</span>  private Map&lt;ThrottleType,TimedQuota&gt; buildThrottleQuotas(Throttle proto) {<a name="line.301"></a>
-<span class="sourceLineNo">302</span>    HashMap&lt;ThrottleType,TimedQuota&gt; quotas = new HashMap&lt;&gt;();<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    if (proto.hasReadNum()) {<a name="line.303"></a>
-<span class="sourceLineNo">304</span>      quotas.put(ThrottleType.READ_NUMBER, proto.getReadNum());<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    }<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    if (proto.hasReadSize()) {<a name="line.306"></a>
-<span class="sourceLineNo">307</span>      quotas.put(ThrottleType.READ_SIZE, proto.getReadSize());<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    }<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    if (proto.hasReqNum()) {<a name="line.309"></a>
-<span class="sourceLineNo">310</span>      quotas.put(ThrottleType.REQUEST_NUMBER, proto.getReqNum());<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    }<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    if (proto.hasReqSize()) {<a name="line.312"></a>
-<span class="sourceLineNo">313</span>      quotas.put(ThrottleType.REQUEST_SIZE, proto.getReqSize());<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    }<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    if (proto.hasWriteNum()) {<a name="line.315"></a>
-<span class="sourceLineNo">316</span>      quotas.put(ThrottleType.WRITE_NUMBER, proto.getWriteNum());<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    }<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    if (proto.hasWriteSize()) {<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      quotas.put(ThrottleType.WRITE_SIZE, proto.getWriteSize());<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    }<a name="line.320"></a>
-<span class="sourceLineNo">321</span>    return quotas;<a name="line.321"></a>
-<span class="sourceLineNo">322</span>  }<a name="line.322"></a>
-<span class="sourceLineNo">323</span><a name="line.323"></a>
-<span class="sourceLineNo">324</span>  private void clearThrottleBuilder(QuotaProtos.Throttle.Builder builder) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    builder.clearReadNum();<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    builder.clearReadSize();<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    builder.clearReqNum();<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    builder.clearReqSize();<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    builder.clearWriteNum();<a name="line.329"></a>
-<span class="sourceLineNo">330</span>    builder.clearWriteSize();<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">133</span>        switch (otherProto.getType()) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span>          case REQUEST_NUMBER:<a name="line.134"></a>
+<span class="sourceLineNo">135</span>            throttleBuilder.setReqNum(otherProto.getTimedQuota());<a name="line.135"></a>
+<span class="sourceLineNo">136</span>            break;<a name="line.136"></a>
+<span class="sourceLineNo">137</span>          case REQUEST_SIZE:<a name="line.137"></a>
+<span class="sourceLineNo">138</span>            throttleBuilder.setReqSize(otherProto.getTimedQuota());<a name="line.138"></a>
+<span class="sourceLineNo">139</span>            break;<a name="line.139"></a>
+<span class="sourceLineNo">140</span>          case WRITE_NUMBER:<a name="line.140"></a>
+<span class="sourceLineNo">141</span>            throttleBuilder.setWriteNum(otherProto.getTimedQuota());<a name="line.141"></a>
+<span class="sourceLineNo">142</span>            break;<a name="line.142"></a>
+<span class="sourceLineNo">143</span>          case WRITE_SIZE:<a name="line.143"></a>
+<span class="sourceLineNo">144</span>            throttleBuilder.setWriteSize(otherProto.getTimedQuota());<a name="line.144"></a>
+<span class="sourceLineNo">145</span>            break;<a name="line.145"></a>
+<span class="sourceLineNo">146</span>          case READ_NUMBER:<a name="line.146"></a>
+<span class="sourceLineNo">147</span>            throttleBuilder.setReadNum(otherProto.getTimedQuota());<a name="line.147"></a>
+<span class="sourceLineNo">148</span>            break;<a name="line.148"></a>
+<span class="sourceLineNo">149</span>          case READ_SIZE:<a name="line.149"></a>
+<span class="sourceLineNo">150</span>            throttleBuilder.setReadSize(otherProto.getTimedQuota());<a name="line.150"></a>
+<span class="sourceLineNo">151</span>            break;<a name="line.151"></a>
+<span class="sourceLineNo">152</span>        }<a name="line.152"></a>
+<span class="sourceLineNo">153</span>      }<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span>    // Propagate the space quota portion<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    QuotaProtos.SpaceQuota.Builder spaceBuilder = (spaceProto == null<a name="line.157"></a>
+<span class="sourceLineNo">158</span>        ? null : spaceProto.toBuilder());<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    if (other instanceof SpaceLimitSettings) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span>      if (spaceBuilder == null) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>        spaceBuilder = QuotaProtos.SpaceQuota.newBuilder();<a name="line.161"></a>
+<span class="sourceLineNo">162</span>      }<a name="line.162"></a>
+<span class="sourceLineNo">163</span>      SpaceLimitSettings settingsToMerge = (SpaceLimitSettings) other;<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span>      QuotaProtos.SpaceLimitRequest spaceRequest = settingsToMerge.getProto();<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span>      // The message contained the expect SpaceQuota object<a name="line.167"></a>
+<span class="sourceLineNo">168</span>      if (spaceRequest.hasQuota()) {<a name="line.168"></a>
+<span class="sourceLineNo">169</span>        SpaceQuota quotaToMerge = spaceRequest.getQuota();<a name="line.169"></a>
+<span class="sourceLineNo">170</span>        // Validate that the two settings are for the same target.<a name="line.170"></a>
+<span class="sourceLineNo">171</span>        // SpaceQuotas either apply to a table or a namespace (no user spacequota).<a name="line.171"></a>
+<span class="sourceLineNo">172</span>        if (!Objects.equals(getTableName(), settingsToMerge.getTableName())<a name="line.172"></a>
+<span class="sourceLineNo">173</span>            &amp;&amp; !Objects.equals(getNamespace(), settingsToMerge.getNamespace())) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span>          throw new IllegalArgumentException(<a name="line.174"></a>
+<span class="sourceLineNo">175</span>              "Cannot merge " + settingsToMerge + " into " + this);<a name="line.175"></a>
+<span class="sourceLineNo">176</span>        }<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span>        if (quotaToMerge.getRemove()) {<a name="line.178"></a>
+<span class="sourceLineNo">179</span>          // Update the builder to propagate the removal<a name="line.179"></a>
+<span class="sourceLineNo">180</span>          spaceBuilder.setRemove(true).clearSoftLimit().clearViolationPolicy();<a name="line.180"></a>
+<span class="sourceLineNo">181</span>        } else {<a name="line.181"></a>
+<span class="sourceLineNo">182</span>          // Add the new settings to the existing settings<a name="line.182"></a>
+<span class="sourceLineNo">183</span>          spaceBuilder.mergeFrom(quotaToMerge);<a name="line.183"></a>
+<span class="sourceLineNo">184</span>        }<a name="line.184"></a>
+<span class="sourceLineNo">185</span>      }<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    }<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span>    Boolean bypassGlobals = this.bypassGlobals;<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    if (other instanceof QuotaGlobalsSettingsBypass) {<a name="line.189"></a>
+<span class="sourceLineNo">190</span>      bypassGlobals = ((QuotaGlobalsSettingsBypass) other).getBypass();<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    }<a name="line.191"></a>
+<span class="sourceLineNo">192</span><a name="line.192"></a>
+<span class="sourceLineNo">193</span>    if (throttleBuilder == null &amp;&amp;<a name="line.193"></a>
+<span class="sourceLineNo">194</span>        (spaceBuilder == null || (spaceBuilder.hasRemove() &amp;&amp; spaceBuilder.getRemove()))<a name="line.194"></a>
+<span class="sourceLineNo">195</span>        &amp;&amp; bypassGlobals == null) {<a name="line.195"></a>
+<span class="sourceLineNo">196</span>      return null;<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    }<a name="line.197"></a>
+<span class="sourceLineNo">198</span><a name="line.198"></a>
+<span class="sourceLineNo">199</span>    return new GlobalQuotaSettingsImpl(<a name="line.199"></a>
+<span class="sourceLineNo">200</span>        getUserName(), getTableName(), getNamespace(),<a name="line.200"></a>
+<span class="sourceLineNo">201</span>        (throttleBuilder == null ? null : throttleBuilder.build()), bypassGlobals,<a name="line.201"></a>
+<span class="sourceLineNo">202</span>        (spaceBuilder == null ? null : spaceBuilder.build()));<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>  private void validateTimedQuota(final TimedQuota timedQuota) throws IOException {<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    if (timedQuota.getSoftLimit() &lt; 1) {<a name="line.206"></a>
+<span class="sourceLineNo">207</span>      throw new DoNotRetryIOException(new UnsupportedOperationException(<a name="line.207"></a>
+<span class="sourceLineNo">208</span>          "The throttle limit must be greater then 0, got " + timedQuota.getSoftLimit()));<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>  @Override<a name="line.212"></a>
+<span class="sourceLineNo">213</span>  public String toString() {<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    StringBuilder builder = new StringBuilder();<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    builder.append("GlobalQuota: ");<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    if (throttleProto != null) {<a name="line.216"></a>
+<span class="sourceLineNo">217</span>      Map&lt;ThrottleType,TimedQuota&gt; throttleQuotas = buildThrottleQuotas(throttleProto);<a name="line.217"></a>
+<span class="sourceLineNo">218</span>      builder.append(" { TYPE =&gt; THROTTLE ");<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      for (Entry&lt;ThrottleType,TimedQuota&gt; entry : throttleQuotas.entrySet()) {<a name="line.219"></a>
+<span class="sourceLineNo">220</span>        final ThrottleType type = entry.getKey();<a name="line.220"></a>
+<span class="sourceLineNo">221</span>        final TimedQuota timedQuota = entry.getValue();<a name="line.221"></a>
+<span class="sourceLineNo">222</span>        builder.append("{THROTTLE_TYPE =&gt; ").append(type.name()).append(", LIMIT =&gt; ");<a name="line.222"></a>
+<span class="sourceLineNo">223</span>        if (timedQuota.hasSoftLimit()) {<a name="line.223"></a>
+<span class="sourceLineNo">224</span>          switch (type) {<a name="line.224"></a>
+<span class="sourceLineNo">225</span>            case REQUEST_NUMBER:<a name="line.225"></a>
+<span class="sourceLineNo">226</span>            case WRITE_NUMBER:<a name="line.226"></a>
+<span class="sourceLineNo">227</span>            case READ_NUMBER:<a name="line.227"></a>
+<span class="sourceLineNo">228</span>              builder.append(String.format("%dreq", timedQuota.getSoftLimit()));<a name="line.228"></a>
+<span class="sourceLineNo">229</span>              break;<a name="line.229"></a>
+<span class="sourceLineNo">230</span>            case REQUEST_SIZE:<a name="line.230"></a>
+<span class="sourceLineNo">231</span>            case WRITE_SIZE:<a name="line.231"></a>
+<span class="sourceLineNo">232</span>            case READ_SIZE:<a name="line.232"></a>
+<span class="sourceLineNo">233</span>              builder.append(sizeToString(timedQuota.getSoftLimit()));<a name="line.233"></a>
+<span class="sourceLineNo">234</span>              break;<a name="line.234"></a>
+<span class="sourceLineNo">235</span>          }<a name="line.235"></a>
+<span class="sourceLineNo">236</span>        } else if (timedQuota.hasShare()) {<a name="line.236"></a>
+<span class="sourceLineNo">237</span>          builder.append(String.format("%.2f%%", timedQuota.getShare()));<a name="line.237"></a>
+<span class="sourceLineNo">238</span>        }<a name="line.238"></a>
+<span class="sourceLineNo">239</span>        builder.append('/');<a name="line.239"></a>
+<span class="sourceLineNo">240</span>        builder.append(timeToString(ProtobufUtil.toTimeUnit(timedQuota.getTimeUnit())));<a name="line.240"></a>
+<span class="sourceLineNo">241</span>        if (timedQuota.hasScope()) {<a name="line.241"></a>
+<span class="sourceLineNo">242</span>          builder.append(", SCOPE =&gt; ");<a name="line.242"></a>
+<span class="sourceLineNo">243</span>          builder.append(timedQuota.getScope().toString());<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>      builder.append( "} } ");<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    } else {<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      builder.append(" {} ");<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    }<a name="line.249"></a>
+<span class="sourceLineNo">250</span>    if (bypassGlobals != null) {<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      builder.append(" { GLOBAL_BYPASS =&gt; " + bypassGlobals + " } ");<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    }<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    if (spaceProto != null) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      builder.append(" { TYPE =&gt; SPACE");<a name="line.254"></a>
+<span class="sourceLineNo">255</span>      if (getTableName() != null) {<a name="line.255"></a>
+<span class="sourceLineNo">256</span>        builder.append(", TABLE =&gt; ").append(getTableName());<a name="line.256"></a>
+<span class="sourceLineNo">257</span>      }<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      if (getNamespace() != null) {<a name="line.258"></a>
+<span class="sourceLineNo">259</span>        builder.append(", NAMESPACE =&gt; ").append(getNamespace());<a name="line.259"></a>
+<span class="sourceLineNo">260</span>      }<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      if (spaceProto.getRemove()) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span>        builder.append(", REMOVE =&gt; ").append(spaceProto.getRemove());<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      } else {<a name="line.263"></a>
+<span class="sourceLineNo">264</span>        builder.append(", LIMIT =&gt; ").append(spaceProto.getSoftLimit());<a name="line.264"></a>
+<span class="sourceLineNo">265</span>        builder.append(", VIOLATION_POLICY =&gt; ").append(spaceProto.getViolationPolicy());<a name="line.265"></a>
+<span class="sourceLineNo">266</span>      }<a name="line.266"></a>
+<span class="sourceLineNo">267</span>      builder.append(" } ");<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    }<a name="line.268"></a>
+<span class="sourceLineNo">269</span>    return builder.toString();<a name="line.269"></a>
+<span class="sourceLineNo">270</span>  }<a name="line.270"></a>
+<span class="sourceLineNo">271</span><a name="line.271"></a>
+<span class="sourceLineNo">272</span>  private Map&lt;ThrottleType,TimedQuota&gt; buildThrottleQuotas(Throttle proto) {<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    HashMap&lt;ThrottleType,TimedQuota&gt; quotas = new HashMap&lt;&gt;();<a name="line.273"></a>
+<span class="sourceLineNo">274</span>    if (proto.hasReadNum()) {<a name="line.274"></a>
+<span class="sourceLineNo">275</span>      quotas.put(ThrottleType.READ_NUMBER, proto.getReadNum());<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    }<a name="line.276"></a>
+<span class="sourceLineNo">277</span>    if (proto.hasReadSize()) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      quotas.put(ThrottleType.READ_SIZE, proto.getReadSize());<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    }<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    if (proto.hasReqNum()) {<a name="line.280"></a>
+<span class="sourceLineNo">281</span>      quotas.put(ThrottleType.REQUEST_NUMBER, proto.getReqNum());<a name="line.281"></a>
+<span class="sourceLineNo">282</span>    }<a name="line.282"></a>
+<span class="sourceLineNo">283</span>    if (proto.hasReqSize()) {<a name="line.283"></a>
+<span class="sourceLineNo">284</span>      quotas.put(ThrottleType.REQUEST_SIZE, proto.getReqSize());<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    }<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    if (proto.hasWriteNum()) {<a name="line.286"></a>
+<span class="sourceLineNo">287</span>      quotas.put(ThrottleType.WRITE_NUMBER, proto.getWriteNum());<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    }<a name="line.288"></a>
+<span class="sourceLineNo">289</span>    if (proto.hasWriteSize()) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span>      quotas.put(ThrottleType.WRITE_SIZE, proto.getWriteSize());<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    }<a name="line.291"></a>
+<span class="sourceLineNo">292</span>    return quotas;<a name="line.292"></a>
+<span class="sourceLineNo">293</span>  }<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span>  private void clearThrottleBuilder(QuotaProtos.Throttle.Builder builder) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    builder.clearReadNum();<a name="line.296"></a>
+<span class="sourceLineNo">297</span>    builder.clearReadSize();<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    builder.clearReqNum();<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    builder.clearReqSize();<a name="line.299"></a>
+<span class="sourceLineNo">300</span>    builder.clearWriteNum();<a name="line.300"></a>
+<span class="sourceLineNo">301</span>    builder.clearWriteSize();<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>