Repository: hbase-site
Updated Branches:
  refs/heads/asf-site 2b524c700 -> f2c435b34


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f2c435b3/sponsors.html
----------------------------------------------------------------------
diff --git a/sponsors.html b/sponsors.html
index d76f321..77f8b54 100644
--- a/sponsors.html
+++ b/sponsors.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20170918" />
+    <meta name="Date-Revision-yyyymmdd" content="20170919" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Apache HBase™ Sponsors</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" 
/>
@@ -338,7 +338,7 @@ under the License. -->
                         <a href="https://www.apache.org/";>The Apache Software 
Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 
2017-09-18</li>
+                  <li id="publishDate" class="pull-right">Last Published: 
2017-09-19</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f2c435b3/supportingprojects.html
----------------------------------------------------------------------
diff --git a/supportingprojects.html b/supportingprojects.html
index 4dda4c7..4c4f499 100644
--- a/supportingprojects.html
+++ b/supportingprojects.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20170918" />
+    <meta name="Date-Revision-yyyymmdd" content="20170919" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Supporting Projects</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" 
/>
@@ -525,7 +525,7 @@ under the License. -->
                         <a href="https://www.apache.org/";>The Apache Software 
Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 
2017-09-18</li>
+                  <li id="publishDate" class="pull-right">Last Published: 
2017-09-19</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f2c435b3/team-list.html
----------------------------------------------------------------------
diff --git a/team-list.html b/team-list.html
index 9370f01..1817de4 100644
--- a/team-list.html
+++ b/team-list.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20170918" />
+    <meta name="Date-Revision-yyyymmdd" content="20170919" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Team</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" 
/>
@@ -699,7 +699,7 @@
                         <a href="https://www.apache.org/";>The Apache Software 
Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 
2017-09-18</li>
+                  <li id="publishDate" class="pull-right">Last Published: 
2017-09-19</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f2c435b3/testdevapidocs/src-html/org/apache/hadoop/hbase/util/LoadTestTool.WorkerThread.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/util/LoadTestTool.WorkerThread.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/util/LoadTestTool.WorkerThread.html
index 9a52bd0..3607aa1 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/util/LoadTestTool.WorkerThread.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/util/LoadTestTool.WorkerThread.html
@@ -32,21 +32,21 @@
 <span class="sourceLineNo">024</span>import java.util.Arrays;<a 
name="line.24"></a>
 <span class="sourceLineNo">025</span>import java.util.List;<a 
name="line.25"></a>
 <span class="sourceLineNo">026</span>import java.util.Properties;<a 
name="line.26"></a>
-<span class="sourceLineNo">027</span>import java.util.Random;<a 
name="line.27"></a>
-<span class="sourceLineNo">028</span>import 
java.util.concurrent.atomic.AtomicReference;<a name="line.28"></a>
-<span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span>import javax.crypto.spec.SecretKeySpec;<a 
name="line.30"></a>
-<span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span>import 
org.apache.commons.cli.CommandLine;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.commons.logging.Log;<a 
name="line.33"></a>
-<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.HBaseConfiguration;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.41"></a>
+<span class="sourceLineNo">027</span>import 
java.util.concurrent.atomic.AtomicReference;<a name="line.27"></a>
+<span class="sourceLineNo">028</span><a name="line.28"></a>
+<span class="sourceLineNo">029</span>import javax.crypto.spec.SecretKeySpec;<a 
name="line.29"></a>
+<span class="sourceLineNo">030</span><a name="line.30"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.commons.cli.CommandLine;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.commons.logging.Log;<a 
name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.commons.logging.LogFactory;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;<a 
name="line.41"></a>
 <span class="sourceLineNo">042</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.42"></a>
 <span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.client.Admin;<a name="line.43"></a>
 <span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.client.Connection;<a name="line.44"></a>
@@ -266,46 +266,46 @@
 <span class="sourceLineNo">258</span>      byte[][] columnFamilies) throws 
