hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From git-site-r...@apache.org
Subject [04/30] hbase-site git commit: Published site at .
Date Sat, 19 Aug 2017 20:02:36 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/495ddb86/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestFromClientSide3.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestFromClientSide3.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestFromClientSide3.html
index 401b413..6bb0bed 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestFromClientSide3.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestFromClientSide3.html
@@ -42,880 +42,981 @@
 <span class="sourceLineNo">034</span>import org.apache.commons.logging.LogFactory;<a name="line.34"></a>
 <span class="sourceLineNo">035</span>import org.apache.hadoop.conf.Configuration;<a name="line.35"></a>
 <span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.Cell;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.Coprocessor;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.coprocessor.ObserverContext;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.coprocessor.RegionObserver;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.regionserver.HRegionServer;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.regionserver.MiniBatchOperationInProgress;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.TableName;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.regionserver.Region;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.regionserver.RegionScanner;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.HConstants;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.HRegionLocation;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.coprocessor.MultiRowMutationEndpoint;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.ipc.CoprocessorRpcUtils;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.ipc.ServerRpcController;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.regionserver.HRegion;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>import org.junit.After;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>import org.junit.AfterClass;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>import static org.junit.Assert.assertEquals;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>import static org.junit.Assert.assertFalse;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>import static org.junit.Assert.assertNull;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>import static org.junit.Assert.assertTrue;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>import static org.junit.Assert.fail;<a name="line.68"></a>
