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/06/23 23:25:39 UTC
[2/3] hbase-site git commit: Published site at
55147c7eae784ebd9b4c5149112c6ec2623e4d48.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3e0aae41/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMultiParallel.MyMasterObserver.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMultiParallel.MyMasterObserver.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMultiParallel.MyMasterObserver.html
index 9e8e892..403d780 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMultiParallel.MyMasterObserver.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMultiParallel.MyMasterObserver.html
@@ -55,45 +55,45 @@
<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.coprocessor.MasterCoprocessorEnvironment;<a name="line.47"></a>
<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.coprocessor.MasterObserver;<a name="line.48"></a>
<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.coprocessor.ObserverContext;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.master.LoadBalancer;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.master.RegionPlan;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.testclassification.FlakeyTests;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.util.JVMClusterUtil;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.util.Threads;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.junit.AfterClass;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.junit.Assert;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.junit.Before;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>import org.junit.BeforeClass;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>import org.junit.ClassRule;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>import org.junit.Test;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>import org.junit.experimental.categories.Category;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>import org.slf4j.Logger;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>import org.slf4j.LoggerFactory;<a name="line.65"></a>
-<span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span>@Category({MediumTests.class, FlakeyTests.class})<a name="line.67"></a>
-<span class="sourceLineNo">068</span>public class TestMultiParallel {<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span> @ClassRule<a name="line.70"></a>
-<span class="sourceLineNo">071</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.71"></a>
-<span class="sourceLineNo">072</span> HBaseClassTestRule.forClass(TestMultiParallel.class);<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span> private static final Logger LOG = LoggerFactory.getLogger(TestMultiParallel.class);<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span> private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.76"></a>
-<span class="sourceLineNo">077</span> private static final byte[] VALUE = Bytes.toBytes("value");<a name="line.77"></a>
-<span class="sourceLineNo">078</span> private static final byte[] QUALIFIER = Bytes.toBytes("qual");<a name="line.78"></a>
-<span class="sourceLineNo">079</span> private static final String FAMILY = "family";<a name="line.79"></a>
-<span class="sourceLineNo">080</span> private static final TableName TEST_TABLE = TableName.valueOf("multi_test_table");<a name="line.80"></a>
-<span class="sourceLineNo">081</span> private static final byte[] BYTES_FAMILY = Bytes.toBytes(FAMILY);<a name="line.81"></a>
-<span class="sourceLineNo">082</span> private static final byte[] ONE_ROW = Bytes.toBytes("xxx");<a name="line.82"></a>
-<span class="sourceLineNo">083</span> private static final byte [][] KEYS = makeKeys();<a name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span> private static final int slaves = 5; // also used for testing HTable pool size<a name="line.85"></a>
-<span class="sourceLineNo">086</span> private static Connection CONNECTION;<a name="line.86"></a>
-<span class="sourceLineNo">087</span><a name="line.87"></a>
-<span class="sourceLineNo">088</span> @BeforeClass public static void beforeClass() throws Exception {<a name="line.88"></a>
+<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.master.RegionPlan;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.testclassification.FlakeyTests;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.util.JVMClusterUtil;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.util.Threads;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.junit.AfterClass;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.junit.Assert;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.junit.Before;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.junit.BeforeClass;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import org.junit.ClassRule;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>import org.junit.Test;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>import org.junit.experimental.categories.Category;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>import org.slf4j.Logger;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>import org.slf4j.LoggerFactory;<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span>@Category({MediumTests.class, FlakeyTests.class})<a name="line.66"></a>
+<span class="sourceLineNo">067</span>public class TestMultiParallel {<a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span> @ClassRule<a name="line.69"></a>
+<span class="sourceLineNo">070</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.70"></a>
+<span class="sourceLineNo">071</span> HBaseClassTestRule.forClass(TestMultiParallel.class);<a name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span> private static final Logger LOG = LoggerFactory.getLogger(TestMultiParallel.class);<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span> private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.75"></a>
+<span class="sourceLineNo">076</span> private static final byte[] VALUE = Bytes.toBytes("value");<a name="line.76"></a>
+<span class="sourceLineNo">077</span> private static final byte[] QUALIFIER = Bytes.toBytes("qual");<a name="line.77"></a>
+<span class="sourceLineNo">078</span> private static final String FAMILY = "family";<a name="line.78"></a>
+<span class="sourceLineNo">079</span> private static final TableName TEST_TABLE = TableName.valueOf("multi_test_table");<a name="line.79"></a>
+<span class="sourceLineNo">080</span> private static final byte[] BYTES_FAMILY = Bytes.toBytes(FAMILY);<a name="line.80"></a>
+<span class="sourceLineNo">081</span> private static final byte[] ONE_ROW = Bytes.toBytes("xxx");<a name="line.81"></a>
+<span class="sourceLineNo">082</span> private static final byte [][] KEYS = makeKeys();<a name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span> private static final int slaves = 5; // also used for testing HTable pool size<a name="line.84"></a>
+<span class="sourceLineNo">085</span> private static Connection CONNECTION;<a name="line.85"></a>
+<span class="sourceLineNo">086</span><a name="line.86"></a>
+<span class="sourceLineNo">087</span> @BeforeClass<a name="line.87"></a>
+<span class="sourceLineNo">088</span> public static void beforeClass() throws Exception {<a name="line.88"></a>
<span class="sourceLineNo">089</span> // Uncomment the following lines if more verbosity is needed for<a name="line.89"></a>
<span class="sourceLineNo">090</span> // debugging (see HBASE-12285 for details).<a name="line.90"></a>
<span class="sourceLineNo">091</span> //((Log4JLogger)RpcServer.LOG).getLogger().setLevel(Level.ALL);<a name="line.91"></a>
@@ -101,90 +101,90 @@
<span class="sourceLineNo">093</span> //((Log4JLogger)ScannerCallable.LOG).getLogger().setLevel(Level.ALL);<a name="line.93"></a>
<span class="sourceLineNo">094</span> UTIL.getConfiguration().set(HConstants.RPC_CODEC_CONF_KEY,<a name="line.94"></a>
<span class="sourceLineNo">095</span> KeyValueCodec.class.getCanonicalName());<a name="line.95"></a>
-<span class="sourceLineNo">096</span> UTIL.getConfiguration().setBoolean(LoadBalancer.TABLES_ON_MASTER, true);<a name="line.96"></a>
-<span class="sourceLineNo">097</span> // We used to ask for system tables on Master exclusively but not needed by test and doesn't<a name="line.97"></a>
-<span class="sourceLineNo">098</span> // work anyways -- so commented out.<a name="line.98"></a>
-<span class="sourceLineNo">099</span> // UTIL.getConfiguration().setBoolean(LoadBalancer.SYSTEM_TABLES_ON_MASTER, true);<a name="line.99"></a>
-<span class="sourceLineNo">100</span> UTIL.getConfiguration()<a name="line.100"></a>
-<span class="sourceLineNo">101</span> .set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY, MyMasterObserver.class.getName());<a name="line.101"></a>
-<span class="sourceLineNo">102</span> UTIL.startMiniCluster(slaves);<a name="line.102"></a>
-<span class="sourceLineNo">103</span> Table t = UTIL.createMultiRegionTable(TEST_TABLE, Bytes.toBytes(FAMILY));<a name="line.103"></a>
-<span class="sourceLineNo">104</span> UTIL.waitTableEnabled(TEST_TABLE);<a name="line.104"></a>
-<span class="sourceLineNo">105</span> t.close();<a name="line.105"></a>
-<span class="sourceLineNo">106</span> CONNECTION = ConnectionFactory.createConnection(UTIL.getConfiguration());<a name="line.106"></a>
-<span class="sourceLineNo">107</span> assertTrue(MyMasterObserver.start.get());<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> @AfterClass public static void afterClass() throws Exception {<a name="line.110"></a>
-<span class="sourceLineNo">111</span> CONNECTION.close();<a name="line.111"></a>
-<span class="sourceLineNo">112</span> UTIL.shutdownMiniCluster();<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> @Before public void before() throws Exception {<a name="line.115"></a>
-<span class="sourceLineNo">116</span> final int balanceCount = MyMasterObserver.postBalanceCount.get();<a name="line.116"></a>
-<span class="sourceLineNo">117</span> LOG.info("before");<a name="line.117"></a>
-<span class="sourceLineNo">118</span> if (UTIL.ensureSomeRegionServersAvailable(slaves)) {<a name="line.118"></a>
-<span class="sourceLineNo">119</span> // Distribute regions<a name="line.119"></a>
-<span class="sourceLineNo">120</span> UTIL.getMiniHBaseCluster().getMaster().balance();<a name="line.120"></a>
-<span class="sourceLineNo">121</span> // Some plans are created.<a name="line.121"></a>
-<span class="sourceLineNo">122</span> if (MyMasterObserver.postBalanceCount.get() > balanceCount) {<a name="line.122"></a>
-<span class="sourceLineNo">123</span> // It is necessary to wait the move procedure to start.<a name="line.123"></a>
-<span class="sourceLineNo">124</span> // Otherwise, the next wait may pass immediately.<a name="line.124"></a>
-<span class="sourceLineNo">125</span> UTIL.waitFor(3 * 1000, 100, false, () -><a name="line.125"></a>
-<span class="sourceLineNo">126</span> UTIL.getMiniHBaseCluster().getMaster().getAssignmentManager().hasRegionsInTransition()<a name="line.126"></a>
-<span class="sourceLineNo">127</span> );<a name="line.127"></a>
-<span class="sourceLineNo">128</span> }<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span> // Wait until completing balance<a name="line.130"></a>
-<span class="sourceLineNo">131</span> UTIL.waitUntilAllRegionsAssigned(TEST_TABLE);<a name="line.131"></a>
-<span class="sourceLineNo">132</span> }<a name="line.132"></a>
-<span class="sourceLineNo">133</span> LOG.info("before done");<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> private static byte[][] makeKeys() {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> byte [][] starterKeys = HBaseTestingUtility.KEYS;<a name="line.137"></a>
-<span class="sourceLineNo">138</span> // Create a "non-uniform" test set with the following characteristics:<a name="line.138"></a>
-<span class="sourceLineNo">139</span> // a) Unequal number of keys per region<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span> // Don't use integer as a multiple, so that we have a number of keys that is<a name="line.141"></a>
-<span class="sourceLineNo">142</span> // not a multiple of the number of regions<a name="line.142"></a>
-<span class="sourceLineNo">143</span> int numKeys = (int) (starterKeys.length * 10.33F);<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span> List<byte[]> keys = new ArrayList<>();<a name="line.145"></a>
-<span class="sourceLineNo">146</span> for (int i = 0; i < numKeys; i++) {<a name="line.146"></a>
-<span class="sourceLineNo">147</span> int kIdx = i % starterKeys.length;<a name="line.147"></a>
-<span class="sourceLineNo">148</span> byte[] k = starterKeys[kIdx];<a name="line.148"></a>
-<span class="sourceLineNo">149</span> byte[] cp = new byte[k.length + 1];<a name="line.149"></a>
-<span class="sourceLineNo">150</span> System.arraycopy(k, 0, cp, 0, k.length);<a name="line.150"></a>
-<span class="sourceLineNo">151</span> cp[k.length] = new Integer(i % 256).byteValue();<a name="line.151"></a>
-<span class="sourceLineNo">152</span> keys.add(cp);<a name="line.152"></a>
-<span class="sourceLineNo">153</span> }<a name="line.153"></a>
-<span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span> // b) Same duplicate keys (showing multiple Gets/Puts to the same row, which<a name="line.155"></a>
-<span class="sourceLineNo">156</span> // should work)<a name="line.156"></a>
-<span class="sourceLineNo">157</span> // c) keys are not in sorted order (within a region), to ensure that the<a name="line.157"></a>
-<span class="sourceLineNo">158</span> // sorting code and index mapping doesn't break the functionality<a name="line.158"></a>
-<span class="sourceLineNo">159</span> for (int i = 0; i < 100; i++) {<a name="line.159"></a>
-<span class="sourceLineNo">160</span> int kIdx = i % starterKeys.length;<a name="line.160"></a>
-<span class="sourceLineNo">161</span> byte[] k = starterKeys[kIdx];<a name="line.161"></a>
-<span class="sourceLineNo">162</span> byte[] cp = new byte[k.length + 1];<a name="line.162"></a>
-<span class="sourceLineNo">163</span> System.arraycopy(k, 0, cp, 0, k.length);<a name="line.163"></a>
-<span class="sourceLineNo">164</span> cp[k.length] = new Integer(i % 256).byteValue();<a name="line.164"></a>
-<span class="sourceLineNo">165</span> keys.add(cp);<a name="line.165"></a>
-<span class="sourceLineNo">166</span> }<a name="line.166"></a>
-<span class="sourceLineNo">167</span> return keys.toArray(new byte [][] {new byte [] {}});<a name="line.167"></a>
-<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span><a name="line.170"></a>
-<span class="sourceLineNo">171</span> /**<a name="line.171"></a>
-<span class="sourceLineNo">172</span> * This is for testing the active number of threads that were used while<a name="line.172"></a>
-<span class="sourceLineNo">173</span> * doing a batch operation. It inserts one row per region via the batch<a name="line.173"></a>
-<span class="sourceLineNo">174</span> * operation, and then checks the number of active threads.<a name="line.174"></a>
-<span class="sourceLineNo">175</span> * For HBASE-3553<a name="line.175"></a>
-<span class="sourceLineNo">176</span> * @throws IOException<a name="line.176"></a>
-<span class="sourceLineNo">177</span> * @throws InterruptedException<a name="line.177"></a>
-<span class="sourceLineNo">178</span> * @throws NoSuchFieldException<a name="line.178"></a>
-<span class="sourceLineNo">179</span> * @throws SecurityException<a name="line.179"></a>
+<span class="sourceLineNo">096</span> // Disable table on master for now as the feature is broken<a name="line.96"></a>
+<span class="sourceLineNo">097</span> //UTIL.getConfiguration().setBoolean(LoadBalancer.TABLES_ON_MASTER, true);<a name="line.97"></a>
+<span class="sourceLineNo">098</span> // We used to ask for system tables on Master exclusively but not needed by test and doesn't<a name="line.98"></a>
+<span class="sourceLineNo">099</span> // work anyways -- so commented out.<a name="line.99"></a>
+<span class="sourceLineNo">100</span> // UTIL.getConfiguration().setBoolean(LoadBalancer.SYSTEM_TABLES_ON_MASTER, true);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> UTIL.getConfiguration()<a name="line.101"></a>
+<span class="sourceLineNo">102</span> .set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY, MyMasterObserver.class.getName());<a name="line.102"></a>
+<span class="sourceLineNo">103</span> UTIL.startMiniCluster(slaves);<a name="line.103"></a>
+<span class="sourceLineNo">104</span> Table t = UTIL.createMultiRegionTable(TEST_TABLE, Bytes.toBytes(FAMILY));<a name="line.104"></a>
+<span class="sourceLineNo">105</span> UTIL.waitTableEnabled(TEST_TABLE);<a name="line.105"></a>
+<span class="sourceLineNo">106</span> t.close();<a name="line.106"></a>
+<span class="sourceLineNo">107</span> CONNECTION = ConnectionFactory.createConnection(UTIL.getConfiguration());<a name="line.107"></a>
+<span class="sourceLineNo">108</span> assertTrue(MyMasterObserver.start.get());<a name="line.108"></a>
+<span class="sourceLineNo">109</span> }<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span> @AfterClass<a name="line.111"></a>
+<span class="sourceLineNo">112</span> public static void afterClass() throws Exception {<a name="line.112"></a>
+<span class="sourceLineNo">113</span> CONNECTION.close();<a name="line.113"></a>
+<span class="sourceLineNo">114</span> UTIL.shutdownMiniCluster();<a name="line.114"></a>
+<span class="sourceLineNo">115</span> }<a name="line.115"></a>
+<span class="sourceLineNo">116</span><a name="line.116"></a>
+<span class="sourceLineNo">117</span> @Before<a name="line.117"></a>
+<span class="sourceLineNo">118</span> public void before() throws Exception {<a name="line.118"></a>
+<span class="sourceLineNo">119</span> final int balanceCount = MyMasterObserver.postBalanceCount.get();<a name="line.119"></a>
+<span class="sourceLineNo">120</span> LOG.info("before");<a name="line.120"></a>
+<span class="sourceLineNo">121</span> if (UTIL.ensureSomeRegionServersAvailable(slaves)) {<a name="line.121"></a>
+<span class="sourceLineNo">122</span> // Distribute regions<a name="line.122"></a>
+<span class="sourceLineNo">123</span> UTIL.getMiniHBaseCluster().getMaster().balance();<a name="line.123"></a>
+<span class="sourceLineNo">124</span> // Some plans are created.<a name="line.124"></a>
+<span class="sourceLineNo">125</span> if (MyMasterObserver.postBalanceCount.get() > balanceCount) {<a name="line.125"></a>
+<span class="sourceLineNo">126</span> // It is necessary to wait the move procedure to start.<a name="line.126"></a>
+<span class="sourceLineNo">127</span> // Otherwise, the next wait may pass immediately.<a name="line.127"></a>
+<span class="sourceLineNo">128</span> UTIL.waitFor(3 * 1000, 100, false, () -><a name="line.128"></a>
+<span class="sourceLineNo">129</span> UTIL.getMiniHBaseCluster().getMaster().getAssignmentManager().hasRegionsInTransition()<a name="line.129"></a>
+<span class="sourceLineNo">130</span> );<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> // Wait until completing balance<a name="line.133"></a>
+<span class="sourceLineNo">134</span> UTIL.waitUntilAllRegionsAssigned(TEST_TABLE);<a name="line.134"></a>
+<span class="sourceLineNo">135</span> }<a name="line.135"></a>
+<span class="sourceLineNo">136</span> LOG.info("before done");<a name="line.136"></a>
+<span class="sourceLineNo">137</span> }<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span> private static byte[][] makeKeys() {<a name="line.139"></a>
+<span class="sourceLineNo">140</span> byte [][] starterKeys = HBaseTestingUtility.KEYS;<a name="line.140"></a>
+<span class="sourceLineNo">141</span> // Create a "non-uniform" test set with the following characteristics:<a name="line.141"></a>
+<span class="sourceLineNo">142</span> // a) Unequal number of keys per region<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span> // Don't use integer as a multiple, so that we have a number of keys that is<a name="line.144"></a>
+<span class="sourceLineNo">145</span> // not a multiple of the number of regions<a name="line.145"></a>
+<span class="sourceLineNo">146</span> int numKeys = (int) (starterKeys.length * 10.33F);<a name="line.146"></a>
+<span class="sourceLineNo">147</span><a name="line.147"></a>
+<span class="sourceLineNo">148</span> List<byte[]> keys = new ArrayList<>();<a name="line.148"></a>
+<span class="sourceLineNo">149</span> for (int i = 0; i < numKeys; i++) {<a name="line.149"></a>
+<span class="sourceLineNo">150</span> int kIdx = i % starterKeys.length;<a name="line.150"></a>
+<span class="sourceLineNo">151</span> byte[] k = starterKeys[kIdx];<a name="line.151"></a>
+<span class="sourceLineNo">152</span> byte[] cp = new byte[k.length + 1];<a name="line.152"></a>
+<span class="sourceLineNo">153</span> System.arraycopy(k, 0, cp, 0, k.length);<a name="line.153"></a>
+<span class="sourceLineNo">154</span> cp[k.length] = new Integer(i % 256).byteValue();<a name="line.154"></a>
+<span class="sourceLineNo">155</span> keys.add(cp);<a name="line.155"></a>
+<span class="sourceLineNo">156</span> }<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span> // b) Same duplicate keys (showing multiple Gets/Puts to the same row, which<a name="line.158"></a>
+<span class="sourceLineNo">159</span> // should work)<a name="line.159"></a>
+<span class="sourceLineNo">160</span> // c) keys are not in sorted order (within a region), to ensure that the<a name="line.160"></a>
+<span class="sourceLineNo">161</span> // sorting code and index mapping doesn't break the functionality<a name="line.161"></a>
+<span class="sourceLineNo">162</span> for (int i = 0; i < 100; i++) {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> int kIdx = i % starterKeys.length;<a name="line.163"></a>
+<span class="sourceLineNo">164</span> byte[] k = starterKeys[kIdx];<a name="line.164"></a>
+<span class="sourceLineNo">165</span> byte[] cp = new byte[k.length + 1];<a name="line.165"></a>
+<span class="sourceLineNo">166</span> System.arraycopy(k, 0, cp, 0, k.length);<a name="line.166"></a>
+<span class="sourceLineNo">167</span> cp[k.length] = new Integer(i % 256).byteValue();<a name="line.167"></a>
+<span class="sourceLineNo">168</span> keys.add(cp);<a name="line.168"></a>
+<span class="sourceLineNo">169</span> }<a name="line.169"></a>
+<span class="sourceLineNo">170</span> return keys.toArray(new byte [][] {new byte [] {}});<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><a name="line.173"></a>
+<span class="sourceLineNo">174</span> /**<a name="line.174"></a>
+<span class="sourceLineNo">175</span> * This is for testing the active number of threads that were used while<a name="line.175"></a>
+<span class="sourceLineNo">176</span> * doing a batch operation. It inserts one row per region via the batch<a name="line.176"></a>
+<span class="sourceLineNo">177</span> * operation, and then checks the number of active threads.<a name="line.177"></a>
+<span class="sourceLineNo">178</span> * <p/><a name="line.178"></a>
+<span class="sourceLineNo">179</span> * For HBASE-3553<a name="line.179"></a>
<span class="sourceLineNo">180</span> */<a name="line.180"></a>
<span class="sourceLineNo">181</span> @Test<a name="line.181"></a>
<span class="sourceLineNo">182</span> public void testActiveThreadsCount() throws Exception {<a name="line.182"></a>
@@ -288,557 +288,554 @@
<span class="sourceLineNo">280</span> /**<a name="line.280"></a>
<span class="sourceLineNo">281</span> * Only run one Multi test with a forced RegionServer abort. Otherwise, the<a name="line.281"></a>
<span class="sourceLineNo">282</span> * unit tests will take an unnecessarily long time to run.<a name="line.282"></a>
-<span class="sourceLineNo">283</span> *<a name="line.283"></a>
-<span class="sourceLineNo">284</span> * @throws Exception<a name="line.284"></a>
-<span class="sourceLineNo">285</span> */<a name="line.285"></a>
-<span class="sourceLineNo">286</span> @Test<a name="line.286"></a>
-<span class="sourceLineNo">287</span> public void testFlushCommitsWithAbort() throws Exception {<a name="line.287"></a>
-<span class="sourceLineNo">288</span> LOG.info("test=testFlushCommitsWithAbort");<a name="line.288"></a>
-<span class="sourceLineNo">289</span> doTestFlushCommits(true);<a name="line.289"></a>
-<span class="sourceLineNo">290</span> }<a name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span> /**<a name="line.292"></a>
-<span class="sourceLineNo">293</span> * Set table auto flush to false and test flushing commits<a name="line.293"></a>
-<span class="sourceLineNo">294</span> * @param doAbort true if abort one regionserver in the testing<a name="line.294"></a>
-<span class="sourceLineNo">295</span> * @throws Exception<a name="line.295"></a>
-<span class="sourceLineNo">296</span> */<a name="line.296"></a>
-<span class="sourceLineNo">297</span> private void doTestFlushCommits(boolean doAbort) throws Exception {<a name="line.297"></a>
-<span class="sourceLineNo">298</span> // Load the data<a name="line.298"></a>
-<span class="sourceLineNo">299</span> LOG.info("get new table");<a name="line.299"></a>
-<span class="sourceLineNo">300</span> Table table = UTIL.getConnection().getTable(TEST_TABLE);<a name="line.300"></a>
-<span class="sourceLineNo">301</span><a name="line.301"></a>
-<span class="sourceLineNo">302</span> LOG.info("constructPutRequests");<a name="line.302"></a>
-<span class="sourceLineNo">303</span> List<Put> puts = constructPutRequests();<a name="line.303"></a>
-<span class="sourceLineNo">304</span> table.put(puts);<a name="line.304"></a>
-<span class="sourceLineNo">305</span> LOG.info("puts");<a name="line.305"></a>
-<span class="sourceLineNo">306</span> final int liveRScount = UTIL.getMiniHBaseCluster().getLiveRegionServerThreads()<a name="line.306"></a>
-<span class="sourceLineNo">307</span> .size();<a name="line.307"></a>
-<span class="sourceLineNo">308</span> assert liveRScount > 0;<a name="line.308"></a>
-<span class="sourceLineNo">309</span> JVMClusterUtil.RegionServerThread liveRS = UTIL.getMiniHBaseCluster()<a name="line.309"></a>
-<span class="sourceLineNo">310</span> .getLiveRegionServerThreads().get(0);<a name="line.310"></a>
-<span class="sourceLineNo">311</span> if (doAbort) {<a name="line.311"></a>
-<span class="sourceLineNo">312</span> liveRS.getRegionServer().abort("Aborting for tests",<a name="line.312"></a>
-<span class="sourceLineNo">313</span> new Exception("doTestFlushCommits"));<a name="line.313"></a>
-<span class="sourceLineNo">314</span> // If we wait for no regions being online after we abort the server, we<a name="line.314"></a>
-<span class="sourceLineNo">315</span> // could ensure the master has re-assigned the regions on killed server<a name="line.315"></a>
-<span class="sourceLineNo">316</span> // after writing successfully. It means the server we aborted is dead<a name="line.316"></a>
-<span class="sourceLineNo">317</span> // and detected by matser<a name="line.317"></a>
-<span class="sourceLineNo">318</span> while (liveRS.getRegionServer().getNumberOfOnlineRegions() != 0) {<a name="line.318"></a>
-<span class="sourceLineNo">319</span> Thread.sleep(100);<a name="line.319"></a>
-<span class="sourceLineNo">320</span> }<a name="line.320"></a>
-<span class="sourceLineNo">321</span> // try putting more keys after the abort. same key/qual... just validating<a name="line.321"></a>
-<span class="sourceLineNo">322</span> // no exceptions thrown<a name="line.322"></a>
-<span class="sourceLineNo">323</span> puts = constructPutRequests();<a name="line.323"></a>
-<span class="sourceLineNo">324</span> table.put(puts);<a name="line.324"></a>
-<span class="sourceLineNo">325</span> }<a name="line.325"></a>
+<span class="sourceLineNo">283</span> */<a name="line.283"></a>
+<span class="sourceLineNo">284</span> @Test<a name="line.284"></a>
+<span class="sourceLineNo">285</span> public void testFlushCommitsWithAbort() throws Exception {<a name="line.285"></a>
+<span class="sourceLineNo">286</span> LOG.info("test=testFlushCommitsWithAbort");<a name="line.286"></a>
+<span class="sourceLineNo">287</span> doTestFlushCommits(true);<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> /**<a name="line.290"></a>
+<span class="sourceLineNo">291</span> * Set table auto flush to false and test flushing commits<a name="line.291"></a>
+<span class="sourceLineNo">292</span> * @param doAbort true if abort one regionserver in the testing<a name="line.292"></a>
+<span class="sourceLineNo">293</span> */<a name="line.293"></a>
+<span class="sourceLineNo">294</span> private void doTestFlushCommits(boolean doAbort) throws Exception {<a name="line.294"></a>
+<span class="sourceLineNo">295</span> // Load the data<a name="line.295"></a>
+<span class="sourceLineNo">296</span> LOG.info("get new table");<a name="line.296"></a>
+<span class="sourceLineNo">297</span> Table table = UTIL.getConnection().getTable(TEST_TABLE);<a name="line.297"></a>
+<span class="sourceLineNo">298</span><a name="line.298"></a>
+<span class="sourceLineNo">299</span> LOG.info("constructPutRequests");<a name="line.299"></a>
+<span class="sourceLineNo">300</span> List<Put> puts = constructPutRequests();<a name="line.300"></a>
+<span class="sourceLineNo">301</span> table.put(puts);<a name="line.301"></a>
+<span class="sourceLineNo">302</span> LOG.info("puts");<a name="line.302"></a>
+<span class="sourceLineNo">303</span> final int liveRScount = UTIL.getMiniHBaseCluster().getLiveRegionServerThreads()<a name="line.303"></a>
+<span class="sourceLineNo">304</span> .size();<a name="line.304"></a>
+<span class="sourceLineNo">305</span> assert liveRScount > 0;<a name="line.305"></a>
+<span class="sourceLineNo">306</span> JVMClusterUtil.RegionServerThread liveRS = UTIL.getMiniHBaseCluster()<a name="line.306"></a>
+<span class="sourceLineNo">307</span> .getLiveRegionServerThreads().get(0);<a name="line.307"></a>
+<span class="sourceLineNo">308</span> if (doAbort) {<a name="line.308"></a>
+<span class="sourceLineNo">309</span> liveRS.getRegionServer().abort("Aborting for tests",<a name="line.309"></a>
+<span class="sourceLineNo">310</span> new Exception("doTestFlushCommits"));<a name="line.310"></a>
+<span class="sourceLineNo">311</span> // If we wait for no regions being online after we abort the server, we<a name="line.311"></a>
+<span class="sourceLineNo">312</span> // could ensure the master has re-assigned the regions on killed server<a name="line.312"></a>
+<span class="sourceLineNo">313</span> // after writing successfully. It means the server we aborted is dead<a name="line.313"></a>
+<span class="sourceLineNo">314</span> // and detected by matser<a name="line.314"></a>
+<span class="sourceLineNo">315</span> while (liveRS.getRegionServer().getNumberOfOnlineRegions() != 0) {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> Thread.sleep(100);<a name="line.316"></a>
+<span class="sourceLineNo">317</span> }<a name="line.317"></a>
+<span class="sourceLineNo">318</span> // try putting more keys after the abort. same key/qual... just validating<a name="line.318"></a>
+<span class="sourceLineNo">319</span> // no exceptions thrown<a name="line.319"></a>
+<span class="sourceLineNo">320</span> puts = constructPutRequests();<a name="line.320"></a>
+<span class="sourceLineNo">321</span> table.put(puts);<a name="line.321"></a>
+<span class="sourceLineNo">322</span> }<a name="line.322"></a>
+<span class="sourceLineNo">323</span><a name="line.323"></a>
+<span class="sourceLineNo">324</span> LOG.info("validating loaded data");<a name="line.324"></a>
+<span class="sourceLineNo">325</span> validateLoadedData(table);<a name="line.325"></a>
<span class="sourceLineNo">326</span><a name="line.326"></a>
-<span class="sourceLineNo">327</span> LOG.info("validating loaded data");<a name="line.327"></a>
-<span class="sourceLineNo">328</span> validateLoadedData(table);<a name="line.328"></a>
-<span class="sourceLineNo">329</span><a name="line.329"></a>
-<span class="sourceLineNo">330</span> // Validate server and region count<a name="line.330"></a>
-<span class="sourceLineNo">331</span> List<JVMClusterUtil.RegionServerThread> liveRSs = UTIL.getMiniHBaseCluster().getLiveRegionServerThreads();<a name="line.331"></a>
-<span class="sourceLineNo">332</span> int count = 0;<a name="line.332"></a>
-<span class="sourceLineNo">333</span> for (JVMClusterUtil.RegionServerThread t: liveRSs) {<a name="line.333"></a>
-<span class="sourceLineNo">334</span> count++;<a name="line.334"></a>
-<span class="sourceLineNo">335</span> LOG.info("Count=" + count + ", Alive=" + t.getRegionServer());<a name="line.335"></a>
-<span class="sourceLineNo">336</span> }<a name="line.336"></a>
-<span class="sourceLineNo">337</span> LOG.info("Count=" + count);<a name="line.337"></a>
-<span class="sourceLineNo">338</span> Assert.assertEquals("Server count=" + count + ", abort=" + doAbort,<a name="line.338"></a>
-<span class="sourceLineNo">339</span> (doAbort ? (liveRScount - 1) : liveRScount), count);<a name="line.339"></a>
-<span class="sourceLineNo">340</span> if (doAbort) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> UTIL.getMiniHBaseCluster().waitOnRegionServer(0);<a name="line.341"></a>
-<span class="sourceLineNo">342</span> UTIL.waitFor(15 * 1000, new Waiter.Predicate<Exception>() {<a name="line.342"></a>
-<span class="sourceLineNo">343</span> @Override<a name="line.343"></a>
-<span class="sourceLineNo">344</span> public boolean evaluate() throws Exception {<a name="line.344"></a>
-<span class="sourceLineNo">345</span> // Master is also a regionserver, so the count is liveRScount<a name="line.345"></a>
-<span class="sourceLineNo">346</span> return UTIL.getMiniHBaseCluster().getMaster()<a name="line.346"></a>
-<span class="sourceLineNo">347</span> .getClusterMetrics().getLiveServerMetrics().size() == liveRScount;<a name="line.347"></a>
-<span class="sourceLineNo">348</span> }<a name="line.348"></a>
-<span class="sourceLineNo">349</span> });<a name="line.349"></a>
-<span class="sourceLineNo">350</span> UTIL.waitFor(15 * 1000, UTIL.predicateNoRegionsInTransition());<a name="line.350"></a>
-<span class="sourceLineNo">351</span> }<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> table.close();<a name="line.353"></a>
-<span class="sourceLineNo">354</span> LOG.info("done");<a name="line.354"></a>
-<span class="sourceLineNo">355</span> }<a name="line.355"></a>
-<span class="sourceLineNo">356</span><a name="line.356"></a>
-<span class="sourceLineNo">357</span> @Test<a name="line.357"></a>
-<span class="sourceLineNo">358</span> public void testBatchWithPut() throws Exception {<a name="line.358"></a>
-<span class="sourceLineNo">359</span> LOG.info("test=testBatchWithPut");<a name="line.359"></a>
-<span class="sourceLineNo">360</span> Table table = CONNECTION.getTable(TEST_TABLE);<a name="line.360"></a>
-<span class="sourceLineNo">361</span> // put multiple rows using a batch<a name="line.361"></a>
-<span class="sourceLineNo">362</span> List<Put> puts = constructPutRequests();<a name="line.362"></a>
-<span class="sourceLineNo">363</span><a name="line.363"></a>
-<span class="sourceLineNo">364</span> Object[] results = new Object[puts.size()];<a name="line.364"></a>
-<span class="sourceLineNo">365</span> table.batch(puts, results);<a name="line.365"></a>
-<span class="sourceLineNo">366</span> validateSizeAndEmpty(results, KEYS.length);<a name="line.366"></a>
-<span class="sourceLineNo">367</span><a name="line.367"></a>
-<span class="sourceLineNo">368</span> if (true) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span> int liveRScount = UTIL.getMiniHBaseCluster().getLiveRegionServerThreads().size();<a name="line.369"></a>
-<span class="sourceLineNo">370</span> assert liveRScount > 0;<a name="line.370"></a>
-<span class="sourceLineNo">371</span> JVMClusterUtil.RegionServerThread liveRS =<a name="line.371"></a>
-<span class="sourceLineNo">372</span> UTIL.getMiniHBaseCluster().getLiveRegionServerThreads().get(0);<a name="line.372"></a>
-<span class="sourceLineNo">373</span> liveRS.getRegionServer().abort("Aborting for tests", new Exception("testBatchWithPut"));<a name="line.373"></a>
-<span class="sourceLineNo">374</span> puts = constructPutRequests();<a name="line.374"></a>
-<span class="sourceLineNo">375</span> try {<a name="line.375"></a>
-<span class="sourceLineNo">376</span> results = new Object[puts.size()];<a name="line.376"></a>
-<span class="sourceLineNo">377</span> table.batch(puts, results);<a name="line.377"></a>
-<span class="sourceLineNo">378</span> } catch (RetriesExhaustedWithDetailsException ree) {<a name="line.378"></a>
-<span class="sourceLineNo">379</span> LOG.info(ree.getExhaustiveDescription());<a name="line.379"></a>
-<span class="sourceLineNo">380</span> table.close();<a name="line.380"></a>
-<span class="sourceLineNo">381</span> throw ree;<a name="line.381"></a>
-<span class="sourceLineNo">382</span> }<a name="line.382"></a>
-<span class="sourceLineNo">383</span> validateSizeAndEmpty(results, KEYS.length);<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> validateLoadedData(table);<a name="line.386"></a>
-<span class="sourceLineNo">387</span> table.close();<a name="line.387"></a>
-<span class="sourceLineNo">388</span> }<a name="line.388"></a>
-<span class="sourceLineNo">389</span><a name="line.389"></a>
-<span class="sourceLineNo">390</span> @Test<a name="line.390"></a>
-<span class="sourceLineNo">391</span> public void testBatchWithDelete() throws Exception {<a name="line.391"></a>
-<span class="sourceLineNo">392</span> LOG.info("test=testBatchWithDelete");<a name="line.392"></a>
-<span class="sourceLineNo">393</span> Table table = UTIL.getConnection().getTable(TEST_TABLE);<a name="line.393"></a>
-<span class="sourceLineNo">394</span><a name="line.394"></a>
-<span class="sourceLineNo">395</span> // Load some data<a name="line.395"></a>
-<span class="sourceLineNo">396</span> List<Put> puts = constructPutRequests();<a name="line.396"></a>
-<span class="sourceLineNo">397</span> Object[] results = new Object[puts.size()];<a name="line.397"></a>
-<span class="sourceLineNo">398</span> table.batch(puts, results);<a name="line.398"></a>
-<span class="sourceLineNo">399</span> validateSizeAndEmpty(results, KEYS.length);<a name="line.399"></a>
-<span class="sourceLineNo">400</span><a name="line.400"></a>
-<span class="sourceLineNo">401</span> // Deletes<a name="line.401"></a>
-<span class="sourceLineNo">402</span> List<Row> deletes = new ArrayList<>();<a name="line.402"></a>
-<span class="sourceLineNo">403</span> for (int i = 0; i < KEYS.length; i++) {<a name="line.403"></a>
-<span class="sourceLineNo">404</span> Delete delete = new Delete(KEYS[i]);<a name="line.404"></a>
-<span class="sourceLineNo">405</span> delete.addFamily(BYTES_FAMILY);<a name="line.405"></a>
-<span class="sourceLineNo">406</span> deletes.add(delete);<a name="line.406"></a>
-<span class="sourceLineNo">407</span> }<a name="line.407"></a>
-<span class="sourceLineNo">408</span> results= new Object[deletes.size()];<a name="line.408"></a>
-<span class="sourceLineNo">409</span> table.batch(deletes, results);<a name="line.409"></a>
-<span class="sourceLineNo">410</span> validateSizeAndEmpty(results, KEYS.length);<a name="line.410"></a>
-<span class="sourceLineNo">411</span><a name="line.411"></a>
-<span class="sourceLineNo">412</span> // Get to make sure ...<a name="line.412"></a>
-<span class="sourceLineNo">413</span> for (byte[] k : KEYS) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> Get get = new Get(k);<a name="line.414"></a>
-<span class="sourceLineNo">415</span> get.addColumn(BYTES_FAMILY, QUALIFIER);<a name="line.415"></a>
-<span class="sourceLineNo">416</span> Assert.assertFalse(table.exists(get));<a name="line.416"></a>
-<span class="sourceLineNo">417</span> }<a name="line.417"></a>
-<span class="sourceLineNo">418</span> table.close();<a name="line.418"></a>
-<span class="sourceLineNo">419</span> }<a name="line.419"></a>
-<span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span> @Test<a name="line.421"></a>
-<span class="sourceLineNo">422</span> public void testHTableDeleteWithList() throws Exception {<a name="line.422"></a>
-<span class="sourceLineNo">423</span> LOG.info("test=testHTableDeleteWithList");<a name="line.423"></a>
-<span class="sourceLineNo">424</span> Table table = UTIL.getConnection().getTable(TEST_TABLE);<a name="line.424"></a>
-<span class="sourceLineNo">425</span><a name="line.425"></a>
-<span class="sourceLineNo">426</span> // Load some data<a name="line.426"></a>
-<span class="sourceLineNo">427</span> List<Put> puts = constructPutRequests();<a name="line.427"></a>
-<span class="sourceLineNo">428</span> Object[] results = new Object[puts.size()];<a name="line.428"></a>
-<span class="sourceLineNo">429</span> table.batch(puts, results);<a name="line.429"></a>
-<span class="sourceLineNo">430</span> validateSizeAndEmpty(results, KEYS.length);<a name="line.430"></a>
-<span class="sourceLineNo">431</span><a name="line.431"></a>
-<span class="sourceLineNo">432</span> // Deletes<a name="line.432"></a>
-<span class="sourceLineNo">433</span> ArrayList<Delete> deletes = new ArrayList<>();<a name="line.433"></a>
-<span class="sourceLineNo">434</span> for (int i = 0; i < KEYS.length; i++) {<a name="line.434"></a>
-<span class="sourceLineNo">435</span> Delete delete = new Delete(KEYS[i]);<a name="line.435"></a>
-<span class="sourceLineNo">436</span> delete.addFamily(BYTES_FAMILY);<a name="line.436"></a>
-<span class="sourceLineNo">437</span> deletes.add(delete);<a name="line.437"></a>
-<span class="sourceLineNo">438</span> }<a name="line.438"></a>
-<span class="sourceLineNo">439</span> table.delete(deletes);<a name="line.439"></a>
-<span class="sourceLineNo">440</span> Assert.assertTrue(deletes.isEmpty());<a name="line.440"></a>
-<span class="sourceLineNo">441</span><a name="line.441"></a>
-<span class="sourceLineNo">442</span> // Get to make sure ...<a name="line.442"></a>
-<span class="sourceLineNo">443</span> for (byte[] k : KEYS) {<a name="line.443"></a>
-<span class="sourceLineNo">444</span> Get get = new Get(k);<a name="line.444"></a>
-<span class="sourceLineNo">445</span> get.addColumn(BYTES_FAMILY, QUALIFIER);<a name="line.445"></a>
-<span class="sourceLineNo">446</span> Assert.assertFalse(table.exists(get));<a name="line.446"></a>
-<span class="sourceLineNo">447</span> }<a name="line.447"></a>
-<span class="sourceLineNo">448</span> table.close();<a name="line.448"></a>
-<span class="sourceLineNo">449</span> }<a name="line.449"></a>
-<span class="sourceLineNo">450</span><a name="line.450"></a>
-<span class="sourceLineNo">451</span> @Test<a name="line.451"></a>
-<span class="sourceLineNo">452</span> public void testBatchWithManyColsInOneRowGetAndPut() throws Exception {<a name="line.452"></a>
-<span class="sourceLineNo">453</span> LOG.info("test=testBatchWithManyColsInOneRowGetAndPut");<a name="line.453"></a>
-<span class="sourceLineNo">454</span> Table table = UTIL.getConnection().getTable(TEST_TABLE);<a name="line.454"></a>
-<span class="sourceLineNo">455</span><a name="line.455"></a>
-<span class="sourceLineNo">456</span> List<Row> puts = new ArrayList<>();<a name="line.456"></a>
-<span class="sourceLineNo">457</span> for (int i = 0; i < 100; i++) {<a name="line.457"></a>
-<span class="sourceLineNo">458</span> Put put = new Put(ONE_ROW);<a name="line.458"></a>
-<span class="sourceLineNo">459</span> byte[] qual = Bytes.toBytes("column" + i);<a name="line.459"></a>
-<span class="sourceLineNo">460</span> put.addColumn(BYTES_FAMILY, qual, VALUE);<a name="line.460"></a>
-<span class="sourceLineNo">461</span> puts.add(put);<a name="line.461"></a>
-<span class="sourceLineNo">462</span> }<a name="line.462"></a>
-<span class="sourceLineNo">463</span> Object[] results = new Object[puts.size()];<a name="line.463"></a>
-<span class="sourceLineNo">464</span> table.batch(puts, results);<a name="line.464"></a>
+<span class="sourceLineNo">327</span> // Validate server and region count<a name="line.327"></a>
+<span class="sourceLineNo">328</span> List<JVMClusterUtil.RegionServerThread> liveRSs = UTIL.getMiniHBaseCluster().getLiveRegionServerThreads();<a name="line.328"></a>
+<span class="sourceLineNo">329</span> int count = 0;<a name="line.329"></a>
+<span class="sourceLineNo">330</span> for (JVMClusterUtil.RegionServerThread t: liveRSs) {<a name="line.330"></a>
+<span class="sourceLineNo">331</span> count++;<a name="line.331"></a>
+<span class="sourceLineNo">332</span> LOG.info("Count=" + count + ", Alive=" + t.getRegionServer());<a name="line.332"></a>
+<span class="sourceLineNo">333</span> }<a name="line.333"></a>
+<span class="sourceLineNo">334</span> LOG.info("Count=" + count);<a name="line.334"></a>
+<span class="sourceLineNo">335</span> Assert.assertEquals("Server count=" + count + ", abort=" + doAbort,<a name="line.335"></a>
+<span class="sourceLineNo">336</span> (doAbort ? (liveRScount - 1) : liveRScount), count);<a name="line.336"></a>
+<span class="sourceLineNo">337</span> if (doAbort) {<a name="line.337"></a>
+<span class="sourceLineNo">338</span> UTIL.getMiniHBaseCluster().waitOnRegionServer(0);<a name="line.338"></a>
+<span class="sourceLineNo">339</span> UTIL.waitFor(15 * 1000, new Waiter.Predicate<Exception>() {<a name="line.339"></a>
+<span class="sourceLineNo">340</span> @Override<a name="line.340"></a>
+<span class="sourceLineNo">341</span> public boolean evaluate() throws Exception {<a name="line.341"></a>
+<span class="sourceLineNo">342</span> // We disable regions on master so the count should be liveRScount - 1<a name="line.342"></a>
+<span class="sourceLineNo">343</span> return UTIL.getMiniHBaseCluster().getMaster()<a name="line.343"></a>
+<span class="sourceLineNo">344</span> .getClusterMetrics().getLiveServerMetrics().size() == liveRScount - 1;<a name="line.344"></a>
+<span class="sourceLineNo">345</span> }<a name="line.345"></a>
+<span class="sourceLineNo">346</span> });<a name="line.346"></a>
+<span class="sourceLineNo">347</span> UTIL.waitFor(15 * 1000, UTIL.predicateNoRegionsInTransition());<a name="line.347"></a>
+<span class="sourceLineNo">348</span> }<a name="line.348"></a>
+<span class="sourceLineNo">349</span><a name="line.349"></a>
+<span class="sourceLineNo">350</span> table.close();<a name="line.350"></a>
+<span class="sourceLineNo">351</span> LOG.info("done");<a name="line.351"></a>
+<span class="sourceLineNo">352</span> }<a name="line.352"></a>
+<span class="sourceLineNo">353</span><a name="line.353"></a>
+<span class="sourceLineNo">354</span> @Test<a name="line.354"></a>
+<span class="sourceLineNo">355</span> public void testBatchWithPut() throws Exception {<a name="line.355"></a>
+<span class="sourceLineNo">356</span> LOG.info("test=testBatchWithPut");<a name="line.356"></a>
+<span class="sourceLineNo">357</span> Table table = CONNECTION.getTable(TEST_TABLE);<a name="line.357"></a>
+<span class="sourceLineNo">358</span> // put multiple rows using a batch<a name="line.358"></a>
+<span class="sourceLineNo">359</span> List<Put> puts = constructPutRequests();<a name="line.359"></a>
+<span class="sourceLineNo">360</span><a name="line.360"></a>
+<span class="sourceLineNo">361</span> Object[] results = new Object[puts.size()];<a name="line.361"></a>
+<span class="sourceLineNo">362</span> table.batch(puts, results);<a name="line.362"></a>
+<span class="sourceLineNo">363</span> validateSizeAndEmpty(results, KEYS.length);<a name="line.363"></a>
+<span class="sourceLineNo">364</span><a name="line.364"></a>
+<span class="sourceLineNo">365</span> if (true) {<a name="line.365"></a>
+<span class="sourceLineNo">366</span> int liveRScount = UTIL.getMiniHBaseCluster().getLiveRegionServerThreads().size();<a name="line.366"></a>
+<span class="sourceLineNo">367</span> assert liveRScount > 0;<a name="line.367"></a>
+<span class="sourceLineNo">368</span> JVMClusterUtil.RegionServerThread liveRS =<a name="line.368"></a>
+<span class="sourceLineNo">369</span> UTIL.getMiniHBaseCluster().getLiveRegionServerThreads().get(0);<a name="line.369"></a>
+<span class="sourceLineNo">370</span> liveRS.getRegionServer().abort("Aborting for tests", new Exception("testBatchWithPut"));<a name="line.370"></a>
+<span class="sourceLineNo">371</span> puts = constructPutRequests();<a name="line.371"></a>
+<span class="sourceLineNo">372</span> try {<a name="line.372"></a>
+<span class="sourceLineNo">373</span> results = new Object[puts.size()];<a name="line.373"></a>
+<span class="sourceLineNo">374</span> table.batch(puts, results);<a name="line.374"></a>
+<span class="sourceLineNo">375</span> } catch (RetriesExhaustedWithDetailsException ree) {<a name="line.375"></a>
+<span class="sourceLineNo">376</span> LOG.info(ree.getExhaustiveDescription());<a name="line.376"></a>
+<span class="sourceLineNo">377</span> table.close();<a name="line.377"></a>
+<span class="sourceLineNo">378</span> throw ree;<a name="line.378"></a>
+<span class="sourceLineNo">379</span> }<a name="line.379"></a>
+<span class="sourceLineNo">380</span> validateSizeAndEmpty(results, KEYS.length);<a name="line.380"></a>
+<span class="sourceLineNo">381</span> }<a name="line.381"></a>
+<span class="sourceLineNo">382</span><a name="line.382"></a>
+<span class="sourceLineNo">383</span> validateLoadedData(table);<a name="line.383"></a>
+<span class="sourceLineNo">384</span> table.close();<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> @Test<a name="line.387"></a>
+<span class="sourceLineNo">388</span> public void testBatchWithDelete() throws Exception {<a name="line.388"></a>
+<span class="sourceLineNo">389</span> LOG.info("test=testBatchWithDelete");<a name="line.389"></a>
+<span class="sourceLineNo">390</span> Table table = UTIL.getConnection().getTable(TEST_TABLE);<a name="line.390"></a>
+<span class="sourceLineNo">391</span><a name="line.391"></a>
+<span class="sourceLineNo">392</span> // Load some data<a name="line.392"></a>
+<span class="sourceLineNo">393</span> List<Put> puts = constructPutRequests();<a name="line.393"></a>
+<span class="sourceLineNo">394</span> Object[] results = new Object[puts.size()];<a name="line.394"></a>
+<span class="sourceLineNo">395</span> table.batch(puts, results);<a name="line.395"></a>
+<span class="sourceLineNo">396</span> validateSizeAndEmpty(results, KEYS.length);<a name="line.396"></a>
+<span class="sourceLineNo">397</span><a name="line.397"></a>
+<span class="sourceLineNo">398</span> // Deletes<a name="line.398"></a>
+<span class="sourceLineNo">399</span> List<Row> deletes = new ArrayList<>();<a name="line.399"></a>
+<span class="sourceLineNo">400</span> for (int i = 0; i < KEYS.length; i++) {<a name="line.400"></a>
+<span class="sourceLineNo">401</span> Delete delete = new Delete(KEYS[i]);<a name="line.401"></a>
+<span class="sourceLineNo">402</span> delete.addFamily(BYTES_FAMILY);<a name="line.402"></a>
+<span class="sourceLineNo">403</span> deletes.add(delete);<a name="line.403"></a>
+<span class="sourceLineNo">404</span> }<a name="line.404"></a>
+<span class="sourceLineNo">405</span> results= new Object[deletes.size()];<a name="line.405"></a>
+<span class="sourceLineNo">406</span> table.batch(deletes, results);<a name="line.406"></a>
+<span class="sourceLineNo">407</span> validateSizeAndEmpty(results, KEYS.length);<a name="line.407"></a>
+<span class="sourceLineNo">408</span><a name="line.408"></a>
+<span class="sourceLineNo">409</span> // Get to make sure ...<a name="line.409"></a>
+<span class="sourceLineNo">410</span> for (byte[] k : KEYS) {<a name="line.410"></a>
+<span class="sourceLineNo">411</span> Get get = new Get(k);<a name="line.411"></a>
+<span class="sourceLineNo">412</span> get.addColumn(BYTES_FAMILY, QUALIFIER);<a name="line.412"></a>
+<span class="sourceLineNo">413</span> Assert.assertFalse(table.exists(get));<a name="line.413"></a>
+<span class="sourceLineNo">414</span> }<a name="line.414"></a>
+<span class="sourceLineNo">415</span> table.close();<a name="line.415"></a>
+<span class="sourceLineNo">416</span> }<a name="line.416"></a>
+<span class="sourceLineNo">417</span><a name="line.417"></a>
+<span class="sourceLineNo">418</span> @Test<a name="line.418"></a>
+<span class="sourceLineNo">419</span> public void testHTableDeleteWithList() throws Exception {<a name="line.419"></a>
+<span class="sourceLineNo">420</span> LOG.info("test=testHTableDeleteWithList");<a name="line.420"></a>
+<span class="sourceLineNo">421</span> Table table = UTIL.getConnection().getTable(TEST_TABLE);<a name="line.421"></a>
+<span class="sourceLineNo">422</span><a name="line.422"></a>
+<span class="sourceLineNo">423</span> // Load some data<a name="line.423"></a>
+<span class="sourceLineNo">424</span> List<Put> puts = constructPutRequests();<a name="line.424"></a>
+<span class="sourceLineNo">425</span> Object[] results = new Object[puts.size()];<a name="line.425"></a>
+<span class="sourceLineNo">426</span> table.batch(puts, results);<a name="line.426"></a>
+<span class="sourceLineNo">427</span> validateSizeAndEmpty(results, KEYS.length);<a name="line.427"></a>
+<span class="sourceLineNo">428</span><a name="line.428"></a>
+<span class="sourceLineNo">429</span> // Deletes<a name="line.429"></a>
+<span class="sourceLineNo">430</span> ArrayList<Delete> deletes = new ArrayList<>();<a name="line.430"></a>
+<span class="sourceLineNo">431</span> for (int i = 0; i < KEYS.length; i++) {<a name="line.431"></a>
+<span class="sourceLineNo">432</span> Delete delete = new Delete(KEYS[i]);<a name="line.432"></a>
+<span class="sourceLineNo">433</span> delete.addFamily(BYTES_FAMILY);<a name="line.433"></a>
+<span class="sourceLineNo">434</span> deletes.add(delete);<a name="line.434"></a>
+<span class="sourceLineNo">435</span> }<a name="line.435"></a>
+<span class="sourceLineNo">436</span> table.delete(deletes);<a name="line.436"></a>
+<span class="sourceLineNo">437</span> Assert.assertTrue(deletes.isEmpty());<a name="line.437"></a>
+<span class="sourceLineNo">438</span><a name="line.438"></a>
+<span class="sourceLineNo">439</span> // Get to make sure ...<a name="line.439"></a>
+<span class="sourceLineNo">440</span> for (byte[] k : KEYS) {<a name="line.440"></a>
+<span class="sourceLineNo">441</span> Get get = new Get(k);<a name="line.441"></a>
+<span class="sourceLineNo">442</span> get.addColumn(BYTES_FAMILY, QUALIFIER);<a name="line.442"></a>
+<span class="sourceLineNo">443</span> Assert.assertFalse(table.exists(get));<a name="line.443"></a>
+<span class="sourceLineNo">444</span> }<a name="line.444"></a>
+<span class="sourceLineNo">445</span> table.close();<a name="line.445"></a>
+<span class="sourceLineNo">446</span> }<a name="line.446"></a>
+<span class="sourceLineNo">447</span><a name="line.447"></a>
+<span class="sourceLineNo">448</span> @Test<a name="line.448"></a>
+<span class="sourceLineNo">449</span> public void testBatchWithManyColsInOneRowGetAndPut() throws Exception {<a name="line.449"></a>
+<span class="sourceLineNo">450</span> LOG.info("test=testBatchWithManyColsInOneRowGetAndPut");<a name="line.450"></a>
+<span class="sourceLineNo">451</span> Table table = UTIL.getConnection().getTable(TEST_TABLE);<a name="line.451"></a>
+<span class="sourceLineNo">452</span><a name="line.452"></a>
+<span class="sourceLineNo">453</span> List<Row> puts = new ArrayList<>();<a name="line.453"></a>
+<span class="sourceLineNo">454</span> for (int i = 0; i < 100; i++) {<a name="line.454"></a>
+<span class="sourceLineNo">455</span> Put put = new Put(ONE_ROW);<a name="line.455"></a>
+<span class="sourceLineNo">456</span> byte[] qual = Bytes.toBytes("column" + i);<a name="line.456"></a>
+<span class="sourceLineNo">457</span> put.addColumn(BYTES_FAMILY, qual, VALUE);<a name="line.457"></a>
+<span class="sourceLineNo">458</span> puts.add(put);<a name="line.458"></a>
+<span class="sourceLineNo">459</span> }<a name="line.459"></a>
+<span class="sourceLineNo">460</span> Object[] results = new Object[puts.size()];<a name="line.460"></a>
+<span class="sourceLineNo">461</span> table.batch(puts, results);<a name="line.461"></a>
+<span class="sourceLineNo">462</span><a name="line.462"></a>
+<span class="sourceLineNo">463</span> // validate<a name="line.463"></a>
+<span class="sourceLineNo">464</span> validateSizeAndEmpty(results, 100);<a name="line.464"></a>
<span class="sourceLineNo">465</span><a name="line.465"></a>
-<span class="sourceLineNo">466</span> // validate<a name="line.466"></a>
-<span class="sourceLineNo">467</span> validateSizeAndEmpty(results, 100);<a name="line.467"></a>
-<span class="sourceLineNo">468</span><a name="line.468"></a>
-<span class="sourceLineNo">469</span> // get the data back and validate that it is correct<a name="line.469"></a>
-<span class="sourceLineNo">470</span> List<Row> gets = new ArrayList<>();<a name="line.470"></a>
-<span class="sourceLineNo">471</span> for (int i = 0; i < 100; i++) {<a name="line.471"></a>
-<span class="sourceLineNo">472</span> Get get = new Get(ONE_ROW);<a name="line.472"></a>
-<span class="sourceLineNo">473</span> byte[] qual = Bytes.toBytes("column" + i);<a name="line.473"></a>
-<span class="sourceLineNo">474</span> get.addColumn(BYTES_FAMILY, qual);<a name="line.474"></a>
-<span class="sourceLineNo">475</span> gets.add(get);<a name="line.475"></a>
-<span class="sourceLineNo">476</span> }<a name="line.476"></a>
+<span class="sourceLineNo">466</span> // get the data back and validate that it is correct<a name="line.466"></a>
+<span class="sourceLineNo">467</span> List<Row> gets = new ArrayList<>();<a name="line.467"></a>
+<span class="sourceLineNo">468</span> for (int i = 0; i < 100; i++) {<a name="line.468"></a>
+<span class="sourceLineNo">469</span> Get get = new Get(ONE_ROW);<a name="line.469"></a>
+<span class="sourceLineNo">470</span> byte[] qual = Bytes.toBytes("column" + i);<a name="line.470"></a>
+<span class="sourceLineNo">471</span> get.addColumn(BYTES_FAMILY, qual);<a name="line.471"></a>
+<span class="sourceLineNo">472</span> gets.add(get);<a name="line.472"></a>
+<span class="sourceLineNo">473</span> }<a name="line.473"></a>
+<span class="sourceLineNo">474</span><a name="line.474"></a>
+<span class="sourceLineNo">475</span> Object[] multiRes = new Object[gets.size()];<a name="line.475"></a>
+<span class="sourceLineNo">476</span> table.batch(gets, multiRes);<a name="line.476"></a>
<span class="sourceLineNo">477</span><a name="line.477"></a>
-<span class="sourceLineNo">478</span> Object[] multiRes = new Object[gets.size()];<a name="line.478"></a>
-<span class="sourceLineNo">479</span> table.batch(gets, multiRes);<a name="line.479"></a>
-<span class="sourceLineNo">480</span><a name="line.480"></a>
-<span class="sourceLineNo">481</span> int idx = 0;<a name="line.481"></a>
-<span class="sourceLineNo">482</span> for (Object r : multiRes) {<a name="line.482"></a>
-<span class="sourceLineNo">483</span> byte[] qual = Bytes.toBytes("column" + idx);<a name="line.483"></a>
-<span class="sourceLineNo">484</span> validateResult(r, qual, VALUE);<a name="line.484"></a>
-<span class="sourceLineNo">485</span> idx++;<a name="line.485"></a>
-<span class="sourceLineNo">486</span> }<a name="line.486"></a>
-<span class="sourceLineNo">487</span> table.close();<a name="line.487"></a>
-<span class="sourceLineNo">488</span> }<a name="line.488"></a>
-<span class="sourceLineNo">489</span><a name="line.489"></a>
-<span class="sourceLineNo">490</span> @Test<a name="line.490"></a>
-<span class="sourceLineNo">491</span> public void testBatchWithIncrementAndAppend() throws Exception {<a name="line.491"></a>
-<span class="sourceLineNo">492</span> LOG.info("test=testBatchWithIncrementAndAppend");<a name="line.492"></a>
-<span class="sourceLineNo">493</span> final byte[] QUAL1 = Bytes.toBytes("qual1");<a name="line.493"></a>
-<span class="sourceLineNo">494</span> final byte[] QUAL2 = Bytes.toBytes("qual2");<a name="line.494"></a>
-<span class="sourceLineNo">495</span> final byte[] QUAL3 = Bytes.toBytes("qual3");<a name="line.495"></a>
-<span class="sourceLineNo">496</span> final byte[] QUAL4 = Bytes.toBytes("qual4");<a name="line.496"></a>
-<span class="sourceLineNo">497</span> Table table = UTIL.getConnection().getTable(TEST_TABLE);<a name="line.497"></a>
-<span class="sourceLineNo">498</span> Delete d = new Delete(ONE_ROW);<a name="line.498"></a>
-<span class="sourceLineNo">499</span> table.delete(d);<a name="line.499"></a>
-<span class="sourceLineNo">500</span> Put put = new Put(ONE_ROW);<a name="line.500"></a>
-<span class="sourceLineNo">501</span> put.addColumn(BYTES_FAMILY, QUAL1, Bytes.toBytes("abc"));<a name="line.501"></a>
-<span class="sourceLineNo">502</span> put.addColumn(BYTES_FAMILY, QUAL2, Bytes.toBytes(1L));<a name="line.502"></a>
-<span class="sourceLineNo">503</span> table.put(put);<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span> Increment inc = new Increment(ONE_ROW);<a name="line.505"></a>
-<span class="sourceLineNo">506</span> inc.addColumn(BYTES_FAMILY, QUAL2, 1);<a name="line.506"></a>
-<span class="sourceLineNo">507</span> inc.addColumn(BYTES_FAMILY, QUAL3, 1);<a name="line.507"></a>
-<span class="sourceLineNo">508</span><a name="line.508"></a>
-<span class="sourceLineNo">509</span> Append a = new Append(ONE_ROW);<a name="line.509"></a>
-<span class="sourceLineNo">510</span> a.addColumn(BYTES_FAMILY, QUAL1, Bytes.toBytes("def"));<a name="line.510"></a>
-<span class="sourceLineNo">511</span> a.addColumn(BYTES_FAMILY, QUAL4, Bytes.toBytes("xyz"));<a name="line.511"></a>
-<span class="sourceLineNo">512</span> List<Row> actions = new ArrayList<>();<a name="line.512"></a>
-<span class="sourceLineNo">513</span> actions.add(inc);<a name="line.513"></a>
-<span class="sourceLineNo">514</span> actions.add(a);<a name="line.514"></a>
-<span class="sourceLineNo">515</span><a name="line.515"></a>
-<span class="sourceLineNo">516</span> Object[] multiRes = new Object[actions.size()];<a name="line.516"></a>
-<span class="sourceLineNo">517</span> table.batch(actions, multiRes);<a name="line.517"></a>
-<span class="sourceLineNo">518</span> validateResult(multiRes[1], QUAL1, Bytes.toBytes("abcdef"));<a name="line.518"></a>
-<span class="sourceLineNo">519</span> validateResult(multiRes[1], QUAL4, Bytes.toBytes("xyz"));<a name="line.519"></a>
-<span class="sourceLineNo">520</span> validateResult(multiRes[0], QUAL2, Bytes.toBytes(2L));<a name="line.520"></a>
-<span class="sourceLineNo">521</span> validateResult(multiRes[0], QUAL3, Bytes.toBytes(1L));<a name="line.521"></a>
-<span class="sourceLineNo">522</span> table.close();<a name="line.522"></a>
-<span class="sourceLineNo">523</span> }<a name="line.523"></a>
-<span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span> @Test<a name="line.525"></a>
-<span class="sourceLineNo">526</span> public void testNonceCollision() throws Exception {<a name="line.526"></a>
-<span class="sourceLineNo">527</span> LOG.info("test=testNonceCollision");<a name="line.527"></a>
-<span class="sourceLineNo">528</span> final Connection connection = ConnectionFactory.createConnection(UTIL.getConfiguration());<a name="line.528"></a>
-<span class="sourceLineNo">529</span> Table table = connection.getTable(TEST_TABLE);<a name="line.529"></a>
-<span class="sourceLineNo">530</span> Put put = new Put(ONE_ROW);<a name="line.530"></a>
-<span class="sourceLineNo">531</span> put.addColumn(BYTES_FAMILY, QUALIFIER, Bytes.toBytes(0L));<a name="line.531"></a>
+<span class="sourceLineNo">478</span> int idx = 0;<a name="line.478"></a>
+<span class="sourceLineNo">479</span> for (Object r : multiRes) {<a name="line.479"></a>
+<span class="sourceLineNo">480</span> byte[] qual = Bytes.toBytes("column" + idx);<a name="line.480"></a>
+<span class="sourceLineNo">481</span> validateResult(r, qual, VALUE);<a name="line.481"></a>
+<span class="sourceLineNo">482</span> idx++;<a name="line.482"></a>
+<span class="sourceLineNo">483</span> }<a name="line.483"></a>
+<span class="sourceLineNo">484</span> table.close();<a name="line.484"></a>
+<span class="sourceLineNo">485</span> }<a name="line.485"></a>
+<span class="sourceLineNo">486</span><a name="line.486"></a>
+<span class="sourceLineNo">487</span> @Test<a name="line.487"></a>
+<span class="sourceLineNo">488</span> public void testBatchWithIncrementAndAppend() throws Exception {<a name="line.488"></a>
+<span class="sourceLineNo">489</span> LOG.info("test=testBatchWithIncrementAndAppend");<a name="line.489"></a>
+<span class="sourceLineNo">490</span> final byte[] QUAL1 = Bytes.toBytes("qual1");<a name="line.490"></a>
+<span class="sourceLineNo">491</span> final byte[] QUAL2 = Bytes.toBytes("qual2");<a name="line.491"></a>
+<span class="sourceLineNo">492</span> final byte[] QUAL3 = Bytes.toBytes("qual3");<a name="line.492"></a>
+<span class="sourceLineNo">493</span> final byte[] QUAL4 = Bytes.toBytes("qual4");<a name="line.493"></a>
+<span class="sourceLineNo">494</span> Table table = UTIL.getConnection().getTable(TEST_TABLE);<a name="line.494"></a>
+<span class="sourceLineNo">495</span> Delete d = new Delete(ONE_ROW);<a name="line.495"></a>
+<span class="sourceLineNo">496</span> table.delete(d);<a name="line.496"></a>
+<span class="sourceLineNo">497</span> Put put = new Put(ONE_ROW);<a name="line.497"></a>
+<span class="sourceLineNo">498</span> put.addColumn(BYTES_FAMILY, QUAL1, Bytes.toBytes("abc"));<a name="line.498"></a>
+<span class="sourceLineNo">499</span> put.addColumn(BYTES_FAMILY, QUAL2, Bytes.toBytes(1L));<a name="line.499"></a>
+<span class="sourceLineNo">500</span> table.put(put);<a name="line.500"></a>
+<span class="sourceLineNo">501</span><a name="line.501"></a>
+<span class="sourceLineNo">502</span> Increment inc = new Increment(ONE_ROW);<a name="line.502"></a>
+<span class="sourceLineNo">503</span> inc.addColumn(BYTES_FAMILY, QUAL2, 1);<a name="line.503"></a>
+<span class="sourceLineNo">504</span> inc.addColumn(BYTES_FAMILY, QUAL3, 1);<a name="line.504"></a>
+<span class="sourceLineNo">505</span><a name="line.505"></a>
+<span class="sourceLineNo">506</span> Append a = new Append(ONE_ROW);<a name="line.506"></a>
+<span class="sourceLineNo">507</span> a.addColumn(BYTES_FAMILY, QUAL1, Bytes.toBytes("def"));<a name="line.507"></a>
+<span class="sourceLineNo">508</span> a.addColumn(BYTES_FAMILY, QUAL4, Bytes.toBytes("xyz"));<a name="line.508"></a>
+<span class="sourceLineNo">509</span> List<Row> actions = new ArrayList<>();<a name="line.509"></a>
+<span class="sourceLineNo">510</span> actions.add(inc);<a name="line.510"></a>
+<span class="sourceLineNo">511</span> actions.add(a);<a name="line.511"></a>
+<span class="sourceLineNo">512</span><a name="line.512"></a>
+<span class="sourceLineNo">513</span> Object[] multiRes = new Object[actions.size()];<a name="line.513"></a>
+<span class="sourceLineNo">514</span> table.batch(actions, multiRes);<a name="line.514"></a>
+<span class="sourceLineNo">515</span> validateResult(multiRes[1], QUAL1, Bytes.toBytes("abcdef"));<a name="line.515"></a>
+<span class="sourceLineNo">516</span> validateResult(multiRes[1], QUAL4, Bytes.toBytes("xyz"));<a name="line.516"></a>
+<span class="sourceLineNo">517</span> validateResult(multiRes[0], QUAL2, Bytes.toBytes(2L));<a name="line.517"></a>
+<span class="sourceLineNo">518</span> validateResult(multiRes[0], QUAL3, Bytes.toBytes(1L));<a name="line.518"></a>
+<span class="sourceLineNo">519</span> table.close();<a name="line.519"></a>
+<span class="sourceLineNo">520</span> }<a name="line.520"></a>
+<span class="sourceLineNo">521</span><a name="line.521"></a>
+<span class="sourceLineNo">522</span> @Test<a name="line.522"></a>
+<span class="sourceLineNo">523</span> public void testNonceCollision() throws Exception {<a name="line.523"></a>
+<span class="sourceLineNo">524</span> LOG.info("test=testNonceCollision");<a name="line.524"></a>
+<span class="sourceLineNo">525</span> final Connection connection = ConnectionFactory.createConnection(UTIL.getConfiguration());<a name="line.525"></a>
+<span class="sourceLineNo">526</span> Table table = connection.getTable(TEST_TABLE);<a name="line.526"></a>
+<span class="sourceLineNo">527</span> Put put = new Put(ONE_ROW);<a name="line.527"></a>
+<span class="sourceLineNo">528</span> put.addColumn(BYTES_FAMILY, QUALIFIER, Bytes.toBytes(0L));<a name="line.528"></a>
+<span class="sourceLineNo">529</span><a name="line.529"></a>
+<span class="sourceLineNo">530</span> // Replace nonce manager with the one that returns each nonce twice.<a name="line.530"></a>
+<span class="sourceLineNo">531</span> NonceGenerator cnm = new NonceGenerator() {<a name="line.531"></a>
<span class="sourceLineNo">532</span><a name="line.532"></a>
-<span class="sourceLineNo">533</span> // Replace nonce manager with the one that returns each nonce twice.<a name="line.533"></a>
-<span class="sourceLineNo">534</span> NonceGenerator cnm = new NonceGenerator() {<a name="line.534"></a>
-<span class="sourceLineNo">535</span><a name="line.535"></a>
-<span class="sourceLineNo">536</span> private final PerClientRandomNonceGenerator delegate = PerClientRandomNonceGenerator.get();<a name="line.536"></a>
-<span class="sourceLineNo">537</span><a name="line.537"></a>
-<span class="sourceLineNo">538</span> private long lastNonce = -1;<a name="line.538"></a>
-<span class="sourceLineNo">539</span><a name="line.539"></a>
-<span class="sourceLineNo">540</span> @Override<a name="line.540"></a>
-<span class="sourceLineNo">541</span> public synchronized long newNonce() {<a name="line.541"></a>
-<span class="sourceLineNo">542</span> long nonce = 0;<a name="line.542"></a>
-<span class="sourceLineNo">543</span> if (lastNonce == -1) {<a name="line.543"></a>
-<span class="sourceLineNo">544</span> lastNonce = nonce = delegate.newNonce();<a name="line.544"></a>
-<span class="sourceLineNo">545</span> } else {<a name="line.545"></a>
-<span class="sourceLineNo">546</span> nonce = lastNonce;<a name="line.546"></a>
-<span class="sourceLineNo">547</span> lastNonce = -1L;<a name="line.547"></a>
-<span class="sourceLineNo">548</span> }<a name="line.548"></a>
-<span class="sourceLineNo">549</span> return nonce;<a name="line.549"></a>
-<span class="sourceLineNo">550</span> }<a name="line.550"></a>
-<span class="sourceLineNo">551</span><a name="line.551"></a>
-<span class="sourceLineNo">552</span> @Override<a name="line.552"></a>
-<span class="sourceLineNo">553</span> public long getNonceGroup() {<a name="line.553"></a>
-<span class="sourceLineNo">554</span> return delegate.getNonceGroup();<a name="line.554"></a>
-<span class="sourceLineNo">555</span> }<a name="line.555"></a>
-<span class="sourceLineNo">556</span> };<a name="line.556"></a>
+<span class="sourceLineNo">533</span> private final PerClientRandomNonceGenerator delegate = PerClientRandomNonceGenerator.get();<a name="line.533"></a>
+<span class="sourceLineNo">534</span><a name="line.534"></a>
+<span class="sourceLineNo">535</span> private long lastNonce = -1;<a name="line.535"></a>
+<span class="sourceLineNo">536</span><a name="line.536"></a>
+<span class="sourceLineNo">537</span> @Override<a name="line.537"></a>
+<span class="sourceLineNo">538</span> public synchronized long newNonce() {<a name="line.538"></a>
+<span class="sourceLineNo">539</span> long nonce = 0;<a name="line.539"></a>
+<span class="sourceLineNo">540</span> if (lastNonce == -1) {<a name="line.540"></a>
+<span class="sourceLineNo">541</span> lastNonce = nonce = delegate.newNonce();<a name="line.541"></a>
+<span class="sourceLineNo">542</span> } else {<a name="line.542"></a>
+<span class="sourceLineNo">543</span> nonce = lastNonce;<a name="line.543"></a>
+<span class="sourceLineNo">544</span> lastNonce = -1L;<a name="line.544"></a>
+<span class="sourceLineNo">545</span> }<a name="line.545"></a>
+<span class="sourceLineNo">546</span> return nonce;<a name="line.546"></a>
+<span class="sourceLineNo">547</span> }<a name="line.547"></a>
+<span class="sourceLineNo">548</span><a name="line.548"></a>
+<span class="sourceLineNo">549</span> @Override<a name="line.549"></a>
+<span class="sourceLineNo">550</span> public long getNonceGroup() {<a name="line.550"></a>
+<span class="sourceLineNo">551</span> return delegate.getNonceGroup();<a name="line.551"></a>
+<span class="sourceLineNo">552</span> }<a name="line.552"></a>
+<span class="sourceLineNo">553</span> };<a name="line.553"></a>
+<span class="sourceLineNo">554</span><a name="line.554"></a>
+<span class="sourceLineNo">555</span> NonceGenerator oldCnm =<a name="line.555"></a>
+<span class="sourceLineNo">556</span> ConnectionUtils.injectNonceGeneratorForTesting((ClusterConnection)connection, cnm);<a name="line.556"></a>
<span class="sourceLineNo">557</span><a name="line.557"></a>
-<span class="sourceLineNo">558</span> NonceGenerator oldCnm =<a name="line.558"></a>
-<span class="sourceLineNo">559</span> ConnectionUtils.injectNonceGeneratorForTesting((ClusterConnection)connection, cnm);<a name="line.559"></a>
-<span class="sourceLineNo">560</span><a name="line.560"></a>
-<span class="sourceLineNo">561</span> // First test sequential requests.<a name="line.561"></a>
-<span class="sourceLineNo">562</span> try {<a name="line.562"></a>
-<span class="sourceLineNo">563</span> Increment inc = new Increment(ONE_ROW);<a name="line.563"></a>
-<span class="sourceLineNo">564</span> inc.addColumn(BYTES_FAMILY, QUALIFIER, 1L);<a name="line.564"></a>
-<span class="sourceLineNo">565</span> table.increment(inc);<a name="line.565"></a>
-<span class="sourceLineNo">566</span><a name="line.566"></a>
-<span class="sourceLineNo">567</span> // duplicate increment<a name="line.567"></a>
-<span class="sourceLineNo">568</span> inc = new Increment(ONE_ROW);<a name="line.568"></a>
-<span class="sourceLineNo">569</span> inc.addColumn(BYTES_FAMILY, QUALIFIER, 1L);<a name="line.569"></a>
-<span class="sourceLineNo">570</span> Result result = table.increment(inc);<a name="line.570"></a>
-<span class="sourceLineNo">571</span> validateResult(result, QUALIFIER, Bytes.toBytes(1L));<a name="line.571"></a>
-<span class="sourceLineNo">572</span><a name="line.572"></a>
-<span class="sourceLineNo">573</span> Get get = new Get(ONE_ROW);<a name="line.573"></a>
-<span class="sourceLineNo">574</span> get.addColumn(BYTES_FAMILY, QUALIFIER);<a name="line.574"></a>
-<span class="sourceLineNo">575</span> result = table.get(get);<a name="line.575"></a>
-<span class="sourceLineNo">576</span> validateResult(result, QUALIFIER, Bytes.toBytes(1L));<a name="line.576"></a>
-<span class="sourceLineNo">577</span><a name="line.577"></a>
-<span class="sourceLineNo">578</span> // Now run a bunch of requests in parallel, exactly half should succeed.<a name="line.578"></a>
-<span class="sourceLineNo">579</span> int numRequests = 40;<a name="line.579"></a>
-<span class="sourceLineNo">580</span> final CountDownLatch startedLatch = new CountDownLatch(numRequests);<a name="line.580"></a>
-<span class="sourceLineNo">581</span> final CountDownLatch startLatch = new CountDownLatch(1);<a name="line.581"></a>
-<span class="sourceLineNo">582</span> final CountDownLatch doneLatch = new CountDownLatch(numRequests);<a name="line.582"></a>
-<span class="sourceLineNo">583</span> for (int i = 0; i < numRequests; ++i) {<a name="line.583"></a>
-<span class="sourceLineNo">584</span> Runnable r = new Runnable() {<a name="line.584"></a>
-<span class="sourceLineNo">585</span> @Override<a name="line.585"></a>
-<span class="sourceLineNo">586</span> public void run() {<a name="line.586"></a>
-<span class="sourceLineNo">587</span> Table table = null;<a name="line.587"></a>
-<span class="sourceLineNo">588</span> try {<a name="line.588"></a>
-<span class="sourceLineNo">589</span> table = connection.getTable(TEST_TABLE);<a name="line.589"></a>
-<span class="sourceLineNo">590</span> } catch (IOException e) {<a name="line.590"></a>
-<span class="sourceLineNo">591</span> fail("Not expected");<a name="line.591"></a>
-<span class="sourceLineNo">592</span> }<a name="line.592"></a>
-<span class="sourceLineNo">593</span> Increment inc = new Increment(ONE_ROW);<a name="line.593"></a>
-<span class="sourceLineNo">594</span> inc.addColumn(BYTES_FAMILY, QUALIFIER, 1L);<a name="line.594"></a>
-<span class="sourceLineNo">595</span> startedLatch.countDown();<a name="line.595"></a>
-<span class="sourceLineNo">596</span> try {<a name="line.596"></a>
-<span class="sourceLineNo">597</span> startLatch.await();<a name="line.597"></a>
-<span class="sourceLineNo">598</span> } catch (InterruptedException e) {<a name="line.598"></a>
-<span class="sourceLineNo">599</span> fail("Not expected");<a name="line.599"></a>
-<span class="sourceLineNo">600</span> }<a name="line.600"></a>
-<span class="sourceLineNo">601</span> try {<a name="line.601"></a>
-<span class="sourceLineNo">602</span> table.increment(inc);<a name="line.602"></a>
-<span class="sourceLineNo">603</span> } catch (IOException ioEx) {<a name="line.603"></a>
-<span class="sourceLineNo">604</span> fail("Not expected");<a name="line.604"></a>
-<span class="sourceLineNo">605</span> }<a name="line.605"></a>
-<span class="sourceLineNo">606</span> doneLatch.countDown();<a name="line.606"></a>
-<span class="sourceLineNo">607</span> }<a name="line.607"></a>
-<span class="sourceLineNo">608</span> };<a name="line.608"></a>
-<span class="sourceLineNo">609</span> Threads.setDaemonThreadRunning(new Thread(r));<a name="line.609"></a>
-<span class="sourceLineNo">610</span> }<a name="line.610"></a>
-<span class="sourceLineNo">611</span> startedLatch.await(); // Wait until all threads are ready...<a name="line.611"></a>
-<span class="sourceLineNo">612</span> startLatch.countDown(); // ...and unleash the herd!<a name="line.612"></a>
-<span class="sourceLineNo">613</span> doneLatch.await();<a name="line.613"></a>
-<span class="sourceLineNo">614</span> // Now verify<a name="line.614"></a>
-<span class="sourceLineNo">615</span> get = new Get(ONE_ROW);<a name="line.615"></a>
-<span class="sourceLineNo">616</span> get.addColumn(BYTES_FAMILY, QUALIFIER);<a name="line.616"></a>
-<span class="sourceLineNo">617</span> result = table.get(get);<a name="line.617"></a>
-<span class="sourceLineNo">618</span> validateResult(result, QUALIFIER, Bytes.toBytes((numRequests / 2) + 1L));<a name="line.618"></a>
-<span class="sourceLineNo">619</span> table.close();<a name="line.619"></a>
-<span class="sourceLineNo">620</span> } finally {<a name="line.620"></a>
-<span class="sourceLineNo">621</span> ConnectionImplementation.injectNonceGeneratorForTesting((ClusterConnection) connection, oldCnm);<a name="line.621"></a>
-<span class="sourceLineNo">622</span> }<a name="line.622"></a>
-<span class="sourceLineNo">623</span> }<a name="line.623"></a>
-<span class="sourceLineNo">624</span><a name="line.624"></a>
-<span class="sourceLineNo">625</span> @Test<a name="line.625"></a>
-<span class="sourceLineNo">626</span> public void testBatchWithMixedActions() throws Exception {<a name="line.626"></a>
-<span class="sourceLineNo">627</span> LOG.info("test=testBatchWithMixedActions");<a name="line.627"></a>
-<span class="sourceLineNo">628</span> Table table = UTIL.getConnection().getTable(TEST_TABLE);<a name="line.628"></a>
-<span class="sourceLineNo">629</span><a name="line.629"></a>
-<span class="sourceLineNo">630</span> // Load some data to start<a name="line.630"></a>
-<span class="sourceLineNo">631</span> List<Put> puts = constructPutRequests();<a name="line.631"></a>
-<span class="sourceLineNo">632</span> Object[] results = new Object[puts.size()];<a name="line.632"></a>
-<span class="sourceLineNo">633</span> table.batch(puts, results);<a name="line.633"></a>
-<span class="sourceLineNo">634</span> validateSizeAndEmpty(results, KEYS.length);<a name="line.634"></a>
-<span class="sourceLineNo">635</span><a name="line.635"></a>
-<span class="sourceLineNo">636</span> // Batch: get, get, put(new col), delete, get, get of put, get of deleted,<a name="line.636"></a>
-<span class="sourceLineNo">637</span> // put<a name="line.637"></a>
-<span class="sourceLineNo">638</span> List<Row> actions = new ArrayList<>();<a name="line.638"></a>
+<span class="sourceLineNo">558</span> // First test sequential requests.<a name="line.558"></a>
+<span class="sourceLineNo">559</span> try {<a name="line.559"></a>
+<span class="sourceLineNo">560</span> Increment inc = new Increment(ONE_ROW);<a name="line.560"></a>
+<span class="sourceLineNo">561</span> inc.addColumn(BYTES_FAMILY, QUALIFIER, 1L);<a name="line.561"></a>
+<span class="sourceLineNo">562</span> table.increment(inc);<a name="line.562"></a>
+<span class="sourceLineNo">563</span><a name="line.563"></a>
+<span class="sourceLineNo">564</span> // duplicate increment<a name="line.564"></a>
+<span class="sourceLineNo">565</span> inc = new Increment(ONE_ROW);<a name="line.565"></a>
+<span class="sourceLineNo">566</span> inc.addColumn(BYTES_FAMILY, QUALIFIER, 1L);<a name="line.566"></a>
+<span class="sourceLineNo">567</span> Result result = table.increment(inc);<a name="line.567"></a>
+<span class="sourceLineNo">568</span> validateResult(result, QUALIFIER, Bytes.toBytes(1L));<a name="line.568"></a>
+<span class="sourceLineNo">569</span><a name="line.569"></a>
+<span class="sourceLineNo">570</span> Get get = new Get(ONE_ROW);<a name="line.570"></a>
+<span class="sourceLineNo">571</span> get.addColumn(BYTES_FAMILY, QUALIFIER);<a name="line.571"></a>
+<span class="sourceLineNo">572</span> result = table.get(get);<a name="line.572"></a>
+<span class="sourceLineNo">573</span> validateResult(result, QUALIFIER, Bytes.toBytes(1L));<a name="line.573"></a>
+<span class="sourceLineNo">574</span><a name="line.574"></a>
+<span class="sourceLineNo">575</span> // Now run a bunch of requests in parallel, exactly half should succeed.<a name="line.575"></a>
+<span class="sourceLineNo">576</span> int numRequests = 40;<a name="line.576"></a>
+<span class="sourceLineNo">577</span> final CountDownLatch startedLatch = new CountDownLatch(numRequests);<a name="line.577"></a>
+<span class="sourceLineNo">578</span> final CountDownLatch startLatch = new CountDownLatch(1);<a name="line.578"></a>
+<span class="sourceLineNo">579</span> final CountDownLatch doneLatch = new CountDownLatch(numRequests);<a name="line.579"></a>
+<span class="sourceLineNo">580</span> for (int i = 0; i < numRequests; ++i) {<a name="line.580"></a>
+<span class="sourceLineNo">581</span> Runnable r = new Runnable() {<a name="line.581"></a>
+<span class="sourceLineNo">582</span> @Override<a name="line.582"></a>
+<span class="sourceLineNo">583</span> public void run() {<a name="line.583"></a>
+<span class="sourceLineNo">584</span> Table table = null;<a name=
<TRUNCATED>