http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5a2158f2/devapidocs/src-html/org/apache/hadoop/hbase/favored/FavoredNodesManager.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/favored/FavoredNodesManager.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/favored/FavoredNodesManager.html
index 4d42a54..7d5ce35 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/favored/FavoredNodesManager.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/favored/FavoredNodesManager.html
@@ -125,7 +125,7 @@
 <span class="sourceLineNo">117</span>   * we apply any favored nodes logic on 
a region.<a name="line.117"></a>
 <span class="sourceLineNo">118</span>   */<a name="line.118"></a>
 <span class="sourceLineNo">119</span>  public static boolean 
isFavoredNodeApplicable(RegionInfo regionInfo) {<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    return !regionInfo.isSystemTable();<a 
name="line.120"></a>
+<span class="sourceLineNo">120</span>    return 
!regionInfo.getTable().isSystemTable();<a name="line.120"></a>
 <span class="sourceLineNo">121</span>  }<a name="line.121"></a>
 <span class="sourceLineNo">122</span><a name="line.122"></a>
 <span class="sourceLineNo">123</span>  /**<a name="line.123"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5a2158f2/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html
index 7052d81..8138d13 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html
@@ -1653,7 +1653,7 @@
 <span class="sourceLineNo">1645</span>    }<a name="line.1645"></a>
 <span class="sourceLineNo">1646</span><a name="line.1646"></a>
 <span class="sourceLineNo">1647</span>    ServerName dest;<a 
name="line.1647"></a>
-<span class="sourceLineNo">1648</span>    List&lt;ServerName&gt; exclude = 
hri.isSystemTable() ? assignmentManager.getExcludedServersForSystemTable()<a 
name="line.1648"></a>
+<span class="sourceLineNo">1648</span>    List&lt;ServerName&gt; exclude = 
hri.getTable().isSystemTable() ? 
assignmentManager.getExcludedServersForSystemTable()<a name="line.1648"></a>
 <span class="sourceLineNo">1649</span>        : new ArrayList&lt;&gt;(1);<a 
name="line.1649"></a>
 <span class="sourceLineNo">1650</span>    if (destServerName != null 
&amp;&amp; 
exclude.contains(ServerName.valueOf(Bytes.toString(destServerName)))) {<a 
name="line.1650"></a>
 <span class="sourceLineNo">1651</span>      LOG.info(<a name="line.1651"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5a2158f2/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 7052d81..8138d13 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
@@ -1653,7 +1653,7 @@
 <span class="sourceLineNo">1645</span>    }<a name="line.1645"></a>
 <span class="sourceLineNo">1646</span><a name="line.1646"></a>
 <span class="sourceLineNo">1647</span>    ServerName dest;<a 
name="line.1647"></a>
-<span class="sourceLineNo">1648</span>    List&lt;ServerName&gt; exclude = 
hri.isSystemTable() ? assignmentManager.getExcludedServersForSystemTable()<a 
name="line.1648"></a>
+<span class="sourceLineNo">1648</span>    List&lt;ServerName&gt; exclude = 
hri.getTable().isSystemTable() ? 
assignmentManager.getExcludedServersForSystemTable()<a name="line.1648"></a>
 <span class="sourceLineNo">1649</span>        : new ArrayList&lt;&gt;(1);<a 
name="line.1649"></a>
 <span class="sourceLineNo">1650</span>    if (destServerName != null 
&amp;&amp; 
exclude.contains(ServerName.valueOf(Bytes.toString(destServerName)))) {<a 
name="line.1650"></a>
 <span class="sourceLineNo">1651</span>      LOG.info(<a name="line.1651"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5a2158f2/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 7052d81..8138d13 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.html
@@ -1653,7 +1653,7 @@
 <span class="sourceLineNo">1645</span>    }<a name="line.1645"></a>
 <span class="sourceLineNo">1646</span><a name="line.1646"></a>
 <span class="sourceLineNo">1647</span>    ServerName dest;<a 
name="line.1647"></a>
-<span class="sourceLineNo">1648</span>    List&lt;ServerName&gt; exclude = 
hri.isSystemTable() ? assignmentManager.getExcludedServersForSystemTable()<a 
name="line.1648"></a>
+<span class="sourceLineNo">1648</span>    List&lt;ServerName&gt; exclude = 
hri.getTable().isSystemTable() ? 
assignmentManager.getExcludedServersForSystemTable()<a name="line.1648"></a>
 <span class="sourceLineNo">1649</span>        : new ArrayList&lt;&gt;(1);<a 
name="line.1649"></a>
 <span class="sourceLineNo">1650</span>    if (destServerName != null 
&amp;&amp; 
exclude.contains(ServerName.valueOf(Bytes.toString(destServerName)))) {<a 
name="line.1650"></a>
 <span class="sourceLineNo">1651</span>      LOG.info(<a name="line.1651"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5a2158f2/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionChore.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionChore.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionChore.html
index 419a935..97005c3 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionChore.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionChore.html
@@ -530,7 +530,7 @@
 <span class="sourceLineNo">522</span>    }<a name="line.522"></a>
 <span class="sourceLineNo">523</span>    return regions.stream()<a 
name="line.523"></a>
 <span class="sourceLineNo">524</span>        
.map(RegionStateNode::getRegionInfo)<a name="line.524"></a>
-<span class="sourceLineNo">525</span>        
.filter(RegionInfo::isSystemTable)<a name="line.525"></a>
+<span class="sourceLineNo">525</span>        .filter(r -&gt; 
r.getTable().isSystemTable())<a name="line.525"></a>
 <span class="sourceLineNo">526</span>        .collect(Collectors.toList());<a 
name="line.526"></a>
 <span class="sourceLineNo">527</span>  }<a name="line.527"></a>
 <span class="sourceLineNo">528</span><a name="line.528"></a>
@@ -699,7 +699,7 @@
 <span class="sourceLineNo">691</span>  }<a name="line.691"></a>
 <span class="sourceLineNo">692</span><a name="line.692"></a>
 <span class="sourceLineNo">693</span>  public MoveRegionProcedure 
createMoveRegionProcedure(final RegionPlan plan) {<a name="line.693"></a>
-<span class="sourceLineNo">694</span>    if 
(plan.getRegionInfo().isSystemTable()) {<a name="line.694"></a>
+<span class="sourceLineNo">694</span>    if 
(plan.getRegionInfo().getTable().isSystemTable()) {<a name="line.694"></a>
 <span class="sourceLineNo">695</span>      List&lt;ServerName&gt; exclude = 
getExcludedServersForSystemTable();<a name="line.695"></a>
 <span class="sourceLineNo">696</span>      if (plan.getDestination() != null 
&amp;&amp; exclude.contains(plan.getDestination())) {<a name="line.696"></a>
 <span class="sourceLineNo">697</span>        try {<a name="line.697"></a>
@@ -1373,7 +1373,7 @@
 <span class="sourceLineNo">1365</span>    List&lt;RegionInfo&gt; systemList = 
new ArrayList&lt;&gt;();<a name="line.1365"></a>
 <span class="sourceLineNo">1366</span>    List&lt;RegionInfo&gt; userList = 
new ArrayList&lt;&gt;();<a name="line.1366"></a>
 <span class="sourceLineNo">1367</span>    for (RegionInfo hri : regions) {<a 
name="line.1367"></a>
-<span class="sourceLineNo">1368</span>      if (hri.isSystemTable()) 
systemList.add(hri);<a name="line.1368"></a>
+<span class="sourceLineNo">1368</span>      if 
(hri.getTable().isSystemTable()) systemList.add(hri);<a name="line.1368"></a>
 <span class="sourceLineNo">1369</span>      else userList.add(hri);<a 
name="line.1369"></a>
 <span class="sourceLineNo">1370</span>    }<a name="line.1370"></a>
 <span class="sourceLineNo">1371</span>    // Append userList to systemList<a 
name="line.1371"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5a2158f2/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionStat.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionStat.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionStat.html
index 419a935..97005c3 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionStat.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionStat.html
@@ -530,7 +530,7 @@
 <span class="sourceLineNo">522</span>    }<a name="line.522"></a>
 <span class="sourceLineNo">523</span>    return regions.stream()<a 
name="line.523"></a>
 <span class="sourceLineNo">524</span>        
.map(RegionStateNode::getRegionInfo)<a name="line.524"></a>
-<span class="sourceLineNo">525</span>        
.filter(RegionInfo::isSystemTable)<a name="line.525"></a>
+<span class="sourceLineNo">525</span>        .filter(r -&gt; 
r.getTable().isSystemTable())<a name="line.525"></a>
 <span class="sourceLineNo">526</span>        .collect(Collectors.toList());<a 
name="line.526"></a>
 <span class="sourceLineNo">527</span>  }<a name="line.527"></a>
 <span class="sourceLineNo">528</span><a name="line.528"></a>
@@ -699,7 +699,7 @@
 <span class="sourceLineNo">691</span>  }<a name="line.691"></a>
 <span class="sourceLineNo">692</span><a name="line.692"></a>
 <span class="sourceLineNo">693</span>  public MoveRegionProcedure 
createMoveRegionProcedure(final RegionPlan plan) {<a name="line.693"></a>
-<span class="sourceLineNo">694</span>    if 
(plan.getRegionInfo().isSystemTable()) {<a name="line.694"></a>
+<span class="sourceLineNo">694</span>    if 
(plan.getRegionInfo().getTable().isSystemTable()) {<a name="line.694"></a>
 <span class="sourceLineNo">695</span>      List&lt;ServerName&gt; exclude = 
getExcludedServersForSystemTable();<a name="line.695"></a>
 <span class="sourceLineNo">696</span>      if (plan.getDestination() != null 
&amp;&amp; exclude.contains(plan.getDestination())) {<a name="line.696"></a>
 <span class="sourceLineNo">697</span>        try {<a name="line.697"></a>
@@ -1373,7 +1373,7 @@
 <span class="sourceLineNo">1365</span>    List&lt;RegionInfo&gt; systemList = 
new ArrayList&lt;&gt;();<a name="line.1365"></a>
 <span class="sourceLineNo">1366</span>    List&lt;RegionInfo&gt; userList = 
new ArrayList&lt;&gt;();<a name="line.1366"></a>
 <span class="sourceLineNo">1367</span>    for (RegionInfo hri : regions) {<a 
name="line.1367"></a>
-<span class="sourceLineNo">1368</span>      if (hri.isSystemTable()) 
systemList.add(hri);<a name="line.1368"></a>
+<span class="sourceLineNo">1368</span>      if 
(hri.getTable().isSystemTable()) systemList.add(hri);<a name="line.1368"></a>
 <span class="sourceLineNo">1369</span>      else userList.add(hri);<a 
name="line.1369"></a>
 <span class="sourceLineNo">1370</span>    }<a name="line.1370"></a>
 <span class="sourceLineNo">1371</span>    // Append userList to systemList<a 
name="line.1371"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5a2158f2/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.html
index 419a935..97005c3 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.html
@@ -530,7 +530,7 @@
 <span class="sourceLineNo">522</span>    }<a name="line.522"></a>
 <span class="sourceLineNo">523</span>    return regions.stream()<a 
name="line.523"></a>
 <span class="sourceLineNo">524</span>        
.map(RegionStateNode::getRegionInfo)<a name="line.524"></a>
-<span class="sourceLineNo">525</span>        
.filter(RegionInfo::isSystemTable)<a name="line.525"></a>
+<span class="sourceLineNo">525</span>        .filter(r -&gt; 
r.getTable().isSystemTable())<a name="line.525"></a>
 <span class="sourceLineNo">526</span>        .collect(Collectors.toList());<a 
name="line.526"></a>
 <span class="sourceLineNo">527</span>  }<a name="line.527"></a>
 <span class="sourceLineNo">528</span><a name="line.528"></a>
@@ -699,7 +699,7 @@
 <span class="sourceLineNo">691</span>  }<a name="line.691"></a>
 <span class="sourceLineNo">692</span><a name="line.692"></a>
 <span class="sourceLineNo">693</span>  public MoveRegionProcedure 
createMoveRegionProcedure(final RegionPlan plan) {<a name="line.693"></a>
-<span class="sourceLineNo">694</span>    if 
(plan.getRegionInfo().isSystemTable()) {<a name="line.694"></a>
+<span class="sourceLineNo">694</span>    if 
(plan.getRegionInfo().getTable().isSystemTable()) {<a name="line.694"></a>
 <span class="sourceLineNo">695</span>      List&lt;ServerName&gt; exclude = 
getExcludedServersForSystemTable();<a name="line.695"></a>
 <span class="sourceLineNo">696</span>      if (plan.getDestination() != null 
&amp;&amp; exclude.contains(plan.getDestination())) {<a name="line.696"></a>
 <span class="sourceLineNo">697</span>        try {<a name="line.697"></a>
@@ -1373,7 +1373,7 @@
 <span class="sourceLineNo">1365</span>    List&lt;RegionInfo&gt; systemList = 
new ArrayList&lt;&gt;();<a name="line.1365"></a>
 <span class="sourceLineNo">1366</span>    List&lt;RegionInfo&gt; userList = 
new ArrayList&lt;&gt;();<a name="line.1366"></a>
 <span class="sourceLineNo">1367</span>    for (RegionInfo hri : regions) {<a 
name="line.1367"></a>
-<span class="sourceLineNo">1368</span>      if (hri.isSystemTable()) 
systemList.add(hri);<a name="line.1368"></a>
+<span class="sourceLineNo">1368</span>      if 
(hri.getTable().isSystemTable()) systemList.add(hri);<a name="line.1368"></a>
 <span class="sourceLineNo">1369</span>      else userList.add(hri);<a 
name="line.1369"></a>
 <span class="sourceLineNo">1370</span>    }<a name="line.1370"></a>
 <span class="sourceLineNo">1371</span>    // Append userList to systemList<a 
name="line.1371"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5a2158f2/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.Action.Type.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.Action.Type.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.Action.Type.html
index 4d53058..d7f4846 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.Action.Type.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.Action.Type.html
@@ -1056,7 +1056,7 @@
 <span class="sourceLineNo">1048</span>   * If so, the primary replica may be 
expected to be put on the master regionserver.<a name="line.1048"></a>
 <span class="sourceLineNo">1049</span>   */<a name="line.1049"></a>
 <span class="sourceLineNo">1050</span>  public boolean 
