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/01/07 15:31:00 UTC
[06/36] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f54ec79f/testdevapidocs/src-html/org/apache/hadoop/hbase/thrift/TestThriftServer.MySlowHBaseHandler.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/thrift/TestThriftServer.MySlowHBaseHandler.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/thrift/TestThriftServer.MySlowHBaseHandler.html
index 10c9d49..7dab9fc 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/thrift/TestThriftServer.MySlowHBaseHandler.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/thrift/TestThriftServer.MySlowHBaseHandler.html
@@ -109,7 +109,7 @@
<span class="sourceLineNo">101</span> private static ByteBuffer valueBname = asByteBuffer("valueB");<a name="line.101"></a>
<span class="sourceLineNo">102</span> private static ByteBuffer valueCname = asByteBuffer("valueC");<a name="line.102"></a>
<span class="sourceLineNo">103</span> private static ByteBuffer valueDname = asByteBuffer("valueD");<a name="line.103"></a>
-<span class="sourceLineNo">104</span> private static ByteBuffer valueEname = asByteBuffer(100l);<a name="line.104"></a>
+<span class="sourceLineNo">104</span> private static ByteBuffer valueEname = asByteBuffer(100L);<a name="line.104"></a>
<span class="sourceLineNo">105</span><a name="line.105"></a>
<span class="sourceLineNo">106</span> @Rule<a name="line.106"></a>
<span class="sourceLineNo">107</span> public TestName name = new TestName();<a name="line.107"></a>
@@ -132,761 +132,748 @@
<span class="sourceLineNo">124</span> * consolidate all testing to one method because HBaseClusterTestCase<a name="line.124"></a>
<span class="sourceLineNo">125</span> * is prone to OutOfMemoryExceptions when there are three or more<a name="line.125"></a>
<span class="sourceLineNo">126</span> * JUnit test methods.<a name="line.126"></a>
-<span class="sourceLineNo">127</span> *<a name="line.127"></a>
-<span class="sourceLineNo">128</span> * @throws Exception<a name="line.128"></a>
-<span class="sourceLineNo">129</span> */<a name="line.129"></a>
-<span class="sourceLineNo">130</span> @Test<a name="line.130"></a>
-<span class="sourceLineNo">131</span> public void testAll() throws Exception {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> // Run all tests<a name="line.132"></a>
-<span class="sourceLineNo">133</span> doTestTableCreateDrop();<a name="line.133"></a>
-<span class="sourceLineNo">134</span> doTestThriftMetrics();<a name="line.134"></a>
-<span class="sourceLineNo">135</span> doTestTableMutations();<a name="line.135"></a>
-<span class="sourceLineNo">136</span> doTestTableTimestampsAndColumns();<a name="line.136"></a>
-<span class="sourceLineNo">137</span> doTestTableScanners();<a name="line.137"></a>
-<span class="sourceLineNo">138</span> doTestGetTableRegions();<a name="line.138"></a>
-<span class="sourceLineNo">139</span> doTestFilterRegistration();<a name="line.139"></a>
-<span class="sourceLineNo">140</span> doTestGetRegionInfo();<a name="line.140"></a>
-<span class="sourceLineNo">141</span> doTestIncrements();<a name="line.141"></a>
-<span class="sourceLineNo">142</span> doTestAppend();<a name="line.142"></a>
-<span class="sourceLineNo">143</span> doTestCheckAndPut();<a name="line.143"></a>
-<span class="sourceLineNo">144</span> }<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span> /**<a name="line.146"></a>
-<span class="sourceLineNo">147</span> * Tests for creating, enabling, disabling, and deleting tables. Also<a name="line.147"></a>
-<span class="sourceLineNo">148</span> * tests that creating a table with an invalid column name yields an<a name="line.148"></a>
-<span class="sourceLineNo">149</span> * IllegalArgument exception.<a name="line.149"></a>
-<span class="sourceLineNo">150</span> *<a name="line.150"></a>
-<span class="sourceLineNo">151</span> * @throws Exception<a name="line.151"></a>
-<span class="sourceLineNo">152</span> */<a name="line.152"></a>
-<span class="sourceLineNo">153</span> public void doTestTableCreateDrop() throws Exception {<a name="line.153"></a>
-<span class="sourceLineNo">154</span> ThriftServerRunner.HBaseHandler handler =<a name="line.154"></a>
-<span class="sourceLineNo">155</span> new ThriftServerRunner.HBaseHandler(UTIL.getConfiguration(),<a name="line.155"></a>
-<span class="sourceLineNo">156</span> UserProvider.instantiate(UTIL.getConfiguration()));<a name="line.156"></a>
-<span class="sourceLineNo">157</span> doTestTableCreateDrop(handler);<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> public static void doTestTableCreateDrop(Hbase.Iface handler) throws Exception {<a name="line.160"></a>
-<span class="sourceLineNo">161</span> createTestTables(handler);<a name="line.161"></a>
-<span class="sourceLineNo">162</span> dropTestTables(handler);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> }<a name="line.163"></a>
-<span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span> public static final class MySlowHBaseHandler extends ThriftServerRunner.HBaseHandler<a name="line.165"></a>
-<span class="sourceLineNo">166</span> implements Hbase.Iface {<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span> protected MySlowHBaseHandler(Configuration c)<a name="line.168"></a>
-<span class="sourceLineNo">169</span> throws IOException {<a name="line.169"></a>
-<span class="sourceLineNo">170</span> super(c, UserProvider.instantiate(c));<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 List<ByteBuffer> getTableNames() throws IOError {<a name="line.174"></a>
-<span class="sourceLineNo">175</span> Threads.sleepWithoutInterrupt(3000);<a name="line.175"></a>
-<span class="sourceLineNo">176</span> return super.getTableNames();<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><a name="line.179"></a>
-<span class="sourceLineNo">180</span> /**<a name="line.180"></a>
-<span class="sourceLineNo">181</span> * TODO: These counts are supposed to be zero but sometimes they are not, they are equal to the<a name="line.181"></a>
-<span class="sourceLineNo">182</span> * passed in maybe. Investigate why. My guess is they are set by the test that runs just<a name="line.182"></a>
-<span class="sourceLineNo">183</span> * previous to this one. Sometimes they are cleared. Sometimes not.<a name="line.183"></a>
-<span class="sourceLineNo">184</span> * @param name<a name="line.184"></a>
-<span class="sourceLineNo">185</span> * @param maybe<a name="line.185"></a>
-<span class="sourceLineNo">186</span> * @param metrics<a name="line.186"></a>
-<span class="sourceLineNo">187</span> * @return<a name="line.187"></a>
-<span class="sourceLineNo">188</span> */<a name="line.188"></a>
-<span class="sourceLineNo">189</span> private int getCurrentCount(final String name, final int maybe, final ThriftMetrics metrics) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> int currentCount = 0;<a name="line.190"></a>
-<span class="sourceLineNo">191</span> try {<a name="line.191"></a>
-<span class="sourceLineNo">192</span> metricsHelper.assertCounter(name, maybe, metrics.getSource());<a name="line.192"></a>
-<span class="sourceLineNo">193</span> LOG.info("Shouldn't this be null? name=" + name + ", equals=" + maybe);<a name="line.193"></a>
-<span class="sourceLineNo">194</span> currentCount = maybe;<a name="line.194"></a>
-<span class="sourceLineNo">195</span> } catch (AssertionError e) {<a name="line.195"></a>
-<span class="sourceLineNo">196</span> // Ignore<a name="line.196"></a>
-<span class="sourceLineNo">197</span> }<a name="line.197"></a>
-<span class="sourceLineNo">198</span> return currentCount;<a name="line.198"></a>
-<span class="sourceLineNo">199</span> }<a name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span> /**<a name="line.201"></a>
-<span class="sourceLineNo">202</span> * Tests if the metrics for thrift handler work correctly<a name="line.202"></a>
-<span class="sourceLineNo">203</span> */<a name="line.203"></a>
-<span class="sourceLineNo">204</span> public void doTestThriftMetrics() throws Exception {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> LOG.info("START doTestThriftMetrics");<a name="line.205"></a>
-<span class="sourceLineNo">206</span> Configuration conf = UTIL.getConfiguration();<a name="line.206"></a>
-<span class="sourceLineNo">207</span> ThriftMetrics metrics = getMetrics(conf);<a name="line.207"></a>
-<span class="sourceLineNo">208</span> Hbase.Iface handler = getHandlerForMetricsTest(metrics, conf);<a name="line.208"></a>
-<span class="sourceLineNo">209</span> int currentCountCreateTable = getCurrentCount("createTable_num_ops", 2, metrics);<a name="line.209"></a>
-<span class="sourceLineNo">210</span> int currentCountDeleteTable = getCurrentCount("deleteTable_num_ops", 2, metrics);<a name="line.210"></a>
-<span class="sourceLineNo">211</span> int currentCountDisableTable = getCurrentCount("disableTable_num_ops", 2, metrics);<a name="line.211"></a>
-<span class="sourceLineNo">212</span> createTestTables(handler);<a name="line.212"></a>
-<span class="sourceLineNo">213</span> dropTestTables(handler);<a name="line.213"></a>
-<span class="sourceLineNo">214</span> metricsHelper.assertCounter("createTable_num_ops", currentCountCreateTable + 2,<a name="line.214"></a>
-<span class="sourceLineNo">215</span> metrics.getSource());<a name="line.215"></a>
-<span class="sourceLineNo">216</span> metricsHelper.assertCounter("deleteTable_num_ops", currentCountDeleteTable + 2,<a name="line.216"></a>
-<span class="sourceLineNo">217</span> metrics.getSource());<a name="line.217"></a>
-<span class="sourceLineNo">218</span> metricsHelper.assertCounter("disableTable_num_ops", currentCountDisableTable + 2,<a name="line.218"></a>
-<span class="sourceLineNo">219</span> metrics.getSource());<a name="line.219"></a>
-<span class="sourceLineNo">220</span> handler.getTableNames(); // This will have an artificial delay.<a name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span> // 3 to 6 seconds (to account for potential slowness), measured in nanoseconds<a name="line.222"></a>
-<span class="sourceLineNo">223</span> try {<a name="line.223"></a>
-<span class="sourceLineNo">224</span> metricsHelper.assertGaugeGt("getTableNames_avg_time", 3L * 1000 * 1000 * 1000, metrics.getSource());<a name="line.224"></a>
-<span class="sourceLineNo">225</span> metricsHelper.assertGaugeLt("getTableNames_avg_time",6L * 1000 * 1000 * 1000, metrics.getSource());<a name="line.225"></a>
-<span class="sourceLineNo">226</span> } catch (AssertionError e) {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> LOG.info("Fix me! Why does this happen? A concurrent cluster running?", e);<a name="line.227"></a>
-<span class="sourceLineNo">228</span> }<a name="line.228"></a>
+<span class="sourceLineNo">127</span> */<a name="line.127"></a>
+<span class="sourceLineNo">128</span> @Test<a name="line.128"></a>
+<span class="sourceLineNo">129</span> public void testAll() throws Exception {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> // Run all tests<a name="line.130"></a>
+<span class="sourceLineNo">131</span> doTestTableCreateDrop();<a name="line.131"></a>
+<span class="sourceLineNo">132</span> doTestThriftMetrics();<a name="line.132"></a>
+<span class="sourceLineNo">133</span> doTestTableMutations();<a name="line.133"></a>
+<span class="sourceLineNo">134</span> doTestTableTimestampsAndColumns();<a name="line.134"></a>
+<span class="sourceLineNo">135</span> doTestTableScanners();<a name="line.135"></a>
+<span class="sourceLineNo">136</span> doTestGetTableRegions();<a name="line.136"></a>
+<span class="sourceLineNo">137</span> doTestFilterRegistration();<a name="line.137"></a>
+<span class="sourceLineNo">138</span> doTestGetRegionInfo();<a name="line.138"></a>
+<span class="sourceLineNo">139</span> doTestIncrements();<a name="line.139"></a>
+<span class="sourceLineNo">140</span> doTestAppend();<a name="line.140"></a>
+<span class="sourceLineNo">141</span> doTestCheckAndPut();<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> * Tests for creating, enabling, disabling, and deleting tables. Also<a name="line.145"></a>
+<span class="sourceLineNo">146</span> * tests that creating a table with an invalid column name yields an<a name="line.146"></a>
+<span class="sourceLineNo">147</span> * IllegalArgument exception.<a name="line.147"></a>
+<span class="sourceLineNo">148</span> */<a name="line.148"></a>
+<span class="sourceLineNo">149</span> public void doTestTableCreateDrop() throws Exception {<a name="line.149"></a>
+<span class="sourceLineNo">150</span> ThriftServerRunner.HBaseHandler handler =<a name="line.150"></a>
+<span class="sourceLineNo">151</span> new ThriftServerRunner.HBaseHandler(UTIL.getConfiguration(),<a name="line.151"></a>
+<span class="sourceLineNo">152</span> UserProvider.instantiate(UTIL.getConfiguration()));<a name="line.152"></a>
+<span class="sourceLineNo">153</span> doTestTableCreateDrop(handler);<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> public static void doTestTableCreateDrop(Hbase.Iface handler) throws Exception {<a name="line.156"></a>
+<span class="sourceLineNo">157</span> createTestTables(handler);<a name="line.157"></a>
+<span class="sourceLineNo">158</span> dropTestTables(handler);<a name="line.158"></a>
+<span class="sourceLineNo">159</span> }<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span> public static final class MySlowHBaseHandler extends ThriftServerRunner.HBaseHandler<a name="line.161"></a>
+<span class="sourceLineNo">162</span> implements Hbase.Iface {<a name="line.162"></a>
+<span class="sourceLineNo">163</span><a name="line.163"></a>
+<span class="sourceLineNo">164</span> protected MySlowHBaseHandler(Configuration c)<a name="line.164"></a>
+<span class="sourceLineNo">165</span> throws IOException {<a name="line.165"></a>
+<span class="sourceLineNo">166</span> super(c, UserProvider.instantiate(c));<a name="line.166"></a>
+<span class="sourceLineNo">167</span> }<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span> @Override<a name="line.169"></a>
+<span class="sourceLineNo">170</span> public List<ByteBuffer> getTableNames() throws IOError {<a name="line.170"></a>
+<span class="sourceLineNo">171</span> Threads.sleepWithoutInterrupt(3000);<a name="line.171"></a>
+<span class="sourceLineNo">172</span> return super.getTableNames();<a name="line.172"></a>
+<span class="sourceLineNo">173</span> }<a name="line.173"></a>
+<span class="sourceLineNo">174</span> }<a name="line.174"></a>
+<span class="sourceLineNo">175</span><a name="line.175"></a>
+<span class="sourceLineNo">176</span> /**<a name="line.176"></a>
+<span class="sourceLineNo">177</span> * TODO: These counts are supposed to be zero but sometimes they are not, they are equal to the<a name="line.177"></a>
+<span class="sourceLineNo">178</span> * passed in maybe. Investigate why. My guess is they are set by the test that runs just<a name="line.178"></a>
+<span class="sourceLineNo">179</span> * previous to this one. Sometimes they are cleared. Sometimes not.<a name="line.179"></a>
+<span class="sourceLineNo">180</span> */<a name="line.180"></a>
+<span class="sourceLineNo">181</span> private int getCurrentCount(final String name, final int maybe, final ThriftMetrics metrics) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span> int currentCount = 0;<a name="line.182"></a>
+<span class="sourceLineNo">183</span> try {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> metricsHelper.assertCounter(name, maybe, metrics.getSource());<a name="line.184"></a>
+<span class="sourceLineNo">185</span> LOG.info("Shouldn't this be null? name=" + name + ", equals=" + maybe);<a name="line.185"></a>
+<span class="sourceLineNo">186</span> currentCount = maybe;<a name="line.186"></a>
+<span class="sourceLineNo">187</span> } catch (AssertionError e) {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> // Ignore<a name="line.188"></a>
+<span class="sourceLineNo">189</span> }<a name="line.189"></a>
+<span class="sourceLineNo">190</span> return currentCount;<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> /**<a name="line.193"></a>
+<span class="sourceLineNo">194</span> * Tests if the metrics for thrift handler work correctly<a name="line.194"></a>
+<span class="sourceLineNo">195</span> */<a name="line.195"></a>
+<span class="sourceLineNo">196</span> public void doTestThriftMetrics() throws Exception {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> LOG.info("START doTestThriftMetrics");<a name="line.197"></a>
+<span class="sourceLineNo">198</span> Configuration conf = UTIL.getConfiguration();<a name="line.198"></a>
+<span class="sourceLineNo">199</span> ThriftMetrics metrics = getMetrics(conf);<a name="line.199"></a>
+<span class="sourceLineNo">200</span> Hbase.Iface handler = getHandlerForMetricsTest(metrics, conf);<a name="line.200"></a>
+<span class="sourceLineNo">201</span> int currentCountCreateTable = getCurrentCount("createTable_num_ops", 2, metrics);<a name="line.201"></a>
+<span class="sourceLineNo">202</span> int currentCountDeleteTable = getCurrentCount("deleteTable_num_ops", 2, metrics);<a name="line.202"></a>
+<span class="sourceLineNo">203</span> int currentCountDisableTable = getCurrentCount("disableTable_num_ops", 2, metrics);<a name="line.203"></a>
+<span class="sourceLineNo">204</span> createTestTables(handler);<a name="line.204"></a>
+<span class="sourceLineNo">205</span> dropTestTables(handler);<a name="line.205"></a>
+<span class="sourceLineNo">206</span> metricsHelper.assertCounter("createTable_num_ops", currentCountCreateTable + 2,<a name="line.206"></a>
+<span class="sourceLineNo">207</span> metrics.getSource());<a name="line.207"></a>
+<span class="sourceLineNo">208</span> metricsHelper.assertCounter("deleteTable_num_ops", currentCountDeleteTable + 2,<a name="line.208"></a>
+<span class="sourceLineNo">209</span> metrics.getSource());<a name="line.209"></a>
+<span class="sourceLineNo">210</span> metricsHelper.assertCounter("disableTable_num_ops", currentCountDisableTable + 2,<a name="line.210"></a>
+<span class="sourceLineNo">211</span> metrics.getSource());<a name="line.211"></a>
+<span class="sourceLineNo">212</span> handler.getTableNames(); // This will have an artificial delay.<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span> // 3 to 6 seconds (to account for potential slowness), measured in nanoseconds<a name="line.214"></a>
+<span class="sourceLineNo">215</span> try {<a name="line.215"></a>
+<span class="sourceLineNo">216</span> metricsHelper.assertGaugeGt("getTableNames_avg_time", 3L * 1000 * 1000 * 1000,<a name="line.216"></a>
+<span class="sourceLineNo">217</span> metrics.getSource());<a name="line.217"></a>
+<span class="sourceLineNo">218</span> metricsHelper.assertGaugeLt("getTableNames_avg_time",6L * 1000 * 1000 * 1000,<a name="line.218"></a>
+<span class="sourceLineNo">219</span> metrics.getSource());<a name="line.219"></a>
+<span class="sourceLineNo">220</span> } catch (AssertionError e) {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> LOG.info("Fix me! Why does this happen? A concurrent cluster running?", e);<a name="line.221"></a>
+<span class="sourceLineNo">222</span> }<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> private static Hbase.Iface getHandlerForMetricsTest(ThriftMetrics metrics, Configuration conf)<a name="line.225"></a>
+<span class="sourceLineNo">226</span> throws Exception {<a name="line.226"></a>
+<span class="sourceLineNo">227</span> Hbase.Iface handler = new MySlowHBaseHandler(conf);<a name="line.227"></a>
+<span class="sourceLineNo">228</span> return HbaseHandlerMetricsProxy.newInstance(handler, metrics, conf);<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> private static Hbase.Iface getHandlerForMetricsTest(ThriftMetrics metrics, Configuration conf)<a name="line.231"></a>
-<span class="sourceLineNo">232</span> throws Exception {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> Hbase.Iface handler = new MySlowHBaseHandler(conf);<a name="line.233"></a>
-<span class="sourceLineNo">234</span> return HbaseHandlerMetricsProxy.newInstance(handler, metrics, conf);<a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span> private static ThriftMetrics getMetrics(Configuration conf) throws Exception {<a name="line.237"></a>
-<span class="sourceLineNo">238</span> return new ThriftMetrics( conf, ThriftMetrics.ThriftServerType.ONE);<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><a name="line.241"></a>
-<span class="sourceLineNo">242</span> public static void createTestTables(Hbase.Iface handler) throws Exception {<a name="line.242"></a>
-<span class="sourceLineNo">243</span> // Create/enable/disable/delete tables, ensure methods act correctly<a name="line.243"></a>
-<span class="sourceLineNo">244</span> assertEquals(handler.getTableNames().size(), 0);<a name="line.244"></a>
-<span class="sourceLineNo">245</span> handler.createTable(tableAname, getColumnDescriptors());<a name="line.245"></a>
-<span class="sourceLineNo">246</span> assertEquals(handler.getTableNames().size(), 1);<a name="line.246"></a>
-<span class="sourceLineNo">247</span> assertEquals(handler.getColumnDescriptors(tableAname).size(), 2);<a name="line.247"></a>
-<span class="sourceLineNo">248</span> assertTrue(handler.isTableEnabled(tableAname));<a name="line.248"></a>
-<span class="sourceLineNo">249</span> handler.createTable(tableBname, getColumnDescriptors());<a name="line.249"></a>
-<span class="sourceLineNo">250</span> assertEquals(handler.getTableNames().size(), 2);<a name="line.250"></a>
-<span class="sourceLineNo">251</span> }<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span> public static void checkTableList(Hbase.Iface handler) throws Exception {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> assertTrue(handler.getTableNames().contains(tableAname));<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> public static void dropTestTables(Hbase.Iface handler) throws Exception {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> handler.disableTable(tableBname);<a name="line.258"></a>
-<span class="sourceLineNo">259</span> assertFalse(handler.isTableEnabled(tableBname));<a name="line.259"></a>
-<span class="sourceLineNo">260</span> handler.deleteTable(tableBname);<a name="line.260"></a>
-<span class="sourceLineNo">261</span> assertEquals(handler.getTableNames().size(), 1);<a name="line.261"></a>
-<span class="sourceLineNo">262</span> handler.disableTable(tableAname);<a name="line.262"></a>
-<span class="sourceLineNo">263</span> assertFalse(handler.isTableEnabled(tableAname));<a name="line.263"></a>
-<span class="sourceLineNo">264</span> /* TODO Reenable.<a name="line.264"></a>
-<span class="sourceLineNo">265</span> assertFalse(handler.isTableEnabled(tableAname));<a name="line.265"></a>
-<span class="sourceLineNo">266</span> handler.enableTable(tableAname);<a name="line.266"></a>
-<span class="sourceLineNo">267</span> assertTrue(handler.isTableEnabled(tableAname));<a name="line.267"></a>
-<span class="sourceLineNo">268</span> handler.disableTable(tableAname);*/<a name="line.268"></a>
-<span class="sourceLineNo">269</span> handler.deleteTable(tableAname);<a name="line.269"></a>
-<span class="sourceLineNo">270</span> assertEquals(handler.getTableNames().size(), 0);<a name="line.270"></a>
-<span class="sourceLineNo">271</span> }<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span> public void doTestIncrements() throws Exception {<a name="line.273"></a>
-<span class="sourceLineNo">274</span> ThriftServerRunner.HBaseHandler handler =<a name="line.274"></a>
-<span class="sourceLineNo">275</span> new ThriftServerRunner.HBaseHandler(UTIL.getConfiguration(),<a name="line.275"></a>
-<span class="sourceLineNo">276</span> UserProvider.instantiate(UTIL.getConfiguration()));<a name="line.276"></a>
-<span class="sourceLineNo">277</span> createTestTables(handler);<a name="line.277"></a>
-<span class="sourceLineNo">278</span> doTestIncrements(handler);<a name="line.278"></a>
-<span class="sourceLineNo">279</span> dropTestTables(handler);<a name="line.279"></a>
-<span class="sourceLineNo">280</span> }<a name="line.280"></a>
-<span class="sourceLineNo">281</span><a name="line.281"></a>
-<span class="sourceLineNo">282</span> public static void doTestIncrements(HBaseHandler handler) throws Exception {<a name="line.282"></a>
-<span class="sourceLineNo">283</span> List<Mutation> mutations = new ArrayList<>(1);<a name="line.283"></a>
-<span class="sourceLineNo">284</span> mutations.add(new Mutation(false, columnAAname, valueEname, true));<a name="line.284"></a>
-<span class="sourceLineNo">285</span> mutations.add(new Mutation(false, columnAname, valueEname, true));<a name="line.285"></a>
-<span class="sourceLineNo">286</span> handler.mutateRow(tableAname, rowAname, mutations, null);<a name="line.286"></a>
-<span class="sourceLineNo">287</span> handler.mutateRow(tableAname, rowBname, mutations, null);<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> List<TIncrement> increments = new ArrayList<>(3);<a name="line.289"></a>
-<span class="sourceLineNo">290</span> increments.add(new TIncrement(tableAname, rowBname, columnAAname, 7));<a name="line.290"></a>
-<span class="sourceLineNo">291</span> increments.add(new TIncrement(tableAname, rowBname, columnAAname, 7));<a name="line.291"></a>
-<span class="sourceLineNo">292</span> increments.add(new TIncrement(tableAname, rowBname, columnAAname, 7));<a name="line.292"></a>
+<span class="sourceLineNo">231</span> private static ThriftMetrics getMetrics(Configuration conf) throws Exception {<a name="line.231"></a>
+<span class="sourceLineNo">232</span> return new ThriftMetrics(conf, ThriftMetrics.ThriftServerType.ONE);<a name="line.232"></a>
+<span class="sourceLineNo">233</span> }<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> public static void createTestTables(Hbase.Iface handler) throws Exception {<a name="line.236"></a>
+<span class="sourceLineNo">237</span> // Create/enable/disable/delete tables, ensure methods act correctly<a name="line.237"></a>
+<span class="sourceLineNo">238</span> assertEquals(handler.getTableNames().size(), 0);<a name="line.238"></a>
+<span class="sourceLineNo">239</span> handler.createTable(tableAname, getColumnDescriptors());<a name="line.239"></a>
+<span class="sourceLineNo">240</span> assertEquals(handler.getTableNames().size(), 1);<a name="line.240"></a>
+<span class="sourceLineNo">241</span> assertEquals(handler.getColumnDescriptors(tableAname).size(), 2);<a name="line.241"></a>
+<span class="sourceLineNo">242</span> assertTrue(handler.isTableEnabled(tableAname));<a name="line.242"></a>
+<span class="sourceLineNo">243</span> handler.createTable(tableBname, getColumnDescriptors());<a name="line.243"></a>
+<span class="sourceLineNo">244</span> assertEquals(handler.getTableNames().size(), 2);<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> public static void checkTableList(Hbase.Iface handler) throws Exception {<a name="line.247"></a>
+<span class="sourceLineNo">248</span> assertTrue(handler.getTableNames().contains(tableAname));<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> public static void dropTestTables(Hbase.Iface handler) throws Exception {<a name="line.251"></a>
+<span class="sourceLineNo">252</span> handler.disableTable(tableBname);<a name="line.252"></a>
+<span class="sourceLineNo">253</span> assertFalse(handler.isTableEnabled(tableBname));<a name="line.253"></a>
+<span class="sourceLineNo">254</span> handler.deleteTable(tableBname);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> assertEquals(handler.getTableNames().size(), 1);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> handler.disableTable(tableAname);<a name="line.256"></a>
+<span class="sourceLineNo">257</span> assertFalse(handler.isTableEnabled(tableAname));<a name="line.257"></a>
+<span class="sourceLineNo">258</span> /* TODO Reenable.<a name="line.258"></a>
+<span class="sourceLineNo">259</span> assertFalse(handler.isTableEnabled(tableAname));<a name="line.259"></a>
+<span class="sourceLineNo">260</span> handler.enableTable(tableAname);<a name="line.260"></a>
+<span class="sourceLineNo">261</span> assertTrue(handler.isTableEnabled(tableAname));<a name="line.261"></a>
+<span class="sourceLineNo">262</span> handler.disableTable(tableAname);*/<a name="line.262"></a>
+<span class="sourceLineNo">263</span> handler.deleteTable(tableAname);<a name="line.263"></a>
+<span class="sourceLineNo">264</span> assertEquals(handler.getTableNames().size(), 0);<a name="line.264"></a>
+<span class="sourceLineNo">265</span> }<a name="line.265"></a>
+<span class="sourceLineNo">266</span><a name="line.266"></a>
+<span class="sourceLineNo">267</span> public void doTestIncrements() throws Exception {<a name="line.267"></a>
+<span class="sourceLineNo">268</span> ThriftServerRunner.HBaseHandler handler =<a name="line.268"></a>
+<span class="sourceLineNo">269</span> new ThriftServerRunner.HBaseHandler(UTIL.getConfiguration(),<a name="line.269"></a>
+<span class="sourceLineNo">270</span> UserProvider.instantiate(UTIL.getConfiguration()));<a name="line.270"></a>
+<span class="sourceLineNo">271</span> createTestTables(handler);<a name="line.271"></a>
+<span class="sourceLineNo">272</span> doTestIncrements(handler);<a name="line.272"></a>
+<span class="sourceLineNo">273</span> dropTestTables(handler);<a name="line.273"></a>
+<span class="sourceLineNo">274</span> }<a name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span> public static void doTestIncrements(HBaseHandler handler) throws Exception {<a name="line.276"></a>
+<span class="sourceLineNo">277</span> List<Mutation> mutations = new ArrayList<>(1);<a name="line.277"></a>
+<span class="sourceLineNo">278</span> mutations.add(new Mutation(false, columnAAname, valueEname, true));<a name="line.278"></a>
+<span class="sourceLineNo">279</span> mutations.add(new Mutation(false, columnAname, valueEname, true));<a name="line.279"></a>
+<span class="sourceLineNo">280</span> handler.mutateRow(tableAname, rowAname, mutations, null);<a name="line.280"></a>
+<span class="sourceLineNo">281</span> handler.mutateRow(tableAname, rowBname, mutations, null);<a name="line.281"></a>
+<span class="sourceLineNo">282</span><a name="line.282"></a>
+<span class="sourceLineNo">283</span> List<TIncrement> increments = new ArrayList<>(3);<a name="line.283"></a>
+<span class="sourceLineNo">284</span> increments.add(new TIncrement(tableAname, rowBname, columnAAname, 7));<a name="line.284"></a>
+<span class="sourceLineNo">285</span> increments.add(new TIncrement(tableAname, rowBname, columnAAname, 7));<a name="line.285"></a>
+<span class="sourceLineNo">286</span> increments.add(new TIncrement(tableAname, rowBname, columnAAname, 7));<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span> int numIncrements = 60000;<a name="line.288"></a>
+<span class="sourceLineNo">289</span> for (int i = 0; i < numIncrements; i++) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span> handler.increment(new TIncrement(tableAname, rowAname, columnAname, 2));<a name="line.290"></a>
+<span class="sourceLineNo">291</span> handler.incrementRows(increments);<a name="line.291"></a>
+<span class="sourceLineNo">292</span> }<a name="line.292"></a>
<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span> int numIncrements = 60000;<a name="line.294"></a>
-<span class="sourceLineNo">295</span> for (int i = 0; i < numIncrements; i++) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> handler.increment(new TIncrement(tableAname, rowAname, columnAname, 2));<a name="line.296"></a>
-<span class="sourceLineNo">297</span> handler.incrementRows(increments);<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> Thread.sleep(1000);<a name="line.300"></a>
-<span class="sourceLineNo">301</span> long lv = handler.get(tableAname, rowAname, columnAname, null).get(0).value.getLong();<a name="line.301"></a>
-<span class="sourceLineNo">302</span> // Wait on all increments being flushed<a name="line.302"></a>
-<span class="sourceLineNo">303</span> while (handler.coalescer.getQueueSize() != 0) Threads.sleep(10);<a name="line.303"></a>
-<span class="sourceLineNo">304</span> assertEquals((100 + (2 * numIncrements)), lv );<a name="line.304"></a>
+<span class="sourceLineNo">294</span> Thread.sleep(1000);<a name="line.294"></a>
+<span class="sourceLineNo">295</span> long lv = handler.get(tableAname, rowAname, columnAname, null).get(0).value.getLong();<a name="line.295"></a>
+<span class="sourceLineNo">296</span> // Wait on all increments being flushed<a name="line.296"></a>
+<span class="sourceLineNo">297</span> while (handler.coalescer.getQueueSize() != 0) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> Threads.sleep(10);<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> assertEquals((100 + (2 * numIncrements)), lv);<a name="line.301"></a>
+<span class="sourceLineNo">302</span><a name="line.302"></a>
+<span class="sourceLineNo">303</span> lv = handler.get(tableAname, rowBname, columnAAname, null).get(0).value.getLong();<a name="line.303"></a>
+<span class="sourceLineNo">304</span> assertEquals((100 + (3 * 7 * numIncrements)), lv);<a name="line.304"></a>
<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span><a name="line.306"></a>
-<span class="sourceLineNo">307</span> lv = handler.get(tableAname, rowBname, columnAAname, null).get(0).value.getLong();<a name="line.307"></a>
-<span class="sourceLineNo">308</span> assertEquals((100 + (3 * 7 * numIncrements)), lv);<a name="line.308"></a>
+<span class="sourceLineNo">306</span> assertTrue(handler.coalescer.getSuccessfulCoalescings() > 0);<a name="line.306"></a>
+<span class="sourceLineNo">307</span><a name="line.307"></a>
+<span class="sourceLineNo">308</span> }<a name="line.308"></a>
<span class="sourceLineNo">309</span><a name="line.309"></a>
-<span class="sourceLineNo">310</span> assertTrue(handler.coalescer.getSuccessfulCoalescings() > 0);<a name="line.310"></a>
-<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span> }<a name="line.312"></a>
-<span class="sourceLineNo">313</span><a name="line.313"></a>
-<span class="sourceLineNo">314</span> /**<a name="line.314"></a>
-<span class="sourceLineNo">315</span> * Tests adding a series of Mutations and BatchMutations, including a<a name="line.315"></a>
-<span class="sourceLineNo">316</span> * delete mutation. Also tests data retrieval, and getting back multiple<a name="line.316"></a>
-<span class="sourceLineNo">317</span> * versions.<a name="line.317"></a>
-<span class="sourceLineNo">318</span> *<a name="line.318"></a>
-<span class="sourceLineNo">319</span> * @throws Exception<a name="line.319"></a>
-<span class="sourceLineNo">320</span> */<a name="line.320"></a>
-<span class="sourceLineNo">321</span> public void doTestTableMutations() throws Exception {<a name="line.321"></a>
-<span class="sourceLineNo">322</span> ThriftServerRunner.HBaseHandler handler =<a name="line.322"></a>
-<span class="sourceLineNo">323</span> new ThriftServerRunner.HBaseHandler(UTIL.getConfiguration(),<a name="line.323"></a>
-<span class="sourceLineNo">324</span> UserProvider.instantiate(UTIL.getConfiguration()));<a name="line.324"></a>
-<span class="sourceLineNo">325</span> doTestTableMutations(handler);<a name="line.325"></a>
-<span class="sourceLineNo">326</span> }<a name="line.326"></a>
-<span class="sourceLineNo">327</span><a name="line.327"></a>
-<span class="sourceLineNo">328</span> public static void doTestTableMutations(Hbase.Iface handler) throws Exception {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> // Setup<a name="line.329"></a>
-<span class="sourceLineNo">330</span> handler.createTable(tableAname, getColumnDescriptors());<a name="line.330"></a>
-<span class="sourceLineNo">331</span><a name="line.331"></a>
-<span class="sourceLineNo">332</span> // Apply a few Mutations to rowA<a name="line.332"></a>
-<span class="sourceLineNo">333</span> // mutations.add(new Mutation(false, columnAname, valueAname));<a name="line.333"></a>
-<span class="sourceLineNo">334</span> // mutations.add(new Mutation(false, columnBname, valueBname));<a name="line.334"></a>
-<span class="sourceLineNo">335</span> handler.mutateRow(tableAname, rowAname, getMutations(), null);<a name="line.335"></a>
-<span class="sourceLineNo">336</span><a name="line.336"></a>
-<span class="sourceLineNo">337</span> // Assert that the changes were made<a name="line.337"></a>
-<span class="sourceLineNo">338</span> assertEquals(valueAname,<a name="line.338"></a>
-<span class="sourceLineNo">339</span> handler.get(tableAname, rowAname, columnAname, null).get(0).value);<a name="line.339"></a>
-<span class="sourceLineNo">340</span> TRowResult rowResult1 = handler.getRow(tableAname, rowAname, null).get(0);<a name="line.340"></a>
-<span class="sourceLineNo">341</span> assertEquals(rowAname, rowResult1.row);<a name="line.341"></a>
-<span class="sourceLineNo">342</span> assertEquals(valueBname,<a name="line.342"></a>
-<span class="sourceLineNo">343</span> rowResult1.columns.get(columnBname).value);<a name="line.343"></a>
-<span class="sourceLineNo">344</span><a name="line.344"></a>
-<span class="sourceLineNo">345</span> // Apply a few BatchMutations for rowA and rowB<a name="line.345"></a>
-<span class="sourceLineNo">346</span> // rowAmutations.add(new Mutation(true, columnAname, null));<a name="line.346"></a>
-<span class="sourceLineNo">347</span> // rowAmutations.add(new Mutation(false, columnBname, valueCname));<a name="line.347"></a>
-<span class="sourceLineNo">348</span> // batchMutations.add(new BatchMutation(rowAname, rowAmutations));<a name="line.348"></a>
-<span class="sourceLineNo">349</span> // Mutations to rowB<a name="line.349"></a>
-<span class="sourceLineNo">350</span> // rowBmutations.add(new Mutation(false, columnAname, valueCname));<a name="line.350"></a>
-<span class="sourceLineNo">351</span> // rowBmutations.add(new Mutation(false, columnBname, valueDname));<a name="line.351"></a>
-<span class="sourceLineNo">352</span> // batchMutations.add(new BatchMutation(rowBname, rowBmutations));<a name="line.352"></a>
-<span class="sourceLineNo">353</span> handler.mutateRows(tableAname, getBatchMutations(), null);<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span> // Assert that changes were made to rowA<a name="line.355"></a>
-<span class="sourceLineNo">356</span> List<TCell> cells = handler.get(tableAname, rowAname, columnAname, null);<a name="line.356"></a>
-<span class="sourceLineNo">357</span> assertFalse(cells.size() > 0);<a name="line.357"></a>
-<span class="sourceLineNo">358</span> assertEquals(valueCname, handler.get(tableAname, rowAname, columnBname, null).get(0).value);<a name="line.358"></a>
-<span class="sourceLineNo">359</span> List<TCell> versions = handler.getVer(tableAname, rowAname, columnBname, MAXVERSIONS, null);<a name="line.359"></a>
-<span class="sourceLineNo">360</span> assertEquals(valueCname, versions.get(0).value);<a name="line.360"></a>
-<span class="sourceLineNo">361</span> assertEquals(valueBname, versions.get(1).value);<a name="line.361"></a>
+<span class="sourceLineNo">310</span> /**<a name="line.310"></a>
+<span class="sourceLineNo">311</span> * Tests adding a series of Mutations and BatchMutations, including a<a name="line.311"></a>
+<span class="sourceLineNo">312</span> * delete mutation. Also tests data retrieval, and getting back multiple<a name="line.312"></a>
+<span class="sourceLineNo">313</span> * versions.<a name="line.313"></a>
+<span class="sourceLineNo">314</span> */<a name="line.314"></a>
+<span class="sourceLineNo">315</span> public void doTestTableMutations() throws Exception {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> ThriftServerRunner.HBaseHandler handler =<a name="line.316"></a>
+<span class="sourceLineNo">317</span> new ThriftServerRunner.HBaseHandler(UTIL.getConfiguration(),<a name="line.317"></a>
+<span class="sourceLineNo">318</span> UserProvider.instantiate(UTIL.getConfiguration()));<a name="line.318"></a>
+<span class="sourceLineNo">319</span> doTestTableMutations(handler);<a name="line.319"></a>
+<span class="sourceLineNo">320</span> }<a name="line.320"></a>
+<span class="sourceLineNo">321</span><a name="line.321"></a>
+<span class="sourceLineNo">322</span> public static void doTestTableMutations(Hbase.Iface handler) throws Exception {<a name="line.322"></a>
+<span class="sourceLineNo">323</span> // Setup<a name="line.323"></a>
+<span class="sourceLineNo">324</span> handler.createTable(tableAname, getColumnDescriptors());<a name="line.324"></a>
+<span class="sourceLineNo">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span> // Apply a few Mutations to rowA<a name="line.326"></a>
+<span class="sourceLineNo">327</span> // mutations.add(new Mutation(false, columnAname, valueAname));<a name="line.327"></a>
+<span class="sourceLineNo">328</span> // mutations.add(new Mutation(false, columnBname, valueBname));<a name="line.328"></a>
+<span class="sourceLineNo">329</span> handler.mutateRow(tableAname, rowAname, getMutations(), null);<a name="line.329"></a>
+<span class="sourceLineNo">330</span><a name="line.330"></a>
+<span class="sourceLineNo">331</span> // Assert that the changes were made<a name="line.331"></a>
+<span class="sourceLineNo">332</span> assertEquals(valueAname,<a name="line.332"></a>
+<span class="sourceLineNo">333</span> handler.get(tableAname, rowAname, columnAname, null).get(0).value);<a name="line.333"></a>
+<span class="sourceLineNo">334</span> TRowResult rowResult1 = handler.getRow(tableAname, rowAname, null).get(0);<a name="line.334"></a>
+<span class="sourceLineNo">335</span> assertEquals(rowAname, rowResult1.row);<a name="line.335"></a>
+<span class="sourceLineNo">336</span> assertEquals(valueBname,<a name="line.336"></a>
+<span class="sourceLineNo">337</span> rowResult1.columns.get(columnBname).value);<a name="line.337"></a>
+<span class="sourceLineNo">338</span><a name="line.338"></a>
+<span class="sourceLineNo">339</span> // Apply a few BatchMutations for rowA and rowB<a name="line.339"></a>
+<span class="sourceLineNo">340</span> // rowAmutations.add(new Mutation(true, columnAname, null));<a name="line.340"></a>
+<span class="sourceLineNo">341</span> // rowAmutations.add(new Mutation(false, columnBname, valueCname));<a name="line.341"></a>
+<span class="sourceLineNo">342</span> // batchMutations.add(new BatchMutation(rowAname, rowAmutations));<a name="line.342"></a>
+<span class="sourceLineNo">343</span> // Mutations to rowB<a name="line.343"></a>
+<span class="sourceLineNo">344</span> // rowBmutations.add(new Mutation(false, columnAname, valueCname));<a name="line.344"></a>
+<span class="sourceLineNo">345</span> // rowBmutations.add(new Mutation(false, columnBname, valueDname));<a name="line.345"></a>
+<span class="sourceLineNo">346</span> // batchMutations.add(new BatchMutation(rowBname, rowBmutations));<a name="line.346"></a>
+<span class="sourceLineNo">347</span> handler.mutateRows(tableAname, getBatchMutations(), null);<a name="line.347"></a>
+<span class="sourceLineNo">348</span><a name="line.348"></a>
+<span class="sourceLineNo">349</span> // Assert that changes were made to rowA<a name="line.349"></a>
+<span class="sourceLineNo">350</span> List<TCell> cells = handler.get(tableAname, rowAname, columnAname, null);<a name="line.350"></a>
+<span class="sourceLineNo">351</span> assertFalse(cells.size() > 0);<a name="line.351"></a>
+<span class="sourceLineNo">352</span> assertEquals(valueCname, handler.get(tableAname, rowAname, columnBname, null).get(0).value);<a name="line.352"></a>
+<span class="sourceLineNo">353</span> List<TCell> versions = handler.getVer(tableAname, rowAname, columnBname, MAXVERSIONS, null);<a name="line.353"></a>
+<span class="sourceLineNo">354</span> assertEquals(valueCname, versions.get(0).value);<a name="line.354"></a>
+<span class="sourceLineNo">355</span> assertEquals(valueBname, versions.get(1).value);<a name="line.355"></a>
+<span class="sourceLineNo">356</span><a name="line.356"></a>
+<span class="sourceLineNo">357</span> // Assert that changes were made to rowB<a name="line.357"></a>
+<span class="sourceLineNo">358</span> TRowResult rowResult2 = handler.getRow(tableAname, rowBname, null).get(0);<a name="line.358"></a>
+<span class="sourceLineNo">359</span> assertEquals(rowBname, rowResult2.row);<a name="line.359"></a>
+<span class="sourceLineNo">360</span> assertEquals(valueCname, rowResult2.columns.get(columnAname).value);<a name="line.360"></a>
+<span class="sourceLineNo">361</span> assertEquals(valueDname, rowResult2.columns.get(columnBname).value);<a name="line.361"></a>
<span class="sourceLineNo">362</span><a name="line.362"></a>
-<span class="sourceLineNo">363</span> // Assert that changes were made to rowB<a name="line.363"></a>
-<span class="sourceLineNo">364</span> TRowResult rowResult2 = handler.getRow(tableAname, rowBname, null).get(0);<a name="line.364"></a>
-<span class="sourceLineNo">365</span> assertEquals(rowBname, rowResult2.row);<a name="line.365"></a>
-<span class="sourceLineNo">366</span> assertEquals(valueCname, rowResult2.columns.get(columnAname).value);<a name="line.366"></a>
-<span class="sourceLineNo">367</span> assertEquals(valueDname, rowResult2.columns.get(columnBname).value);<a name="line.367"></a>
-<span class="sourceLineNo">368</span><a name="line.368"></a>
-<span class="sourceLineNo">369</span> // Apply some deletes<a name="line.369"></a>
-<span class="sourceLineNo">370</span> handler.deleteAll(tableAname, rowAname, columnBname, null);<a name="line.370"></a>
-<span class="sourceLineNo">371</span> handler.deleteAllRow(tableAname, rowBname, null);<a name="line.371"></a>
+<span class="sourceLineNo">363</span> // Apply some deletes<a name="line.363"></a>
+<span class="sourceLineNo">364</span> handler.deleteAll(tableAname, rowAname, columnBname, null);<a name="line.364"></a>
+<span class="sourceLineNo">365</span> handler.deleteAllRow(tableAname, rowBname, null);<a name="line.365"></a>
+<span class="sourceLineNo">366</span><a name="line.366"></a>
+<span class="sourceLineNo">367</span> // Assert that the deletes were applied<a name="line.367"></a>
+<span class="sourceLineNo">368</span> int size = handler.get(tableAname, rowAname, columnBname, null).size();<a name="line.368"></a>
+<span class="sourceLineNo">369</span> assertEquals(0, size);<a name="line.369"></a>
+<span class="sourceLineNo">370</span> size = handler.getRow(tableAname, rowBname, null).size();<a name="line.370"></a>
+<span class="sourceLineNo">371</span> assertEquals(0, size);<a name="line.371"></a>
<span class="sourceLineNo">372</span><a name="line.372"></a>
-<span class="sourceLineNo">373</span> // Assert that the deletes were applied<a name="line.373"></a>
-<span class="sourceLineNo">374</span> int size = handler.get(tableAname, rowAname, columnBname, null).size();<a name="line.374"></a>
-<span class="sourceLineNo">375</span> assertEquals(0, size);<a name="line.375"></a>
-<span class="sourceLineNo">376</span> size = handler.getRow(tableAname, rowBname, null).size();<a name="line.376"></a>
-<span class="sourceLineNo">377</span> assertEquals(0, size);<a name="line.377"></a>
-<span class="sourceLineNo">378</span><a name="line.378"></a>
-<span class="sourceLineNo">379</span> // Try null mutation<a name="line.379"></a>
-<span class="sourceLineNo">380</span> List<Mutation> mutations = new ArrayList<>(1);<a name="line.380"></a>
-<span class="sourceLineNo">381</span> mutations.add(new Mutation(false, columnAname, null, true));<a name="line.381"></a>
-<span class="sourceLineNo">382</span> handler.mutateRow(tableAname, rowAname, mutations, null);<a name="line.382"></a>
-<span class="sourceLineNo">383</span> TRowResult rowResult3 = handler.getRow(tableAname, rowAname, null).get(0);<a name="line.383"></a>
-<span class="sourceLineNo">384</span> assertEquals(rowAname, rowResult3.row);<a name="line.384"></a>
-<span class="sourceLineNo">385</span> assertEquals(0, rowResult3.columns.get(columnAname).value.remaining());<a name="line.385"></a>
-<span class="sourceLineNo">386</span><a name="line.386"></a>
-<span class="sourceLineNo">387</span> // Teardown<a name="line.387"></a>
-<span class="sourceLineNo">388</span> handler.disableTable(tableAname);<a name="line.388"></a>
-<span class="sourceLineNo">389</span> handler.deleteTable(tableAname);<a name="line.389"></a>
-<span class="sourceLineNo">390</span> }<a name="line.390"></a>
-<span class="sourceLineNo">391</span><a name="line.391"></a>
-<span class="sourceLineNo">392</span> /**<a name="line.392"></a>
-<span class="sourceLineNo">393</span> * Similar to testTableMutations(), except Mutations are applied with<a name="line.393"></a>
-<span class="sourceLineNo">394</span> * specific timestamps and data retrieval uses these timestamps to<a name="line.394"></a>
-<span class="sourceLineNo">395</span> * extract specific versions of data.<a name="line.395"></a>
-<span class="sourceLineNo">396</span> *<a name="line.396"></a>
-<span class="sourceLineNo">397</span> * @throws Exception<a name="line.397"></a>
-<span class="sourceLineNo">398</span> */<a name="line.398"></a>
-<span class="sourceLineNo">399</span> public void doTestTableTimestampsAndColumns() throws Exception {<a name="line.399"></a>
-<span class="sourceLineNo">400</span> // Setup<a name="line.400"></a>
-<span class="sourceLineNo">401</span> ThriftServerRunner.HBaseHandler handler =<a name="line.401"></a>
-<span class="sourceLineNo">402</span> new ThriftServerRunner.HBaseHandler(UTIL.getConfiguration(),<a name="line.402"></a>
-<span class="sourceLineNo">403</span> UserProvider.instantiate(UTIL.getConfiguration()));<a name="line.403"></a>
-<span class="sourceLineNo">404</span> handler.createTable(tableAname, getColumnDescriptors());<a name="line.404"></a>
-<span class="sourceLineNo">405</span><a name="line.405"></a>
-<span class="sourceLineNo">406</span> // Apply timestamped Mutations to rowA<a name="line.406"></a>
-<span class="sourceLineNo">407</span> long time1 = System.currentTimeMillis();<a name="line.407"></a>
-<span class="sourceLineNo">408</span> handler.mutateRowTs(tableAname, rowAname, getMutations(), time1, null);<a name="line.408"></a>
-<span class="sourceLineNo">409</span><a name="line.409"></a>
-<span class="sourceLineNo">410</span> Thread.sleep(1000);<a name="line.410"></a>
-<span class="sourceLineNo">411</span><a name="line.411"></a>
-<span class="sourceLineNo">412</span> // Apply timestamped BatchMutations for rowA and rowB<a name="line.412"></a>
-<span class="sourceLineNo">413</span> long time2 = System.currentTimeMillis();<a name="line.413"></a>
-<span class="sourceLineNo">414</span> handler.mutateRowsTs(tableAname, getBatchMutations(), time2, null);<a name="line.414"></a>
-<span class="sourceLineNo">415</span><a name="line.415"></a>
-<span class="sourceLineNo">416</span> // Apply an overlapping timestamped mutation to rowB<a name="line.416"></a>
-<span class="sourceLineNo">417</span> handler.mutateRowTs(tableAname, rowBname, getMutations(), time2, null);<a name="line.417"></a>
-<span class="sourceLineNo">418</span><a name="line.418"></a>
-<span class="sourceLineNo">419</span> // the getVerTs is [inf, ts) so you need to increment one.<a name="line.419"></a>
-<span class="sourceLineNo">420</span> time1 += 1;<a name="line.420"></a>
-<span class="sourceLineNo">421</span> time2 += 2;<a name="line.421"></a>
-<span class="sourceLineNo">422</span><a name="line.422"></a>
-<span class="sourceLineNo">423</span> // Assert that the timestamp-related methods retrieve the correct data<a name="line.423"></a>
-<span class="sourceLineNo">424</span> assertEquals(2, handler.getVerTs(tableAname, rowAname, columnBname, time2,<a name="line.424"></a>
-<span class="sourceLineNo">425</span> MAXVERSIONS, null).size());<a name="line.425"></a>
-<span class="sourceLineNo">426</span> assertEquals(1, handler.getVerTs(tableAname, rowAname, columnBname, time1,<a name="line.426"></a>
-<span class="sourceLineNo">427</span> MAXVERSIONS, null).size());<a name="line.427"></a>
-<span class="sourceLineNo">428</span><a name="line.428"></a>
-<span class="sourceLineNo">429</span> TRowResult rowResult1 = handler.getRowTs(tableAname, rowAname, time1, null).get(0);<a name="line.429"></a>
-<span class="sourceLineNo">430</span> TRowResult rowResult2 = handler.getRowTs(tableAname, rowAname, time2, null).get(0);<a name="line.430"></a>
-<span class="sourceLineNo">431</span> // columnA was completely deleted<a name="line.431"></a>
-<span class="sourceLineNo">432</span> //assertTrue(Bytes.equals(rowResult1.columns.get(columnAname).value, valueAname));<a name="line.432"></a>
-<span class="sourceLineNo">433</span> assertEquals(rowResult1.columns.get(columnBname).value, valueBname);<a name="line.433"></a>
-<span class="sourceLineNo">434</span> assertEquals(rowResult2.columns.get(columnBname).value, valueCname);<a name="line.434"></a>
-<span class="sourceLineNo">435</span><a name="line.435"></a>
-<span class="sourceLineNo">436</span> // ColumnAname has been deleted, and will never be visible even with a getRowTs()<a name="line.436"></a>
-<span class="sourceLineNo">437</span> assertFalse(rowResult2.columns.containsKey(columnAname));<a name="line.437"></a>
-<span class="sourceLineNo">438</span><a name="line.438"></a>
-<span class="sourceLineNo">439</span> List<ByteBuffer> columns = new ArrayList<>(1);<a name="line.439"></a>
-<span class="sourceLineNo">440</span> columns.add(columnBname);<a name="line.440"></a>
+<span class="sourceLineNo">373</span> // Try null mutation<a name="line.373"></a>
+<span class="sourceLineNo">374</span> List<Mutation> mutations = new ArrayList<>(1);<a name="line.374"></a>
+<span class="sourceLineNo">375</span> mutations.add(new Mutation(false, columnAname, null, true));<a name="line.375"></a>
+<span class="sourceLineNo">376</span> handler.mutateRow(tableAname, rowAname, mutations, null);<a name="line.376"></a>
+<span class="sourceLineNo">377</span> TRowResult rowResult3 = handler.getRow(tableAname, rowAname, null).get(0);<a name="line.377"></a>
+<span class="sourceLineNo">378</span> assertEquals(rowAname, rowResult3.row);<a name="line.378"></a>
+<span class="sourceLineNo">379</span> assertEquals(0, rowResult3.columns.get(columnAname).value.remaining());<a name="line.379"></a>
+<span class="sourceLineNo">380</span><a name="line.380"></a>
+<span class="sourceLineNo">381</span> // Teardown<a name="line.381"></a>
+<span class="sourceLineNo">382</span> handler.disableTable(tableAname);<a name="line.382"></a>
+<span class="sourceLineNo">383</span> handler.deleteTable(tableAname);<a name="line.383"></a>
+<span class="sourceLineNo">384</span> }<a name="line.384"></a>
+<span class="sourceLineNo">385</span><a name="line.385"></a>
+<span class="sourceLineNo">386</span> /**<a name="line.386"></a>
+<span class="sourceLineNo">387</span> * Similar to testTableMutations(), except Mutations are applied with<a name="line.387"></a>
+<span class="sourceLineNo">388</span> * specific timestamps and data retrieval uses these timestamps to<a name="line.388"></a>
+<span class="sourceLineNo">389</span> * extract specific versions of data.<a name="line.389"></a>
+<span class="sourceLineNo">390</span> */<a name="line.390"></a>
+<span class="sourceLineNo">391</span> public void doTestTableTimestampsAndColumns() throws Exception {<a name="line.391"></a>
+<span class="sourceLineNo">392</span> // Setup<a name="line.392"></a>
+<span class="sourceLineNo">393</span> ThriftServerRunner.HBaseHandler handler =<a name="line.393"></a>
+<span class="sourceLineNo">394</span> new ThriftServerRunner.HBaseHandler(UTIL.getConfiguration(),<a name="line.394"></a>
+<span class="sourceLineNo">395</span> UserProvider.instantiate(UTIL.getConfiguration()));<a name="line.395"></a>
+<span class="sourceLineNo">396</span> handler.createTable(tableAname, getColumnDescriptors());<a name="line.396"></a>
+<span class="sourceLineNo">397</span><a name="line.397"></a>
+<span class="sourceLineNo">398</span> // Apply timestamped Mutations to rowA<a name="line.398"></a>
+<span class="sourceLineNo">399</span> long time1 = System.currentTimeMillis();<a name="line.399"></a>
+<span class="sourceLineNo">400</span> handler.mutateRowTs(tableAname, rowAname, getMutations(), time1, null);<a name="line.400"></a>
+<span class="sourceLineNo">401</span><a name="line.401"></a>
+<span class="sourceLineNo">402</span> Thread.sleep(1000);<a name="line.402"></a>
+<span class="sourceLineNo">403</span><a name="line.403"></a>
+<span class="sourceLineNo">404</span> // Apply timestamped BatchMutations for rowA and rowB<a name="line.404"></a>
+<span class="sourceLineNo">405</span> long time2 = System.currentTimeMillis();<a name="line.405"></a>
+<span class="sourceLineNo">406</span> handler.mutateRowsTs(tableAname, getBatchMutations(), time2, null);<a name="line.406"></a>
+<span class="sourceLineNo">407</span><a name="line.407"></a>
+<span class="sourceLineNo">408</span> // Apply an overlapping timestamped mutation to rowB<a name="line.408"></a>
+<span class="sourceLineNo">409</span> handler.mutateRowTs(tableAname, rowBname, getMutations(), time2, null);<a name="line.409"></a>
+<span class="sourceLineNo">410</span><a name="line.410"></a>
+<span class="sourceLineNo">411</span> // the getVerTs is [inf, ts) so you need to increment one.<a name="line.411"></a>
+<span class="sourceLineNo">412</span> time1 += 1;<a name="line.412"></a>
+<span class="sourceLineNo">413</span> time2 += 2;<a name="line.413"></a>
+<span class="sourceLineNo">414</span><a name="line.414"></a>
+<span class="sourceLineNo">415</span> // Assert that the timestamp-related methods retrieve the correct data<a name="line.415"></a>
+<span class="sourceLineNo">416</span> assertEquals(2, handler.getVerTs(tableAname, rowAname, columnBname, time2,<a name="line.416"></a>
+<span class="sourceLineNo">417</span> MAXVERSIONS, null).size());<a name="line.417"></a>
+<span class="sourceLineNo">418</span> assertEquals(1, handler.getVerTs(tableAname, rowAname, columnBname, time1,<a name="line.418"></a>
+<span class="sourceLineNo">419</span> MAXVERSIONS, null).size());<a name="line.419"></a>
+<span class="sourceLineNo">420</span><a name="line.420"></a>
+<span class="sourceLineNo">421</span> TRowResult rowResult1 = handler.getRowTs(tableAname, rowAname, time1, null).get(0);<a name="line.421"></a>
+<span class="sourceLineNo">422</span> TRowResult rowResult2 = handler.getRowTs(tableAname, rowAname, time2, null).get(0);<a name="line.422"></a>
+<span class="sourceLineNo">423</span> // columnA was completely deleted<a name="line.423"></a>
+<span class="sourceLineNo">424</span> //assertTrue(Bytes.equals(rowResult1.columns.get(columnAname).value, valueAname));<a name="line.424"></a>
+<span class="sourceLineNo">425</span> assertEquals(rowResult1.columns.get(columnBname).value, valueBname);<a name="line.425"></a>
+<span class="sourceLineNo">426</span> assertEquals(rowResult2.columns.get(columnBname).value, valueCname);<a name="line.426"></a>
+<span class="sourceLineNo">427</span><a name="line.427"></a>
+<span class="sourceLineNo">428</span> // ColumnAname has been deleted, and will never be visible even with a getRowTs()<a name="line.428"></a>
+<span class="sourceLineNo">429</span> assertFalse(rowResult2.columns.containsKey(columnAname));<a name="line.429"></a>
+<span class="sourceLineNo">430</span><a name="line.430"></a>
+<span class="sourceLineNo">431</span> List<ByteBuffer> columns = new ArrayList<>(1);<a name="line.431"></a>
+<span class="sourceLineNo">432</span> columns.add(columnBname);<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span> rowResult1 = handler.getRowWithColumns(tableAname, rowAname, columns, null).get(0);<a name="line.434"></a>
+<span class="sourceLineNo">435</span> assertEquals(rowResult1.columns.get(columnBname).value, valueCname);<a name="line.435"></a>
+<span class="sourceLineNo">436</span> assertFalse(rowResult1.columns.containsKey(columnAname));<a name="line.436"></a>
+<span class="sourceLineNo">437</span><a name="line.437"></a>
+<span class="sourceLineNo">438</span> rowResult1 = handler.getRowWithColumnsTs(tableAname, rowAname, columns, time1, null).get(0);<a name="line.438"></a>
+<span class="sourceLineNo">439</span> assertEquals(rowResult1.columns.get(columnBname).value, valueBname);<a name="line.439"></a>
+<span class="sourceLineNo">440</span> assertFalse(rowResult1.columns.containsKey(columnAname));<a name="line.440"></a>
<span class="sourceLineNo">441</span><a name="line.441"></a>
-<span class="sourceLineNo">442</span> rowResult1 = handler.getRowWithColumns(tableAname, rowAname, columns, null).get(0);<a name="line.442"></a>
-<span class="sourceLineNo">443</span> assertEquals(rowResult1.columns.get(columnBname).value, valueCname);<a name="line.443"></a>
-<span class="sourceLineNo">444</span> assertFalse(rowResult1.columns.containsKey(columnAname));<a name="line.444"></a>
-<span class="sourceLineNo">445</span><a name="line.445"></a>
-<span class="sourceLineNo">446</span> rowResult1 = handler.getRowWithColumnsTs(tableAname, rowAname, columns, time1, null).get(0);<a name="line.446"></a>
-<span class="sourceLineNo">447</span> assertEquals(rowResult1.columns.get(columnBname).value, valueBname);<a name="line.447"></a>
-<span class="sourceLineNo">448</span> assertFalse(rowResult1.columns.containsKey(columnAname));<a name="line.448"></a>
-<span class="sourceLineNo">449</span><a name="line.449"></a>
-<span class="sourceLineNo">450</span> // Apply some timestamped deletes<a name="line.450"></a>
-<span class="sourceLineNo">451</span> // this actually deletes _everything_.<a name="line.451"></a>
-<span class="sourceLineNo">452</span> // nukes everything in columnB: forever.<a name="line.452"></a>
-<span class="sourceLineNo">453</span> handler.deleteAllTs(tableAname, rowAname, columnBname, time1, null);<a name="line.453"></a>
-<span class="sourceLineNo">454</span> handler.deleteAllRowTs(tableAname, rowBname, time2, null);<a name="line.454"></a>
-<span class="sourceLineNo">455</span><a name="line.455"></a>
-<span class="sourceLineNo">456</span> // Assert that the timestamp-related methods retrieve the correct data<a name="line.456"></a>
-<span class="sourceLineNo">457</span> int size = handler.getVerTs(tableAname, rowAname, columnBname, time1, MAXVERSIONS, null).size();<a name="line.457"></a>
-<span class="sourceLineNo">458</span> assertEquals(0, size);<a name="line.458"></a>
+<span class="sourceLineNo">442</span> // Apply some timestamped deletes<a name="line.442"></a>
+<span class="sourceLineNo">443</span> // this actually deletes _everything_.<a name="line.443"></a>
+<span class="sourceLineNo">444</span> // nukes everything in columnB: forever.<a name="line.444"></a>
+<span class="sourceLineNo">445</span> handler.deleteAllTs(tableAname, rowAname, columnBname, time1, null);<a name="line.445"></a>
+<span class="sourceLineNo">446</span> handler.deleteAllRowTs(tableAname, rowBname, time2, null);<a name="line.446"></a>
+<span class="sourceLineNo">447</span><a name="line.447"></a>
+<span class="sourceLineNo">448</span> // Assert that the timestamp-related methods retrieve the correct data<a name="line.448"></a>
+<span class="sourceLineNo">449</span> int size = handler.getVerTs(tableAname, rowAname, columnBname, time1, MAXVERSIONS, null).size();<a name="line.449"></a>
+<span class="sourceLineNo">450</span> assertEquals(0, size);<a name="line.450"></a>
+<span class="sourceLineNo">451</span><a name="line.451"></a>
+<span class="sourceLineNo">452</span> size = handler.getVerTs(tableAname, rowAname, columnBname, time2, MAXVERSIONS, null).size();<a name="line.452"></a>
+<span class="sourceLineNo">453</span> assertEquals(1, size);<a name="line.453"></a>
+<span class="sourceLineNo">454</span><a name="line.454"></a>
+<span class="sourceLineNo">455</span> // should be available....<a name="line.455"></a>
+<span class="sourceLineNo">456</span> assertEquals(handler.get(tableAname, rowAname, columnBname, null).get(0).value, valueCname);<a name="line.456"></a>
+<span class="sourceLineNo">457</span><a name="line.457"></a>
+<span class="sourceLineNo">458</span> assertEquals(0, handler.getRow(tableAname, rowBname, null).size());<a name="line.458"></a>
<span class="sourceLineNo">459</span><a name="line.459"></a>
-<span class="sourceLineNo">460</span> size = handler.getVerTs(tableAname, rowAname, columnBname, time2, MAXVERSIONS, null).size();<a name="line.460"></a>
-<span class="sourceLineNo">461</span> assertEquals(1, size);<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span> // should be available....<a name="line.463"></a>
-<span class="sourceLineNo">464</span> assertEquals(handler.get(tableAname, rowAname, columnBname, null).get(0).value, valueCname);<a name="line.464"></a>
-<span class="sourceLineNo">465</span><a name="line.465"></a>
-<span class="sourceLineNo">466</span> assertEquals(0, handler.getRow(tableAname, rowBname, null).size());<a name="line.466"></a>
-<span class="sourceLineNo">467</span><a name="line.467"></a>
-<span class="sourceLineNo">468</span> // Teardown<a name="line.468"></a>
-<span class="sourceLineNo">469</span> handler.disableTable(tableAname);<a name="line.469"></a>
-<span class="sourceLineNo">470</span> handler.deleteTable(tableAname);<a name="line.470"></a>
-<span class="sourceLineNo">471</span> }<a name="line.471"></a>
-<span class="sourceLineNo">472</span><a name="line.472"></a>
-<span class="sourceLineNo">473</span> /**<a name="line.473"></a>
-<span class="sourceLineNo">474</span> * Tests the four different scanner-opening methods (with and without<a name="line.474"></a>
-<span class="sourceLineNo">475</span> * a stoprow, with and without a timestamp).<a name="line.475"></a>
-<span class="sourceLineNo">476</span> *<a name="line.476"></a>
-<span class="sourceLineNo">477</span> * @throws Exception<a name="line.477"></a>
-<span class="sourceLineNo">478</span> */<a name="line.478"></a>
-<span class="sourceLineNo">479</span> public void doTestTableScanners() throws Exception {<a name="line.479"></a>
-<span class="sourceLineNo">480</span> // Setup<a name="line.480"></a>
-<span class="sourceLineNo">481</span> ThriftServerRunner.HBaseHandler handler =<a name="line.481"></a>
-<span class="sourceLineNo">482</span> new ThriftServerRunner.HBaseHandler(UTIL.getConfiguration(),<a name="line.482"></a>
-<span class="sourceLineNo">483</span> UserProvider.instantiate(UTIL.getConfiguration()));<a name="line.483"></a>
-<span class="sourceLineNo">484</span> handler.createTable(tableAname, getColumnDescriptors());<a name="line.484"></a>
-<span class="sourceLineNo">485</span><a name="line.485"></a>
-<span class="sourceLineNo">486</span> // Apply timestamped Mutations to rowA<a name="line.486"></a>
-<span class="sourceLineNo">487</span> long time1 = System.currentTimeMillis();<a name="line.487"></a>
-<span class="sourceLineNo">488</span> handler.mutateRowTs(tableAname, rowAname, getMutations(), time1, null);<a name="line.488"></a>
+<span class="sourceLineNo">460</span> // Teardown<a name="line.460"></a>
+<span class="sourceLineNo">461</span> handler.disableTable(tableAname);<a name="line.461"></a>
+<span class="sourceLineNo">462</span> handler.deleteTable(tableAname);<a name="line.462"></a>
+<span class="sourceLineNo">463</span> }<a name="line.463"></a>
+<span class="sourceLineNo">464</span><a name="line.464"></a>
+<span class="sourceLineNo">465</span> /**<a name="line.465"></a>
+<span class="sourceLineNo">466</span> * Tests the four different scanner-opening methods (with and without<a name="line.466"></a>
+<span class="sourceLineNo">467</span> * a stoprow, with and without a timestamp).<a name="line.467"></a>
+<span class="sourceLineNo">468</span> */<a name="line.468"></a>
+<span class="sourceLineNo">469</span> public void doTestTableScanners() throws Exception {<a name="line.469"></a>
+<span class="sourceLineNo">470</span> // Setup<a name="line.470"></a>
+<span class="sourceLineNo">471</span> ThriftServerRunner.HBaseHandler handler =<a name="line.471"></a>
+<span class="sourceLineNo">472</span> new ThriftServerRunner.HBaseHandler(UTIL.getConfiguration(),<a name="line.472"></a>
+<span class="sourceLineNo">473</span> UserProvider.instantiate(UTIL.getConfiguration()));<a name="line.473"></a>
+<span class="sourceLineNo">474</span> handler.createTable(tableAname, getColumnDescriptors());<a name="line.474"></a>
+<span class="sourceLineNo">475</span><a name="line.475"></a>
+<span class="sourceLineNo">476</span> // Apply timestamped Mutations to rowA<a name="line.476"></a>
+<span class="sourceLineNo">477</span> long time1 = System.currentTimeMillis();<a name="line.477"></a>
+<span class="sourceLineNo">478</span> handler.mutateRowTs(tableAname, rowAname, getMutations(), time1, null);<a name="line.478"></a>
+<span class="sourceLineNo">479</span><a name="line.479"></a>
+<span class="sourceLineNo">480</span> // Sleep to assure that 'time1' and 'time2' will be different even with a<a name="line.480"></a>
+<span class="sourceLineNo">481</span> // coarse grained system timer.<a name="line.481"></a>
+<span class="sourceLineNo">482</span> Thread.sleep(1000);<a name="line.482"></a>
+<span class="sourceLineNo">483</span><a name="line.483"></a>
+<span class="sourceLineNo">484</span> // Apply timestamped BatchMutations for rowA and rowB<a name="line.484"></a>
+<span class="sourceLineNo">485</span> long time2 = System.currentTimeMillis();<a name="line.485"></a>
+<span class="sourceLineNo">486</span> handler.mutateRowsTs(tableAname, getBatchMutations(), time2, null);<a name="line.486"></a>
+<span class="sourceLineNo">487</span><a name="line.487"></a>
+<span class="sourceLineNo">488</span> time1 += 1;<a name="line.488"></a>
<span class="sourceLineNo">489</span><a name="line.489"></a>
-<span class="sourceLineNo">490</span> // Sleep to assure that 'time1' and 'time2' will be different even with a<a name="line.490"></a>
-<span class="sourceLineNo">491</span> // coarse grained system timer.<a name="line.491"></a>
-<span class="sourceLineNo">492</span> Thread.sleep(1000);<a name="line.492"></a>
-<span class="sourceLineNo">493</span><a name="line.493"></a>
-<span class="sourceLineNo">494</span> // Apply timestamped BatchMutations for rowA and rowB<a name="line.494"></a>
-<span class="sourceLineNo">495</span> long time2 = System.currentTimeMillis();<a name="line.495"></a>
-<span class="sourceLineNo">496</span> handler.mutateRowsTs(tableAname, getBatchMutations(), time2, null);<a name="line.496"></a>
-<span class="sourceLineNo">497</span><a name="line.497"></a>
-<span class="sourceLineNo">498</span> time1 += 1;<a name="line.498"></a>
+<span class="sourceLineNo">490</span> // Test a scanner on all rows and all columns, no timestamp<a name="line.490"></a>
+<span class="sourceLineNo">491</span> int scanner1 = handler.scannerOpen(tableAname, rowAname, getColumnList(true, true), null);<a name="line.491"></a>
+<span class="sourceLineNo">492</span> TRowResult rowResult1a = handler.scannerGet(scanner1).get(0);<a name="line.492"></a>
+<span class="sourceLineNo">493</span> assertEquals(rowResult1a.row, rowAname);<a name="line.493"></a>
+<span class="sourceLineNo">494</span> // This used to be '1'. I don't know why when we are asking for two columns<a name="line.494"></a>
+<span class="sourceLineNo">495</span> // and when the mutations above would seem to add two columns to the row.<a name="line.495"></a>
+<span class="sourceLineNo">496</span> // -- St.Ack 05/12/2009<a name="line.496"></a>
+<span class="sourceLineNo">497</span> assertEquals(rowResult1a.columns.size(), 1);<a name="line.497"></a>
+<span class="sourceLineNo">498</span> assertEquals(rowResult1a.columns.get(columnBname).value, valueCname);<a name="line.498"></a>
<span class="sourceLineNo">499</span><a name="line.499"></a>
-<span class="sourceLineNo">500</span> // Test a scanner on all rows and all columns, no timestamp<a name="line.500"></a>
-<span class="sourceLineNo">501</span> int scanner1 = handler.scannerOpen(tableAname, rowAname, getColumnList(true, true), null);<a name="line.501"></a>
-<span class="sourceLineNo">502</span> TRowResult rowResult1a = handler.scannerGet(scanner1).get(0);<a name="line.502"></a>
-<span class="sourceLineNo">503</span> assertEquals(rowResult1a.row, rowAname);<a name="line.503"></a>
-<span class="sourceLineNo">504</span> // This used to be '1'. I don't know why when we are asking for two columns<a name="line.504"></a>
-<span class="sourceLineNo">505</span> // and when the mutations above would seem to add two columns to the row.<a name="line.505"></a>
-<span class="sourceLineNo">506</span> // -- St.Ack 05/12/2009<a name="line.506"></a>
-<span class="sourceLineNo">507</span> assertEquals(rowResult1a.columns.size(), 1);<a name="line.507"></a>
-<span class="sourceLineNo">508</span> assertEquals(rowResult1a.columns.get(columnBname).value, valueCname);<a name="line.508"></a>
-<span class="sourceLineNo">509</span><a name="line.509"></a>
-<span class="sourceLineNo">510</span> TRowResult rowResult1b = handler.scannerGet(scanner1).get(0);<a name="line.510"></a>
-<span class="sourceLineNo">511</span> assertEquals(rowResult1b.row, rowBname);<a name="line.511"></a>
-<span class="sourceLineNo">512</span> assertEquals(rowResult1b.columns.size(), 2);<a name="line.512"></a>
-<span class="sourceLineNo">513</span> assertEquals(rowResult1b.columns.get(columnAname).value, valueCname);<a name="line.513"></a>
-<span class="sourceLineNo">514</span> assertEquals(rowResult1b.columns.get(columnBname).value, valueDname);<a name="line.514"></a>
-<span class="sourceLineNo">515</span> closeScanner(scanner1, handler);<a name="line.515"></a>
+<span class="sourceLineNo">500</span> TRowResult rowResult1b = handler.scannerGet(scanner1).get(0);<a name="line.500"></a>
+<span class="sourceLineNo">501</span> assertEquals(rowResult1b.row, rowBname);<a name="line.501"></a>
+<span class="sourceLineNo">502</span> assertEquals(rowResult1b.columns.size(), 2);<a name="line.502"></a>
+<span class="sourceLineNo">503</span> assertEquals(rowResult1b.columns.get(columnAname).value, valueCname);<a name="line.503"></a>
+<span class="sourceLineNo">504</span> assertEquals(rowResult1b.columns.get(columnBname).value, valueDname);<a name="line.504"></a>
+<span class="sourceLineNo">505</span> closeScanner(scanner1, handler);<a name="line.505"></a>
+<span class="sourceLineNo">506</span><a name="line.506"></a>
+<span class="sourceLineNo">507</span> // Test a scanner on all rows and all columns, with timestamp<a name="line.507"></a>
+<span class="sourceLineNo">508</span> int scanner2 = handler.scannerOpenTs(tableAname, rowAname, getColumnList(true, true), time1,<a name="line.508"></a>
+<span class="sourceLineNo">509</span> null);<a name="line.509"></a>
+<span class="sourceLineNo">510</span> TRowResult rowResult2a = handler.scannerGet(scanner2).get(0);<a name="line.510"></a>
+<span class="sourceLineNo">511</span> assertEquals(rowResult2a.columns.size(), 1);<a name="line.511"></a>
+<span class="sourceLineNo">512</span> // column A deleted, does not exist.<a name="line.512"></a>
+<span class="sourceLineNo">513</span> //assertTrue(Bytes.equals(rowResult2a.columns.get(columnAname).value, valueAname));<a name="line.513"></a>
+<span class="sourceLineNo">514</span> assertEquals(rowResult2a.columns.get(columnBname).value, valueBname);<a name="line.514"></a>
+<span class="sourceLineNo">515</span> closeScanner(scanner2, handler);<a name="line.515"></a>
<span class="sourceLineNo">516</span><a name="line.516"></a>
-<span class="sourceLineNo">517</span> // Test a scanner on all rows and all columns, with timestamp<a name="line.517"></a>
-<span class="sourceLineNo">518</span> int scanner2 = handler.scannerOpenTs(tableAname, rowAname, getColumnList(true, true), time1, null);<a name="line.518"></a>
-<span class="sourceLineNo">519</span> TRowResult rowResult2a = handler.scannerGet(scanner2).get(0);<a name="line.519"></a>
-<span class="sourceLineNo">520</span> assertEquals(rowResult2a.columns.size(), 1);<a name="line.520"></a>
-<span class="sourceLineNo">521</span> // column A deleted, does not exist.<a name="line.521"></a>
-<span class="sourceLineNo">522</span> //assertTrue(Bytes.equals(rowResult2a.columns.get(columnAname).value, valueAname));<a name="line.522"></a>
-<span class="sourceLineNo">523</span> assertEquals(rowResult2a.columns.get(columnBname).value, valueBname);<a name="line.523"></a>
-<span class="sourceLineNo">524</span> closeScanner(scanner2, handler);<a name="line.524"></a>
-<span class="sourceLineNo">525</span><a name="line.525"></a>
-<span class="sourceLineNo">526</span> // Test a scanner on the first row and first column only, no timestamp<a name="line.526"></a>
-<span class="sourceLineNo">527</span> int scanner3 = handler.scannerOpenWithStop(tableAname, rowAname, rowBname,<a name="line.527"></a>
-<span class="sourceLineNo">528</span> getColumnList(true, false), null);<a name="line.528"></a>
-<span class="sourceLineNo">529</span> closeScanner(scanner3, handler);<a name="line.529"></a>
-<span class="sourceLineNo">530</span><a name="line.530"></a>
-<span class="sourceLineNo">531</span> // Test a scanner on the first row and second column only, with timestamp<a name="line.531"></a>
-<span class="sourceLineNo">532</span> int scanner4 = handler.scannerOpenWithStopTs(tableAname, rowAname, rowBname,<a name="line.532"></a>
-<span class="sourceLineNo">533</span> getColumnList(false, true), time1, null);<a name="line.533"></a>
-<span class="sourceLineNo">534</span> TRowResult rowResult4a = handler.scannerGet(scanner4).get(0);<a name="line.534"></a>
-<span class="sourceLineNo">535</span> assertEquals(rowResult4a.columns.size(), 1);<a name="line.535"></a>
-<span class="sourceLineNo">536</span> assertEquals(rowResult4a.columns.get(columnBname).value, valueBname);<a name="line.536"></a>
-<span class="sourceLineNo">537</span><a name="line.537"></a>
-<span class="sourceLineNo">538</span> // Test scanner using a TScan object once with sortColumns False and once with sortColumns true<a name="line.538"></a>
-<span class="sourceLineNo">539</span> TScan scanNoSortColumns = new TScan();<a name="line.539"></a>
-<span class="sourceLineNo">540</span> scanNoSortColumns.setStartRow(rowAname);<a name="line.540"></a>
-<span class="sourceLineNo">541</span> scanNoSortColumns.setStopRow(rowBname);<a name="line.541"></a>
-<span class="sourceLineNo">542</span><a name="line.542"></a>
-<span class="sourceLineNo">543</span> int scanner5 = handler.scannerOpenWithScan(tableAname , scanNoSortColumns, null);<a name="line.543"></a>
-<span class="sourceLineNo">544</span> TRowResult rowResult5 = handler.scannerGet(scanner5).get(0);<a name="line.544"></a>
-<span class="sourceLineNo">545</span> assertEquals(rowResult5.columns.size(), 1);<a name="line.545"></a>
-<span class="sourceLineNo">546</span> assertEquals(rowResult5.columns.get(columnBname).value, valueCname);<a name="line.546"></a>
-<span class="sourceLineNo">547</span><a name="line.547"></a>
-<span class="sourceLineNo">548</span> TScan scanSortColumns = new TScan();<a name="line.548"></a>
-<span class="sourceLineNo">549</span> scanSortColumns.setStartRow(rowAname);<a name="line.549"></a>
-<span class="sourceLineNo">550</span> scanSortColumns.setStopRow(rowBname);<a name="line.550"></a>
-<span class="sourceLineNo">551</span> scanSortColumns = scanSortColumns.setSortColumns(true);<a name="line.551"></a>
-<span class="sourceLineNo">552</span><a name="line.552"></a>
-<span class="sourceLineNo">553</span> int scanner6 = handler.scannerOpenWithScan(tableAname ,scanSortColumns, null);<a name="line.553"></a>
-<span class="sourceLineNo">554</span> TRowResult rowResult6 = handler.scannerGet(scanner6).get(0);<a name="line.554"></a>
-<span class="sourceLineNo">555</span> assertEquals(rowResult6.sortedColumns.size(), 1);<a name="line.555"></a>
-<span class="sourceLineNo">556</span> assertEquals(rowResult6.sortedColumns.get(0).getCell().value, valueCname);<a name="line.556"></a>
-<span class="sourceLineNo">557</span><a name="line.557"></a>
-<span class="sourceLineNo">558</span> List<Mutation> rowBmutations = new ArrayList<>(20);<a name="line.558"></a>
-<span class="sourceLineNo">559</span> for (int i = 0; i < 20; i++) {<a name="line.559"></a>
-<span class="sourceLineNo">560</span> rowBmutations.add(new Mutation(false, asByteBuffer("columnA:" + i), valueCname, true));<a name="line.560"></a>
-<span class="sourceLineNo">561</span> }<a name="line.561"></a>
-<span class="sourceLineNo">562</span> ByteBuffer rowC = asByteBuffer("rowC");<a name="line.562"></a>
-<span class="sourceLineNo">563</span> handler.mutateRow(tableAname, rowC, rowBmutations, null);<a name="line.563"></a>
-<span class="sourceLineNo">564</span><a name="line.564"></a>
-<span class="sourceLineNo">565</span> TScan scanSortMultiColumns = new TScan();<a name="line.565"></a>
-<span class="sourceLineNo">566</span> scanSortMultiColumns.setStartRow(rowC);<a name="line.566"></a>
-<span class="sourceLineNo">567</span> scanSortMultiColumns = scanSortMultiColumns.setSortColumns(true);<a name="line.567"></a>
-<span class="sourceLineNo">568</span> int scanner7 = handler.scannerOpenWithScan(tableAname, scanSortMultiColumns, null);<a name="line.568"></a>
-<span class="sourceLineNo">569</span> TRowResult rowResult7 = handler.scannerGet(scanner7).get(0);<a name="line.569"></a>
-<span class="sourceLineNo">570</span><a name="line.570"></a>
-<span class="sourceLineNo">571</span> ByteBuffer smallerColumn = asByteBuffer("columnA:");<a name="line.571"></a>
-<span class="sourceLineNo">572</span> for (int i = 0; i < 20; i++) {<a name="line.572"></a>
-<span class="sourceLineNo">573</span> ByteBuffer currentColumn = rowResult7.sortedColumns.get(i).columnName;<a name="line.573"></a>
-<span class="sourceLineNo">574</span> assertTrue(Bytes.compareTo(smallerColumn.array(), currentColumn.array()) < 0);<a name="line.574"></a>
-<span class="sourceLineNo">575</span> smallerColumn = currentColumn;<a name="line.575"></a>
-<span class="sourceLineNo">576</span> }<a name="line.576"></a>
-<span class="sourceLineNo">577</span><a name="line.577"></a>
-<span class="sourceLineNo">578</span> TScan reversedScan = new TScan();<a name="line.578"></a>
-<span class="sourceLineNo">579</span> reversedScan.setReversed(true);<a name="line.579"></a>
-<span class="sourceLineNo">580</span> reversedScan.setStartRow(rowBname);<a name="line.580"></a>
-<span class="sourceLineNo">581</span> reversedScan.setStopRow(rowAname);<a name="line.581"></a>
-<span class="sourceLineNo">582</span><a name="line.582"></a>
-<span class="sourceLineNo">583</span> int scanner8 = handler.scannerOpenWithScan(tableAname , reversedScan, null);<a name="line.583"></a>
-<span class="sourceLineNo">584</span> List<TRowResult> results = handler.scannerGet(scanner8);<a name="line.584"></a>
-<span class="sourceLineNo">585</span> handler.scannerClose(scanner8);<a name="line.585"></a>
-<span class="sourceLineNo">586</span> assertEquals(results.size(), 1);<a name="line.586"></a>
-<span class="sourceLineNo">587</span> assertEquals(ByteBuffer.wrap(results.get(0).getRow()), rowBname);<a name="line.587"></a>
-<span class="sourceLineNo">588</span><a name="line.588"></a>
-<span class="sourceLineNo">589</span> // Teardown<a name="line.589"></a>
-<span class="sourceLineNo">590</span> handler.disableTable(tableAname);<a name="line.590"></a>
-<span class="sourceLineNo">591</span> handler.deleteTable(tableAname);<a name="line.591"></a>
-<span class="sourceLineNo">592</span> }<a name="line.592"></a>
-<span class="sourceLineNo">593</span><a name="line.593"></a>
-<span clas
<TRUNCATED>