-<span class="sourceLineNo">069</span>import org.junit.Before;<a name="line.69"></a>
-<span class="sourceLineNo">070</span>import org.junit.BeforeClass;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>import org.junit.Rule;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>import org.junit.Test;<a name="line.72"></a>
-<span class="sourceLineNo">073</span>import org.junit.experimental.categories.Category;<a name="line.73"></a>
-<span class="sourceLineNo">074</span>import org.junit.rules.TestName;<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span>@Category({LargeTests.class, ClientTests.class})<a name="line.76"></a>
-<span class="sourceLineNo">077</span>public class TestFromClientSide3 {<a name="line.77"></a>
-<span class="sourceLineNo">078</span>  private static final Log LOG = LogFactory.getLog(TestFromClientSide3.class);<a name="line.78"></a>
-<span class="sourceLineNo">079</span>  private final static HBaseTestingUtility TEST_UTIL<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    = new HBaseTestingUtility();<a name="line.80"></a>
-<span class="sourceLineNo">081</span>  private static byte[] FAMILY = Bytes.toBytes("testFamily");<a name="line.81"></a>
-<span class="sourceLineNo">082</span>  private static Random random = new Random();<a name="line.82"></a>
-<span class="sourceLineNo">083</span>  private static int SLAVES = 3;<a name="line.83"></a>
-<span class="sourceLineNo">084</span>  private static byte [] ROW = Bytes.toBytes("testRow");<a name="line.84"></a>
-<span class="sourceLineNo">085</span>  private static final byte[] ANOTHERROW = Bytes.toBytes("anotherrow");<a name="line.85"></a>
-<span class="sourceLineNo">086</span>  private static byte [] QUALIFIER = Bytes.toBytes("testQualifier");<a name="line.86"></a>
-<span class="sourceLineNo">087</span>  private static byte [] VALUE = Bytes.toBytes("testValue");<a name="line.87"></a>
-<span class="sourceLineNo">088</span>  private final static byte[] COL_QUAL = Bytes.toBytes("f1");<a name="line.88"></a>
-<span class="sourceLineNo">089</span>  private final static byte[] VAL_BYTES = Bytes.toBytes("v1");<a name="line.89"></a>
-<span class="sourceLineNo">090</span>  private final static byte[] ROW_BYTES = Bytes.toBytes("r1");<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span>  @Rule<a name="line.92"></a>
-<span class="sourceLineNo">093</span>  public TestName name = new TestName();<a name="line.93"></a>
-<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span>  /**<a name="line.95"></a>
-<span class="sourceLineNo">096</span>   * @throws java.lang.Exception<a name="line.96"></a>
-<span class="sourceLineNo">097</span>   */<a name="line.97"></a>
-<span class="sourceLineNo">098</span>  @BeforeClass<a name="line.98"></a>
-<span class="sourceLineNo">099</span>  public static void setUpBeforeClass() throws Exception {<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    TEST_UTIL.startMiniCluster(SLAVES);<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  }<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span>  /**<a name="line.103"></a>
-<span class="sourceLineNo">104</span>   * @throws java.lang.Exception<a name="line.104"></a>
-<span class="sourceLineNo">105</span>   */<a name="line.105"></a>
-<span class="sourceLineNo">106</span>  @AfterClass<a name="line.106"></a>
-<span class="sourceLineNo">107</span>  public static void tearDownAfterClass() throws Exception {<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    TEST_UTIL.shutdownMiniCluster();<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>  /**<a name="line.111"></a>
-<span class="sourceLineNo">112</span>   * @throws java.lang.Exception<a name="line.112"></a>
-<span class="sourceLineNo">113</span>   */<a name="line.113"></a>
-<span class="sourceLineNo">114</span>  @Before<a name="line.114"></a>
-<span class="sourceLineNo">115</span>  public void setUp() throws Exception {<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    // Nothing to do.<a name="line.116"></a>
-<span class="sourceLineNo">117</span>  }<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span>  /**<a name="line.119"></a>
-<span class="sourceLineNo">120</span>   * @throws java.lang.Exception<a name="line.120"></a>
-<span class="sourceLineNo">121</span>   */<a name="line.121"></a>
-<span class="sourceLineNo">122</span>  @After<a name="line.122"></a>
-<span class="sourceLineNo">123</span>  public void tearDown() throws Exception {<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    for (HTableDescriptor htd: TEST_UTIL.getAdmin().listTables()) {<a name="line.124"></a>
-<span class="sourceLineNo">125</span>      LOG.info("Tear down, remove table=" + htd.getTableName());<a name="line.125"></a>
-<span class="sourceLineNo">126</span>      TEST_UTIL.deleteTable(htd.getTableName());<a name="line.126"></a>
-<span class="sourceLineNo">127</span>  }<a name="line.127"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.CellUtil;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.Coprocessor;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.coprocessor.ObserverContext;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.coprocessor.RegionObserver;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.regionserver.HRegionServer;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.regionserver.MiniBatchOperationInProgress;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.TableName;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.regionserver.Region;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.regionserver.RegionScanner;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.HConstants;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.HRegionLocation;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.coprocessor.MultiRowMutationEndpoint;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.ipc.CoprocessorRpcUtils;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.ipc.ServerRpcController;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.regionserver.HRegion;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>import org.junit.After;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>import org.junit.AfterClass;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>import static org.junit.Assert.assertEquals;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>import static org.junit.Assert.assertFalse;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>import static org.junit.Assert.assertNull;<a name="line.67"></a>
+<span class="sourceLineNo">068</span>import static org.junit.Assert.assertTrue;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>import static org.junit.Assert.fail;<a name="line.69"></a>
+<span class="sourceLineNo">070</span>import org.junit.Before;<a name="line.70"></a>
+<span class="sourceLineNo">071</span>import org.junit.BeforeClass;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>import org.junit.Rule;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>import org.junit.Test;<a name="line.73"></a>
+<span class="sourceLineNo">074</span>import org.junit.experimental.categories.Category;<a name="line.74"></a>
+<span class="sourceLineNo">075</span>import org.junit.rules.TestName;<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span>@Category({LargeTests.class, ClientTests.class})<a name="line.77"></a>
+<span class="sourceLineNo">078</span>public class TestFromClientSide3 {<a name="line.78"></a>
+<span class="sourceLineNo">079</span>  private static final Log LOG = LogFactory.getLog(TestFromClientSide3.class);<a name="line.79"></a>
+<span class="sourceLineNo">080</span>  private final static HBaseTestingUtility TEST_UTIL<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    = new HBaseTestingUtility();<a name="line.81"></a>
+<span class="sourceLineNo">082</span>  private static byte[] FAMILY = Bytes.toBytes("testFamily");<a name="line.82"></a>
+<span class="sourceLineNo">083</span>  private static Random random = new Random();<a name="line.83"></a>
+<span class="sourceLineNo">084</span>  private static int SLAVES = 3;<a name="line.84"></a>
+<span class="sourceLineNo">085</span>  private static byte [] ROW = Bytes.toBytes("testRow");<a name="line.85"></a>
+<span class="sourceLineNo">086</span>  private static final byte[] ANOTHERROW = Bytes.toBytes("anotherrow");<a name="line.86"></a>
+<span class="sourceLineNo">087</span>  private static byte [] QUALIFIER = Bytes.toBytes("testQualifier");<a name="line.87"></a>
+<span class="sourceLineNo">088</span>  private static byte [] VALUE = Bytes.toBytes("testValue");<a name="line.88"></a>
+<span class="sourceLineNo">089</span>  private final static byte[] COL_QUAL = Bytes.toBytes("f1");<a name="line.89"></a>
+<span class="sourceLineNo">090</span>  private final static byte[] VAL_BYTES = Bytes.toBytes("v1");<a name="line.90"></a>
+<span class="sourceLineNo">091</span>  private final static byte[] ROW_BYTES = Bytes.toBytes("r1");<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span>  @Rule<a name="line.93"></a>
+<span class="sourceLineNo">094</span>  public TestName name = new TestName();<a name="line.94"></a>
+<span class="sourceLineNo">095</span><a name="line.95"></a>
+<span class="sourceLineNo">096</span>  /**<a name="line.96"></a>
+<span class="sourceLineNo">097</span>   * @throws java.lang.Exception<a name="line.97"></a>
+<span class="sourceLineNo">098</span>   */<a name="line.98"></a>
+<span class="sourceLineNo">099</span>  @BeforeClass<a name="line.99"></a>
+<span class="sourceLineNo">100</span>  public static void setUpBeforeClass() throws Exception {<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    TEST_UTIL.startMiniCluster(SLAVES);<a name="line.101"></a>
+<span class="sourceLineNo">102</span>  }<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span>  /**<a name="line.104"></a>
+<span class="sourceLineNo">105</span>   * @throws java.lang.Exception<a name="line.105"></a>
+<span class="sourceLineNo">106</span>   */<a name="line.106"></a>
+<span class="sourceLineNo">107</span>  @AfterClass<a name="line.107"></a>
+<span class="sourceLineNo">108</span>  public static void tearDownAfterClass() throws Exception {<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    TEST_UTIL.shutdownMiniCluster();<a name="line.109"></a>
+<span class="sourceLineNo">110</span>  }<a name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span>  /**<a name="line.112"></a>
+<span class="sourceLineNo">113</span>   * @throws java.lang.Exception<a name="line.113"></a>
+<span class="sourceLineNo">114</span>   */<a name="line.114"></a>
+<span class="sourceLineNo">115</span>  @Before<a name="line.115"></a>
+<span class="sourceLineNo">116</span>  public void setUp() throws Exception {<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    // Nothing to do.<a name="line.117"></a>
+<span class="sourceLineNo">118</span>  }<a name="line.118"></a>
+<span class="sourceLineNo">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span>  /**<a name="line.120"></a>
+<span class="sourceLineNo">121</span>   * @throws java.lang.Exception<a name="line.121"></a>
+<span class="sourceLineNo">122</span>   */<a name="line.122"></a>
+<span class="sourceLineNo">123</span>  @After<a name="line.123"></a>
+<span class="sourceLineNo">124</span>  public void tearDown() throws Exception {<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    for (HTableDescriptor htd: TEST_UTIL.getAdmin().listTables()) {<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      LOG.info("Tear down, remove table=" + htd.getTableName());<a name="line.126"></a>
+<span class="sourceLineNo">127</span>      TEST_UTIL.deleteTable(htd.getTableName());<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>  private void randomCFPuts(Table table, byte[] row, byte[] family, int nPuts)<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      throws Exception {<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    Put put = new Put(row);<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    for (int i = 0; i &lt; nPuts; i++) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      byte[] qualifier = Bytes.toBytes(random.nextInt());<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      byte[] value = Bytes.toBytes(random.nextInt());<a name="line.135"></a>
-<span class="sourceLineNo">136</span>      put.addColumn(family, qualifier, value);<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    }<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    table.put(put);<a name="line.138"></a>
-<span class="sourceLineNo">139</span>  }<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span>  private void performMultiplePutAndFlush(HBaseAdmin admin, Table table,<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      byte[] row, byte[] family, int nFlushes, int nPuts)<a name="line.142"></a>
-<span class="sourceLineNo">143</span>  throws Exception {<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span>    try (RegionLocator locator = TEST_UTIL.getConnection().getRegionLocator(table.getName())) {<a name="line.145"></a>
-<span class="sourceLineNo">146</span>      // connection needed for poll-wait<a name="line.146"></a>
-<span class="sourceLineNo">147</span>      HRegionLocation loc = locator.getRegionLocation(row, true);<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      AdminProtos.AdminService.BlockingInterface server =<a name="line.148"></a>
-<span class="sourceLineNo">149</span>        ((ClusterConnection) admin.getConnection()).getAdmin(loc.getServerName());<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      byte[] regName = loc.getRegionInfo().getRegionName();<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span>      for (int i = 0; i &lt; nFlushes; i++) {<a name="line.152"></a>
-<span class="sourceLineNo">153</span>        randomCFPuts(table, row, family, nPuts);<a name="line.153"></a>
-<span class="sourceLineNo">154</span>        List&lt;String&gt; sf = ProtobufUtil.getStoreFiles(server, regName, FAMILY);<a name="line.154"></a>
-<span class="sourceLineNo">155</span>        int sfCount = sf.size();<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span>        admin.flush(table.getName());<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>  }<a name="line.160"></a>
-<span class="sourceLineNo">161</span><a name="line.161"></a>
-<span class="sourceLineNo">162</span>  // override the config settings at the CF level and ensure priority<a name="line.162"></a>
-<span class="sourceLineNo">163</span>  @Test(timeout = 60000)<a name="line.163"></a>
-<span class="sourceLineNo">164</span>  public void testAdvancedConfigOverride() throws Exception {<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    /*<a name="line.165"></a>
-<span class="sourceLineNo">166</span>     * Overall idea: (1) create 3 store files and issue a compaction. config's<a name="line.166"></a>
-<span class="sourceLineNo">167</span>     * compaction.min == 3, so should work. (2) Increase the compaction.min<a name="line.167"></a>
-<span class="sourceLineNo">168</span>     * toggle in the HTD to 5 and modify table. If we use the HTD value instead<a name="line.168"></a>
-<span class="sourceLineNo">169</span>     * of the default config value, adding 3 files and issuing a compaction<a name="line.169"></a>
-<span class="sourceLineNo">170</span>     * SHOULD NOT work (3) Decrease the compaction.min toggle in the HCD to 2<a name="line.170"></a>
-<span class="sourceLineNo">171</span>     * and modify table. The CF schema should override the Table schema and now<a name="line.171"></a>
-<span class="sourceLineNo">172</span>     * cause a minor compaction.<a name="line.172"></a>
-<span class="sourceLineNo">173</span>     */<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    TEST_UTIL.getConfiguration().setInt("hbase.hstore.compaction.min", 3);<a name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    Table hTable = TEST_UTIL.createTable(tableName, FAMILY, 10);<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    Admin admin = TEST_UTIL.getAdmin();<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    ClusterConnection connection = (ClusterConnection) TEST_UTIL.getConnection();<a name="line.179"></a>
-<span class="sourceLineNo">180</span><a name="line.180"></a>
-<span class="sourceLineNo">181</span>    // Create 3 store files.<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    byte[] row = Bytes.toBytes(random.nextInt());<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    performMultiplePutAndFlush((HBaseAdmin) admin, hTable, row, FAMILY, 3, 100);<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span>    try (RegionLocator locator = TEST_UTIL.getConnection().getRegionLocator(tableName)) {<a name="line.185"></a>
-<span class="sourceLineNo">186</span>      // Verify we have multiple store files.<a name="line.186"></a>
-<span class="sourceLineNo">187</span>      HRegionLocation loc = locator.getRegionLocation(row, true);<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      byte[] regionName = loc.getRegionInfo().getRegionName();<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      AdminProtos.AdminService.BlockingInterface server = connection.getAdmin(loc.getServerName());<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      assertTrue(ProtobufUtil.getStoreFiles(server, regionName, FAMILY).size() &gt; 1);<a name="line.190"></a>
-<span class="sourceLineNo">191</span><a name="line.191"></a>
-<span class="sourceLineNo">192</span>      // Issue a compaction request<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      admin.compact(tableName);<a name="line.193"></a>
-<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span>      // poll wait for the compactions to happen<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      for (int i = 0; i &lt; 10 * 1000 / 40; ++i) {<a name="line.196"></a>
-<span class="sourceLineNo">197</span>        // The number of store files after compaction should be lesser.<a name="line.197"></a>
-<span class="sourceLineNo">198</span>        loc = locator.getRegionLocation(row, true);<a name="line.198"></a>
-<span class="sourceLineNo">199</span>        if (!loc.getRegionInfo().isOffline()) {<a name="line.199"></a>
-<span class="sourceLineNo">200</span>          regionName = loc.getRegionInfo().getRegionName();<a name="line.200"></a>
-<span class="sourceLineNo">201</span>          server = connection.getAdmin(loc.getServerName());<a name="line.201"></a>
-<span class="sourceLineNo">202</span>          if (ProtobufUtil.getStoreFiles(server, regionName, FAMILY).size() &lt;= 1) {<a name="line.202"></a>
-<span class="sourceLineNo">203</span>            break;<a name="line.203"></a>
-<span class="sourceLineNo">204</span>          }<a name="line.204"></a>
-<span class="sourceLineNo">205</span>        }<a name="line.205"></a>
-<span class="sourceLineNo">206</span>        Thread.sleep(40);<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      }<a name="line.207"></a>
-<span class="sourceLineNo">208</span>      // verify the compactions took place and that we didn't just time out<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      assertTrue(ProtobufUtil.getStoreFiles(server, regionName, FAMILY).size() &lt;= 1);<a name="line.209"></a>
-<span class="sourceLineNo">210</span><a name="line.210"></a>
-<span class="sourceLineNo">211</span>      // change the compaction.min config option for this table to 5<a name="line.211"></a>
-<span class="sourceLineNo">212</span>      LOG.info("hbase.hstore.compaction.min should now be 5");<a name="line.212"></a>
-<span class="sourceLineNo">213</span>      HTableDescriptor htd = new HTableDescriptor(hTable.getTableDescriptor());<a name="line.213"></a>
-<span class="sourceLineNo">214</span>      htd.setValue("hbase.hstore.compaction.min", String.valueOf(5));<a name="line.214"></a>
-<span class="sourceLineNo">215</span>      admin.modifyTable(tableName, htd);<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      Pair&lt;Integer, Integer&gt; st;<a name="line.216"></a>
-<span class="sourceLineNo">217</span>      while (null != (st = admin.getAlterStatus(tableName)) &amp;&amp; st.getFirst() &gt; 0) {<a name="line.217"></a>
-<span class="sourceLineNo">218</span>        LOG.debug(st.getFirst() + " regions left to update");<a name="line.218"></a>
-<span class="sourceLineNo">219</span>        Thread.sleep(40);<a name="line.219"></a>
-<span class="sourceLineNo">220</span>      }<a name="line.220"></a>
-<span class="sourceLineNo">221</span>      LOG.info("alter status finished");<a name="line.221"></a>
-<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span>      // Create 3 more store files.<a name="line.223"></a>
-<span class="sourceLineNo">224</span>      performMultiplePutAndFlush((HBaseAdmin) admin, hTable, row, FAMILY, 3, 10);<a name="line.224"></a>
-<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span>      // Issue a compaction request<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      admin.compact(tableName);<a name="line.227"></a>
-<span class="sourceLineNo">228</span><a name="line.228"></a>
-<span class="sourceLineNo">229</span>      // This time, the compaction request should not happen<a name="line.229"></a>
-<span class="sourceLineNo">230</span>      Thread.sleep(10 * 1000);<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      loc = locator.getRegionLocation(row, true);<a name="line.231"></a>
-<span class="sourceLineNo">232</span>      regionName = loc.getRegionInfo().getRegionName();<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      server = connection.getAdmin(loc.getServerName());<a name="line.233"></a>
-<span class="sourceLineNo">234</span>      int sfCount = ProtobufUtil.getStoreFiles(server, regionName, FAMILY).size();<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      assertTrue(sfCount &gt; 1);<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span>      // change an individual CF's config option to 2 &amp; online schema update<a name="line.237"></a>
-<span class="sourceLineNo">238</span>      LOG.info("hbase.hstore.compaction.min should now be 2");<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      HColumnDescriptor hcd = new HColumnDescriptor(htd.getFamily(FAMILY));<a name="line.239"></a>
-<span class="sourceLineNo">240</span>      hcd.setValue("hbase.hstore.compaction.min", String.valueOf(2));<a name="line.240"></a>
-<span class="sourceLineNo">241</span>      htd.modifyFamily(hcd);<a name="line.241"></a>
-<span class="sourceLineNo">242</span>      admin.modifyTable(tableName, htd);<a name="line.242"></a>
-<span class="sourceLineNo">243</span>      while (null != (st = admin.getAlterStatus(tableName)) &amp;&amp; st.getFirst() &gt; 0) {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>        LOG.debug(st.getFirst() + " regions left to update");<a name="line.244"></a>
-<span class="sourceLineNo">245</span>        Thread.sleep(40);<a name="line.245"></a>
-<span class="sourceLineNo">246</span>      }<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      LOG.info("alter status finished");<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span>      // Issue a compaction request<a name="line.249"></a>
-<span class="sourceLineNo">250</span>      admin.compact(tableName);<a name="line.250"></a>
-<span class="sourceLineNo">251</span><a name="line.251"></a>
-<span class="sourceLineNo">252</span>      // poll wait for the compactions to happen<a name="line.252"></a>
-<span class="sourceLineNo">253</span>      for (int i = 0; i &lt; 10 * 1000 / 40; ++i) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span>        loc = locator.getRegionLocation(row, true);<a name="line.254"></a>
-<span class="sourceLineNo">255</span>        regionName = loc.getRegionInfo().getRegionName();<a name="line.255"></a>
-<span class="sourceLineNo">256</span>        try {<a name="line.256"></a>
-<span class="sourceLineNo">257</span>          server = connection.getAdmin(loc.getServerName());<a name="line.257"></a>
-<span class="sourceLineNo">258</span>          if (ProtobufUtil.getStoreFiles(server, regionName, FAMILY).size() &lt; sfCount) {<a name="line.258"></a>
-<span class="sourceLineNo">259</span>            break;<a name="line.259"></a>
-<span class="sourceLineNo">260</span>          }<a name="line.260"></a>
-<span class="sourceLineNo">261</span>        } catch (Exception e) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span>          LOG.debug("Waiting for region to come online: " + regionName);<a name="line.262"></a>
-<span class="sourceLineNo">263</span>        }<a name="line.263"></a>
-<span class="sourceLineNo">264</span>        Thread.sleep(40);<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>      // verify the compaction took place and that we didn't just time out<a name="line.267"></a>
-<span class="sourceLineNo">268</span>      assertTrue(ProtobufUtil.getStoreFiles(<a name="line.268"></a>
-<span class="sourceLineNo">269</span>        server, regionName, FAMILY).size() &lt; sfCount);<a name="line.269"></a>
-<span class="sourceLineNo">270</span><a name="line.270"></a>
-<span class="sourceLineNo">271</span>      // Finally, ensure that we can remove a custom config value after we made it<a name="line.271"></a>
-<span class="sourceLineNo">272</span>      LOG.info("Removing CF config value");<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      LOG.info("hbase.hstore.compaction.min should now be 5");<a name="line.273"></a>
-<span class="sourceLineNo">274</span>      hcd = new HColumnDescriptor(htd.getFamily(FAMILY));<a name="line.274"></a>
-<span class="sourceLineNo">275</span>      hcd.setValue("hbase.hstore.compaction.min", null);<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      htd.modifyFamily(hcd);<a name="line.276"></a>
-<span class="sourceLineNo">277</span>      admin.modifyTable(tableName, htd);<a name="line.277"></a>
-<span class="sourceLineNo">278</span>      while (null != (st = admin.getAlterStatus(tableName)) &amp;&amp; st.getFirst() &gt; 0) {<a name="line.278"></a>
-<span class="sourceLineNo">279</span>        LOG.debug(st.getFirst() + " regions left to update");<a name="line.279"></a>
-<span class="sourceLineNo">280</span>        Thread.sleep(40);<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      }<a name="line.281"></a>
-<span class="sourceLineNo">282</span>      LOG.info("alter status finished");<a name="line.282"></a>
-<span class="sourceLineNo">283</span>      assertNull(hTable.getTableDescriptor().getFamily(FAMILY).getValue(<a name="line.283"></a>
-<span class="sourceLineNo">284</span>          "hbase.hstore.compaction.min"));<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    }<a name="line.285"></a>
-<span class="sourceLineNo">286</span>  }<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span>  @Test<a name="line.288"></a>
-<span class="sourceLineNo">289</span>  public void testHTableBatchWithEmptyPut ()throws Exception {<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      Table table = TEST_UTIL.createTable(TableName.valueOf(name.getMethodName()),<a name="line.290"></a>
-<span class="sourceLineNo">291</span>          new byte[][] { FAMILY });<a name="line.291"></a>
-<span class="sourceLineNo">292</span>    try {<a name="line.292"></a>
-<span class="sourceLineNo">293</span>      List actions = (List) new ArrayList();<a name="line.293"></a>
-<span class="sourceLineNo">294</span>      Object[] results = new Object[2];<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      // create an empty Put<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      Put put1 = new Put(ROW);<a name="line.296"></a>
-<span class="sourceLineNo">297</span>      actions.add(put1);<a name="line.297"></a>
-<span class="sourceLineNo">298</span><a name="line.298"></a>
-<span class="sourceLineNo">299</span>      Put put2 = new Put(ANOTHERROW);<a name="line.299"></a>
-<span class="sourceLineNo">300</span>      put2.addColumn(FAMILY, QUALIFIER, VALUE);<a name="line.300"></a>
-<span class="sourceLineNo">301</span>      actions.add(put2);<a name="line.301"></a>
-<span class="sourceLineNo">302</span><a name="line.302"></a>
-<span class="sourceLineNo">303</span>      table.batch(actions, results);<a name="line.303"></a>
-<span class="sourceLineNo">304</span>      fail("Empty Put should have failed the batch call");<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    } catch (IllegalArgumentException iae) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span><a name="line.306"></a>
-<span class="sourceLineNo">307</span>    } finally {<a name="line.307"></a>
-<span class="sourceLineNo">308</span>      table.close();<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    }<a name="line.309"></a>
-<span class="sourceLineNo">310</span>  }<a name="line.310"></a>
+<span class="sourceLineNo">129</span>  }<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span>  private void randomCFPuts(Table table, byte[] row, byte[] family, int nPuts)<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      throws Exception {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    Put put = new Put(row);<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    for (int i = 0; i &lt; nPuts; i++) {<a name="line.134"></a>
+<span class="sourceLineNo">135</span>      byte[] qualifier = Bytes.toBytes(random.nextInt());<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      byte[] value = Bytes.toBytes(random.nextInt());<a name="line.136"></a>
+<span class="sourceLineNo">137</span>      put.addColumn(family, qualifier, value);<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    }<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    table.put(put);<a name="line.139"></a>
+<span class="sourceLineNo">140</span>  }<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span>  private void performMultiplePutAndFlush(HBaseAdmin admin, Table table,<a name="line.142"></a>
+<span class="sourceLineNo">143</span>      byte[] row, byte[] family, int nFlushes, int nPuts)<a name="line.143"></a>
+<span class="sourceLineNo">144</span>  throws Exception {<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span>    try (RegionLocator locator = TEST_UTIL.getConnection().getRegionLocator(table.getName())) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>      // connection needed for poll-wait<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      HRegionLocation loc = locator.getRegionLocation(row, true);<a name="line.148"></a>
+<span class="sourceLineNo">149</span>      AdminProtos.AdminService.BlockingInterface server =<a name="line.149"></a>
+<span class="sourceLineNo">150</span>        ((ClusterConnection) admin.getConnection()).getAdmin(loc.getServerName());<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      byte[] regName = loc.getRegionInfo().getRegionName();<a name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span>      for (int i = 0; i &lt; nFlushes; i++) {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>        randomCFPuts(table, row, family, nPuts);<a name="line.154"></a>
+<span class="sourceLineNo">155</span>        List&lt;String&gt; sf = ProtobufUtil.getStoreFiles(server, regName, FAMILY);<a name="line.155"></a>
+<span class="sourceLineNo">156</span>        int sfCount = sf.size();<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span>        admin.flush(table.getName());<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>  }<a name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span>  private static List&lt;Cell&gt; toList(ResultScanner scanner) {<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    try {<a name="line.164"></a>
+<span class="sourceLineNo">165</span>      List&lt;Cell&gt; cells = new ArrayList&lt;&gt;();<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      for (Result r : scanner) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span>        cells.addAll(r.listCells());<a name="line.167"></a>
+<span class="sourceLineNo">168</span>      }<a name="line.168"></a>
+<span class="sourceLineNo">169</span>      return cells;<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    } finally {<a name="line.170"></a>
+<span class="sourceLineNo">171</span>      scanner.close();<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>  @Test<a name="line.175"></a>
+<span class="sourceLineNo">176</span>  public void testScanAfterDeletingSpecifiedRow() throws IOException {<a name="line.176"></a>
+<span class="sourceLineNo">177</span>    TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    TableDescriptor desc = TableDescriptorBuilder.newBuilder(tableName)<a name="line.178"></a>
+<span class="sourceLineNo">179</span>            .addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY))<a name="line.179"></a>
+<span class="sourceLineNo">180</span>            .build();<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    TEST_UTIL.getAdmin().createTable(desc);<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    byte[] row = Bytes.toBytes("SpecifiedRow");<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    byte[] value0 = Bytes.toBytes("value_0");<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    byte[] value1 = Bytes.toBytes("value_1");<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    try (Table t = TEST_UTIL.getConnection().getTable(tableName)) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      Put put = new Put(row);<a name="line.186"></a>
+<span class="sourceLineNo">187</span>      put.addColumn(FAMILY, QUALIFIER, VALUE);<a name="line.187"></a>
+<span class="sourceLineNo">188</span>      t.put(put);<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      Delete d = new Delete(row);<a name="line.189"></a>
+<span class="sourceLineNo">190</span>      t.delete(d);<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      put = new Put(row);<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      put.addColumn(FAMILY, null, value0);<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      t.put(put);<a name="line.193"></a>
+<span class="sourceLineNo">194</span>      put = new Put(row);<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      put.addColumn(FAMILY, null, value1);<a name="line.195"></a>
+<span class="sourceLineNo">196</span>      t.put(put);<a name="line.196"></a>
+<span class="sourceLineNo">197</span>      List&lt;Cell&gt; cells = toList(t.getScanner(new Scan()));<a name="line.197"></a>
+<span class="sourceLineNo">198</span>      assertEquals(1, cells.size());<a name="line.198"></a>
+<span class="sourceLineNo">199</span>      assertEquals("value_1", Bytes.toString(CellUtil.cloneValue(cells.get(0))));<a name="line.199"></a>
+<span class="sourceLineNo">200</span><a name="line.200"></a>
+<span class="sourceLineNo">201</span>      cells = toList(t.getScanner(new Scan().addFamily(FAMILY)));<a name="line.201"></a>
+<span class="sourceLineNo">202</span>      assertEquals(1, cells.size());<a name="line.202"></a>
+<span class="sourceLineNo">203</span>      assertEquals("value_1", Bytes.toString(CellUtil.cloneValue(cells.get(0))));<a name="line.203"></a>
+<span class="sourceLineNo">204</span><a name="line.204"></a>
+<span class="sourceLineNo">205</span>      cells = toList(t.getScanner(new Scan().addColumn(FAMILY, QUALIFIER)));<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      assertEquals(0, cells.size());<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span>      TEST_UTIL.getAdmin().flush(tableName);<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      cells = toList(t.getScanner(new Scan()));<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      assertEquals(1, cells.size());<a name="line.210"></a>
+<span class="sourceLineNo">211</span>      assertEquals("value_1", Bytes.toString(CellUtil.cloneValue(cells.get(0))));<a name="line.211"></a>
+<span class="sourceLineNo">212</span><a name="line.212"></a>
+<span class="sourceLineNo">213</span>      cells = toList(t.getScanner(new Scan().addFamily(FAMILY)));<a name="line.213"></a>
+<span class="sourceLineNo">214</span>      assertEquals(1, cells.size());<a name="line.214"></a>
+<span class="sourceLineNo">215</span>      assertEquals("value_1", Bytes.toString(CellUtil.cloneValue(cells.get(0))));<a name="line.215"></a>
+<span class="sourceLineNo">216</span><a name="line.216"></a>
+<span class="sourceLineNo">217</span>      cells = toList(t.getScanner(new Scan().addColumn(FAMILY, QUALIFIER)));<a name="line.217"></a>
+<span class="sourceLineNo">218</span>      assertEquals(0, cells.size());<a name="line.218"></a>
+<span class="sourceLineNo">219</span>    }<a name="line.219"></a>
+<span class="sourceLineNo">220</span>  }<a name="line.220"></a>
+<span class="sourceLineNo">221</span><a name="line.221"></a>
+<span class="sourceLineNo">222</span>  @Test<a name="line.222"></a>
+<span class="sourceLineNo">223</span>  public void testScanAfterDeletingSpecifiedRowV2() throws IOException {<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    TableDescriptor desc = TableDescriptorBuilder.newBuilder(tableName)<a name="line.225"></a>
+<span class="sourceLineNo">226</span>            .addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY))<a name="line.226"></a>
+<span class="sourceLineNo">227</span>            .build();<a name="line.227"></a>
+<span class="sourceLineNo">228</span>    TEST_UTIL.getAdmin().createTable(desc);<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    byte[] row = Bytes.toBytes("SpecifiedRow");<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    byte[] qual0 = Bytes.toBytes("qual0");<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    byte[] qual1 = Bytes.toBytes("qual1");<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    try (Table t = TEST_UTIL.getConnection().getTable(tableName)) {<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      Delete d = new Delete(row);<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      t.delete(d);<a name="line.234"></a>
+<span class="sourceLineNo">235</span><a name="line.235"></a>
+<span class="sourceLineNo">236</span>      Put put = new Put(row);<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      put.addColumn(FAMILY, null, VALUE);<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      t.put(put);<a name="line.238"></a>
+<span class="sourceLineNo">239</span><a name="line.239"></a>
+<span class="sourceLineNo">240</span>      put = new Put(row);<a name="line.240"></a>
+<span class="sourceLineNo">241</span>      put.addColumn(FAMILY, qual1, qual1);<a name="line.241"></a>
+<span class="sourceLineNo">242</span>      t.put(put);<a name="line.242"></a>
+<span class="sourceLineNo">243</span><a name="line.243"></a>
+<span class="sourceLineNo">244</span>      put = new Put(row);<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      put.addColumn(FAMILY, qual0, qual0);<a name="line.245"></a>
+<span class="sourceLineNo">246</span>      t.put(put);<a name="line.246"></a>
+<span class="sourceLineNo">247</span><a name="line.247"></a>
+<span class="sourceLineNo">248</span>      Result r = t.get(new Get(row));<a name="line.248"></a>
+<span class="sourceLineNo">249</span>      assertEquals(3, r.size());<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      assertEquals("testValue", Bytes.toString(CellUtil.cloneValue(r.rawCells()[0])));<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      assertEquals("qual0", Bytes.toString(CellUtil.cloneValue(r.rawCells()[1])));<a name="line.251"></a>
+<span class="sourceLineNo">252</span>      assertEquals("qual1", Bytes.toString(CellUtil.cloneValue(r.rawCells()[2])));<a name="line.252"></a>
+<span class="sourceLineNo">253</span><a name="line.253"></a>
+<span class="sourceLineNo">254</span>      TEST_UTIL.getAdmin().flush(tableName);<a name="line.254"></a>
+<span class="sourceLineNo">255</span>      r = t.get(new Get(row));<a name="line.255"></a>
+<span class="sourceLineNo">256</span>      assertEquals(3, r.size());<a name="line.256"></a>
+<span class="sourceLineNo">257</span>      assertEquals("testValue", Bytes.toString(CellUtil.cloneValue(r.rawCells()[0])));<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      assertEquals("qual0", Bytes.toString(CellUtil.cloneValue(r.rawCells()[1])));<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      assertEquals("qual1", Bytes.toString(CellUtil.cloneValue(r.rawCells()[2])));<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    }<a name="line.260"></a>
+<span class="sourceLineNo">261</span>  }<a name="line.261"></a>
+<span class="sourceLineNo">262</span><a name="line.262"></a>
+<span class="sourceLineNo">263</span>  // override the config settings at the CF level and ensure priority<a name="line.263"></a>
+<span class="sourceLineNo">264</span>  @Test(timeout = 60000)<a name="line.264"></a>
+<span class="sourceLineNo">265</span>  public void testAdvancedConfigOverride() throws Exception {<a name="line.265"></a>
+<span class="sourceLineNo">266</span>    /*<a name="line.266"></a>
+<span class="sourceLineNo">267</span>     * Overall idea: (1) create 3 store files and issue a compaction. config's<a name="line.267"></a>
+<span class="sourceLineNo">268</span>     * compaction.min == 3, so should work. (2) Increase the compaction.min<a name="line.268"></a>
+<span class="sourceLineNo">269</span>     * toggle in the HTD to 5 and modify table. If we use the HTD value instead<a name="line.269"></a>
+<span class="sourceLineNo">270</span>     * of the default config value, adding 3 files and issuing a compaction<a name="line.270"></a>
+<span class="sourceLineNo">271</span>     * SHOULD NOT work (3) Decrease the compaction.min toggle in the HCD to 2<a name="line.271"></a>
+<span class="sourceLineNo">272</span>     * and modify table. The CF schema should override the Table schema and now<a name="line.272"></a>
+<span class="sourceLineNo">273</span>     * cause a minor compaction.<a name="line.273"></a>
+<span class="sourceLineNo">274</span>     */<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    TEST_UTIL.getConfiguration().setInt("hbase.hstore.compaction.min", 3);<a name="line.275"></a>
+<span class="sourceLineNo">276</span><a name="line.276"></a>
+<span class="sourceLineNo">277</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    Table hTable = TEST_UTIL.createTable(tableName, FAMILY, 10);<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    Admin admin = TEST_UTIL.getAdmin();<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    ClusterConnection connection = (ClusterConnection) TEST_UTIL.getConnection();<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span>    // Create 3 store files.<a name="line.282"></a>
+<span class="sourceLineNo">283</span>    byte[] row = Bytes.toBytes(random.nextInt());<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    performMultiplePutAndFlush((HBaseAdmin) admin, hTable, row, FAMILY, 3, 100);<a name="line.284"></a>
+<span class="sourceLineNo">285</span><a name="line.285"></a>
+<span class="sourceLineNo">286</span>    try (RegionLocator locator = TEST_UTIL.getConnection().getRegionLocator(tableName)) {<a name="line.286"></a>
+<span class="sourceLineNo">287</span>      // Verify we have multiple store files.<a name="line.287"></a>
+<span class="sourceLineNo">288</span>      HRegionLocation loc = locator.getRegionLocation(row, true);<a name="line.288"></a>
+<span class="sourceLineNo">289</span>      byte[] regionName = loc.getRegionInfo().getRegionName();<a name="line.289"></a>
+<span class="sourceLineNo">290</span>      AdminProtos.AdminService.BlockingInterface server = connection.getAdmin(loc.getServerName());<a name="line.290"></a>
+<span class="sourceLineNo">291</span>      assertTrue(ProtobufUtil.getStoreFiles(server, regionName, FAMILY).size() &gt; 1);<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span>      // Issue a compaction request<a name="line.293"></a>
+<span class="sourceLineNo">294</span>      admin.compact(tableName);<a name="line.294"></a>
+<span class="sourceLineNo">295</span><a name="line.295"></a>
+<span class="sourceLineNo">296</span>      // poll wait for the compactions to happen<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      for (int i = 0; i &lt; 10 * 1000 / 40; ++i) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span>        // The number of store files after compaction should be lesser.<a name="line.298"></a>
+<span class="sourceLineNo">299</span>        loc = locator.getRegionLocation(row, true);<a name="line.299"></a>
+<span class="sourceLineNo">300</span>        if (!loc.getRegionInfo().isOffline()) {<a name="line.300"></a>
+<span class="sourceLineNo">301</span>          regionName = loc.getRegionInfo().getRegionName();<a name="line.301"></a>
+<span class="sourceLineNo">302</span>          server = connection.getAdmin(loc.getServerName());<a name="line.302"></a>
+<span class="sourceLineNo">303</span>          if (ProtobufUtil.getStoreFiles(server, regionName, FAMILY).size() &lt;= 1) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span>            break;<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>        Thread.sleep(40);<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      }<a name="line.308"></a>
+<span class="sourceLineNo">309</span>      // verify the compactions took place and that we didn't just time out<a name="line.309"></a>
+<span class="sourceLineNo">310</span>      assertTrue(ProtobufUtil.getStoreFiles(server, regionName, FAMILY).size() &lt;= 1);<a name="line.310"></a>
 <span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span>  @Test<a name="line.312"></a>
-<span class="sourceLineNo">313</span>  public void testBatchWithRowMutation() throws Exception {<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    LOG.info("Starting testBatchWithRowMutation");<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    final TableName TABLENAME = TableName.valueOf("testBatchWithRowMutation");<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    try (Table t = TEST_UTIL.createTable(TABLENAME, FAMILY)) {<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      byte [][] QUALIFIERS = new byte [][] {<a name="line.317"></a>
-<span class="sourceLineNo">318</span>        Bytes.toBytes("a"), Bytes.toBytes("b")<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      };<a name="line.319"></a>
-<span class="sourceLineNo">320</span>      RowMutations arm = new RowMutations(ROW);<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      Put p = new Put(ROW);<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      p.addColumn(FAMILY, QUALIFIERS[0], VALUE);<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      arm.add(p);<a name="line.323"></a>
-<span class="sourceLineNo">324</span>      Object[] batchResult = new Object[1];<a name="line.324"></a>
-<span class="sourceLineNo">325</span>      t.batch(Arrays.asList(arm), batchResult);<a name="line.325"></a>
+<span class="sourceLineNo">312</span>      // change the compaction.min config option for this table to 5<a name="line.312"></a>
+<span class="sourceLineNo">313</span>      LOG.info("hbase.hstore.compaction.min should now be 5");<a name="line.313"></a>
+<span class="sourceLineNo">314</span>      HTableDescriptor htd = new HTableDescriptor(hTable.getTableDescriptor());<a name="line.314"></a>
+<span class="sourceLineNo">315</span>      htd.setValue("hbase.hstore.compaction.min", String.valueOf(5));<a name="line.315"></a>
+<span class="sourceLineNo">316</span>      admin.modifyTable(tableName, htd);<a name="line.316"></a>
+<span class="sourceLineNo">317</span>      Pair&lt;Integer, Integer&gt; st;<a name="line.317"></a>
+<span class="sourceLineNo">318</span>      while (null != (st = admin.getAlterStatus(tableName)) &amp;&amp; st.getFirst() &gt; 0) {<a name="line.318"></a>
+<span class="sourceLineNo">319</span>        LOG.debug(st.getFirst() + " regions left to update");<a name="line.319"></a>
+<span class="sourceLineNo">320</span>        Thread.sleep(40);<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      }<a name="line.321"></a>
+<span class="sourceLineNo">322</span>      LOG.info("alter status finished");<a name="line.322"></a>
+<span class="sourceLineNo">323</span><a name="line.323"></a>
+<span class="sourceLineNo">324</span>      // Create 3 more store files.<a name="line.324"></a>
+<span class="sourceLineNo">325</span>      performMultiplePutAndFlush((HBaseAdmin) admin, hTable, row, FAMILY, 3, 10);<a name="line.325"></a>
 <span class="sourceLineNo">326</span><a name="line.326"></a>
-<span class="sourceLineNo">327</span>      Get g = new Get(ROW);<a name="line.327"></a>
-<span class="sourceLineNo">328</span>      Result r = t.get(g);<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      assertEquals(0, Bytes.compareTo(VALUE, r.getValue(FAMILY, QUALIFIERS[0])));<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span>      arm = new RowMutations(ROW);<a name="line.331"></a>
-<span class="sourceLineNo">332</span>      p = new Put(ROW);<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      p.addColumn(FAMILY, QUALIFIERS[1], VALUE);<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      arm.add(p);<a name="line.334"></a>
-<span class="sourceLineNo">335</span>      Delete d = new Delete(ROW);<a name="line.335"></a>
-<span class="sourceLineNo">336</span>      d.addColumns(FAMILY, QUALIFIERS[0]);<a name="line.336"></a>
-<span class="sourceLineNo">337</span>      arm.add(d);<a name="line.337"></a>
-<span class="sourceLineNo">338</span>      t.batch(Arrays.asList(arm), batchResult);<a name="line.338"></a>
-<span class="sourceLineNo">339</span>      r = t.get(g);<a name="line.339"></a>
-<span class="sourceLineNo">340</span>      assertEquals(0, Bytes.compareTo(VALUE, r.getValue(FAMILY, QUALIFIERS[1])));<a name="line.340"></a>
-<span class="sourceLineNo">341</span>      assertNull(r.getValue(FAMILY, QUALIFIERS[0]));<a name="line.341"></a>
-<span class="sourceLineNo">342</span><a name="line.342"></a>
-<span class="sourceLineNo">343</span>      // Test that we get the correct remote exception for RowMutations from batch()<a name="line.343"></a>
-<span class="sourceLineNo">344</span>      try {<a name="line.344"></a>
-<span class="sourceLineNo">345</span>        arm = new RowMutations(ROW);<a name="line.345"></a>
-<span class="sourceLineNo">346</span>        p = new Put(ROW);<a name="line.346"></a>
-<span class="sourceLineNo">347</span>        p.addColumn(new byte[]{'b', 'o', 'g', 'u', 's'}, QUALIFIERS[0], VALUE);<a name="line.347"></a>
-<span class="sourceLineNo">348</span>        arm.add(p);<a name="line.348"></a>
-<span class="sourceLineNo">349</span>        t.batch(Arrays.asList(arm), batchResult);<a name="line.349"></a>
-<span class="sourceLineNo">350</span>        fail("Expected RetriesExhaustedWithDetailsException with NoSuchColumnFamilyException");<a name="line.350"></a>
-<span class="sourceLineNo">351</span>      } catch(RetriesExhaustedWithDetailsException e) {<a name="line.351"></a>
-<span class="sourceLineNo">352</span>        String msg = e.getMessage();<a name="line.352"></a>
-<span class="sourceLineNo">353</span>        assertTrue(msg.contains("NoSuchColumnFamilyException"));<a name="line.353"></a>
-<span class="sourceLineNo">354</span>      }<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><a name="line.357"></a>
-<span class="sourceLineNo">358</span>  @Test<a name="line.358"></a>
-<span class="sourceLineNo">359</span>  public void testHTableExistsMethodSingleRegionSingleGet() throws Exception {<a name="line.359"></a>
-<span class="sourceLineNo">360</span>      // Test with a single region table.<a name="line.360"></a>
-<span class="sourceLineNo">361</span>      Table table = TEST_UTIL.createTable(<a name="line.361"></a>
-<span class="sourceLineNo">362</span>          TableName.valueOf(name.getMethodName()),<a name="line.362"></a>
-<span class="sourceLineNo">363</span>          new byte[][] { FAMILY });<a name="line.363"></a>
-<span class="sourceLineNo">364</span><a name="line.364"></a>
-<span class="sourceLineNo">365</span>    Put put = new Put(ROW);<a name="line.365"></a>
-<span class="sourceLineNo">366</span>    put.addColumn(FAMILY, QUALIFIER, VALUE);<a name="line.366"></a>
+<span class="sourceLineNo">327</span>      // Issue a compaction request<a name="line.327"></a>
+<span class="sourceLineNo">328</span>      admin.compact(tableName);<a name="line.328"></a>
+<span class="sourceLineNo">329</span><a name="line.329"></a>
+<span class="sourceLineNo">330</span>      // This time, the compaction request should not happen<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      Thread.sleep(10 * 1000);<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      loc = locator.getRegionLocation(row, true);<a name="line.332"></a>
+<span class="sourceLineNo">333</span>      regionName = loc.getRegionInfo().getRegionName();<a name="line.333"></a>
+<span class="sourceLineNo">334</span>      server = connection.getAdmin(loc.getServerName());<a name="line.334"></a>
+<span class="sourceLineNo">335</span>      int sfCount = ProtobufUtil.getStoreFiles(server, regionName, FAMILY).size();<a name="line.335"></a>
+<span class="sourceLineNo">336</span>      assertTrue(sfCount &gt; 1);<a name="line.336"></a>
+<span class="sourceLineNo">337</span><a name="line.337"></a>
+<span class="sourceLineNo">338</span>      // change an individual CF's config option to 2 &amp; online schema update<a name="line.338"></a>
+<span class="sourceLineNo">339</span>      LOG.info("hbase.hstore.compaction.min should now be 2");<a name="line.339"></a>
+<span class="sourceLineNo">340</span>      HColumnDescriptor hcd = new HColumnDescriptor(htd.getFamily(FAMILY));<a name="line.340"></a>
+<span class="sourceLineNo">341</span>      hcd.setValue("hbase.hstore.compaction.min", String.valueOf(2));<a name="line.341"></a>
+<span class="sourceLineNo">342</span>      htd.modifyFamily(hcd);<a name="line.342"></a>
+<span class="sourceLineNo">343</span>      admin.modifyTable(tableName, htd);<a name="line.343"></a>
+<span class="sourceLineNo">344</span>      while (null != (st = admin.getAlterStatus(tableName)) &amp;&amp; st.getFirst() &gt; 0) {<a name="line.344"></a>
+<span class="sourceLineNo">345</span>        LOG.debug(st.getFirst() + " regions left to update");<a name="line.345"></a>
+<span class="sourceLineNo">346</span>        Thread.sleep(40);<a name="line.346"></a>
+<span class="sourceLineNo">347</span>      }<a name="line.347"></a>
+<span class="sourceLineNo">348</span>      LOG.info("alter status finished");<a name="line.348"></a>
+<span class="sourceLineNo">349</span><a name="line.349"></a>
+<span class="sourceLineNo">350</span>      // Issue a compaction request<a name="line.350"></a>
+<span class="sourceLineNo">351</span>      admin.compact(tableName);<a name="line.351"></a>
+<span class="sourceLineNo">352</span><a name="line.352"></a>
+<span class="sourceLineNo">353</span>      // poll wait for the compactions to happen<a name="line.353"></a>
+<span class="sourceLineNo">354</span>      for (int i = 0; i &lt; 10 * 1000 / 40; ++i) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span>        loc = locator.getRegionLocation(row, true);<a name="line.355"></a>
+<span class="sourceLineNo">356</span>        regionName = loc.getRegionInfo().getRegionName();<a name="line.356"></a>
+<span class="sourceLineNo">357</span>        try {<a name="line.357"></a>
+<span class="sourceLineNo">358</span>          server = connection.getAdmin(loc.getServerName());<a name="line.358"></a>
+<span class="sourceLineNo">359</span>          if (ProtobufUtil.getStoreFiles(server, regionName, FAMILY).size() &lt; sfCount) {<a name="line.359"></a>
+<span class="sourceLineNo">360</span>            break;<a name="line.360"></a>
+<span class="sourceLineNo">361</span>          }<a name="line.361"></a>
+<span class="sourceLineNo">362</span>        } catch (Exception e) {<a name="line.362"></a>
+<span class="sourceLineNo">363</span>          LOG.debug("Waiting for region to come online: " + regionName);<a name="line.363"></a>
+<span class="sourceLineNo">364</span>        }<a name="line.364"></a>
+<span class="sourceLineNo">365</span>        Thread.sleep(40);<a name="line.365"></a>
+<span class="sourceLineNo">366</span>      }<a name="line.366"></a>
 <span class="sourceLineNo">367</span><a name="line.367"></a>
-<span class="sourceLineNo">368</span>    Get get = new Get(ROW);<a name="line.368"></a>
-<span class="sourceLineNo">369</span><a name="line.369"></a>
-<span class="sourceLineNo">370</span>    boolean exist = table.exists(get);<a name="line.370"></a>
-<span class="sourceLineNo">371</span>    assertEquals(exist, false);<a name="line.371"></a>
-<span class="sourceLineNo">372</span><a name="line.372"></a>
-<span class="sourceLineNo">373</span>    table.put(put);<a name="line.373"></a>
-<span class="sourceLineNo">374</span><a name="line.374"></a>
-<span class="sourceLineNo">375</span>    exist = table.exists(get);<a name="line.375"></a>
-<span class="sourceLineNo">376</span>    assertEquals(exist, true);<a name="line.376"></a>
-<span class="sourceLineNo">377</span>  }<a name="line.377"></a>
-<span class="sourceLineNo">378</span><a name="line.378"></a>
-<span class="sourceLineNo">379</span>  public void testHTableExistsMethodSingleRegionMultipleGets() throws Exception {<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    Table table = TEST_UTIL.createTable(TableName.valueOf(<a name="line.380"></a>
-<span class="sourceLineNo">381</span>        name.getMethodName()), new byte[][] { FAMILY });<a name="line.381"></a>
-<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span>    Put put = new Put(ROW);<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    put.addColumn(FAMILY, QUALIFIER, VALUE);<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    table.put(put);<a name="line.385"></a>
-<span class="sourceLineNo">386</span><a name="line.386"></a>
-<span class="sourceLineNo">387</span>    List&lt;Get&gt; gets = new ArrayList&lt;&gt;();<a name="line.387"></a>
-<span class="sourceLineNo">388</span>    gets.add(new Get(ROW));<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    gets.add(null);<a name="line.389"></a>
-<span class="sourceLineNo">390</span>    gets.add(new Get(ANOTHERROW));<a name="line.390"></a>
-<span class="sourceLineNo">391</span><a name="line.391"></a>
-<span class="sourceLineNo">392</span>    boolean[] results = table.existsAll(gets);<a name="line.392"></a>
-<span class="sourceLineNo">393</span>    assertEquals(results[0], true);<a name="line.393"></a>
-<span class="sourceLineNo">394</span>    assertEquals(results[1], false);<a name="line.394"></a>
-<span class="sourceLineNo">395</span>    assertEquals(results[2], false);<a name="line.395"></a>
-<span class="sourceLineNo">396</span>  }<a name="line.396"></a>
-<span class="sourceLineNo">397</span><a name="line.397"></a>
-<span class="sourceLineNo">398</span>  @Test<a name="line.398"></a>
-<span class="sourceLineNo">399</span>  public void testHTableExistsBeforeGet() throws Exception {<a name="line.399"></a>
-<span class="sourceLineNo">400</span>    Table table = TEST_UTIL.createTable(TableName.valueOf(name.getMethodName()),<a name="line.400"></a>
-<span class="sourceLineNo">401</span>        new byte[][] { FAMILY });<a name="line.401"></a>
-<span class="sourceLineNo">402</span>    try {<a name="line.402"></a>
-<span class="sourceLineNo">403</span>      Put put = new Put(ROW);<a name="line.403"></a>
-<span class="sourceLineNo">404</span>      put.addColumn(FAMILY, QUALIFIER, VALUE);<a name="line.404"></a>
-<span class="sourceLineNo">405</span>      table.put(put);<a name="line.405"></a>
-<span class="sourceLineNo">406</span><a name="line.406"></a>
-<span class="sourceLineNo">407</span>      Get get = new Get(ROW);<a name="line.407"></a>
-<span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span>      boolean exist = table.exists(get);<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      assertEquals(true, exist);<a name="line.410"></a>
-<span class="sourceLineNo">411</span><a name="line.411"></a>
-<span class="sourceLineNo">412</span>      Result result = table.get(get);<a name="line.412"></a>
-<span class="sourceLineNo">413</span>      assertEquals(false, result.isEmpty());<a name="line.413"></a>
-<span class="sourceLineNo">414</span>      assertTrue(Bytes.equals(VALUE, result.getValue(FAMILY, QUALIFIER)));<a name="line.414"></a>
-<span class="sourceLineNo">415</span>    } finally {<a name="line.415"></a>
-<span class="sourceLineNo">416</span>      table.close();<a name="line.416"></a>
-<span class="sourceLineNo">417</span>    }<a name="line.417"></a>
-<span class="sourceLineNo">418</span>  }<a name="line.418"></a>
-<span class="sourceLineNo">419</span><a name="line.419"></a>
-<span class="sourceLineNo">420</span>  @Test<a name="line.420"></a>
-<span class="sourceLineNo">421</span>  public void testHTableExistsAllBeforeGet() throws Exception {<a name="line.421"></a>
-<span class="sourceLineNo">422</span>    final byte[] ROW2 = Bytes.add(ROW, Bytes.toBytes("2"));<a name="line.422"></a>
-<span class="sourceLineNo">423</span>    Table table = TEST_UTIL.createTable(<a name="line.423"></a>
-<span class="sourceLineNo">424</span>        TableName.valueOf(name.getMethodName()), new byte[][] { FAMILY });<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    try {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>      Put put = new Put(ROW);<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      put.addColumn(FAMILY, QUALIFIER, VALUE);<a name="line.427"></a>
-<span class="sourceLineNo">428</span>      table.put(put);<a name="line.428"></a>
-<span class="sourceLineNo">429</span>      put = new Put(ROW2);<a name="line.429"></a>
-<span class="sourceLineNo">430</span>      put.addColumn(FAMILY, QUALIFIER, VALUE);<a name="line.430"></a>
-<span class="sourceLineNo">431</span>      table.put(put);<a name="line.431"></a>
-<span class="sourceLineNo">432</span><a name="line.432"></a>
-<span class="sourceLineNo">433</span>      Get get = new Get(ROW);<a name="line.433"></a>
-<span class="sourceLineNo">434</span>      Get get2 = new Get(ROW2);<a name="line.434"></a>
-<span class="sourceLineNo">435</span>      ArrayList&lt;Get&gt; getList = new ArrayList(2);<a name="line.435"></a>
-<span class="sourceLineNo">436</span>      getList.add(get);<a name="line.436"></a>
-<span class="sourceLineNo">437</span>      getList.add(get2);<a name="line.437"></a>
-<span class="sourceLineNo">438</span><a name="line.438"></a>
-<span class="sourceLineNo">439</span>      boolean[] exists = table.existsAll(getList);<a name="line.439"></a>
-<span class="sourceLineNo">440</span>      assertEquals(true, exists[0]);<a name="line.440"></a>
-<span class="sourceLineNo">441</span>      assertEquals(true, exists[1]);<a name="line.441"></a>
-<span class="sourceLineNo">442</span><a name="line.442"></a>
-<span class="sourceLineNo">443</span>      Result[] result = table.get(getList);<a name="line.443"></a>
-<span class="sourceLineNo">444</span>      assertEquals(false, result[0].isEmpty());<a name="line.444"></a>
-<span class="sourceLineNo">445</span>      assertTrue(Bytes.equals(VALUE, result[0].getValue(FAMILY, QUALIFIER)));<a name="line.445"></a>
-<span class="sourceLineNo">446</span>      assertEquals(false, result[1].isEmpty());<a name="line.446"></a>
-<span class="sourceLineNo">447</span>      assertTrue(Bytes.equals(VALUE, result[1].getValue(FAMILY, QUALIFIER)));<a name="line.447"></a>
-<span class="sourceLineNo">448</span>    } finally {<a name="line.448"></a>
-<span class="sourceLineNo">449</span>      table.close();<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    }<a name="line.450"></a>
-<span class="sourceLineNo">451</span>  }<a name="line.451"></a>
-<span class="sourceLineNo">452</span><a name="line.452"></a>
-<span class="sourceLineNo">453</span>  @Test<a name="line.453"></a>
-<span class="sourceLineNo">454</span>  public void testHTableExistsMethodMultipleRegionsSingleGet() throws Exception {<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    Table table = TEST_UTIL.createTable(<a name="line.455"></a>
-<span class="sourceLineNo">456</span>      TableName.valueOf(name.getMethodName()), new byte[][] { FAMILY },<a name="line.456"></a>
-<span class="sourceLineNo">457</span>      1, new byte[] { 0x00 }, new byte[] { (byte) 0xff }, 255);<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    Put put = new Put(ROW);<a name="line.458"></a>
-<span class="sourceLineNo">459</span>    put.addColumn(FAMILY, QUALIFIER, VALUE);<a name="line.459"></a>
-<span class="sourceLineNo">460</span><a name="line.460"></a>
-<span class="sourceLineNo">461</span>    Get get = new Get(ROW);<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span>    boolean exist = table.exists(get);<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    assertEquals(exist, false);<a name="line.464"></a>
+<span class="sourceLineNo">368</span>      // verify the compaction took place and that we didn't just time out<a name="line.368"></a>
+<span class="sourceLineNo">369</span>      assertTrue(ProtobufUtil.getStoreFiles(<a name="line.369"></a>
+<span class="sourceLineNo">370</span>        server, regionName, FAMILY).size() &lt; sfCount);<a name="line.370"></a>
+<span class="sourceLineNo">371</span><a name="line.371"></a>
+<span class="sourceLineNo">372</span>      // Finally, ensure that we can remove a custom config value after we made it<a name="line.372"></a>
+<span class="sourceLineNo">373</span>      LOG.info("Removing CF config value");<a name="line.373"></a>
+<span class="sourceLineNo">374</span>      LOG.info("hbase.hstore.compaction.min should now be 5");<a name="line.374"></a>
+<span class="sourceLineNo">375</span>      hcd = new HColumnDescriptor(htd.getFamily(FAMILY));<a name="line.375"></a>
+<span class="sourceLineNo">376</span>      hcd.setValue("hbase.hstore.compaction.min", null);<a name="line.376"></a>
+<span class="sourceLineNo">377</span>      htd.modifyFamily(hcd);<a name="line.377"></a>
+<span class="sourceLineNo">378</span>      admin.modifyTable(tableName, htd);<a name="line.378"></a>
+<span class="sourceLineNo">379</span>      while (null != (st = admin.getAlterStatus(tableName)) &amp;&amp; st.getFirst() &gt; 0) {<a name="line.379"></a>
+<span class="sourceLineNo">380</span>        LOG.debug(st.getFirst() + " regions left to update");<a name="line.380"></a>
+<span class="sourceLineNo">381</span>        Thread.sleep(40);<a name="line.381"></a>
+<span class="sourceLineNo">382</span>      }<a name="line.382"></a>
+<span class="sourceLineNo">383</span>      LOG.info("alter status finished");<a name="line.383"></a>
+<span class="sourceLineNo">384</span>      assertNull(hTable.getTableDescriptor().getFamily(FAMILY).getValue(<a name="line.384"></a>
+<span class="sourceLineNo">385</span>          "hbase.hstore.compaction.min"));<a name="line.385"></a>
+<span class="sourceLineNo">386</span>    }<a name="line.386"></a>
+<span class="sourceLineNo">387</span>  }<a name="line.387"></a>
+<span class="sourceLineNo">388</span><a name="line.388"></a>
+<span class="sourceLineNo">389</span>  @Test<a name="line.389"></a>
+<span class="sourceLineNo">390</span>  public void testHTableBatchWithEmptyPut ()throws Exception {<a name="line.390"></a>
+<span class="sourceLineNo">391</span>      Table table = TEST_UTIL.createTable(TableName.valueOf(name.getMethodName()),<a name="line.391"></a>
+<span class="sourceLineNo">392</span>          new byte[][] { FAMILY });<a name="line.392"></a>
+<span class="sourceLineNo">393</span>    try {<a name="line.393"></a>
+<span class="sourceLineNo">394</span>      List actions = (List) new ArrayList();<a name="line.394"></a>
+<span class="sourceLineNo">395</span>      Object[] results = new Object[2];<a name="line.395"></a>
+<span class="sourceLineNo">396</span>      // create an empty Put<a name="line.396"></a>
+<span class="sourceLineNo">397</span>      Put put1 = new Put(ROW);<a name="line.397"></a>
+<span class="sourceLineNo">398</span>      actions.add(put1);<a name="line.398"></a>
+<span class="sourceLineNo">399</span><a name="line.399"></a>
+<span class="sourceLineNo">400</span>      Put put2 = new Put(ANOTHERROW);<a name="line.400"></a>
+<span class="sourceLineNo">401</span>      put2.addColumn(FAMILY, QUALIFIER, VALUE);<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      actions.add(put2);<a name="line.402"></a>
+<span class="sourceLineNo">403</span><a name="line.403"></a>
+<span class="sourceLineNo">404</span>      table.batch(actions, results);<a name="line.404"></a>
+<span class="sourceLineNo">405</span>      fail("Empty Put should have failed the batch call");<a name="line.405"></a>
+<span class="sourceLineNo">406</span>    } catch (IllegalArgumentException iae) {<a name="line.406"></a>
+<span class="sourceLineNo">407</span><a name="line.407"></a>
+<span class="sourceLineNo">408</span>    } finally {<a name="line.408"></a>
+<span class="sourceLineNo">409</span>      table.close();<a name="line.409"></a>
+<span class="sourceLineNo">410</span>    }<a name="line.410"></a>
+<span class="sourceLineNo">411</span>  }<a name="line.411"></a>
+<span class="sourceLineNo">412</span><a name="line.412"></a>
+<span class="sourceLineNo">413</span>  @Test<a name="line.413"></a>
+<span class="sourceLineNo">414</span>  public void testBatchWithRowMutation() throws Exception {<a name="line.414"></a>
+<span class="sourceLineNo">415</span>    LOG.info("Starting testBatchWithRowMutation");<a name="line.415"></a>
+<span class="sourceLineNo">416</span>    final TableName TABLENAME = TableName.valueOf("testBatchWithRowMutation");<a name="line.416"></a>
+<span class="sourceLineNo">417</span>    try (Table t = TEST_UTIL.createTable(TABLENAME, FAMILY)) {<a name="line.417"></a>
+<span class="sourceLineNo">418</span>      byte [][] QUALIFIERS = new byte [][] {<a name="line.418"></a>
+<span class="sourceLineNo">419</span>        Bytes.toBytes("a"), Bytes.toBytes("b")<a name="line.419"></a>
+<span class="sourceLineNo">420</span>      };<a name="line.420"></a>
+<span class="sourceLineNo">421</span>      RowMutations arm = new RowMutations(ROW);<a name="line.421"></a>
+<span class="sourceLineNo">422</span>      Put p = new Put(ROW);<a name="line.422"></a>
+<span class="sourceLineNo">423</span>      p.addColumn(FAMILY, QUALIFIERS[0], VALUE);<a name="line.423"></a>
+<span class="sourceLineNo">424</span>      arm.add(p);<a name="line.424"></a>
+<span class="sourceLineNo">425</span>      Object[] batchResult = new Object[1];<a name="line.425"></a>
+<span class="sourceLineNo">426</span>      t.batch(Arrays.asList(arm), batchResult);<a name="line.426"></a>
+<span class="sourceLineNo">427</span><a name="line.427"></a>
+<span class="sourceLineNo">428</span>      Get g = new Get(ROW);<a name="line.428"></a>
+<span class="sourceLineNo">429</span>      Result r = t.get(g);<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      assertEquals(0, Bytes.compareTo(VALUE, r.getValue(FAMILY, QUALIFIERS[0])));<a name="line.430"></a>
+<span class="sourceLineNo">431</span><a name="line.431"></a>
+<span class="sourceLineNo">432</span>      arm = new RowMutations(ROW);<a name="line.432"></a>
+<span class="sourceLineNo">433</span>      p = new Put(ROW);<a name="line.433"></a>
+<span class="sourceLineNo">434</span>      p.addColumn(FAMILY, QUALIFIERS[1], VALUE);<a name="line.434"></a>
+<span class="sourceLineNo">435</span>      arm.add(p);<a name="line.435"></a>
+<span class="sourceLineNo">436</span>      Delete d = new Delete(ROW);<a name="line.436"></a>
+<span class="sourceLineNo">437</span>      d.addColumns(FAMILY, QUALIFIERS[0]);<a name="line.437"></a>
+<span class="sourceLineNo">438</span>      arm.add(d);<a name="line.438"></a>
+<span class="sourceLineNo">439</span>      t.batch(Arrays.asList(arm), batchResult);<a name="line.439"></a>
+<span class="sourceLineNo">440</span>      r = t.get(g);<a name="line.440"></a>
+<span class="sourceLineNo">441</span>      assertEquals(0, Bytes.compareTo(VALUE, r.getValue(FAMILY, QUALIFIERS[1])));<a name="line.441"></a>
+<span class="sourceLineNo">442</span>      assertNull(r.getValue(FAMILY, QUALIFIERS[0]));<a name="line.442"></a>
+<span class="sourceLineNo">443</span><a name="line.443"></a>
+<span class="sourceLineNo">444</span>      // Test that we get the correct remote exception for RowMutations from batch()<a name="line.444"></a>
+<span class="sourceLineNo">445</span>      try {<a name="line.445"></a>
+<span class="sourceLineNo">446</span>        arm = new RowMutations(ROW);<a name="line.446"></a>
+<span class="sourceLineNo">447</span>        p = new Put(ROW);<a name="line.447"></a>
+<span class="sourceLineNo">448</span>        p.addColumn(new byte[]{'b', 'o', 'g', 'u', 's'}, QUALIFIERS[0], VALUE);<a name="line.448"></a>
+<span class="sourceLineNo">449</span>        arm.add(p);<a name="line.449"></a>
+<span class="sourceLineNo">450</span>        t.batch(Arrays.asList(arm), batchResult);<a name="line.450"></a>
+<span class="sourceLineNo">451</span>        fail("Expected RetriesExhaustedWithDetailsException with NoSuchColumnFamilyException");<a name="line.451"></a>
+<span class="sourceLineNo">452</span>      } catch(RetriesExhaustedWithDetailsException e) {<a name="line.452"></a>
+<span class="sourceLineNo">453</span>        String msg = e.getMessage();<a name="line.453"></a>
+<span class="sourceLineNo">454</span>        assertTrue(msg.contains("NoSuchColumnFamilyException"));<a name="line.454"></a>
+<span class="sourceLineNo">455</span>      }<a name="line.455"></a>
+<span class="sourceLineNo">456</span>    }<a name="line.456"></a>
+<span class="sourceLineNo">457</span>  }<a name="line.457"></a>
+<span class="sourceLineNo">458</span><a name="line.458"></a>
+<span class="sourceLineNo">459</span>  @Test<a name="line.459"></a>
+<span class="sourceLineNo">460</span>  public void testHTableExistsMethodSingleRegionSingleGet() throws Exception {<a name="line.460"></a>
+<span class="sourceLineNo">461</span>      // Test with a single region table.<a name="line.461"></a>
+<span class="sourceLineNo">462</span>      Table table = TEST_UTIL.createTable(<a name="line.462"></a>
+<span class="sourceLineNo">463</span>          TableName.valueOf(name.getMethodName()),<a name="line.463"></a>
+<span class="sourceLineNo">464</span>          new byte[][] { FAMILY });<a name="line.464"></a>
 <span class="sourceLineNo">465</span><a name="line.465"></a>
-<span class="sourceLineNo">466</span>    table.put(put);<a name="line.466"></a>
-<span class="sourceLineNo">467</span><a name="line.467"></a>
-<span class="sourceLineNo">468</span>    exist = table.exists(get);<a name="line.468"></a>
-<span class="sourceLineNo">469</span>    assertEquals(exist, true);<a name="line.469"></a>
-<span class="sourceLineNo">470</span>  }<a name="line.470"></a>
-<span class="sourceLineNo">471</span><a name="line.471"></a>
-<span class="sourceLineNo">472</span>  @Test<a name="line.472"></a>
-<span class="sourceLineNo">473</span>  public void testHTableExistsMethodMultipleRegionsMultipleGets() throws Exception {<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    Table table = TEST_UTIL.createTable(<a name="line.474"></a>
-<span class="sourceLineNo">475</span>      TableName.valueOf(name.getMethodName()),<a name="line.475"></a>
-<span class="sourceLineNo">476</span>      new byte[][] { FAMILY }, 1, new byte[] { 0x00 }, new byte[] { (byte) 0xff }, 255);<a name="line.476"></a>
-<span class="sourceLineNo">477</span>    Put put = new Put(ROW);<a name="line.477"></a>
-<span class="sourceLineNo">478</span>    put.addColumn(FAMILY, QUALIFIER, VALUE);<a name="line.478"></a>
-<span class="sourceLineNo">479</span>    table.put (put);<a name="line.479"></a>
-<span class="sourceLineNo">480</span><a name="line.480"></a>
-<span class="sourceLineNo">481</span>    List&lt;Get&gt; gets = new ArrayList&lt;&gt;();<a name="line.481"></a>
-<span class="sourceLineNo">482</span>    gets.add(new Get(ANOTHERROW));<a name="line.482"></a>
-<span class="sourceLineNo">483</span>    gets.add(new Get(Bytes.add(ROW, new byte[] { 0x00 })));<a name="line.483"></a>
-<span class="sourceLineNo">484</span>    gets.add(new Get(ROW));<a name="line.484"></a>
-<span class="sourceLineNo">485</span>    gets.add(new Get(Bytes.add(ANOTHERROW, new byte[] { 0x00 })));<a name="line.485"></a>
-<span class="sourceLineNo">486</span><a name="line.486"></a>
-<span class="sourceLineNo">487</span>    LOG.info("Calling exists");<a name="line.487"></a>
-<span class="sourceLineNo">488</span>    boolean[] results = table.existsAll(gets);<a name="line.488"></a>
-<span class="sourceLineNo">489</span>    assertEquals(results[0], false);<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    assertEquals(results[1], false);<a name="line.490"></a>
-<span class="sourceLineNo">491</span>    assertEquals(results[2], true);<a name="line.491"></a>
-<span class="sourceLineNo">492</span>    assertEquals(results[3], false);<a name="line.492"></a>
-<span class="sourceLineNo">493</span><a name="line.493"></a>
-<span class="sourceLineNo">494</span>    // Test with the first region.<a name="line.494"></a>
-<span class="sourceLineNo">495</span>    put = new Put(new byte[] { 0x00 });<a name="line.495"></a>
-<span class="sourceLineNo">496</span>    put.addColumn(FAMILY, QUALIFIER, VALUE);<a name="line.496"></a>
-<span class="sourceLineNo">497</span>    table.put(put);<a name="line.497"></a>
+<span class="sourceLineNo">466</span>    Put put = new Put(ROW);<a name="line.466"></a>
+<span class="sourceLineNo">467</span>    put.addColumn(FAMILY, QUALIFIER, VALUE);<a name="line.467"></a>
+<span class="sourceLineNo">468</span><a name="line.468"></a>
+<span class="sourceLineNo">469</span>    Get get = new Get(ROW);<a name="line.469"></a>
+<span class="sourceLineNo">470</span><a name="line.470"></a>
+<span class="sourceLineNo">471</span>    boolean exist = table.exists(get);<a name="line.471"></a>
+<span class="sourceLineNo">472</span>    assertEquals(exist, false);<a name="line.472"></a>
+<span class="sourceLineNo">473</span><a name="line.473"></a>
+<span class="sourceLineNo">474</span>    table.put(put);<a name="li

<TRUNCATED>

Mime
View raw message