shouldBeOnMaster(RegionInfo region) {<a name="line.1050"></a>
-<span class="sourceLineNo">1051</span>    return this.onlySystemTablesOnMaster 
&amp;&amp; region.isSystemTable();<a name="line.1051"></a>
+<span class="sourceLineNo">1051</span>    return this.onlySystemTablesOnMaster 
&amp;&amp; region.getTable().isSystemTable();<a name="line.1051"></a>
 <span class="sourceLineNo">1052</span>  }<a name="line.1052"></a>
 <span class="sourceLineNo">1053</span><a name="line.1053"></a>
 <span class="sourceLineNo">1054</span>  /**<a name="line.1054"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5a2158f2/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.Action.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.Action.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.Action.html
index 4d53058..d7f4846 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.Action.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.Action.html
@@ -1056,7 +1056,7 @@
 <span class="sourceLineNo">1048</span>   * If so, the primary replica may be 
expected to be put on the master regionserver.<a name="line.1048"></a>
 <span class="sourceLineNo">1049</span>   */<a name="line.1049"></a>
 <span class="sourceLineNo">1050</span>  public boolean 
shouldBeOnMaster(RegionInfo region) {<a name="line.1050"></a>
-<span class="sourceLineNo">1051</span>    return this.onlySystemTablesOnMaster 
&amp;&amp; region.isSystemTable();<a name="line.1051"></a>
+<span class="sourceLineNo">1051</span>    return this.onlySystemTablesOnMaster 
&amp;&amp; region.getTable().isSystemTable();<a name="line.1051"></a>
 <span class="sourceLineNo">1052</span>  }<a name="line.1052"></a>
 <span class="sourceLineNo">1053</span><a name="line.1053"></a>
 <span class="sourceLineNo">1054</span>  /**<a name="line.1054"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5a2158f2/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.AssignRegionAction.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.AssignRegionAction.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.AssignRegionAction.html
index 4d53058..d7f4846 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.AssignRegionAction.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.AssignRegionAction.html
@@ -1056,7 +1056,7 @@
 <span class="sourceLineNo">1048</span>   * If so, the primary replica may be 
expected to be put on the master regionserver.<a name="line.1048"></a>
 <span class="sourceLineNo">1049</span>   */<a name="line.1049"></a>
 <span class="sourceLineNo">1050</span>  public boolean 