IOException {<a name="line.258"></a>
 <span class="sourceLineNo">259</span>    try (Connection conn = 
ConnectionFactory.createConnection(conf);<a name="line.259"></a>
 <span class="sourceLineNo">260</span>        Admin admin = conn.getAdmin()) 
{<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      TableDescriptor tableDesc = 
admin.getTableDescriptor(tableName);<a name="line.261"></a>
+<span class="sourceLineNo">261</span>      TableDescriptor tableDesc = 
admin.getDescriptor(tableName);<a name="line.261"></a>
 <span class="sourceLineNo">262</span>      LOG.info("Disabling table " + 
tableName);<a name="line.262"></a>
 <span class="sourceLineNo">263</span>      admin.disableTable(tableName);<a 
name="line.263"></a>
 <span class="sourceLineNo">264</span>      for (byte[] cf : columnFamilies) 
{<a name="line.264"></a>
-<span class="sourceLineNo">265</span>        HColumnDescriptor columnDesc = 
(HColumnDescriptor) tableDesc.getColumnFamily(cf);<a name="line.265"></a>
+<span class="sourceLineNo">265</span>        ColumnFamilyDescriptor columnDesc 
= tableDesc.getColumnFamily(cf);<a name="line.265"></a>
 <span class="sourceLineNo">266</span>        boolean isNewCf = columnDesc == 
null;<a name="line.266"></a>
-<span class="sourceLineNo">267</span>        if (isNewCf) {<a 
name="line.267"></a>
-<span class="sourceLineNo">268</span>          columnDesc = new 
HColumnDescriptor(cf);<a name="line.268"></a>
-<span class="sourceLineNo">269</span>        }<a name="line.269"></a>
+<span class="sourceLineNo">267</span>        ColumnFamilyDescriptorBuilder 
columnDescBuilder = isNewCf ?<a name="line.267"></a>
+<span class="sourceLineNo">268</span>            
ColumnFamilyDescriptorBuilder.newBuilder(cf) :<a name="line.268"></a>
+<span class="sourceLineNo">269</span>            
ColumnFamilyDescriptorBuilder.newBuilder(columnDesc);<a name="line.269"></a>
 <span class="sourceLineNo">270</span>        if (bloomType != null) {<a 
name="line.270"></a>
-<span class="sourceLineNo">271</span>          
columnDesc.setBloomFilterType(bloomType);<a name="line.271"></a>
+<span class="sourceLineNo">271</span>          
columnDescBuilder.setBloomFilterType(bloomType);<a name="line.271"></a>
 <span class="sourceLineNo">272</span>        }<a name="line.272"></a>
 <span class="sourceLineNo">273</span>        if (compressAlgo != null) {<a 
name="line.273"></a>
-<span class="sourceLineNo">274</span>          
columnDesc.setCompressionType(compressAlgo);<a name="line.274"></a>
+<span class="sourceLineNo">274</span>          
columnDescBuilder.setCompressionType(compressAlgo);<a name="line.274"></a>
 <span class="sourceLineNo">275</span>        }<a name="line.275"></a>
 <span class="sourceLineNo">276</span>        if (dataBlockEncodingAlgo != 
null) {<a name="line.276"></a>
-<span class="sourceLineNo">277</span>          
columnDesc.setDataBlockEncoding(dataBlockEncodingAlgo);<a name="line.277"></a>
+<span class="sourceLineNo">277</span>          
columnDescBuilder.setDataBlockEncoding(dataBlockEncodingAlgo);<a 
name="line.277"></a>
 <span class="sourceLineNo">278</span>        }<a name="line.278"></a>
 <span class="sourceLineNo">279</span>        if (inMemoryCF) {<a 
name="line.279"></a>
-<span class="sourceLineNo">280</span>          
columnDesc.setInMemory(inMemoryCF);<a name="line.280"></a>
+<span class="sourceLineNo">280</span>          
columnDescBuilder.setInMemory(inMemoryCF);<a name="line.280"></a>
 <span class="sourceLineNo">281</span>        }<a name="line.281"></a>
 <span class="sourceLineNo">282</span>        if (cipher != null) {<a 
name="line.282"></a>
 <span class="sourceLineNo">283</span>          byte[] keyBytes = new 
byte[cipher.getKeyLength()];<a name="line.283"></a>
 <span class="sourceLineNo">284</span>          new 
SecureRandom().nextBytes(keyBytes);<a name="line.284"></a>
-<span class="sourceLineNo">285</span>          
columnDesc.setEncryptionType(cipher.getName());<a name="line.285"></a>
-<span class="sourceLineNo">286</span>          columnDesc.setEncryptionKey(<a 
name="line.286"></a>
+<span class="sourceLineNo">285</span>          
columnDescBuilder.setEncryptionType(cipher.getName());<a name="line.285"></a>
+<span class="sourceLineNo">286</span>          
columnDescBuilder.setEncryptionKey(<a name="line.286"></a>
 <span class="sourceLineNo">287</span>              
EncryptionUtil.wrapKey(conf,<a name="line.287"></a>
 <span class="sourceLineNo">288</span>                  
User.getCurrent().getShortName(),<a name="line.288"></a>
 <span class="sourceLineNo">289</span>                  new 
SecretKeySpec(keyBytes,<a name="line.289"></a>
 <span class="sourceLineNo">290</span>                      
cipher.getName())));<a name="line.290"></a>
 <span class="sourceLineNo">291</span>        }<a name="line.291"></a>
 <span class="sourceLineNo">292</span>        if (mobThreshold &gt;= 0) {<a 
name="line.292"></a>
-<span class="sourceLineNo">293</span>          
columnDesc.setMobEnabled(true);<a name="line.293"></a>
-<span class="sourceLineNo">294</span>          
columnDesc.setMobThreshold(mobThreshold);<a name="line.294"></a>
+<span class="sourceLineNo">293</span>          
columnDescBuilder.setMobEnabled(true);<a name="line.293"></a>
+<span class="sourceLineNo">294</span>          
columnDescBuilder.setMobThreshold(mobThreshold);<a name="line.294"></a>
 <span class="sourceLineNo">295</span>        }<a name="line.295"></a>
 <span class="sourceLineNo">296</span><a name="line.296"></a>
 <span class="sourceLineNo">297</span>        if (isNewCf) {<a 
name="line.297"></a>
-<span class="sourceLineNo">298</span>          
admin.addColumnFamily(tableName, columnDesc);<a name="line.298"></a>
+<span class="sourceLineNo">298</span>          
admin.addColumnFamily(tableName, columnDescBuilder.build());<a 
name="line.298"></a>
 <span class="sourceLineNo">299</span>        } else {<a name="line.299"></a>
-<span class="sourceLineNo">300</span>          
admin.modifyColumnFamily(tableName, columnDesc);<a name="line.300"></a>
+<span class="sourceLineNo">300</span>          
admin.modifyColumnFamily(tableName, columnDescBuilder.build());<a 
name="line.300"></a>
 <span class="sourceLineNo">301</span>        }<a name="line.301"></a>
 <span class="sourceLineNo">302</span>      }<a name="line.302"></a>
 <span class="sourceLineNo">303</span>      LOG.info("Enabling table " + 
tableName);<a name="line.303"></a>
@@ -354,7 +354,7 @@
 <span class="sourceLineNo">346</span>        + "already exists");<a 
name="line.346"></a>
 <span class="sourceLineNo">347</span><a name="line.347"></a>
 <span class="sourceLineNo">348</span>    addOptWithArg(NUM_TABLES,<a 
name="line.348"></a>
-<span class="sourceLineNo">349</span>      "A positive integer number. When a 
number n is speicfied, load test "<a name="line.349"></a>
+<span class="sourceLineNo">349</span>      "A positive integer number. When a 
number n is specified, load test "<a name="line.349"></a>
 <span class="sourceLineNo">350</span>          + "tool  will load n table 
parallely. -tn parameter value becomes "<a name="line.350"></a>
 <span class="sourceLineNo">351</span>          + "table name prefix. Each 
table name is in format &lt;tn&gt;_1...&lt;tn&gt;_n");<a name="line.351"></a>
 <span class="sourceLineNo">352</span><a name="line.352"></a>
@@ -713,7 +713,7 @@
 <span class="sourceLineNo">705</span>      LOG.info("Starting to mutate 
data...");<a name="line.705"></a>
 <span class="sourceLineNo">706</span>      System.out.println("Starting to 
mutate data...");<a name="line.706"></a>
 <span class="sourceLineNo">707</span>      // TODO : currently append and 
increment operations not tested with tags<a name="line.707"></a>
-<span class="sourceLineNo">708</span>      // Will update this aftet it is 
done<a name="line.708"></a>
+<span class="sourceLineNo">708</span>      // Will update this after it is 
done<a name="line.708"></a>
 <span class="sourceLineNo">709</span>      updaterThreads.start(startKey, 
endKey, numUpdaterThreads);<a name="line.709"></a>
 <span class="sourceLineNo">710</span>    }<a name="line.710"></a>
 <span class="sourceLineNo">711</span><a name="line.711"></a>
@@ -905,7 +905,7 @@
 <span class="sourceLineNo">897</span><a name="line.897"></a>
 <span class="sourceLineNo">898</span>  private void 
addAuthInfoToConf(Properties authConfig, Configuration conf, String owner,<a 
name="line.898"></a>
 <span class="sourceLineNo">899</span>      String userList) throws IOException 
{<a name="line.899"></a>
-<span class="sourceLineNo">900</span>    List&lt;String&gt; users = new 
ArrayList(Arrays.asList(userList.split(",")));<a name="line.900"></a>
+<span class="sourceLineNo">900</span>    List&lt;String&gt; users = new 
ArrayList&lt;&gt;(Arrays.asList(userList.split(",")));<a name="line.900"></a>
 <span class="sourceLineNo">901</span>    users.add(owner);<a 
name="line.901"></a>
 <span class="sourceLineNo">902</span>    for (String user : users) {<a 
name="line.902"></a>
 <span class="sourceLineNo">903</span>      String keyTabFileConfKey = "hbase." 
+ user + ".keytab.file";<a name="line.903"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f2c435b3/testdevapidocs/src-html/org/apache/hadoop/hbase/util/LoadTestTool.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/util/LoadTestTool.html 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/util/LoadTestTool.html
index 9a52bd0..3607aa1 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/util/LoadTestTool.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/util/LoadTestTool.html
@@ -32,21 +32,21 @@
 <span class="sourceLineNo">024</span>import java.util.Arrays;<a 
name="line.24"></a>
 <span class="sourceLineNo">025</span>import java.util.List;<a 
name="line.25"></a>
 <span class="sourceLineNo">026</span>import java.util.Properties;<a 
name="line.26"></a>
-<span class="sourceLineNo">027</span>import java.util.Random;<a 
name="line.27"></a>
-<span class="sourceLineNo">028</span>import 
java.util.concurrent.atomic.AtomicReference;<a name="line.28"></a>
-<span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span>import javax.crypto.spec.SecretKeySpec;<a 
name="line.30"></a>
-<span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span>import 
org.apache.commons.cli.CommandLine;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.commons.logging.Log;<a 
name="line.33"></a>
-<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.HBaseConfiguration;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.41"></a>
+<span class="sourceLineNo">027</span>import 
java.util.concurrent.atomic.AtomicReference;<a name="line.27"></a>
+<span class="sourceLineNo">028</span><a name="line.28"></a>
+<span class="sourceLineNo">029</span>import javax.crypto.spec.SecretKeySpec;<a 
name="line.29"></a>
+<span class="sourceLineNo">030</span><a name="line.30"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.commons.cli.CommandLine;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.commons.logging.Log;<a 
name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.commons.logging.LogFactory;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;<a 
name="line.41"></a>
 <span class="sourceLineNo">042</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.42"></a>
 <span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.client.Admin;<a name="line.43"></a>
 <span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.client.Connection;<a name="line.44"></a>
@@ -266,46 +266,46 @@
 <span class="sourceLineNo">258</span>      byte[][] columnFamilies) throws 
IOException {<a name="line.258"></a>
 <span class="sourceLineNo">259</span>    try (Connection conn = 
ConnectionFactory.createConnection(conf);<a name="line.259"></a>
 <span class="sourceLineNo">260</span>        Admin admin = conn.getAdmin()) 
{<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      TableDescriptor tableDesc = 
admin.getTableDescriptor(tableName);<a name="line.261"></a>
+<span class="sourceLineNo">261</span>      TableDescriptor tableDesc = 
admin.getDescriptor(tableName);<a name="line.261"></a>
 <span class="sourceLineNo">262</span>      LOG.info("Disabling table " + 
tableName);<a name="line.262"></a>
 <span class="sourceLineNo">263</span>      admin.disableTable(tableName);<a 
name="line.263"></a>
 <span class="sourceLineNo">264</span>      for (byte[] cf : columnFamilies) 
{<a name="line.264"></a>
-<span class="sourceLineNo">265</span>        HColumnDescriptor columnDesc = 
(HColumnDescriptor) tableDesc.getColumnFamily(cf);<a name="line.265"></a>
+<span class="sourceLineNo">265</span>        ColumnFamilyDescriptor columnDesc 
= tableDesc.getColumnFamily(cf);<a name="line.265"></a>
 <span class="sourceLineNo">266</span>        boolean isNewCf = columnDesc == 
null;<a name="line.266"></a>
-<span class="sourceLineNo">267</span>        if (isNewCf) {<a 
name="line.267"></a>
-<span class="sourceLineNo">268</span>          columnDesc = new 
HColumnDescriptor(cf);<a name="line.268"></a>
-<span class="sourceLineNo">269</span>        }<a name="line.269"></a>
+<span class="sourceLineNo">267</span>        ColumnFamilyDescriptorBuilder 
columnDescBuilder = isNewCf ?<a name="line.267"></a>
+<span class="sourceLineNo">268</span>            
ColumnFamilyDescriptorBuilder.newBuilder(cf) :<a name="line.268"></a>
+<span class="sourceLineNo">269</span>            
ColumnFamilyDescriptorBuilder.newBuilder(columnDesc);<a name="line.269"></a>
 <span class="sourceLineNo">270</span>        if (bloomType != null) {<a 
name="line.270"></a>
-<span class="sourceLineNo">271</span>          
columnDesc.setBloomFilterType(bloomType);<a name="line.271"></a>
+<span class="sourceLineNo">271</span>          
columnDescBuilder.setBloomFilterType(bloomType);<a name="line.271"></a>
 <span class="sourceLineNo">272</span>        }<a name="line.272"></a>
 <span class="sourceLineNo">273</span>        if (compressAlgo != null) {<a 
name="line.273"></a>
-<span class="sourceLineNo">274</span>          
columnDesc.setCompressionType(compressAlgo);<a name="line.274"></a>
+<span class="sourceLineNo">274</span>          
columnDescBuilder.setCompressionType(compressAlgo);<a name="line.274"></a>
 <span class="sourceLineNo">275</span>        }<a name="line.275"></a>
 <span class="sourceLineNo">276</span>        if (dataBlockEncodingAlgo != 
null) {<a name="line.276"></a>
-<span class="sourceLineNo">277</span>          
columnDesc.setDataBlockEncoding(dataBlockEncodingAlgo);<a name="line.277"></a>
+<span class="sourceLineNo">277</span>          
columnDescBuilder.setDataBlockEncoding(dataBlockEncodingAlgo);<a 
name="line.277"></a>
 <span class="sourceLineNo">278</span>        }<a name="line.278"></a>
 <span class="sourceLineNo">279</span>        if (inMemoryCF) {<a 
name="line.279"></a>
-<span class="sourceLineNo">280</span>          
columnDesc.setInMemory(inMemoryCF);<a name="line.280"></a>
+<span class="sourceLineNo">280</span>          
columnDescBuilder.setInMemory(inMemoryCF);<a name="line.280"></a>
 <span class="sourceLineNo">281</span>        }<a name="line.281"></a>
 <span class="sourceLineNo">282</span>        if (cipher != null) {<a 
name="line.282"></a>
 <span class="sourceLineNo">283</span>          byte[] keyBytes = new 
byte[cipher.getKeyLength()];<a name="line.283"></a>
 <span class="sourceLineNo">284</span>          new 
SecureRandom().nextBytes(keyBytes);<a name="line.284"></a>
-<span class="sourceLineNo">285</span>          
columnDesc.setEncryptionType(cipher.getName());<a name="line.285"></a>
-<span class="sourceLineNo">286</span>          columnDesc.setEncryptionKey(<a 
name="line.286"></a>
+<span class="sourceLineNo">285</span>          
columnDescBuilder.setEncryptionType(cipher.getName());<a name="line.285"></a>
+<span class="sourceLineNo">286</span>          
columnDescBuilder.setEncryptionKey(<a name="line.286"></a>
 <span class="sourceLineNo">287</span>              
EncryptionUtil.wrapKey(conf,<a name="line.287"></a>
 <span class="sourceLineNo">288</span>                  
User.getCurrent().getShortName(),<a name="line.288"></a>
 <span class="sourceLineNo">289</span>                  new 
SecretKeySpec(keyBytes,<a name="line.289"></a>
 <span class="sourceLineNo">290</span>                      
cipher.getName())));<a name="line.290"></a>
 <span class="sourceLineNo">291</span>        }<a name="line.291"></a>
 <span class="sourceLineNo">292</span>        if (mobThreshold &gt;= 0) {<a 
name="line.292"></a>
-<span class="sourceLineNo">293</span>          
columnDesc.setMobEnabled(true);<a name="line.293"></a>
-<span class="sourceLineNo">294</span>          
columnDesc.setMobThreshold(mobThreshold);<a name="line.294"></a>
+<span class="sourceLineNo">293</span>          
columnDescBuilder.setMobEnabled(true);<a name="line.293"></a>
+<span class="sourceLineNo">294</span>          
columnDescBuilder.setMobThreshold(mobThreshold);<a name="line.294"></a>
 <span class="sourceLineNo">295</span>        }<a name="line.295"></a>
 <span class="sourceLineNo">296</span><a name="line.296"></a>
 <span class="sourceLineNo">297</span>        if (isNewCf) {<a 
name="line.297"></a>
-<span class="sourceLineNo">298</span>          
admin.addColumnFamily(tableName, columnDesc);<a name="line.298"></a>
+<span class="sourceLineNo">298</span>          
admin.addColumnFamily(tableName, columnDescBuilder.build());<a 
name="line.298"></a>
 <span class="sourceLineNo">299</span>        } else {<a name="line.299"></a>
-<span class="sourceLineNo">300</span>          
admin.modifyColumnFamily(tableName, columnDesc);<a name="line.300"></a>
+<span class="sourceLineNo">300</span>          
admin.modifyColumnFamily(tableName, columnDescBuilder.build());<a 
name="line.300"></a>
 <span class="sourceLineNo">301</span>        }<a name="line.301"></a>
 <span class="sourceLineNo">302</span>      }<a name="line.302"></a>
 <span class="sourceLineNo">303</span>      LOG.info("Enabling table " + 
tableName);<a name="line.303"></a>
@@ -354,7 +354,7 @@
 <span class="sourceLineNo">346</span>        + "already exists");<a 
name="line.346"></a>
 <span class="sourceLineNo">347</span><a name="line.347"></a>
 <span class="sourceLineNo">348</span>    addOptWithArg(NUM_TABLES,<a 
name="line.348"></a>
-<span class="sourceLineNo">349</span>      "A positive integer number. When a 
number n is speicfied, load test "<a name="line.349"></a>
+<span class="sourceLineNo">349</span>      "A positive integer number. When a 
number n is specified, load test "<a name="line.349"></a>
 <span class="sourceLineNo">350</span>          + "tool  will load n table 
parallely. -tn parameter value becomes "<a name="line.350"></a>
 <span class="sourceLineNo">351</span>          + "table name prefix. Each 
table name is in format &lt;tn&gt;_1...&lt;tn&gt;_n");<a name="line.351"></a>
 <span class="sourceLineNo">352</span><a name="line.352"></a>
@@ -713,7 +713,7 @@
 <span class="sourceLineNo">705</span>      LOG.info("Starting to mutate 
data...");<a name="line.705"></a>
 <span class="sourceLineNo">706</span>      System.out.println("Starting to 
mutate data...");<a name="line.706"></a>
 <span class="sourceLineNo">707</span>      // TODO : currently append and 
increment operations not tested with tags<a name="line.707"></a>
-<span class="sourceLineNo">708</span>      // Will update this aftet it is 
done<a name="line.708"></a>
+<span class="sourceLineNo">708</span>      // Will update this after it is 
done<a name="line.708"></a>
 <span class="sourceLineNo">709</span>      updaterThreads.start(startKey, 
endKey, numUpdaterThreads);<a name="line.709"></a>
 <span class="sourceLineNo">710</span>    }<a name="line.710"></a>
 <span class="sourceLineNo">711</span><a name="line.711"></a>
@@ -905,7 +905,7 @@
 <span class="sourceLineNo">897</span><a name="line.897"></a>
 <span class="sourceLineNo">898</span>  private void 
addAuthInfoToConf(Properties authConfig, Configuration conf, String owner,<a 
name="line.898"></a>
 <span class="sourceLineNo">899</span>      String userList) throws IOException 
{<a name="line.899"></a>
-<span class="sourceLineNo">900</span>    List&lt;String&gt; users = new 
ArrayList(Arrays.asList(userList.split(",")));<a name="line.900"></a>
+<span class="sourceLineNo">900</span>    List&lt;String&gt; users = new 
ArrayList&lt;&gt;(Arrays.asList(userList.split(",")));<a name="line.900"></a>
 <span class="sourceLineNo">901</span>    users.add(owner);<a 
name="line.901"></a>
 <span class="sourceLineNo">902</span>    for (String user : users) {<a 
name="line.902"></a>
 <span class="sourceLineNo">903</span>      String keyTabFileConfKey = "hbase." 
+ user + ".keytab.file";<a name="line.903"></a>

Reply via email to