shouldBeOnMaster(RegionInfo region) {<a name="line.1050"></a>
-<span class="sourceLineNo">1051</span>    return this.onlySystemTablesOnMaster 
&amp;&amp; region.isSystemTable();<a name="line.1051"></a>
+<span class="sourceLineNo">1051</span>    return this.onlySystemTablesOnMaster 
&amp;&amp; region.getTable().isSystemTable();<a name="line.1051"></a>
 <span class="sourceLineNo">1052</span>  }<a name="line.1052"></a>
 <span class="sourceLineNo">1053</span><a name="line.1053"></a>
 <span class="sourceLineNo">1054</span>  /**<a name="line.1054"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5a2158f2/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.LocalityType.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.LocalityType.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.LocalityType.html
index 4d53058..d7f4846 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.LocalityType.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.LocalityType.html
@@ -1056,7 +1056,7 @@
 <span class="sourceLineNo">1048</span>   * If so, the primary replica may be 
expected to be put on the master regionserver.<a name="line.1048"></a>
 <span class="sourceLineNo">1049</span>   */<a name="line.1049"></a>
 <span class="sourceLineNo">1050</span>  public boolean 
shouldBeOnMaster(RegionInfo region) {<a name="line.1050"></a>
-<span class="sourceLineNo">1051</span>    return this.onlySystemTablesOnMaster 
&amp;&amp; region.isSystemTable();<a name="line.1051"></a>
+<span class="sourceLineNo">1051</span>    return this.onlySystemTablesOnMaster 
&amp;&amp; region.getTable().isSystemTable();<a name="line.1051"></a>
 <span class="sourceLineNo">1052</span>  }<a name="line.1052"></a>
 <span class="sourceLineNo">1053</span><a name="line.1053"></a>
 <span class="sourceLineNo">1054</span>  /**<a name="line.1054"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5a2158f2/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.MoveRegionAction.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.MoveRegionAction.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.MoveRegionAction.html
index 4d53058..d7f4846 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.MoveRegionAction.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.MoveRegionAction.html
@@ -1056,7 +1056,7 @@
 <span class="sourceLineNo">1048</span>   * If so, the primary replica may be 
expected to be put on the master regionserver.<a name="line.1048"></a>
 <span class="sourceLineNo">1049</span>   */<a name="line.1049"></a>
 <span class="sourceLineNo">1050</span>  public boolean 
shouldBeOnMaster(RegionInfo region) {<a name="line.1050"></a>
-<span class="sourceLineNo">1051</span>    return this.onlySystemTablesOnMaster 
&amp;&amp; region.isSystemTable();<a name="line.1051"></a>
+<span class="sourceLineNo">1051</span>    return this.onlySystemTablesOnMaster 
&amp;&amp; region.getTable().isSystemTable();<a name="line.1051"></a>
 <span class="sourceLineNo">1052</span>  }<a name="line.1052"></a>
 <span class="sourceLineNo">1053</span><a name="line.1053"></a>
 <span class="sourceLineNo">1054</span>  /**<a name="line.1054"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5a2158f2/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.SwapRegionsAction.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.SwapRegionsAction.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.SwapRegionsAction.html
index 4d53058..d7f4846 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.SwapRegionsAction.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.SwapRegionsAction.html
@@ -1056,7 +1056,7 @@
 <span class="sourceLineNo">1048</span>   * If so, the primary replica may be 
expected to be put on the master regionserver.<a name="line.1048"></a>
 <span class="sourceLineNo">1049</span>   */<a name="line.1049"></a>
 <span class="sourceLineNo">1050</span>  public boolean 
shouldBeOnMaster(RegionInfo region) {<a name="line.1050"></a>
-<span class="sourceLineNo">1051</span>    return this.onlySystemTablesOnMaster 
&amp;&amp; region.isSystemTable();<a name="line.1051"></a>
+<span class="sourceLineNo">1051</span>    return this.onlySystemTablesOnMaster 
&amp;&amp; region.getTable().isSystemTable();<a name="line.1051"></a>
 <span class="sourceLineNo">1052</span>  }<a name="line.1052"></a>
 <span class="sourceLineNo">1053</span><a name="line.1053"></a>
 <span class="sourceLineNo">1054</span>  /**<a name="line.1054"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5a2158f2/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html
index 4d53058..d7f4846 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html
@@ -1056,7 +1056,7 @@
 <span class="sourceLineNo">1048</span>   * If so, the primary replica may be 
expected to be put on the master regionserver.<a name="line.1048"></a>
 <span class="sourceLineNo">1049</span>   */<a name="line.1049"></a>
 <span class="sourceLineNo">1050</span>  public boolean 
shouldBeOnMaster(RegionInfo region) {<a name="line.1050"></a>
-<span class="sourceLineNo">1051</span>    return this.onlySystemTablesOnMaster 
&amp;&amp; region.isSystemTable();<a name="line.1051"></a>
+<span class="sourceLineNo">1051</span>    return this.onlySystemTablesOnMaster 
&amp;&amp; region.getTable().isSystemTable();<a name="line.1051"></a>
 <span class="sourceLineNo">1052</span>  }<a name="line.1052"></a>
 <span class="sourceLineNo">1053</span><a name="line.1053"></a>
 <span class="sourceLineNo">1054</span>  /**<a name="line.1054"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5a2158f2/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.DefaultRackManager.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.DefaultRackManager.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.DefaultRackManager.html
index 4d53058..d7f4846 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.DefaultRackManager.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.DefaultRackManager.html
@@ -1056,7 +1056,7 @@
 <span class="sourceLineNo">1048</span>   * If so, the primary replica may be 
expected to be put on the master regionserver.<a name="line.1048"></a>
 <span class="sourceLineNo">1049</span>   */<a name="line.1049"></a>
 <span class="sourceLineNo">1050</span>  public boolean 
shouldBeOnMaster(RegionInfo region) {<a name="line.1050"></a>
-<span class="sourceLineNo">1051</span>    return this.onlySystemTablesOnMaster 
&amp;&amp; region.isSystemTable();<a name="line.1051"></a>
+<span class="sourceLineNo">1051</span>    return this.onlySystemTablesOnMaster 
&amp;&amp; region.getTable().isSystemTable();<a name="line.1051"></a>
 <span class="sourceLineNo">1052</span>  }<a name="line.1052"></a>
 <span class="sourceLineNo">1053</span><a name="line.1053"></a>
 <span class="sourceLineNo">1054</span>  /**<a name="line.1054"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5a2158f2/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html
index 4d53058..d7f4846 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html
@@ -1056,7 +1056,7 @@
 <span class="sourceLineNo">1048</span>   * If so, the primary replica may be 
expected to be put on the master regionserver.<a name="line.1048"></a>
 <span class="sourceLineNo">1049</span>   */<a name="line.1049"></a>
 <span class="sourceLineNo">1050</span>  public boolean 
shouldBeOnMaster(RegionInfo region) {<a name="line.1050"></a>
-<span class="sourceLineNo">1051</span>    return this.onlySystemTablesOnMaster 
&amp;&amp; region.isSystemTable();<a name="line.1051"></a>
+<span class="sourceLineNo">1051</span>    return this.onlySystemTablesOnMaster 
&amp;&amp; region.getTable().isSystemTable();<a name="line.1051"></a>
 <span class="sourceLineNo">1052</span>  }<a name="line.1052"></a>
 <span class="sourceLineNo">1053</span><a name="line.1053"></a>
 <span class="sourceLineNo">1054</span>  /**<a name="line.1054"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5a2158f2/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/RegionLocationFinder.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/RegionLocationFinder.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/RegionLocationFinder.html
index 13701b3..70941d5 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/RegionLocationFinder.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/RegionLocationFinder.html
@@ -165,7 +165,7 @@
 <span class="sourceLineNo">157</span>    boolean includesUserTables = false;<a 
name="line.157"></a>
 <span class="sourceLineNo">158</span>    for (final RegionInfo hri : 
am.getAssignedRegions()) {<a name="line.158"></a>
 <span class="sourceLineNo">159</span>      cache.refresh(hri);<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>      includesUserTables = 
includesUserTables || !hri.isSystemTable();<a name="line.160"></a>
+<span class="sourceLineNo">160</span>      includesUserTables = 
includesUserTables || !hri.getTable().isSystemTable();<a name="line.160"></a>
 <span class="sourceLineNo">161</span>    }<a name="line.161"></a>
 <span class="sourceLineNo">162</span>    return includesUserTables;<a 
name="line.162"></a>
 <span class="sourceLineNo">163</span>  }<a name="line.163"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5a2158f2/devapidocs/src-html/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html
index c4a0b12..20f63c1 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html
@@ -193,7 +193,7 @@
 <span class="sourceLineNo">185</span>    List&lt;Cell&gt; cells = new 
ArrayList&lt;&gt;();<a name="line.185"></a>
 <span class="sourceLineNo">186</span>    boolean hasMore;<a 
name="line.186"></a>
 <span class="sourceLineNo">187</span>    String flushName = 
ThroughputControlUtil.getNameForThrottling(store, "flush");<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>    boolean control = 
throughputController != null &amp;&amp; 
!store.getRegionInfo().isSystemTable();<a name="line.188"></a>
+<span class="sourceLineNo">188</span>    boolean control = 
throughputController != null &amp;&amp; 
!store.getRegionInfo().getTable().isSystemTable();<a name="line.188"></a>
 <span class="sourceLineNo">189</span>    if (control) {<a name="line.189"></a>
 <span class="sourceLineNo">190</span>      
throughputController.start(flushName);<a name="line.190"></a>
 <span class="sourceLineNo">191</span>    }<a name="line.191"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5a2158f2/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/AnnotationReadingPriorityFunction.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/AnnotationReadingPriorityFunction.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/AnnotationReadingPriorityFunction.html
index 7cef7e9..f3afc66 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/AnnotationReadingPriorityFunction.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/AnnotationReadingPriorityFunction.html
@@ -226,7 +226,7 @@
 <span class="sourceLineNo">218</span>        Method getRegion = 
methodMap.get("getRegion").get(rpcArgClass);<a name="line.218"></a>
 <span class="sourceLineNo">219</span>        regionSpecifier = 
(RegionSpecifier)getRegion.invoke(param, (Object[])null);<a name="line.219"></a>
 <span class="sourceLineNo">220</span>        Region region = 
rpcServices.getRegion(regionSpecifier);<a name="line.220"></a>
-<span class="sourceLineNo">221</span>        if 
(region.getRegionInfo().isSystemTable()) {<a name="line.221"></a>
+<span class="sourceLineNo">221</span>        if 
(region.getRegionInfo().getTable().isSystemTable()) {<a name="line.221"></a>
 <span class="sourceLineNo">222</span>          if (LOG.isTraceEnabled()) {<a 
name="line.222"></a>
 <span class="sourceLineNo">223</span>            LOG.trace("High priority 
because region=" +<a name="line.223"></a>
 <span class="sourceLineNo">224</span>              
region.getRegionInfo().getRegionNameAsString());<a name="line.224"></a>
@@ -247,7 +247,7 @@
 <span class="sourceLineNo">239</span>        return HConstants.NORMAL_QOS;<a 
name="line.239"></a>
 <span class="sourceLineNo">240</span>      }<a name="line.240"></a>
 <span class="sourceLineNo">241</span>      RegionScanner scanner = 
rpcServices.getScanner(request.getScannerId());<a name="line.241"></a>
-<span class="sourceLineNo">242</span>      if (scanner != null &amp;&amp; 
scanner.getRegionInfo().isSystemTable()) {<a name="line.242"></a>
+<span class="sourceLineNo">242</span>      if (scanner != null &amp;&amp; 
scanner.getRegionInfo().getTable().isSystemTable()) {<a name="line.242"></a>
 <span class="sourceLineNo">243</span>        if (LOG.isTraceEnabled()) {<a 
name="line.243"></a>
 <span class="sourceLineNo">244</span>          // Scanner requests are small 
in size so TextFormat version should not overwhelm log.<a name="line.244"></a>
 <span class="sourceLineNo">245</span>          LOG.trace("High priority 
scanner request " + TextFormat.shortDebugString(request));<a 
name="line.245"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5a2158f2/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.html
index db655cf..ecd87c5 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.html
@@ -50,272 +50,261 @@
 <span class="sourceLineNo">042</span>public class CompositeImmutableSegment 
extends ImmutableSegment {<a name="line.42"></a>
 <span class="sourceLineNo">043</span><a name="line.43"></a>
 <span class="sourceLineNo">044</span>  private final 
List&lt;ImmutableSegment&gt; segments;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>  // CompositeImmutableSegment is used 
for snapshots and snapshot should<a name="line.45"></a>
-<span class="sourceLineNo">046</span>  // support getTimeRangeTracker() 
interface.<a name="line.46"></a>
-<span class="sourceLineNo">047</span>  // Thus we hold a constant TRT build in 
the construction time from TRT of the given segments.<a name="line.47"></a>
-<span class="sourceLineNo">048</span>  private final TimeRangeTracker 
timeRangeTracker;<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>  private long keySize = 0;<a 
name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>  public 
CompositeImmutableSegment(CellComparator comparator, 
List&lt;ImmutableSegment&gt; segments) {<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    super(comparator);<a 
name="line.53"></a>
-<span class="sourceLineNo">054</span>    this.segments = segments;<a 
name="line.54"></a>
-<span class="sourceLineNo">055</span>    this.timeRangeTracker = 
TimeRangeTracker.create(TimeRangeTracker.Type.SYNC);<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    for (ImmutableSegment s : segments) 
{<a name="line.56"></a>
-<span class="sourceLineNo">057</span>      
this.timeRangeTracker.includeTimestamp(s.getTimeRangeTracker().getMax());<a 
name="line.57"></a>
-<span class="sourceLineNo">058</span>      
this.timeRangeTracker.includeTimestamp(s.getTimeRangeTracker().getMin());<a 
name="line.58"></a>
-<span class="sourceLineNo">059</span>      this.keySize += s.keySize();<a 
name="line.59"></a>
-<span class="sourceLineNo">060</span>    }<a name="line.60"></a>
+<span class="sourceLineNo">045</span>  private long keySize = 0;<a 
name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span>  public 
CompositeImmutableSegment(CellComparator comparator, 
List&lt;ImmutableSegment&gt; segments) {<a name="line.47"></a>
+<span class="sourceLineNo">048</span>    super(comparator);<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>    this.segments = segments;<a 
name="line.49"></a>
+<span class="sourceLineNo">050</span>    for (ImmutableSegment s : segments) 
{<a name="line.50"></a>
+<span class="sourceLineNo">051</span>      
this.timeRangeTracker.includeTimestamp(s.getTimeRangeTracker().getMax());<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>      
this.timeRangeTracker.includeTimestamp(s.getTimeRangeTracker().getMin());<a 
name="line.52"></a>
+<span class="sourceLineNo">053</span>      this.keySize += s.keySize();<a 
name="line.53"></a>
+<span class="sourceLineNo">054</span>    }<a name="line.54"></a>
+<span class="sourceLineNo">055</span>  }<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span>  @VisibleForTesting<a name="line.57"></a>
+<span class="sourceLineNo">058</span>  @Override<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  public List&lt;Segment&gt; 
getAllSegments() {<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    return new 
LinkedList&lt;&gt;(segments);<a name="line.60"></a>
 <span class="sourceLineNo">061</span>  }<a name="line.61"></a>
 <span class="sourceLineNo">062</span><a name="line.62"></a>
-<span class="sourceLineNo">063</span>  @VisibleForTesting<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  @Override<a name="line.64"></a>
-<span class="sourceLineNo">065</span>  public List&lt;Segment&gt; 
getAllSegments() {<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    return new 
LinkedList&lt;&gt;(segments);<a name="line.66"></a>
-<span class="sourceLineNo">067</span>  }<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span>  @Override<a name="line.69"></a>
-<span class="sourceLineNo">070</span>  public int getNumOfSegments() {<a 
name="line.70"></a>
-<span class="sourceLineNo">071</span>    return segments.size();<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>   * @return whether the segment has any 
cells<a name="line.75"></a>
-<span class="sourceLineNo">076</span>   */<a name="line.76"></a>
-<span class="sourceLineNo">077</span>  @Override<a name="line.77"></a>
-<span class="sourceLineNo">078</span>  public boolean isEmpty() {<a 
name="line.78"></a>
-<span class="sourceLineNo">079</span>    for (ImmutableSegment s : segments) 
{<a name="line.79"></a>
-<span class="sourceLineNo">080</span>      if (!s.isEmpty()) return false;<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span>    }<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    return true;<a name="line.82"></a>
-<span class="sourceLineNo">083</span>  }<a name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span>  /**<a name="line.85"></a>
-<span class="sourceLineNo">086</span>   * @return number of cells in segment<a 
name="line.86"></a>
-<span class="sourceLineNo">087</span>   */<a name="line.87"></a>
-<span class="sourceLineNo">088</span>  @Override<a name="line.88"></a>
-<span class="sourceLineNo">089</span>  public int getCellsCount() {<a 
name="line.89"></a>
-<span class="sourceLineNo">090</span>    int result = 0;<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    for (ImmutableSegment s : segments) 
{<a name="line.91"></a>
-<span class="sourceLineNo">092</span>      result += s.getCellsCount();<a 
name="line.92"></a>
-<span class="sourceLineNo">093</span>    }<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    return result;<a name="line.94"></a>
-<span class="sourceLineNo">095</span>  }<a name="line.95"></a>
-<span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span>  /**<a name="line.97"></a>
-<span class="sourceLineNo">098</span>   * @return the first cell in the 
segment that has equal or greater key than the given cell<a name="line.98"></a>
-<span class="sourceLineNo">099</span>   */<a name="line.99"></a>
-<span class="sourceLineNo">100</span>  @Override<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  public Cell getFirstAfter(Cell cell) 
{<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<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>   * Closing a segment before it is being 
discarded<a name="line.106"></a>
-<span class="sourceLineNo">107</span>   */<a name="line.107"></a>
-<span class="sourceLineNo">108</span>  @Override<a name="line.108"></a>
-<span class="sourceLineNo">109</span>  public void close() {<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>    for (ImmutableSegment s : segments) 
{<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      s.close();<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    }<a name="line.112"></a>
-<span class="sourceLineNo">113</span>  }<a name="line.113"></a>
-<span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span>  /**<a name="line.115"></a>
-<span class="sourceLineNo">116</span>   * If the segment has a memory 
allocator the cell is being cloned to this space, and returned;<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>   * otherwise the given cell is 
returned<a name="line.117"></a>
-<span class="sourceLineNo">118</span>   * @return either the given cell or its 
clone<a name="line.118"></a>
-<span class="sourceLineNo">119</span>   */<a name="line.119"></a>
-<span class="sourceLineNo">120</span>  @Override<a name="line.120"></a>
-<span class="sourceLineNo">121</span>  public Cell 
maybeCloneWithAllocator(Cell cell) {<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.122"></a>
-<span class="sourceLineNo">123</span>  }<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span>  @Override<a name="line.125"></a>
-<span class="sourceLineNo">126</span>  public boolean shouldSeek(TimeRange tr, 
long oldestUnexpiredTS){<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.127"></a>
-<span class="sourceLineNo">128</span>  }<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>  @Override<a name="line.130"></a>
-<span class="sourceLineNo">131</span>  public long getMinTimestamp(){<a 
name="line.131"></a>
-<span class="sourceLineNo">132</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.132"></a>
-<span class="sourceLineNo">133</span>  }<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>   * Creates the scanner for the given 
read point<a name="line.136"></a>
-<span class="sourceLineNo">137</span>   * @return a scanner for the given read 
point<a name="line.137"></a>
-<span class="sourceLineNo">138</span>   */<a name="line.138"></a>
-<span class="sourceLineNo">139</span>  @Override<a name="line.139"></a>
-<span class="sourceLineNo">140</span>  public KeyValueScanner getScanner(long 
readPoint) {<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.141"></a>
-<span class="sourceLineNo">142</span>  }<a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span>  /**<a name="line.144"></a>
-<span class="sourceLineNo">145</span>   * Creates the scanner for the given 
read point, and a specific order in a list<a name="line.145"></a>
-<span class="sourceLineNo">146</span>   * @return a scanner for the given read 
point<a name="line.146"></a>
-<span class="sourceLineNo">147</span>   */<a name="line.147"></a>
-<span class="sourceLineNo">148</span>  @Override<a name="line.148"></a>
-<span class="sourceLineNo">149</span>  public KeyValueScanner getScanner(long 
readPoint, long order) {<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.150"></a>
-<span class="sourceLineNo">151</span>  }<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span>  @Override<a name="line.153"></a>
-<span class="sourceLineNo">154</span>  public List&lt;KeyValueScanner&gt; 
getScanners(long readPoint, long order) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    List&lt;KeyValueScanner&gt; list = 
new ArrayList&lt;&gt;(segments.size());<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    
AbstractMemStore.addToScanners(segments, readPoint, order, list);<a 
name="line.156"></a>
-<span class="sourceLineNo">157</span>    return list;<a name="line.157"></a>
-<span class="sourceLineNo">158</span>  }<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span>  @Override<a name="line.160"></a>
-<span class="sourceLineNo">161</span>  public boolean isTagsPresent() {<a 
name="line.161"></a>
-<span class="sourceLineNo">162</span>    for (ImmutableSegment s : segments) 
{<a name="line.162"></a>
-<span class="sourceLineNo">163</span>      if (s.isTagsPresent()) return 
true;<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    }<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    return false;<a name="line.165"></a>
-<span class="sourceLineNo">166</span>  }<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>  @Override<a name="line.168"></a>
-<span class="sourceLineNo">169</span>  public void incScannerCount() {<a 
name="line.169"></a>
-<span class="sourceLineNo">170</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.170"></a>
-<span class="sourceLineNo">171</span>  }<a name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span>  @Override<a name="line.173"></a>
-<span class="sourceLineNo">174</span>  public void decScannerCount() {<a 
name="line.174"></a>
-<span class="sourceLineNo">175</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.175"></a>
-<span class="sourceLineNo">176</span>  }<a name="line.176"></a>
+<span class="sourceLineNo">063</span>  @Override<a name="line.63"></a>
+<span class="sourceLineNo">064</span>  public int getNumOfSegments() {<a 
name="line.64"></a>
+<span class="sourceLineNo">065</span>    return segments.size();<a 
name="line.65"></a>
+<span class="sourceLineNo">066</span>  }<a name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span>  /**<a name="line.68"></a>
+<span class="sourceLineNo">069</span>   * @return whether the segment has any 
cells<a name="line.69"></a>
+<span class="sourceLineNo">070</span>   */<a name="line.70"></a>
+<span class="sourceLineNo">071</span>  @Override<a name="line.71"></a>
+<span class="sourceLineNo">072</span>  public boolean isEmpty() {<a 
name="line.72"></a>
+<span class="sourceLineNo">073</span>    for (ImmutableSegment s : segments) 
{<a name="line.73"></a>
+<span class="sourceLineNo">074</span>      if (!s.isEmpty()) return false;<a 
name="line.74"></a>
+<span class="sourceLineNo">075</span>    }<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    return true;<a name="line.76"></a>
+<span class="sourceLineNo">077</span>  }<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span>  /**<a name="line.79"></a>
+<span class="sourceLineNo">080</span>   * @return number of cells in segment<a 
name="line.80"></a>
+<span class="sourceLineNo">081</span>   */<a name="line.81"></a>
+<span class="sourceLineNo">082</span>  @Override<a name="line.82"></a>
+<span class="sourceLineNo">083</span>  public int getCellsCount() {<a 
name="line.83"></a>
+<span class="sourceLineNo">084</span>    int result = 0;<a name="line.84"></a>
+<span class="sourceLineNo">085</span>    for (ImmutableSegment s : segments) 
{<a name="line.85"></a>
+<span class="sourceLineNo">086</span>      result += s.getCellsCount();<a 
name="line.86"></a>
+<span class="sourceLineNo">087</span>    }<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    return result;<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>   * @return the first cell in the 
segment that has equal or greater key than the given cell<a name="line.92"></a>
+<span class="sourceLineNo">093</span>   */<a name="line.93"></a>
+<span class="sourceLineNo">094</span>  @Override<a name="line.94"></a>
+<span class="sourceLineNo">095</span>  public Cell getFirstAfter(Cell cell) 
{<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.96"></a>
+<span class="sourceLineNo">097</span>  }<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span>  /**<a name="line.99"></a>
+<span class="sourceLineNo">100</span>   * Closing a segment before it is being 
discarded<a name="line.100"></a>
+<span class="sourceLineNo">101</span>   */<a name="line.101"></a>
+<span class="sourceLineNo">102</span>  @Override<a name="line.102"></a>
+<span class="sourceLineNo">103</span>  public void close() {<a 
name="line.103"></a>
+<span class="sourceLineNo">104</span>    for (ImmutableSegment s : segments) 
{<a name="line.104"></a>
+<span class="sourceLineNo">105</span>      s.close();<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>   * If the segment has a memory 
allocator the cell is being cloned to this space, and returned;<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>   * otherwise the given cell is 
returned<a name="line.111"></a>
+<span class="sourceLineNo">112</span>   * @return either the given cell or its 
clone<a name="line.112"></a>
+<span class="sourceLineNo">113</span>   */<a name="line.113"></a>
+<span class="sourceLineNo">114</span>  @Override<a name="line.114"></a>
+<span class="sourceLineNo">115</span>  public Cell 
maybeCloneWithAllocator(Cell cell) {<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.116"></a>
+<span class="sourceLineNo">117</span>  }<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span>  @Override<a name="line.119"></a>
+<span class="sourceLineNo">120</span>  public boolean shouldSeek(TimeRange tr, 
long oldestUnexpiredTS){<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.121"></a>
+<span class="sourceLineNo">122</span>  }<a name="line.122"></a>
+<span class="sourceLineNo">123</span><a name="line.123"></a>
+<span class="sourceLineNo">124</span>  /**<a name="line.124"></a>
+<span class="sourceLineNo">125</span>   * Creates the scanner for the given 
read point<a name="line.125"></a>
+<span class="sourceLineNo">126</span>   * @return a scanner for the given read 
point<a name="line.126"></a>
+<span class="sourceLineNo">127</span>   */<a name="line.127"></a>
+<span class="sourceLineNo">128</span>  @Override<a name="line.128"></a>
+<span class="sourceLineNo">129</span>  public KeyValueScanner getScanner(long 
readPoint) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<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>   * Creates the scanner for the given 
read point, and a specific order in a list<a name="line.134"></a>
+<span class="sourceLineNo">135</span>   * @return a scanner for the given read 
point<a name="line.135"></a>
+<span class="sourceLineNo">136</span>   */<a name="line.136"></a>
+<span class="sourceLineNo">137</span>  @Override<a name="line.137"></a>
+<span class="sourceLineNo">138</span>  public KeyValueScanner getScanner(long 
readPoint, long order) {<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.139"></a>
+<span class="sourceLineNo">140</span>  }<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span>  @Override<a name="line.142"></a>
+<span class="sourceLineNo">143</span>  public List&lt;KeyValueScanner&gt; 
getScanners(long readPoint, long order) {<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    List&lt;KeyValueScanner&gt; list = 
new ArrayList&lt;&gt;(segments.size());<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    
AbstractMemStore.addToScanners(segments, readPoint, order, list);<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span>    return list;<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>  @Override<a name="line.149"></a>
+<span class="sourceLineNo">150</span>  public boolean isTagsPresent() {<a 
name="line.150"></a>
+<span class="sourceLineNo">151</span>    for (ImmutableSegment s : segments) 
{<a name="line.151"></a>
+<span class="sourceLineNo">152</span>      if (s.isTagsPresent()) return 
true;<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    }<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    return false;<a name="line.154"></a>
+<span class="sourceLineNo">155</span>  }<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span>  @Override<a name="line.157"></a>
+<span class="sourceLineNo">158</span>  public void incScannerCount() {<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.159"></a>
+<span class="sourceLineNo">160</span>  }<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span>  @Override<a name="line.162"></a>
+<span class="sourceLineNo">163</span>  public void decScannerCount() {<a 
name="line.163"></a>
+<span class="sourceLineNo">164</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.164"></a>
+<span class="sourceLineNo">165</span>  }<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span>  /**<a name="line.167"></a>
+<span class="sourceLineNo">168</span>   * Setting the CellSet of the segment - 
used only for flat immutable segment for setting<a name="line.168"></a>
+<span class="sourceLineNo">169</span>   * immutable CellSet after its creation 
in immutable segment constructor<a name="line.169"></a>
+<span class="sourceLineNo">170</span>   * @return this object<a 
name="line.170"></a>
+<span class="sourceLineNo">171</span>   */<a name="line.171"></a>
+<span class="sourceLineNo">172</span>  @Override<a name="line.172"></a>
+<span class="sourceLineNo">173</span>  protected CompositeImmutableSegment 
setCellSet(CellSet cellSetOld, CellSet cellSetNew) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.174"></a>
+<span class="sourceLineNo">175</span>  }<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>  /**<a name="line.178"></a>
-<span class="sourceLineNo">179</span>   * Setting the CellSet of the segment - 
used only for flat immutable segment for setting<a name="line.179"></a>
-<span class="sourceLineNo">180</span>   * immutable CellSet after its creation 
in immutable segment constructor<a name="line.180"></a>
-<span class="sourceLineNo">181</span>   * @return this object<a 
name="line.181"></a>
-<span class="sourceLineNo">182</span>   */<a name="line.182"></a>
-<span class="sourceLineNo">183</span>  @Override<a name="line.183"></a>
-<span class="sourceLineNo">184</span>  protected CompositeImmutableSegment 
setCellSet(CellSet cellSetOld, CellSet cellSetNew) {<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<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><a name="line.188"></a>
-<span class="sourceLineNo">189</span>  @Override<a name="line.189"></a>
-<span class="sourceLineNo">190</span>  protected long indexEntrySize() {<a 
name="line.190"></a>
-<span class="sourceLineNo">191</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.191"></a>
-<span class="sourceLineNo">192</span>  }<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span>  @Override protected boolean 
canBeFlattened() {<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    return false;<a name="line.195"></a>
-<span class="sourceLineNo">196</span>  }<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 Sum of all cell sizes.<a 
name="line.199"></a>
-<span class="sourceLineNo">200</span>   */<a name="line.200"></a>
-<span class="sourceLineNo">201</span>  @Override<a name="line.201"></a>
-<span class="sourceLineNo">202</span>  public long keySize() {<a 
name="line.202"></a>
-<span class="sourceLineNo">203</span>    return this.keySize;<a 
name="line.203"></a>
-<span class="sourceLineNo">204</span>  }<a name="line.204"></a>
-<span class="sourceLineNo">205</span><a name="line.205"></a>
-<span class="sourceLineNo">206</span>  /**<a name="line.206"></a>
-<span class="sourceLineNo">207</span>   * @return The heap size of this 
segment.<a name="line.207"></a>
-<span class="sourceLineNo">208</span>   */<a name="line.208"></a>
-<span class="sourceLineNo">209</span>  @Override<a name="line.209"></a>
-<span class="sourceLineNo">210</span>  public long heapSize() {<a 
name="line.210"></a>
-<span class="sourceLineNo">211</span>    long result = 0;<a 
name="line.211"></a>
-<span class="sourceLineNo">212</span>    for (ImmutableSegment s : segments) 
{<a name="line.212"></a>
-<span class="sourceLineNo">213</span>      result += s.heapSize();<a 
name="line.213"></a>
-<span class="sourceLineNo">214</span>    }<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    return result;<a name="line.215"></a>
-<span class="sourceLineNo">216</span>  }<a name="line.216"></a>
-<span class="sourceLineNo">217</span><a name="line.217"></a>
-<span class="sourceLineNo">218</span>  /**<a name="line.218"></a>
-<span class="sourceLineNo">219</span>   * Updates the heap size counter of the 
segment by the given delta<a name="line.219"></a>
-<span class="sourceLineNo">220</span>   */<a name="line.220"></a>
-<span class="sourceLineNo">221</span>  @Override<a name="line.221"></a>
-<span class="sourceLineNo">222</span>  protected void incSize(long delta, long 
heapOverhead) {<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.223"></a>
-<span class="sourceLineNo">224</span>  }<a name="line.224"></a>
-<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">178</span>  @Override<a name="line.178"></a>
+<span class="sourceLineNo">179</span>  protected long indexEntrySize() {<a 
name="line.179"></a>
+<span class="sourceLineNo">180</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.180"></a>
+<span class="sourceLineNo">181</span>  }<a name="line.181"></a>
+<span class="sourceLineNo">182</span><a name="line.182"></a>
+<span class="sourceLineNo">183</span>  @Override protected boolean 
canBeFlattened() {<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    return false;<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>   * @return Sum of all cell sizes.<a 
name="line.188"></a>
+<span class="sourceLineNo">189</span>   */<a name="line.189"></a>
+<span class="sourceLineNo">190</span>  @Override<a name="line.190"></a>
+<span class="sourceLineNo">191</span>  public long keySize() {<a 
name="line.191"></a>
+<span class="sourceLineNo">192</span>    return this.keySize;<a 
name="line.192"></a>
+<span class="sourceLineNo">193</span>  }<a name="line.193"></a>
+<span class="sourceLineNo">194</span><a name="line.194"></a>
+<span class="sourceLineNo">195</span>  /**<a name="line.195"></a>
+<span class="sourceLineNo">196</span>   * @return The heap size of this 
segment.<a name="line.196"></a>
+<span class="sourceLineNo">197</span>   */<a name="line.197"></a>
+<span class="sourceLineNo">198</span>  @Override<a name="line.198"></a>
+<span class="sourceLineNo">199</span>  public long heapSize() {<a 
name="line.199"></a>
+<span class="sourceLineNo">200</span>    long result = 0;<a 
name="line.200"></a>
+<span class="sourceLineNo">201</span>    for (ImmutableSegment s : segments) 
{<a name="line.201"></a>
+<span class="sourceLineNo">202</span>      result += s.heapSize();<a 
name="line.202"></a>
+<span class="sourceLineNo">203</span>    }<a name="line.203"></a>
+<span class="sourceLineNo">204</span>    return result;<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>  /**<a name="line.207"></a>
+<span class="sourceLineNo">208</span>   * Updates the heap size counter of the 
segment by the given delta<a name="line.208"></a>
+<span class="sourceLineNo">209</span>   */<a name="line.209"></a>
+<span class="sourceLineNo">210</span>  @Override<a name="line.210"></a>
+<span class="sourceLineNo">211</span>  protected void incSize(long delta, long 
heapOverhead) {<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<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>  @Override<a name="line.215"></a>
+<span class="sourceLineNo">216</span>  public long getMinSequenceId() {<a 
name="line.216"></a>
+<span class="sourceLineNo">217</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.217"></a>
+<span class="sourceLineNo">218</span>  }<a name="line.218"></a>
+<span class="sourceLineNo">219</span><a name="line.219"></a>
+<span class="sourceLineNo">220</span>  @Override<a name="line.220"></a>
+<span class="sourceLineNo">221</span>  public TimeRangeTracker 
getTimeRangeTracker() {<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    return this.timeRangeTracker;<a 
name="line.222"></a>
+<span class="sourceLineNo">223</span>  }<a name="line.223"></a>
+<span class="sourceLineNo">224</span><a name="line.224"></a>
+<span class="sourceLineNo">225</span>  //*** Methods for SegmentsScanner<a 
name="line.225"></a>
 <span class="sourceLineNo">226</span>  @Override<a name="line.226"></a>
-<span class="sourceLineNo">227</span>  public long getMinSequenceId() {<a 
name="line.227"></a>
+<span class="sourceLineNo">227</span>  public Cell last() {<a 
name="line.227"></a>
 <span class="sourceLineNo">228</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.228"></a>
 <span class="sourceLineNo">229</span>  }<a name="line.229"></a>
 <span class="sourceLineNo">230</span><a name="line.230"></a>
 <span class="sourceLineNo">231</span>  @Override<a name="line.231"></a>
-<span class="sourceLineNo">232</span>  public TimeRangeTracker 
getTimeRangeTracker() {<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    return this.timeRangeTracker;<a 
name="line.233"></a>
+<span class="sourceLineNo">232</span>  public Iterator&lt;Cell&gt; iterator() 
{<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.233"></a>
 <span class="sourceLineNo">234</span>  }<a name="line.234"></a>
 <span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span>  //*** Methods for SegmentsScanner<a 
name="line.236"></a>
-<span class="sourceLineNo">237</span>  @Override<a name="line.237"></a>
-<span class="sourceLineNo">238</span>  public Cell last() {<a 
name="line.238"></a>
-<span class="sourceLineNo">239</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.239"></a>
-<span class="sourceLineNo">240</span>  }<a name="line.240"></a>
-<span class="sourceLineNo">241</span><a name="line.241"></a>
-<span class="sourceLineNo">242</span>  @Override<a name="line.242"></a>
-<span class="sourceLineNo">243</span>  public Iterator&lt;Cell&gt; iterator() 
{<a name="line.243"></a>
-<span class="sourceLineNo">244</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.244"></a>
-<span class="sourceLineNo">245</span>  }<a name="line.245"></a>
-<span class="sourceLineNo">246</span><a name="line.246"></a>
-<span class="sourceLineNo">247</span>  @Override<a name="line.247"></a>
-<span class="sourceLineNo">248</span>  public SortedSet&lt;Cell&gt; 
headSet(Cell firstKeyOnRow) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.249"></a>
-<span class="sourceLineNo">250</span>  }<a name="line.250"></a>
-<span class="sourceLineNo">251</span><a name="line.251"></a>
-<span class="sourceLineNo">252</span>  @Override<a name="line.252"></a>
-<span class="sourceLineNo">253</span>  public int compare(Cell left, Cell 
right) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.254"></a>
-<span class="sourceLineNo">255</span>  }<a name="line.255"></a>
-<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span>  @Override<a name="line.257"></a>
-<span class="sourceLineNo">258</span>  public int compareRows(Cell left, Cell 
right) {<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.259"></a>
-<span class="sourceLineNo">260</span>  }<a name="line.260"></a>
-<span class="sourceLineNo">261</span><a name="line.261"></a>
-<span class="sourceLineNo">262</span>  /**<a name="line.262"></a>
-<span class="sourceLineNo">263</span>   * @return a set of all cells in the 
segment<a name="line.263"></a>
-<span class="sourceLineNo">264</span>   */<a name="line.264"></a>
-<span class="sourceLineNo">265</span>  @Override<a name="line.265"></a>
-<span class="sourceLineNo">266</span>  protected CellSet getCellSet() {<a 
name="line.266"></a>
+<span class="sourceLineNo">236</span>  @Override<a name="line.236"></a>
+<span class="sourceLineNo">237</span>  public SortedSet&lt;Cell&gt; 
headSet(Cell firstKeyOnRow) {<a name="line.237"></a>
+<span class="sourceLineNo">238</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<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 int compare(Cell left, Cell 
right) {<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<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>  @Override<a name="line.246"></a>
+<span class="sourceLineNo">247</span>  public int compareRows(Cell left, Cell 
right) {<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.248"></a>
+<span class="sourceLineNo">249</span>  }<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span>  /**<a name="line.251"></a>
+<span class="sourceLineNo">252</span>   * @return a set of all cells in the 
segment<a name="line.252"></a>
+<span class="sourceLineNo">253</span>   */<a name="line.253"></a>
+<span class="sourceLineNo">254</span>  @Override<a name="line.254"></a>
+<span class="sourceLineNo">255</span>  protected CellSet getCellSet() {<a 
name="line.255"></a>
+<span class="sourceLineNo">256</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.256"></a>
+<span class="sourceLineNo">257</span>  }<a name="line.257"></a>
+<span class="sourceLineNo">258</span><a name="line.258"></a>
+<span class="sourceLineNo">259</span>  @Override<a name="line.259"></a>
+<span class="sourceLineNo">260</span>  protected void internalAdd(Cell cell, 
boolean mslabUsed, MemStoreSize memstoreSize) {<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.261"></a>
+<span class="sourceLineNo">262</span>  }<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span>  @Override<a name="line.264"></a>
+<span class="sourceLineNo">265</span>  protected void updateMetaInfo(Cell 
cellToAdd, boolean succ, boolean mslabUsed,<a name="line.265"></a>
+<span class="sourceLineNo">266</span>      MemStoreSize memstoreSize) {<a 
name="line.266"></a>
 <span class="sourceLineNo">267</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.267"></a>
 <span class="sourceLineNo">268</span>  }<a name="line.268"></a>
 <span class="sourceLineNo">269</span><a name="line.269"></a>
-<span class="sourceLineNo">270</span>  @Override<a name="line.270"></a>
-<span class="sourceLineNo">271</span>  protected void internalAdd(Cell cell, 
boolean mslabUsed, MemStoreSize memstoreSize) {<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<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">270</span>  /**<a name="line.270"></a>
+<span class="sourceLineNo">271</span>   * Returns a subset of the segment cell 
set, which starts with the given cell<a name="line.271"></a>
+<span class="sourceLineNo">272</span>   * @param firstCell a cell in the 
segment<a name="line.272"></a>
+<span class="sourceLineNo">273</span>   * @return a subset of the segment cell 
set, which starts with the given cell<a name="line.273"></a>
+<span class="sourceLineNo">274</span>   */<a name="line.274"></a>
 <span class="sourceLineNo">275</span>  @Override<a name="line.275"></a>
-<span class="sourceLineNo">276</span>  protected void updateMetaInfo(Cell 
cellToAdd, boolean succ, boolean mslabUsed,<a name="line.276"></a>
-<span class="sourceLineNo">277</span>      MemStoreSize memstoreSize) {<a 
name="line.277"></a>
-<span class="sourceLineNo">278</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.278"></a>
-<span class="sourceLineNo">279</span>  }<a name="line.279"></a>
-<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">276</span>  protected SortedSet&lt;Cell&gt; 
tailSet(Cell firstCell) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.277"></a>
+<span class="sourceLineNo">278</span>  }<a name="line.278"></a>
+<span class="sourceLineNo">279</span><a name="line.279"></a>
+<span class="sourceLineNo">280</span>  // Debug methods<a name="line.280"></a>
 <span class="sourceLineNo">281</span>  /**<a name="line.281"></a>
-<span class="sourceLineNo">282</span>   * Returns a subset of the segment cell 
set, which starts with the given cell<a name="line.282"></a>
-<span class="sourceLineNo">283</span>   * @param firstCell a cell in the 
segment<a name="line.283"></a>
-<span class="sourceLineNo">284</span>   * @return a subset of the segment cell 
set, which starts with the given cell<a name="line.284"></a>
-<span class="sourceLineNo">285</span>   */<a name="line.285"></a>
-<span class="sourceLineNo">286</span>  @Override<a name="line.286"></a>
-<span class="sourceLineNo">287</span>  protected SortedSet&lt;Cell&gt; 
tailSet(Cell firstCell) {<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    throw new IllegalStateException("Not 
supported by CompositeImmutableScanner");<a name="line.288"></a>
-<span class="sourceLineNo">289</span>  }<a name="line.289"></a>
-<span class="sourceLineNo">290</span><a name="line.290"></a>
-<span class="sourceLineNo">291</span>  // Debug methods<a name="line.291"></a>
-<span class="sourceLineNo">292</span>  /**<a name="line.292"></a>
-<span class="sourceLineNo">293</span>   * Dumps all cells of the segment into 
the given log<a name="line.293"></a>
-<span class="sourceLineNo">294</span>   */<a name="line.294"></a>
-<span class="sourceLineNo">295</span>  void dump(Log log) {<a 
name="line.295"></a>
-<span class="sourceLineNo">296</span>    for (ImmutableSegment s : segments) 
{<a name="line.296"></a>
-<span class="sourceLineNo">297</span>      s.dump(log);<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    }<a name="line.298"></a>
-<span class="sourceLineNo">299</span>  }<a name="line.299"></a>
-<span class="sourceLineNo">300</span><a name="line.300"></a>
-<span class="sourceLineNo">301</span>  @Override<a name="line.301"></a>
-<span class="sourceLineNo">302</span>  public String toString() {<a 
name="line.302"></a>
-<span class="sourceLineNo">303</span>    StringBuilder sb =<a 
name="line.303"></a>
-<span class="sourceLineNo">304</span>        new StringBuilder("This is 
CompositeImmutableSegment and those are its segments:: ");<a 
name="line.304"></a>
-<span class="sourceLineNo">305</span>    for (ImmutableSegment s : segments) 
{<a name="line.305"></a>
-<span class="sourceLineNo">306</span>      sb.append(s.toString());<a 
name="line.306"></a>
-<span class="sourceLineNo">307</span>    }<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    return sb.toString();<a 
name="line.308"></a>
-<span class="sourceLineNo">309</span>  }<a name="line.309"></a>
-<span class="sourceLineNo">310</span>}<a name="line.310"></a>
+<span class="sourceLineNo">282</span>   * Dumps all cells of the segment into 
the given log<a name="line.282"></a>
+<span class="sourceLineNo">283</span>   */<a name="line.283"></a>
+<span class="sourceLineNo">284</span>  void dump(Log log) {<a 
name="line.284"></a>
+<span class="sourceLineNo">285</span>    for (ImmutableSegment s : segments) 
{<a name="line.285"></a>
+<span class="sourceLineNo">286</span>      s.dump(log);<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    }<a name="line.287"></a>
+<span class="sourceLineNo">288</span>  }<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span>  @Override<a name="line.290"></a>
+<span class="sourceLineNo">291</span>  public String toString() {<a 
name="line.291"></a>
+<span class="sourceLineNo">292</span>    StringBuilder sb =<a 
name="line.292"></a>
+<span class="sourceLineNo">293</span>        new StringBuilder("This is 
CompositeImmutableSegment and those are its segments:: ");<a 
name="line.293"></a>
+<span class="sourceLineNo">294</span>    for (ImmutableSegment s : segments) 
{<a name="line.294"></a>
+<span class="sourceLineNo">295</span>      sb.append(s.toString());<a 
name="line.295"></a>
+<span class="sourceLineNo">296</span>    }<a name="line.296"></a>
+<span class="sourceLineNo">297</span>    return sb.toString();<a 
name="line.297"></a>
+<span class="sourceLineNo">298</span>  }<a name="line.298"></a>
+<span class="sourceLineNo">299</span>}<a name="line.299"></a>
 
 
 

Reply via email to