hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmhs...@apache.org
Subject [5/8] hbase git commit: HBASE-14675 Exorcise deprecated Put#add(...) and replace with Put#addColumn(...)
Date Thu, 29 Oct 2015 18:16:17 GMT
http://git-wip-us.apache.org/repos/asf/hbase/blob/de9555ce/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
index 3e988d6..7901b81 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
@@ -193,13 +193,13 @@ public class TestFromClientSide {
 
      long ts = System.currentTimeMillis();
      Put p = new Put(T1, ts);
-     p.add(FAMILY, C0, T1);
+     p.addColumn(FAMILY, C0, T1);
      h.put(p);
      p = new Put(T1, ts+2);
-     p.add(FAMILY, C0, T2);
+     p.addColumn(FAMILY, C0, T2);
      h.put(p);
      p = new Put(T1, ts+4);
-     p.add(FAMILY, C0, T3);
+     p.addColumn(FAMILY, C0, T3);
      h.put(p);
 
      Delete d = new Delete(T1, ts+3);
@@ -254,7 +254,7 @@ public class TestFromClientSide {
      // future timestamp
      long ts = System.currentTimeMillis() * 2;
      Put put = new Put(ROW, ts);
-     put.add(FAMILY, COLUMN, VALUE);
+     put.addColumn(FAMILY, COLUMN, VALUE);
      table.put(put);
 
      Get get = new Get(ROW);
@@ -283,7 +283,7 @@ public class TestFromClientSide {
      });
 
      put = new Put(ROW, ts);
-     put.add(FAMILY, COLUMN, VALUE);
+     put.addColumn(FAMILY, COLUMN, VALUE);
      table.put(put);
 
      get = new Get(ROW);
@@ -418,14 +418,14 @@ public class TestFromClientSide {
           value));
       Put put = new Put(Bytes.toBytes(row));
       put.setDurability(Durability.SKIP_WAL);
-      put.add(Bytes.toBytes("trans-blob"), null, Bytes
+      put.addColumn(Bytes.toBytes("trans-blob"), null, Bytes
           .toBytes("value for blob"));
-      put.add(Bytes.toBytes("trans-type"), null, Bytes.toBytes("statement"));
-      put.add(Bytes.toBytes("trans-date"), null, Bytes
+      put.addColumn(Bytes.toBytes("trans-type"), null, Bytes.toBytes("statement"));
+      put.addColumn(Bytes.toBytes("trans-date"), null, Bytes
           .toBytes("20090921010101999"));
-      put.add(Bytes.toBytes("trans-tags"), Bytes.toBytes("qual2"), Bytes
+      put.addColumn(Bytes.toBytes("trans-tags"), Bytes.toBytes("qual2"), Bytes
           .toBytes(value));
-      put.add(Bytes.toBytes("trans-group"), null, Bytes
+      put.addColumn(Bytes.toBytes("trans-group"), null, Bytes
           .toBytes("adhocTransactionGroupId"));
       ht.put(put);
     }
@@ -590,7 +590,7 @@ public class TestFromClientSide {
     TableName TABLE = TableName.valueOf("testSuperSimple");
     Table ht = TEST_UTIL.createTable(TABLE, FAMILY);
     Put put = new Put(ROW);
-    put.add(FAMILY, QUALIFIER, VALUE);
+    put.addColumn(FAMILY, QUALIFIER, VALUE);
     ht.put(put);
     Scan scan = new Scan();
     scan.addColumn(FAMILY, TABLE.toBytes());
@@ -608,7 +608,7 @@ public class TestFromClientSide {
     Table ht = TEST_UTIL.createTable(TABLE, FAMILY);
     byte[] value = new byte[4 * 1024 * 1024];
     Put put = new Put(ROW);
-    put.add(FAMILY, QUALIFIER, value);
+    put.addColumn(FAMILY, QUALIFIER, value);
     ht.put(put);
     try {
       TEST_UTIL.getConfiguration().setInt(
@@ -618,7 +618,7 @@ public class TestFromClientSide {
           ConnectionFactory.createConnection(TEST_UTIL.getConfiguration())) {
         try (Table t = connection.getTable(TableName.valueOf(FAMILY))) {
           put = new Put(ROW);
-          put.add(FAMILY, QUALIFIER, value);
+          put.addColumn(FAMILY, QUALIFIER, value);
           t.put(put);
         }
       }
@@ -642,7 +642,7 @@ public class TestFromClientSide {
     for(int i=0;i<10;i++) {
       Put put = new Put(ROWS[i]);
       put.setDurability(Durability.SKIP_WAL);
-      put.add(FAMILY, QUALIFIERS[i], VALUE);
+      put.addColumn(FAMILY, QUALIFIERS[i], VALUE);
       ht.put(put);
     }
     Scan scan = new Scan();
@@ -675,7 +675,7 @@ public class TestFromClientSide {
     for(int i = 0; i < 10; i ++) {
       Put put = new Put(ROWS[i]);
       put.setDurability(Durability.SKIP_WAL);
-      put.add(FAMILY, QUALIFIER, values[i]);
+      put.addColumn(FAMILY, QUALIFIER, values[i]);
       ht.put(put);
     }
     Scan scan = new Scan();
@@ -709,7 +709,7 @@ public class TestFromClientSide {
     for(int i=0;i<10;i++) {
       Put put = new Put(ROWS[i]);
       put.setDurability(Durability.SKIP_WAL);
-      put.add(FAMILY, QUALIFIERS[i], VALUE);
+      put.addColumn(FAMILY, QUALIFIERS[i], VALUE);
       ht.put(put);
     }
     Scan scan = new Scan();
@@ -778,7 +778,7 @@ public class TestFromClientSide {
     // Insert a row
 
     Put put = new Put(ROWS[2]);
-    put.add(FAMILY, QUALIFIER, VALUE);
+    put.addColumn(FAMILY, QUALIFIER, VALUE);
     ht.put(put);
 
     // Try to get empty rows around it
@@ -863,7 +863,7 @@ public class TestFromClientSide {
     ////////////////////////////////////////////////////////////////////////////
 
     put = new Put(ROWS[0]);
-    put.add(FAMILIES[4], QUALIFIERS[0], VALUES[0]);
+    put.addColumn(FAMILIES[4], QUALIFIERS[0], VALUES[0]);
     ht.put(put);
 
     // Get the single column
@@ -896,13 +896,13 @@ public class TestFromClientSide {
 
     // Insert multiple columns to two other families
     put = new Put(ROWS[0]);
-    put.add(FAMILIES[2], QUALIFIERS[2], VALUES[2]);
-    put.add(FAMILIES[2], QUALIFIERS[4], VALUES[4]);
-    put.add(FAMILIES[4], QUALIFIERS[4], VALUES[4]);
-    put.add(FAMILIES[6], QUALIFIERS[6], VALUES[6]);
-    put.add(FAMILIES[6], QUALIFIERS[7], VALUES[7]);
-    put.add(FAMILIES[7], QUALIFIERS[7], VALUES[7]);
-    put.add(FAMILIES[9], QUALIFIERS[0], VALUES[0]);
+    put.addColumn(FAMILIES[2], QUALIFIERS[2], VALUES[2]);
+    put.addColumn(FAMILIES[2], QUALIFIERS[4], VALUES[4]);
+    put.addColumn(FAMILIES[4], QUALIFIERS[4], VALUES[4]);
+    put.addColumn(FAMILIES[6], QUALIFIERS[6], VALUES[6]);
+    put.addColumn(FAMILIES[6], QUALIFIERS[7], VALUES[7]);
+    put.addColumn(FAMILIES[7], QUALIFIERS[7], VALUES[7]);
+    put.addColumn(FAMILIES[9], QUALIFIERS[0], VALUES[0]);
     ht.put(put);
 
     // Get multiple columns across multiple families and get empties around it
@@ -923,10 +923,10 @@ public class TestFromClientSide {
 
     // Insert more data to memstore
     put = new Put(ROWS[0]);
-    put.add(FAMILIES[6], QUALIFIERS[5], VALUES[5]);
-    put.add(FAMILIES[6], QUALIFIERS[8], VALUES[8]);
-    put.add(FAMILIES[6], QUALIFIERS[9], VALUES[9]);
-    put.add(FAMILIES[4], QUALIFIERS[3], VALUES[3]);
+    put.addColumn(FAMILIES[6], QUALIFIERS[5], VALUES[5]);
+    put.addColumn(FAMILIES[6], QUALIFIERS[8], VALUES[8]);
+    put.addColumn(FAMILIES[6], QUALIFIERS[9], VALUES[9]);
+    put.addColumn(FAMILIES[4], QUALIFIERS[3], VALUES[3]);
     ht.put(put);
 
     ////////////////////////////////////////////////////////////////////////////
@@ -1164,7 +1164,7 @@ public class TestFromClientSide {
     // Null row (should NOT work)
     try {
       Put put = new Put((byte[])null);
-      put.add(FAMILY, QUALIFIER, VALUE);
+      put.addColumn(FAMILY, QUALIFIER, VALUE);
       ht.put(put);
       fail("Inserting a null row worked, should throw exception");
     } catch(Exception e) {}
@@ -1172,7 +1172,7 @@ public class TestFromClientSide {
     // Null qualifier (should work)
     {
       Put put = new Put(ROW);
-      put.add(FAMILY, null, VALUE);
+      put.addColumn(FAMILY, null, VALUE);
       ht.put(put);
 
       getTestNull(ht, ROW, FAMILY, VALUE);
@@ -1195,7 +1195,7 @@ public class TestFromClientSide {
     // Empty qualifier, byte[0] instead of null (should work)
     try {
       Put put = new Put(ROW);
-      put.add(FAMILY, HConstants.EMPTY_BYTE_ARRAY, VALUE);
+      put.addColumn(FAMILY, HConstants.EMPTY_BYTE_ARRAY, VALUE);
       ht.put(put);
 
       getTestNull(ht, ROW, FAMILY, VALUE);
@@ -1225,7 +1225,7 @@ public class TestFromClientSide {
     // Null value
     try {
       Put put = new Put(ROW);
-      put.add(FAMILY, QUALIFIER, null);
+      put.addColumn(FAMILY, QUALIFIER, null);
       ht.put(put);
 
       Get get = new Get(ROW);
@@ -1262,10 +1262,10 @@ public class TestFromClientSide {
 
     // Insert 4 versions of same column
     Put put = new Put(ROW);
-    put.add(FAMILY, QUALIFIER, STAMPS[1], VALUES[1]);
-    put.add(FAMILY, QUALIFIER, STAMPS[2], VALUES[2]);
-    put.add(FAMILY, QUALIFIER, STAMPS[4], VALUES[4]);
-    put.add(FAMILY, QUALIFIER, STAMPS[5], VALUES[5]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[1], VALUES[1]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[2], VALUES[2]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[4], VALUES[4]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[5], VALUES[5]);
     ht.put(put);
 
     // Verify we can get each one properly
@@ -1351,10 +1351,10 @@ public class TestFromClientSide {
 
     // Insert 4 more versions of same column and a dupe
     put = new Put(ROW);
-    put.add(FAMILY, QUALIFIER, STAMPS[3], VALUES[3]);
-    put.add(FAMILY, QUALIFIER, STAMPS[6], VALUES[6]);
-    put.add(FAMILY, QUALIFIER, STAMPS[7], VALUES[7]);
-    put.add(FAMILY, QUALIFIER, STAMPS[8], VALUES[8]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[3], VALUES[3]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[6], VALUES[6]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[7], VALUES[7]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[8], VALUES[8]);
     ht.put(put);
 
     // Ensure maxVersions in query is respected
@@ -1414,10 +1414,10 @@ public class TestFromClientSide {
 
     // Insert 4 more versions of same column and a dupe
     put = new Put(ROW);
-    put.add(FAMILY, QUALIFIER, STAMPS[9], VALUES[9]);
-    put.add(FAMILY, QUALIFIER, STAMPS[11], VALUES[11]);
-    put.add(FAMILY, QUALIFIER, STAMPS[13], VALUES[13]);
-    put.add(FAMILY, QUALIFIER, STAMPS[15], VALUES[15]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[9], VALUES[9]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[11], VALUES[11]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[13], VALUES[13]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[15], VALUES[15]);
     ht.put(put);
 
     get = new Get(ROW);
@@ -1476,19 +1476,19 @@ public class TestFromClientSide {
 
     // Insert limit + 1 on each family
     Put put = new Put(ROW);
-    put.add(FAMILIES[0], QUALIFIER, STAMPS[0], VALUES[0]);
-    put.add(FAMILIES[0], QUALIFIER, STAMPS[1], VALUES[1]);
-    put.add(FAMILIES[1], QUALIFIER, STAMPS[0], VALUES[0]);
-    put.add(FAMILIES[1], QUALIFIER, STAMPS[1], VALUES[1]);
-    put.add(FAMILIES[1], QUALIFIER, STAMPS[2], VALUES[2]);
-    put.add(FAMILIES[1], QUALIFIER, STAMPS[3], VALUES[3]);
-    put.add(FAMILIES[2], QUALIFIER, STAMPS[0], VALUES[0]);
-    put.add(FAMILIES[2], QUALIFIER, STAMPS[1], VALUES[1]);
-    put.add(FAMILIES[2], QUALIFIER, STAMPS[2], VALUES[2]);
-    put.add(FAMILIES[2], QUALIFIER, STAMPS[3], VALUES[3]);
-    put.add(FAMILIES[2], QUALIFIER, STAMPS[4], VALUES[4]);
-    put.add(FAMILIES[2], QUALIFIER, STAMPS[5], VALUES[5]);
-    put.add(FAMILIES[2], QUALIFIER, STAMPS[6], VALUES[6]);
+    put.addColumn(FAMILIES[0], QUALIFIER, STAMPS[0], VALUES[0]);
+    put.addColumn(FAMILIES[0], QUALIFIER, STAMPS[1], VALUES[1]);
+    put.addColumn(FAMILIES[1], QUALIFIER, STAMPS[0], VALUES[0]);
+    put.addColumn(FAMILIES[1], QUALIFIER, STAMPS[1], VALUES[1]);
+    put.addColumn(FAMILIES[1], QUALIFIER, STAMPS[2], VALUES[2]);
+    put.addColumn(FAMILIES[1], QUALIFIER, STAMPS[3], VALUES[3]);
+    put.addColumn(FAMILIES[2], QUALIFIER, STAMPS[0], VALUES[0]);
+    put.addColumn(FAMILIES[2], QUALIFIER, STAMPS[1], VALUES[1]);
+    put.addColumn(FAMILIES[2], QUALIFIER, STAMPS[2], VALUES[2]);
+    put.addColumn(FAMILIES[2], QUALIFIER, STAMPS[3], VALUES[3]);
+    put.addColumn(FAMILIES[2], QUALIFIER, STAMPS[4], VALUES[4]);
+    put.addColumn(FAMILIES[2], QUALIFIER, STAMPS[5], VALUES[5]);
+    put.addColumn(FAMILIES[2], QUALIFIER, STAMPS[6], VALUES[6]);
     ht.put(put);
 
     // Verify we only get the right number out of each
@@ -1673,7 +1673,7 @@ public class TestFromClientSide {
     Put put = new Put(ROW);
     for (int q = 0; q < 1; q++)
       for (int t = 0; t < 5; t++)
-        put.add(FAMILY, QUALIFIERS[q], ts[t], VALUES[t]);
+        put.addColumn(FAMILY, QUALIFIERS[q], ts[t], VALUES[t]);
     ht.put(put);
     admin.flush(TABLE);
 
@@ -1717,7 +1717,7 @@ public class TestFromClientSide {
     put = new Put(ROW);
     for (int q = 0; q < 5; q++)
       for (int t = 0; t < 5; t++)
-        put.add(FAMILY, QUALIFIERS[q], ts[t], VALUES[t]);
+        put.addColumn(FAMILY, QUALIFIERS[q], ts[t], VALUES[t]);
     ht.put(put);
     admin.flush(TABLE);
 
@@ -1726,7 +1726,7 @@ public class TestFromClientSide {
     put = new Put(ROW2);
     for (int q = 0; q < 5; q++)
       for (int t = 0; t < 5; t++)
-        put.add(FAMILY, QUALIFIERS[q], ts[t], VALUES[t]);
+        put.addColumn(FAMILY, QUALIFIERS[q], ts[t], VALUES[t]);
     ht.put(put);
     admin.flush(TABLE);
 
@@ -1825,8 +1825,8 @@ public class TestFromClientSide {
     Table ht = TEST_UTIL.createTable(TABLE, FAMILIES, 3);
 
     Put put = new Put(ROW);
-    put.add(FAMILIES[0], QUALIFIER, ts[0], VALUES[0]);
-    put.add(FAMILIES[0], QUALIFIER, ts[1], VALUES[1]);
+    put.addColumn(FAMILIES[0], QUALIFIER, ts[0], VALUES[0]);
+    put.addColumn(FAMILIES[0], QUALIFIER, ts[1], VALUES[1]);
     ht.put(put);
 
     Delete delete = new Delete(ROW);
@@ -1853,12 +1853,12 @@ public class TestFromClientSide {
 
     // Test delete latest version
     put = new Put(ROW);
-    put.add(FAMILIES[0], QUALIFIER, ts[4], VALUES[4]);
-    put.add(FAMILIES[0], QUALIFIER, ts[2], VALUES[2]);
-    put.add(FAMILIES[0], QUALIFIER, ts[3], VALUES[3]);
-    put.add(FAMILIES[0], null, ts[4], VALUES[4]);
-    put.add(FAMILIES[0], null, ts[2], VALUES[2]);
-    put.add(FAMILIES[0], null, ts[3], VALUES[3]);
+    put.addColumn(FAMILIES[0], QUALIFIER, ts[4], VALUES[4]);
+    put.addColumn(FAMILIES[0], QUALIFIER, ts[2], VALUES[2]);
+    put.addColumn(FAMILIES[0], QUALIFIER, ts[3], VALUES[3]);
+    put.addColumn(FAMILIES[0], null, ts[4], VALUES[4]);
+    put.addColumn(FAMILIES[0], null, ts[2], VALUES[2]);
+    put.addColumn(FAMILIES[0], null, ts[3], VALUES[3]);
     ht.put(put);
 
     delete = new Delete(ROW);
@@ -1897,8 +1897,8 @@ public class TestFromClientSide {
     // But alas, this is not to be.  We can't put them back in either case.
 
     put = new Put(ROW);
-    put.add(FAMILIES[0], QUALIFIER, ts[0], VALUES[0]); // 1000
-    put.add(FAMILIES[0], QUALIFIER, ts[4], VALUES[4]); // 5000
+    put.addColumn(FAMILIES[0], QUALIFIER, ts[0], VALUES[0]); // 1000
+    put.addColumn(FAMILIES[0], QUALIFIER, ts[4], VALUES[4]); // 5000
     ht.put(put);
 
 
@@ -1928,24 +1928,24 @@ public class TestFromClientSide {
     // Test deleting an entire family from one row but not the other various ways
 
     put = new Put(ROWS[0]);
-    put.add(FAMILIES[1], QUALIFIER, ts[0], VALUES[0]);
-    put.add(FAMILIES[1], QUALIFIER, ts[1], VALUES[1]);
-    put.add(FAMILIES[2], QUALIFIER, ts[2], VALUES[2]);
-    put.add(FAMILIES[2], QUALIFIER, ts[3], VALUES[3]);
+    put.addColumn(FAMILIES[1], QUALIFIER, ts[0], VALUES[0]);
+    put.addColumn(FAMILIES[1], QUALIFIER, ts[1], VALUES[1]);
+    put.addColumn(FAMILIES[2], QUALIFIER, ts[2], VALUES[2]);
+    put.addColumn(FAMILIES[2], QUALIFIER, ts[3], VALUES[3]);
     ht.put(put);
 
     put = new Put(ROWS[1]);
-    put.add(FAMILIES[1], QUALIFIER, ts[0], VALUES[0]);
-    put.add(FAMILIES[1], QUALIFIER, ts[1], VALUES[1]);
-    put.add(FAMILIES[2], QUALIFIER, ts[2], VALUES[2]);
-    put.add(FAMILIES[2], QUALIFIER, ts[3], VALUES[3]);
+    put.addColumn(FAMILIES[1], QUALIFIER, ts[0], VALUES[0]);
+    put.addColumn(FAMILIES[1], QUALIFIER, ts[1], VALUES[1]);
+    put.addColumn(FAMILIES[2], QUALIFIER, ts[2], VALUES[2]);
+    put.addColumn(FAMILIES[2], QUALIFIER, ts[3], VALUES[3]);
     ht.put(put);
 
     put = new Put(ROWS[2]);
-    put.add(FAMILIES[1], QUALIFIER, ts[0], VALUES[0]);
-    put.add(FAMILIES[1], QUALIFIER, ts[1], VALUES[1]);
-    put.add(FAMILIES[2], QUALIFIER, ts[2], VALUES[2]);
-    put.add(FAMILIES[2], QUALIFIER, ts[3], VALUES[3]);
+    put.addColumn(FAMILIES[1], QUALIFIER, ts[0], VALUES[0]);
+    put.addColumn(FAMILIES[1], QUALIFIER, ts[1], VALUES[1]);
+    put.addColumn(FAMILIES[2], QUALIFIER, ts[2], VALUES[2]);
+    put.addColumn(FAMILIES[2], QUALIFIER, ts[3], VALUES[3]);
     ht.put(put);
 
     // Assert that above went in.
@@ -2040,12 +2040,12 @@ public class TestFromClientSide {
     ht.delete(delete);
 
     put = new Put(ROWS[3]);
-    put.add(FAMILIES[2], QUALIFIER, VALUES[0]);
+    put.addColumn(FAMILIES[2], QUALIFIER, VALUES[0]);
     ht.put(put);
 
     put = new Put(ROWS[4]);
-    put.add(FAMILIES[1], QUALIFIER, VALUES[1]);
-    put.add(FAMILIES[2], QUALIFIER, VALUES[2]);
+    put.addColumn(FAMILIES[1], QUALIFIER, VALUES[1]);
+    put.addColumn(FAMILIES[2], QUALIFIER, VALUES[2]);
     ht.put(put);
 
     get = new Get(ROWS[3]);
@@ -2088,7 +2088,7 @@ public class TestFromClientSide {
       byte [] bytes = Bytes.toBytes(i);
       put = new Put(bytes);
       put.setDurability(Durability.SKIP_WAL);
-      put.add(FAMILIES[0], QUALIFIER, bytes);
+      put.addColumn(FAMILIES[0], QUALIFIER, bytes);
       ht.put(put);
     }
     for (int i = 0; i < 10; i++) {
@@ -2197,7 +2197,7 @@ public class TestFromClientSide {
       Put put = new Put(ROWS[i]);
       put.setDurability(Durability.SKIP_WAL);
       for(int j=0;j<numColsPerRow;j++) {
-        put.add(FAMILY, QUALIFIERS[j], QUALIFIERS[j]);
+        put.addColumn(FAMILY, QUALIFIERS[j], QUALIFIERS[j]);
       }
       assertTrue("Put expected to contain " + numColsPerRow + " columns but " +
           "only contains " + put.size(), put.size() == numColsPerRow);
@@ -2277,9 +2277,9 @@ public class TestFromClientSide {
     // Insert three versions
 
     Put put = new Put(ROW);
-    put.add(FAMILY, QUALIFIER, STAMPS[3], VALUES[3]);
-    put.add(FAMILY, QUALIFIER, STAMPS[2], VALUES[2]);
-    put.add(FAMILY, QUALIFIER, STAMPS[4], VALUES[4]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[3], VALUES[3]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[2], VALUES[2]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[4], VALUES[4]);
     ht.put(put);
 
     // Get the middle value
@@ -2299,8 +2299,8 @@ public class TestFromClientSide {
 
     // Insert two more versions surrounding others, into memstore
     put = new Put(ROW);
-    put.add(FAMILY, QUALIFIER, STAMPS[0], VALUES[0]);
-    put.add(FAMILY, QUALIFIER, STAMPS[6], VALUES[6]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[0], VALUES[0]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[6], VALUES[6]);
     ht.put(put);
 
     // Check we can get everything we should and can't get what we shouldn't
@@ -2341,12 +2341,12 @@ public class TestFromClientSide {
     // Insert lots versions
 
     Put put = new Put(ROW);
-    put.add(FAMILY, QUALIFIER, STAMPS[0], VALUES[0]);
-    put.add(FAMILY, QUALIFIER, STAMPS[1], VALUES[1]);
-    put.add(FAMILY, QUALIFIER, STAMPS[2], VALUES[2]);
-    put.add(FAMILY, QUALIFIER, STAMPS[3], VALUES[3]);
-    put.add(FAMILY, QUALIFIER, STAMPS[4], VALUES[4]);
-    put.add(FAMILY, QUALIFIER, STAMPS[5], VALUES[5]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[0], VALUES[0]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[1], VALUES[1]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[2], VALUES[2]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[3], VALUES[3]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[4], VALUES[4]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[5], VALUES[5]);
     ht.put(put);
 
     getVersionRangeAndVerify(ht, ROW, FAMILY, QUALIFIER, STAMPS, VALUES, 0, 5);
@@ -2390,7 +2390,7 @@ public class TestFromClientSide {
     // Insert lots versions
 
     Put put = new Put(ROW);
-    put.add(FAMILY, QUALIFIER, manualStamp, VALUE);
+    put.addColumn(FAMILY, QUALIFIER, manualStamp, VALUE);
     ht.put(put);
 
     getVersionAndVerify(ht, ROW, FAMILY, QUALIFIER, manualStamp, VALUE);
@@ -2415,12 +2415,12 @@ public class TestFromClientSide {
     // Insert lots versions
 
     Put put = new Put(ROW);
-    put.add(FAMILY, QUALIFIER, STAMPS[0], VALUES[0]);
-    put.add(FAMILY, QUALIFIER, STAMPS[1], VALUES[1]);
-    put.add(FAMILY, QUALIFIER, STAMPS[2], VALUES[2]);
-    put.add(FAMILY, QUALIFIER, STAMPS[3], VALUES[3]);
-    put.add(FAMILY, QUALIFIER, STAMPS[4], VALUES[4]);
-    put.add(FAMILY, QUALIFIER, STAMPS[5], VALUES[5]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[0], VALUES[0]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[1], VALUES[1]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[2], VALUES[2]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[3], VALUES[3]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[4], VALUES[4]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[5], VALUES[5]);
     ht.put(put);
 
     getVersionRangeAndVerifyGreaterThan(ht, ROW, FAMILY, QUALIFIER, STAMPS, VALUES, 0, 5);
@@ -2458,12 +2458,12 @@ public class TestFromClientSide {
     // Insert lots versions
 
     Put put = new Put(ROW);
-    put.add(FAMILY, QUALIFIER, STAMPS[0], VALUES[0]);
-    put.add(FAMILY, QUALIFIER, STAMPS[1], VALUES[1]);
-    put.add(FAMILY, QUALIFIER, STAMPS[2], VALUES[2]);
-    put.add(FAMILY, QUALIFIER, STAMPS[3], VALUES[3]);
-    put.add(FAMILY, QUALIFIER, STAMPS[4], VALUES[4]);
-    put.add(FAMILY, QUALIFIER, STAMPS[5], VALUES[5]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[0], VALUES[0]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[1], VALUES[1]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[2], VALUES[2]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[3], VALUES[3]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[4], VALUES[4]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[5], VALUES[5]);
     ht.put(put);
 
     getAllVersionsAndVerify(ht, ROW, FAMILY, QUALIFIER, STAMPS, VALUES, 0, 5);
@@ -3288,10 +3288,10 @@ public class TestFromClientSide {
 
     // Insert 4 versions of same column
     Put put = new Put(ROW);
-    put.add(FAMILY, QUALIFIER, STAMPS[1], VALUES[1]);
-    put.add(FAMILY, QUALIFIER, STAMPS[2], VALUES[2]);
-    put.add(FAMILY, QUALIFIER, STAMPS[4], VALUES[4]);
-    put.add(FAMILY, QUALIFIER, STAMPS[5], VALUES[5]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[1], VALUES[1]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[2], VALUES[2]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[4], VALUES[4]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[5], VALUES[5]);
     ht.put(put);
 
     // Verify we can get each one properly
@@ -3377,11 +3377,11 @@ public class TestFromClientSide {
 
     // Insert 4 more versions of same column and a dupe
     put = new Put(ROW);
-    put.add(FAMILY, QUALIFIER, STAMPS[3], VALUES[3]);
-    put.add(FAMILY, QUALIFIER, STAMPS[4], VALUES[14]);
-    put.add(FAMILY, QUALIFIER, STAMPS[6], VALUES[6]);
-    put.add(FAMILY, QUALIFIER, STAMPS[7], VALUES[7]);
-    put.add(FAMILY, QUALIFIER, STAMPS[8], VALUES[8]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[3], VALUES[3]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[4], VALUES[14]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[6], VALUES[6]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[7], VALUES[7]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[8], VALUES[8]);
     ht.put(put);
 
     // Ensure maxVersions in query is respected
@@ -3441,10 +3441,10 @@ public class TestFromClientSide {
 
     // Insert 4 more versions of same column and a dupe
     put = new Put(ROW);
-    put.add(FAMILY, QUALIFIER, STAMPS[9], VALUES[9]);
-    put.add(FAMILY, QUALIFIER, STAMPS[11], VALUES[11]);
-    put.add(FAMILY, QUALIFIER, STAMPS[13], VALUES[13]);
-    put.add(FAMILY, QUALIFIER, STAMPS[15], VALUES[15]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[9], VALUES[9]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[11], VALUES[11]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[13], VALUES[13]);
+    put.addColumn(FAMILY, QUALIFIER, STAMPS[15], VALUES[15]);
     ht.put(put);
 
     get = new Get(ROW);
@@ -3501,15 +3501,15 @@ public class TestFromClientSide {
     byte[] row = Bytes.toBytes("row1");
     byte[] qualifier = Bytes.toBytes("myCol");
     Put put = new Put(row);
-    put.add(FAMILY, qualifier, 1L, Bytes.toBytes("AAA"));
+    put.addColumn(FAMILY, qualifier, 1L, Bytes.toBytes("AAA"));
     hTable.put(put);
 
     put = new Put(row);
-    put.add(FAMILY, qualifier, 2L, Bytes.toBytes("BBB"));
+    put.addColumn(FAMILY, qualifier, 2L, Bytes.toBytes("BBB"));
     hTable.put(put);
 
     put = new Put(row);
-    put.add(FAMILY, qualifier, 3L, Bytes.toBytes("EEE"));
+    put.addColumn(FAMILY, qualifier, 3L, Bytes.toBytes("EEE"));
     hTable.put(put);
 
     Get get = new Get(row);
@@ -3526,12 +3526,12 @@ public class TestFromClientSide {
 
     // Update the value at timestamp 1
     put = new Put(row);
-    put.add(FAMILY, qualifier, 1L, Bytes.toBytes("CCC"));
+    put.addColumn(FAMILY, qualifier, 1L, Bytes.toBytes("CCC"));
     hTable.put(put);
 
     // Update the value at timestamp 2
     put = new Put(row);
-    put.add(FAMILY, qualifier, 2L, Bytes.toBytes("DDD"));
+    put.addColumn(FAMILY, qualifier, 2L, Bytes.toBytes("DDD"));
     hTable.put(put);
 
     // Check that the values at timestamp 2 and 1 got updated
@@ -3552,15 +3552,15 @@ public class TestFromClientSide {
     byte[] row = Bytes.toBytes("row2");
     byte[] qualifier = Bytes.toBytes("myCol");
     Put put = new Put(row);
-    put.add(FAMILY, qualifier, 1L, Bytes.toBytes("AAA"));
+    put.addColumn(FAMILY, qualifier, 1L, Bytes.toBytes("AAA"));
     hTable.put(put);
 
     put = new Put(row);
-    put.add(FAMILY, qualifier, 2L, Bytes.toBytes("BBB"));
+    put.addColumn(FAMILY, qualifier, 2L, Bytes.toBytes("BBB"));
     hTable.put(put);
 
     put = new Put(row);
-    put.add(FAMILY, qualifier, 3L, Bytes.toBytes("EEE"));
+    put.addColumn(FAMILY, qualifier, 3L, Bytes.toBytes("EEE"));
     hTable.put(put);
 
     Get get = new Get(row);
@@ -3582,12 +3582,12 @@ public class TestFromClientSide {
 
     // Update the value at timestamp 1
     put = new Put(row);
-    put.add(FAMILY, qualifier, 1L, Bytes.toBytes("CCC"));
+    put.addColumn(FAMILY, qualifier, 1L, Bytes.toBytes("CCC"));
     hTable.put(put);
 
     // Update the value at timestamp 2
     put = new Put(row);
-    put.add(FAMILY, qualifier, 2L, Bytes.toBytes("DDD"));
+    put.addColumn(FAMILY, qualifier, 2L, Bytes.toBytes("DDD"));
     hTable.put(put);
 
     // Trigger a major compaction
@@ -3614,15 +3614,15 @@ public class TestFromClientSide {
     byte[] row = Bytes.toBytes("row3");
     byte[] qualifier = Bytes.toBytes("myCol");
     Put put = new Put(row);
-    put.add(FAMILY, qualifier, 1L, Bytes.toBytes("AAA"));
+    put.addColumn(FAMILY, qualifier, 1L, Bytes.toBytes("AAA"));
     hTable.put(put);
 
     put = new Put(row);
-    put.add(FAMILY, qualifier, 2L, Bytes.toBytes("BBB"));
+    put.addColumn(FAMILY, qualifier, 2L, Bytes.toBytes("BBB"));
     hTable.put(put);
 
     put = new Put(row);
-    put.add(FAMILY, qualifier, 3L, Bytes.toBytes("EEE"));
+    put.addColumn(FAMILY, qualifier, 3L, Bytes.toBytes("EEE"));
     hTable.put(put);
 
     Get get = new Get(row);
@@ -3644,7 +3644,7 @@ public class TestFromClientSide {
 
     // Update the value at timestamp 1
     put = new Put(row);
-    put.add(FAMILY, qualifier, 1L, Bytes.toBytes("CCC"));
+    put.addColumn(FAMILY, qualifier, 1L, Bytes.toBytes("CCC"));
     hTable.put(put);
 
     // Trigger a major compaction
@@ -3654,7 +3654,7 @@ public class TestFromClientSide {
 
     // Update the value at timestamp 2
     put = new Put(row);
-    put.add(FAMILY, qualifier, 2L, Bytes.toBytes("DDD"));
+    put.addColumn(FAMILY, qualifier, 2L, Bytes.toBytes("DDD"));
     hTable.put(put);
 
     // Trigger a major compaction
@@ -3683,11 +3683,11 @@ public class TestFromClientSide {
   public void testGet_NullQualifier() throws IOException {
     Table table = TEST_UTIL.createTable(TableName.valueOf("testGet_NullQualifier"), FAMILY);
     Put put = new Put(ROW);
-    put.add(FAMILY, QUALIFIER, VALUE);
+    put.addColumn(FAMILY, QUALIFIER, VALUE);
     table.put(put);
 
     put = new Put(ROW);
-    put.add(FAMILY, null, VALUE);
+    put.addColumn(FAMILY, null, VALUE);
     table.put(put);
     LOG.info("Row put");
 
@@ -3706,7 +3706,7 @@ public class TestFromClientSide {
   public void testGet_NonExistentRow() throws IOException {
     Table table = TEST_UTIL.createTable(TableName.valueOf("testGet_NonExistentRow"), FAMILY);
     Put put = new Put(ROW);
-    put.add(FAMILY, QUALIFIER, VALUE);
+    put.addColumn(FAMILY, QUALIFIER, VALUE);
     table.put(put);
     LOG.info("Row put");
 
@@ -3734,11 +3734,11 @@ public class TestFromClientSide {
     Table table = TEST_UTIL.createTable(TableName.valueOf("testPut"),
         new byte[][] { CONTENTS_FAMILY, SMALL_FAMILY });
     Put put = new Put(row1);
-    put.add(CONTENTS_FAMILY, null, value);
+    put.addColumn(CONTENTS_FAMILY, null, value);
     table.put(put);
 
     put = new Put(row2);
-    put.add(CONTENTS_FAMILY, null, value);
+    put.addColumn(CONTENTS_FAMILY, null, value);
 
     assertEquals(put.size(), 1);
     assertEquals(put.getFamilyCellMap().get(CONTENTS_FAMILY).size(), 1);
@@ -3774,7 +3774,7 @@ public class TestFromClientSide {
 
     try {
       Put p = new Put(ROW);
-      p.add(BAD_FAM, QUALIFIER, VAL);
+      p.addColumn(BAD_FAM, QUALIFIER, VAL);
       table.put(p);
     } catch (RetriesExhaustedWithDetailsException e) {
       caughtNSCFE = e.getCause(0) instanceof NoSuchColumnFamilyException;
@@ -3796,7 +3796,7 @@ public class TestFromClientSide {
       byte[] row = Bytes.toBytes("row" + i);
       Put put = new Put(row);
       put.setDurability(Durability.SKIP_WAL);
-      put.add(CONTENTS_FAMILY, null, value);
+      put.addColumn(CONTENTS_FAMILY, null, value);
       rowsUpdate.add(put);
     }
     table.put(rowsUpdate);
@@ -3828,7 +3828,7 @@ public class TestFromClientSide {
         byte[] row = Bytes.toBytes("row" + i);
         Put put = new Put(row);
         put.setDurability(Durability.SKIP_WAL);
-        put.add(CONTENTS_FAMILY, null, value);
+        put.addColumn(CONTENTS_FAMILY, null, value);
         rowsUpdate.add(put);
       }
       table.put(rowsUpdate);
@@ -3869,7 +3869,7 @@ public class TestFromClientSide {
       byte[] row = Bytes.toBytes("row" + i);
       Put put = new Put(row);
       put.setDurability(Durability.SKIP_WAL);
-      put.add(CONTENTS_FAMILY, null, value);
+      put.addColumn(CONTENTS_FAMILY, null, value);
       rowsUpdate.add(put);
     }
     table.put(rowsUpdate);
@@ -3927,7 +3927,7 @@ public class TestFromClientSide {
       new byte [][] {FAM1, FAM2});
     // Insert some values
     Put put = new Put(ROW);
-    put.add(FAM1, Bytes.toBytes("letters"), Bytes.toBytes("abcdefg"));
+    put.addColumn(FAM1, Bytes.toBytes("letters"), Bytes.toBytes("abcdefg"));
     table.put(put);
     try {
       Thread.sleep(1000);
@@ -3936,7 +3936,7 @@ public class TestFromClientSide {
     }
 
     put = new Put(ROW);
-    put.add(FAM1, Bytes.toBytes("numbers"), Bytes.toBytes("123456"));
+    put.addColumn(FAM1, Bytes.toBytes("numbers"), Bytes.toBytes("123456"));
     table.put(put);
 
     try {
@@ -3946,7 +3946,7 @@ public class TestFromClientSide {
     }
 
     put = new Put(ROW);
-    put.add(FAM2, Bytes.toBytes("letters"), Bytes.toBytes("hijklmnop"));
+    put.addColumn(FAM2, Bytes.toBytes("letters"), Bytes.toBytes("hijklmnop"));
     table.put(put);
 
     long times[] = new long[3];
@@ -4099,7 +4099,7 @@ public class TestFromClientSide {
     Table a = TEST_UTIL.createTable(tableAname, HConstants.CATALOG_FAMILY);
     Table b = TEST_UTIL.createTable(tableBname, HConstants.CATALOG_FAMILY);
     Put put = new Put(ROW);
-    put.add(HConstants.CATALOG_FAMILY, null, value);
+    put.addColumn(HConstants.CATALOG_FAMILY, null, value);
     a.put(put);
 
     // open a new connection to A and a connection to b
@@ -4198,10 +4198,10 @@ public class TestFromClientSide {
         byte[] three = new byte[] { 3 };
         byte[] four = new byte[] { 4 };
 
-        put1.add(HConstants.CATALOG_FAMILY, null, one);
-        put2.add(HConstants.CATALOG_FAMILY, null, two);
-        put3.add(HConstants.CATALOG_FAMILY, null, three);
-        put4.add(HConstants.CATALOG_FAMILY, null, four);
+        put1.addColumn(HConstants.CATALOG_FAMILY, null, one);
+        put2.addColumn(HConstants.CATALOG_FAMILY, null, two);
+        put3.addColumn(HConstants.CATALOG_FAMILY, null, three);
+        put4.addColumn(HConstants.CATALOG_FAMILY, null, four);
         table.put(put1);
         table.put(put2);
         table.put(put3);
@@ -4304,11 +4304,11 @@ public class TestFromClientSide {
 
     Table t = TEST_UTIL.createTable(TABLENAME, FAMILY);
     Put p = new Put(ROW);
-    p.add(FAMILY, QUALIFIER, VALUE);
+    p.addColumn(FAMILY, QUALIFIER, VALUE);
     MutationProto m1 = ProtobufUtil.toMutation(MutationType.PUT, p);
 
     p = new Put(ROW1);
-    p.add(FAMILY, QUALIFIER, VALUE);
+    p.addColumn(FAMILY, QUALIFIER, VALUE);
     MutationProto m2 = ProtobufUtil.toMutation(MutationType.PUT, p);
 
     MutateRowsRequest.Builder mrmBuilder = MutateRowsRequest.newBuilder();
@@ -4337,7 +4337,7 @@ public class TestFromClientSide {
     };
     RowMutations arm = new RowMutations(ROW);
     Put p = new Put(ROW);
-    p.add(FAMILY, QUALIFIERS[0], VALUE);
+    p.addColumn(FAMILY, QUALIFIERS[0], VALUE);
     arm.add(p);
     t.mutateRow(arm);
 
@@ -4347,7 +4347,7 @@ public class TestFromClientSide {
 
     arm = new RowMutations(ROW);
     p = new Put(ROW);
-    p.add(FAMILY, QUALIFIERS[1], VALUE);
+    p.addColumn(FAMILY, QUALIFIERS[1], VALUE);
     arm.add(p);
     Delete d = new Delete(ROW);
     d.deleteColumns(FAMILY, QUALIFIERS[0]);
@@ -4362,7 +4362,7 @@ public class TestFromClientSide {
     try {
       arm = new RowMutations(ROW);
       p = new Put(ROW);
-      p.add(new byte[]{'b', 'o', 'g', 'u', 's'}, QUALIFIERS[0], VALUE);
+      p.addColumn(new byte[]{'b', 'o', 'g', 'u', 's'}, QUALIFIERS[0], VALUE);
       arm.add(p);
       t.mutateRow(arm);
       fail("Expected NoSuchColumnFamilyException");
@@ -4429,7 +4429,7 @@ public class TestFromClientSide {
     final byte[] COLUMN = Bytes.toBytes("column");
     Put p = new Put(ROW);
     // write an integer here (not a Long)
-    p.add(FAMILY, COLUMN, Bytes.toBytes(5));
+    p.addColumn(FAMILY, COLUMN, Bytes.toBytes(5));
     ht.put(p);
     try {
       ht.incrementColumnValue(ROW, FAMILY, COLUMN, 5);
@@ -4676,7 +4676,7 @@ public class TestFromClientSide {
 
     for (int versions = 1; versions <= numVersions; versions++) {
       Put put = new Put(ROW);
-      put.add(FAMILY, QUALIFIER, ts + versions, VALUE);
+      put.addColumn(FAMILY, QUALIFIER, ts + versions, VALUE);
       table.put(put);
 
       Result result = table.get(get);
@@ -4712,7 +4712,7 @@ public class TestFromClientSide {
 
     for (int versions = 1; versions <= numVersions; versions++) {
       Put put = new Put(ROW);
-      put.add(FAMILY, QUALIFIER, ts + versions, VALUE);
+      put.addColumn(FAMILY, QUALIFIER, ts + versions, VALUE);
       table.put(put);
 
       Result result = table.get(get);
@@ -4738,7 +4738,7 @@ public class TestFromClientSide {
         public Void call() {
           try {
             Put put = new Put(ROW);
-            put.add(FAMILY, QUALIFIER, ts + versionsCopy, VALUE);
+            put.addColumn(FAMILY, QUALIFIER, ts + versionsCopy, VALUE);
             table.put(put);
 
             Result result = table.get(get);
@@ -4782,7 +4782,7 @@ public class TestFromClientSide {
 
     Table table = TEST_UTIL.createTable(TableName.valueOf("testCheckAndPut"), FAMILY);
     Put put1 = new Put(ROW);
-    put1.add(FAMILY, QUALIFIER, VALUE);
+    put1.addColumn(FAMILY, QUALIFIER, VALUE);
 
     // row doesn't exist, so using non-null value should be considered "not match".
     boolean ok = table.checkAndPut(ROW, FAMILY, QUALIFIER, VALUE, put1);
@@ -4797,14 +4797,14 @@ public class TestFromClientSide {
     assertEquals(ok, false);
 
     Put put2 = new Put(ROW);
-    put2.add(FAMILY, QUALIFIER, value2);
+    put2.addColumn(FAMILY, QUALIFIER, value2);
 
     // row now exists, use the matching value to check
     ok = table.checkAndPut(ROW, FAMILY, QUALIFIER, VALUE, put2);
     assertEquals(ok, true);
 
     Put put3 = new Put(anotherrow);
-    put3.add(FAMILY, QUALIFIER, VALUE);
+    put3.addColumn(FAMILY, QUALIFIER, VALUE);
 
     // try to do CheckAndPut on different rows
     try {
@@ -4824,10 +4824,10 @@ public class TestFromClientSide {
     Table table = TEST_UTIL.createTable(TableName.valueOf("testCheckAndPutWithCompareOp"), FAMILY);
 
     Put put2 = new Put(ROW);
-    put2.add(FAMILY, QUALIFIER, value2);
+    put2.addColumn(FAMILY, QUALIFIER, value2);
 
     Put put3 = new Put(ROW);
-    put3.add(FAMILY, QUALIFIER, value3);
+    put3.addColumn(FAMILY, QUALIFIER, value3);
 
     // row doesn't exist, so using "null" to check for existence should be considered "match".
     boolean ok = table.checkAndPut(ROW, FAMILY, QUALIFIER, null, put2);
@@ -4890,11 +4890,11 @@ public class TestFromClientSide {
         FAMILY);
 
     Put put2 = new Put(ROW);
-    put2.add(FAMILY, QUALIFIER, value2);
+    put2.addColumn(FAMILY, QUALIFIER, value2);
     table.put(put2);
 
     Put put3 = new Put(ROW);
-    put3.add(FAMILY, QUALIFIER, value3);
+    put3.addColumn(FAMILY, QUALIFIER, value3);
 
     Delete delete = new Delete(ROW);
     delete.deleteColumns(FAMILY, QUALIFIER);
@@ -4972,11 +4972,11 @@ public class TestFromClientSide {
     // Create 3 rows in the table, with rowkeys starting with "zzz*" so that
     // scan are forced to hit all the regions.
     Put put1 = new Put(Bytes.toBytes("zzz1"));
-    put1.add(FAMILY, QUALIFIER, VALUE);
+    put1.addColumn(FAMILY, QUALIFIER, VALUE);
     Put put2 = new Put(Bytes.toBytes("zzz2"));
-    put2.add(FAMILY, QUALIFIER, VALUE);
+    put2.addColumn(FAMILY, QUALIFIER, VALUE);
     Put put3 = new Put(Bytes.toBytes("zzz3"));
-    put3.add(FAMILY, QUALIFIER, VALUE);
+    put3.addColumn(FAMILY, QUALIFIER, VALUE);
     ht.put(Arrays.asList(put1, put2, put3));
 
     Scan scan1 = new Scan();
@@ -5134,7 +5134,7 @@ public class TestFromClientSide {
 
       // insert data
       Put put = new Put(ROW);
-      put.add(FAMILY, QUALIFIER, data);
+      put.addColumn(FAMILY, QUALIFIER, data);
       table.put(put);
       assertTrue(Bytes.equals(table.get(new Get(ROW)).value(), data));
       // data was in memstore so don't expect any changes
@@ -5160,7 +5160,7 @@ public class TestFromClientSide {
       byte [] QUALIFIER2 = Bytes.add(QUALIFIER, QUALIFIER);
       byte [] data2 = Bytes.add(data, data);
       put = new Put(ROW);
-      put.add(FAMILY, QUALIFIER2, data2);
+      put.addColumn(FAMILY, QUALIFIER2, data2);
       table.put(put);
       Result r = table.get(new Get(ROW));
       assertTrue(Bytes.equals(r.getValue(FAMILY, QUALIFIER), data));
@@ -5346,7 +5346,7 @@ public class TestFromClientSide {
     List<Put> puts = new ArrayList<Put>();
     for (int i=0;i !=100; i++){
       Put put = new Put(Bytes.toBytes(i));
-      put.add(FAMILY, FAMILY, Bytes.toBytes(i));
+      put.addColumn(FAMILY, FAMILY, Bytes.toBytes(i));
       puts.add(put);
     }
     foo.put(puts);
@@ -5369,11 +5369,11 @@ public class TestFromClientSide {
   public void testScan_NullQualifier() throws IOException {
     Table table = TEST_UTIL.createTable(TableName.valueOf("testScan_NullQualifier"), FAMILY);
     Put put = new Put(ROW);
-    put.add(FAMILY, QUALIFIER, VALUE);
+    put.addColumn(FAMILY, QUALIFIER, VALUE);
     table.put(put);
 
     put = new Put(ROW);
-    put.add(FAMILY, null, VALUE);
+    put.addColumn(FAMILY, null, VALUE);
     table.put(put);
     LOG.info("Row put");
 
@@ -5400,7 +5400,7 @@ public class TestFromClientSide {
 
     try {
       Put put = new Put(ROW, -1);
-      put.add(FAMILY, QUALIFIER, VALUE);
+      put.addColumn(FAMILY, QUALIFIER, VALUE);
       table.put(put);
       fail("Negative timestamps should not have been allowed");
     } catch (IllegalArgumentException ex) {
@@ -5409,7 +5409,8 @@ public class TestFromClientSide {
 
     try {
       Put put = new Put(ROW);
-      put.add(FAMILY, QUALIFIER, -1, VALUE);
+      long ts = -1;
+      put.addColumn(FAMILY, QUALIFIER, ts, VALUE);
       table.put(put);
       fail("Negative timestamps should not have been allowed");
     } catch (IllegalArgumentException ex) {
@@ -5606,18 +5607,18 @@ public class TestFromClientSide {
 
     // put the same row 4 times, with different values
     Put p = new Put(row);
-    p.add(FAMILY, QUALIFIER, 10, VALUE);
+    p.addColumn(FAMILY, QUALIFIER, (long) 10, VALUE);
     table.put(p);
     p = new Put(row);
-    p.add(FAMILY, QUALIFIER, 11, ArrayUtils.add(VALUE, (byte) 2));
+    p.addColumn(FAMILY, QUALIFIER, (long) 11, ArrayUtils.add(VALUE, (byte) 2));
     table.put(p);
 
     p = new Put(row);
-    p.add(FAMILY, QUALIFIER, 12, ArrayUtils.add(VALUE, (byte) 3));
+    p.addColumn(FAMILY, QUALIFIER, (long) 12, ArrayUtils.add(VALUE, (byte) 3));
     table.put(p);
 
     p = new Put(row);
-    p.add(FAMILY, QUALIFIER, 13, ArrayUtils.add(VALUE, (byte) 4));
+    p.addColumn(FAMILY, QUALIFIER, (long) 13, ArrayUtils.add(VALUE, (byte) 4));
     table.put(p);
 
     int versions = 4;
@@ -5678,7 +5679,7 @@ public class TestFromClientSide {
     int insertNum = 10;
     for (int i = 0; i < 10; i++) {
       Put put = new Put(Bytes.toBytes("row" + String.format("%03d", i)));
-      put.add(FAMILY, QUALIFIER, VALUE);
+      put.addColumn(FAMILY, QUALIFIER, VALUE);
       table.put(put);
     }
 
@@ -5710,34 +5711,34 @@ public class TestFromClientSide {
     TableName TABLE = TableName.valueOf("testSuperSimpleWithReverseScan");
     Table ht = TEST_UTIL.createTable(TABLE, FAMILY);
     Put put = new Put(Bytes.toBytes("0-b11111-0000000000000000000"));
-    put.add(FAMILY, QUALIFIER, VALUE);
+    put.addColumn(FAMILY, QUALIFIER, VALUE);
     ht.put(put);
     put = new Put(Bytes.toBytes("0-b11111-0000000000000000002"));
-    put.add(FAMILY, QUALIFIER, VALUE);
+    put.addColumn(FAMILY, QUALIFIER, VALUE);
     ht.put(put);
     put = new Put(Bytes.toBytes("0-b11111-0000000000000000004"));
-    put.add(FAMILY, QUALIFIER, VALUE);
+    put.addColumn(FAMILY, QUALIFIER, VALUE);
     ht.put(put);
     put = new Put(Bytes.toBytes("0-b11111-0000000000000000006"));
-    put.add(FAMILY, QUALIFIER, VALUE);
+    put.addColumn(FAMILY, QUALIFIER, VALUE);
     ht.put(put);
     put = new Put(Bytes.toBytes("0-b11111-0000000000000000008"));
-    put.add(FAMILY, QUALIFIER, VALUE);
+    put.addColumn(FAMILY, QUALIFIER, VALUE);
     ht.put(put);
     put = new Put(Bytes.toBytes("0-b22222-0000000000000000001"));
-    put.add(FAMILY, QUALIFIER, VALUE);
+    put.addColumn(FAMILY, QUALIFIER, VALUE);
     ht.put(put);
     put = new Put(Bytes.toBytes("0-b22222-0000000000000000003"));
-    put.add(FAMILY, QUALIFIER, VALUE);
+    put.addColumn(FAMILY, QUALIFIER, VALUE);
     ht.put(put);
     put = new Put(Bytes.toBytes("0-b22222-0000000000000000005"));
-    put.add(FAMILY, QUALIFIER, VALUE);
+    put.addColumn(FAMILY, QUALIFIER, VALUE);
     ht.put(put);
     put = new Put(Bytes.toBytes("0-b22222-0000000000000000007"));
-    put.add(FAMILY, QUALIFIER, VALUE);
+    put.addColumn(FAMILY, QUALIFIER, VALUE);
     ht.put(put);
     put = new Put(Bytes.toBytes("0-b22222-0000000000000000009"));
-    put.add(FAMILY, QUALIFIER, VALUE);
+    put.addColumn(FAMILY, QUALIFIER, VALUE);
     ht.put(put);
     Scan scan = new Scan(Bytes.toBytes("0-b11111-9223372036854775807"),
         Bytes.toBytes("0-b11111-0000000000000000000"));
@@ -5767,7 +5768,7 @@ public class TestFromClientSide {
         Bytes.toBytes("col9-<d2v1>-<d3v2>") };
     for (int i = 0; i < 10; i++) {
       Put put = new Put(ROWS[i]);
-      put.add(FAMILY, QUALIFIERS[i], VALUE);
+      put.addColumn(FAMILY, QUALIFIERS[i], VALUE);
       ht.put(put);
     }
     Scan scan = new Scan();
@@ -5809,7 +5810,7 @@ public class TestFromClientSide {
         Bytes.toBytes("col9-<d2v1>-<d3v2>") };
     for (int i = 0; i < 10; i++) {
       Put put = new Put(ROWS[i]);
-      put.add(FAMILY, QUALIFIERS[i], VALUE);
+      put.addColumn(FAMILY, QUALIFIERS[i], VALUE);
       ht.put(put);
     }
     Scan scan = new Scan();
@@ -5870,7 +5871,7 @@ public class TestFromClientSide {
     // Insert a row
 
     Put put = new Put(ROWS[2]);
-    put.add(FAMILY, QUALIFIER, VALUE);
+    put.addColumn(FAMILY, QUALIFIER, VALUE);
     ht.put(put);
 
     // Make sure we can scan the row
@@ -5904,7 +5905,7 @@ public class TestFromClientSide {
     Table ht = TEST_UTIL.createTable(TABLE, FAMILY);
     // Null qualifier (should work)
     Put put = new Put(ROW);
-    put.add(FAMILY, null, VALUE);
+    put.addColumn(FAMILY, null, VALUE);
     ht.put(put);
     scanTestNull(ht, ROW, FAMILY, VALUE, true);
     Delete delete = new Delete(ROW);
@@ -5915,7 +5916,7 @@ public class TestFromClientSide {
     ht = TEST_UTIL.createTable(TableName.valueOf(TABLE2), FAMILY);
     // Empty qualifier, byte[0] instead of null (should work)
     put = new Put(ROW);
-    put.add(FAMILY, HConstants.EMPTY_BYTE_ARRAY, VALUE);
+    put.addColumn(FAMILY, HConstants.EMPTY_BYTE_ARRAY, VALUE);
     ht.put(put);
     scanTestNull(ht, ROW, FAMILY, VALUE, true);
     TEST_UTIL.flush();
@@ -5925,7 +5926,7 @@ public class TestFromClientSide {
     ht.delete(delete);
     // Null value
     put = new Put(ROW);
-    put.add(FAMILY, QUALIFIER, null);
+    put.addColumn(FAMILY, QUALIFIER, null);
     ht.put(put);
     Scan scan = new Scan();
     scan.setReversed(true);
@@ -5945,8 +5946,8 @@ public class TestFromClientSide {
     Table ht = TEST_UTIL.createTable(TABLE, FAMILIES, 3);
 
     Put put = new Put(ROW);
-    put.add(FAMILIES[0], QUALIFIER, ts[0], VALUES[0]);
-    put.add(FAMILIES[0], QUALIFIER, ts[1], VALUES[1]);
+    put.addColumn(FAMILIES[0], QUALIFIER, ts[0], VALUES[0]);
+    put.addColumn(FAMILIES[0], QUALIFIER, ts[1], VALUES[1]);
     ht.put(put);
 
     Delete delete = new Delete(ROW);
@@ -5963,12 +5964,12 @@ public class TestFromClientSide {
 
     // Test delete latest version
     put = new Put(ROW);
-    put.add(FAMILIES[0], QUALIFIER, ts[4], VALUES[4]);
-    put.add(FAMILIES[0], QUALIFIER, ts[2], VALUES[2]);
-    put.add(FAMILIES[0], QUALIFIER, ts[3], VALUES[3]);
-    put.add(FAMILIES[0], null, ts[4], VALUES[4]);
-    put.add(FAMILIES[0], null, ts[2], VALUES[2]);
-    put.add(FAMILIES[0], null, ts[3], VALUES[3]);
+    put.addColumn(FAMILIES[0], QUALIFIER, ts[4], VALUES[4]);
+    put.addColumn(FAMILIES[0], QUALIFIER, ts[2], VALUES[2]);
+    put.addColumn(FAMILIES[0], QUALIFIER, ts[3], VALUES[3]);
+    put.addColumn(FAMILIES[0], null, ts[4], VALUES[4]);
+    put.addColumn(FAMILIES[0], null, ts[2], VALUES[2]);
+    put.addColumn(FAMILIES[0], null, ts[3], VALUES[3]);
     ht.put(put);
 
     delete = new Delete(ROW);
@@ -5997,8 +5998,8 @@ public class TestFromClientSide {
     // But alas, this is not to be. We can't put them back in either case.
 
     put = new Put(ROW);
-    put.add(FAMILIES[0], QUALIFIER, ts[0], VALUES[0]); // 1000
-    put.add(FAMILIES[0], QUALIFIER, ts[4], VALUES[4]); // 5000
+    put.addColumn(FAMILIES[0], QUALIFIER, ts[0], VALUES[0]);
+    put.addColumn(FAMILIES[0], QUALIFIER, ts[4], VALUES[4]);
     ht.put(put);
 
     // The Scanner returns the previous values, the expected-naive-unexpected
@@ -6016,24 +6017,24 @@ public class TestFromClientSide {
     // ways
 
     put = new Put(ROWS[0]);
-    put.add(FAMILIES[1], QUALIFIER, ts[0], VALUES[0]);
-    put.add(FAMILIES[1], QUALIFIER, ts[1], VALUES[1]);
-    put.add(FAMILIES[2], QUALIFIER, ts[2], VALUES[2]);
-    put.add(FAMILIES[2], QUALIFIER, ts[3], VALUES[3]);
+    put.addColumn(FAMILIES[1], QUALIFIER, ts[0], VALUES[0]);
+    put.addColumn(FAMILIES[1], QUALIFIER, ts[1], VALUES[1]);
+    put.addColumn(FAMILIES[2], QUALIFIER, ts[2], VALUES[2]);
+    put.addColumn(FAMILIES[2], QUALIFIER, ts[3], VALUES[3]);
     ht.put(put);
 
     put = new Put(ROWS[1]);
-    put.add(FAMILIES[1], QUALIFIER, ts[0], VALUES[0]);
-    put.add(FAMILIES[1], QUALIFIER, ts[1], VALUES[1]);
-    put.add(FAMILIES[2], QUALIFIER, ts[2], VALUES[2]);
-    put.add(FAMILIES[2], QUALIFIER, ts[3], VALUES[3]);
+    put.addColumn(FAMILIES[1], QUALIFIER, ts[0], VALUES[0]);
+    put.addColumn(FAMILIES[1], QUALIFIER, ts[1], VALUES[1]);
+    put.addColumn(FAMILIES[2], QUALIFIER, ts[2], VALUES[2]);
+    put.addColumn(FAMILIES[2], QUALIFIER, ts[3], VALUES[3]);
     ht.put(put);
 
     put = new Put(ROWS[2]);
-    put.add(FAMILIES[1], QUALIFIER, ts[0], VALUES[0]);
-    put.add(FAMILIES[1], QUALIFIER, ts[1], VALUES[1]);
-    put.add(FAMILIES[2], QUALIFIER, ts[2], VALUES[2]);
-    put.add(FAMILIES[2], QUALIFIER, ts[3], VALUES[3]);
+    put.addColumn(FAMILIES[1], QUALIFIER, ts[0], VALUES[0]);
+    put.addColumn(FAMILIES[1], QUALIFIER, ts[1], VALUES[1]);
+    put.addColumn(FAMILIES[2], QUALIFIER, ts[2], VALUES[2]);
+    put.addColumn(FAMILIES[2], QUALIFIER, ts[3], VALUES[3]);
     ht.put(put);
 
     delete = new Delete(ROWS[0]);
@@ -6087,12 +6088,12 @@ public class TestFromClientSide {
     ht.delete(delete);
 
     put = new Put(ROWS[3]);
-    put.add(FAMILIES[2], QUALIFIER, VALUES[0]);
+    put.addColumn(FAMILIES[2], QUALIFIER, VALUES[0]);
     ht.put(put);
 
     put = new Put(ROWS[4]);
-    put.add(FAMILIES[1], QUALIFIER, VALUES[1]);
-    put.add(FAMILIES[2], QUALIFIER, VALUES[2]);
+    put.addColumn(FAMILIES[1], QUALIFIER, VALUES[1]);
+    put.addColumn(FAMILIES[2], QUALIFIER, VALUES[2]);
     ht.put(put);
 
     scan = new Scan(ROWS[4]);
@@ -6142,7 +6143,7 @@ public class TestFromClientSide {
     int insertNum = splitRows.length;
     for (int i = 0; i < insertNum; i++) {
       Put put = new Put(splitRows[i]);
-      put.add(FAMILY, QUALIFIER, VALUE);
+      put.addColumn(FAMILY, QUALIFIER, VALUE);
       table.put(put);
     }
 
@@ -6194,14 +6195,14 @@ public class TestFromClientSide {
     }
     for (byte[] splitRow : splitRows) {
       Put put = new Put(splitRow);
-      put.add(FAMILY, QUALIFIER, VALUE);
+      put.addColumn(FAMILY, QUALIFIER, VALUE);
       table.put(put);
 
       byte[] nextRow = Bytes.copy(splitRow);
       nextRow[nextRow.length - 1]++;
 
       put = new Put(nextRow);
-      put.add(FAMILY, QUALIFIER, VALUE);
+      put.addColumn(FAMILY, QUALIFIER, VALUE);
       table.put(put);
     }
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/de9555ce/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java
index 22309ef..ece98c1 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java
@@ -109,7 +109,7 @@ public class TestFromClientSide3 {
     for (int i = 0; i < nPuts; i++) {
       byte[] qualifier = Bytes.toBytes(random.nextInt());
       byte[] value = Bytes.toBytes(random.nextInt());
-      put.add(family, qualifier, value);
+      put.addColumn(family, qualifier, value);
     }
     table.put(put);
   }
@@ -274,7 +274,7 @@ public class TestFromClientSide3 {
       actions.add(put1);
       
       Put put2 = new Put(ANOTHERROW);
-      put2.add(FAMILY, QUALIFIER, VALUE);
+      put2.addColumn(FAMILY, QUALIFIER, VALUE);
       actions.add(put2);
       
       table.batch(actions, results);
@@ -294,7 +294,7 @@ public class TestFromClientSide3 {
           new byte[][] { FAMILY });
 
     Put put = new Put(ROW);
-    put.add(FAMILY, QUALIFIER, VALUE);
+    put.addColumn(FAMILY, QUALIFIER, VALUE);
 
     Get get = new Get(ROW);
 
@@ -312,7 +312,7 @@ public class TestFromClientSide3 {
         "testHTableExistsMethodSingleRegionMultipleGets"), new byte[][] { FAMILY });
 
     Put put = new Put(ROW);
-    put.add(FAMILY, QUALIFIER, VALUE);
+    put.addColumn(FAMILY, QUALIFIER, VALUE);
     table.put(put);
 
     List<Get> gets = new ArrayList<Get>();
@@ -406,7 +406,7 @@ public class TestFromClientSide3 {
       TableName.valueOf("testHTableExistsMethodMultipleRegionsMultipleGets"), 
       new byte[][] { FAMILY }, 1, new byte[] { 0x00 }, new byte[] { (byte) 0xff }, 255);
     Put put = new Put(ROW);
-    put.add(FAMILY, QUALIFIER, VALUE);
+    put.addColumn(FAMILY, QUALIFIER, VALUE);
     table.put (put);
 
     List<Get> gets = new ArrayList<Get>();
@@ -424,7 +424,7 @@ public class TestFromClientSide3 {
 
     // Test with the first region.
     put = new Put(new byte[] { 0x00 });
-    put.add(FAMILY, QUALIFIER, VALUE);
+    put.addColumn(FAMILY, QUALIFIER, VALUE);
     table.put(put);
 
     gets = new ArrayList<Get>();
@@ -436,7 +436,7 @@ public class TestFromClientSide3 {
 
     // Test with the last region
     put = new Put(new byte[] { (byte) 0xff, (byte) 0xff });
-    put.add(FAMILY, QUALIFIER, VALUE);
+    put.addColumn(FAMILY, QUALIFIER, VALUE);
     table.put(put);
 
     gets = new ArrayList<Get>();
@@ -459,7 +459,7 @@ public class TestFromClientSide3 {
     Table table = TEST_UTIL.getConnection().getTable(desc.getTableName());
 
     Put put = new Put(ROW_BYTES);
-    put.add(FAMILY, COL_QUAL, VAL_BYTES);
+    put.addColumn(FAMILY, COL_QUAL, VAL_BYTES);
     table.put(put);
 
     //Try getting the row with an empty row key

http://git-wip-us.apache.org/repos/asf/hbase/blob/de9555ce/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideNoCodec.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideNoCodec.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideNoCodec.java
index dbb1cd1..550a4c9 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideNoCodec.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideNoCodec.java
@@ -69,7 +69,9 @@ public class TestFromClientSideNoCodec {
     // Check put and get.
     final byte [] row = Bytes.toBytes("row");
     Put p = new Put(row);
-    for (byte [] f: fs) p.add(f, f, f);
+    for (byte [] f: fs) {
+      p.addColumn(f, f, f);
+    }
     ht.put(p);
     Result r = ht.get(new Get(row));
     int i = 0;

http://git-wip-us.apache.org/repos/asf/hbase/blob/de9555ce/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
index a9b85c7..16465d2 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
@@ -248,7 +248,7 @@ public class TestHCM {
     }
 
     Put p1 = new Put(rk);
-    p1.add(cf, "qual".getBytes(), "val".getBytes());
+    p1.addColumn(cf, "qual".getBytes(), "val".getBytes());
     t.put(p1);
 
     rs.getRegionServer().abort("I'm dead");
@@ -430,7 +430,7 @@ public class TestHCM {
     final Table table = connection.getTable(tableName);
 
     Put put = new Put(ROW);
-    put.add(FAM_NAM, ROW, ROW);
+    put.addColumn(FAM_NAM, ROW, ROW);
     table.put(put);
 
     ManualEnvironmentEdge mee = new ManualEnvironmentEdge();
@@ -583,7 +583,7 @@ public class TestHCM {
 
     TEST_UTIL.waitUntilAllRegionsAssigned(table.getName());
     Put put = new Put(ROW);
-    put.add(FAM_NAM, ROW, ROW);
+    put.addColumn(FAM_NAM, ROW, ROW);
     table.put(put);
     ConnectionImplementation conn = (ConnectionImplementation) connection;
 
@@ -606,7 +606,7 @@ public class TestHCM {
     conn.clearRegionCache(TABLE_NAME);
     Assert.assertEquals(0, conn.getNumberOfCachedRegionLocations(TABLE_NAME));
     Put put2 = new Put(ROW);
-    put2.add(FAM_NAM, ROW, ROW);
+    put2.addColumn(FAM_NAM, ROW, ROW);
     table.put(put2);
     assertNotNull(conn.getCachedLocation(TABLE_NAME, ROW));
     assertNotNull(conn.getCachedLocation(TableName.valueOf(TABLE_NAME.getName()), ROW.clone()));
@@ -676,7 +676,7 @@ public class TestHCM {
     // We do a put and expect the cache to be updated, even if we don't retry
     LOG.info("Put starting");
     Put put3 = new Put(ROW);
-    put3.add(FAM_NAM, ROW, ROW);
+    put3.addColumn(FAM_NAM, ROW, ROW);
     try {
       table.put(put3);
       Assert.fail("Unreachable point");
@@ -783,7 +783,7 @@ public class TestHCM {
   public void testCacheSeqNums() throws Exception{
     Table table = TEST_UTIL.createMultiRegionTable(TABLE_NAME2, FAM_NAM);
     Put put = new Put(ROW);
-    put.add(FAM_NAM, ROW, ROW);
+    put.addColumn(FAM_NAM, ROW, ROW);
     table.put(put);
     ConnectionImplementation conn = (ConnectionImplementation) TEST_UTIL.getConnection();
 
@@ -895,44 +895,44 @@ public class TestHCM {
   @Test
   public void testMulti() throws Exception {
     Table table = TEST_UTIL.createMultiRegionTable(TABLE_NAME3, FAM_NAM);
-     try {
-       ConnectionImplementation conn =
+    try {
+      ConnectionImplementation conn =
            (ConnectionImplementation)TEST_UTIL.getConnection();
 
-       // We're now going to move the region and check that it works for the client
-       // First a new put to add the location in the cache
-       conn.clearRegionCache(TABLE_NAME3);
-       Assert.assertEquals(0, conn.getNumberOfCachedRegionLocations(TABLE_NAME3));
+      // We're now going to move the region and check that it works for the client
+      // First a new put to add the location in the cache
+      conn.clearRegionCache(TABLE_NAME3);
+      Assert.assertEquals(0, conn.getNumberOfCachedRegionLocations(TABLE_NAME3));
 
-       TEST_UTIL.getHBaseAdmin().setBalancerRunning(false, false);
-       HMaster master = TEST_UTIL.getMiniHBaseCluster().getMaster();
+      TEST_UTIL.getHBaseAdmin().setBalancerRunning(false, false);
+      HMaster master = TEST_UTIL.getMiniHBaseCluster().getMaster();
 
-       // We can wait for all regions to be online, that makes log reading easier when debugging
-       while (master.getAssignmentManager().getRegionStates().isRegionsInTransition()) {
-         Thread.sleep(1);
-       }
+      // We can wait for all regions to be online, that makes log reading easier when debugging
+      while (master.getAssignmentManager().getRegionStates().isRegionsInTransition()) {
+        Thread.sleep(1);
+      }
 
-       Put put = new Put(ROW_X);
-       put.add(FAM_NAM, ROW_X, ROW_X);
-       table.put(put);
+      Put put = new Put(ROW_X);
+      put.addColumn(FAM_NAM, ROW_X, ROW_X);
+      table.put(put);
 
-       // Now moving the region to the second server
-       HRegionLocation toMove = conn.getCachedLocation(TABLE_NAME3, ROW_X).getRegionLocation();
-       byte[] regionName = toMove.getRegionInfo().getRegionName();
-       byte[] encodedRegionNameBytes = toMove.getRegionInfo().getEncodedNameAsBytes();
+      // Now moving the region to the second server
+      HRegionLocation toMove = conn.getCachedLocation(TABLE_NAME3, ROW_X).getRegionLocation();
+      byte[] regionName = toMove.getRegionInfo().getRegionName();
+      byte[] encodedRegionNameBytes = toMove.getRegionInfo().getEncodedNameAsBytes();
 
-       // Choose the other server.
-       int curServerId = TEST_UTIL.getHBaseCluster().getServerWith(regionName);
-       int destServerId = (curServerId == 0 ? 1 : 0);
+      // Choose the other server.
+      int curServerId = TEST_UTIL.getHBaseCluster().getServerWith(regionName);
+      int destServerId = (curServerId == 0 ? 1 : 0);
 
-       HRegionServer curServer = TEST_UTIL.getHBaseCluster().getRegionServer(curServerId);
-       HRegionServer destServer = TEST_UTIL.getHBaseCluster().getRegionServer(destServerId);
+      HRegionServer curServer = TEST_UTIL.getHBaseCluster().getRegionServer(curServerId);
+      HRegionServer destServer = TEST_UTIL.getHBaseCluster().getRegionServer(destServerId);
 
-       ServerName destServerName = destServer.getServerName();
+      ServerName destServerName = destServer.getServerName();
 
        //find another row in the cur server that is less than ROW_X
-       List<Region> regions = curServer.getOnlineRegions(TABLE_NAME3);
-       byte[] otherRow = null;
+      List<Region> regions = curServer.getOnlineRegions(TABLE_NAME3);
+      byte[] otherRow = null;
        for (Region region : regions) {
          if (!region.getRegionInfo().getEncodedName().equals(toMove.getRegionInfo().getEncodedName())
              && Bytes.BYTES_COMPARATOR.compare(region.getRegionInfo().getStartKey(), ROW_X) < 0) {
@@ -940,69 +940,71 @@ public class TestHCM {
            break;
          }
        }
-       assertNotNull(otherRow);
-       // If empty row, set it to first row.-f
-       if (otherRow.length <= 0) otherRow = Bytes.toBytes("aaa");
-       Put put2 = new Put(otherRow);
-       put2.add(FAM_NAM, otherRow, otherRow);
-       table.put(put2); //cache put2's location
-
-       // Check that we are in the expected state
-       Assert.assertTrue(curServer != destServer);
-       Assert.assertNotEquals(curServer.getServerName(), destServer.getServerName());
-       Assert.assertNotEquals(toMove.getPort(), destServerName.getPort());
-       Assert.assertNotNull(curServer.getOnlineRegion(regionName));
-       Assert.assertNull(destServer.getOnlineRegion(regionName));
-       Assert.assertFalse(TEST_UTIL.getMiniHBaseCluster().getMaster().
-           getAssignmentManager().getRegionStates().isRegionsInTransition());
+      assertNotNull(otherRow);
+      // If empty row, set it to first row.-f
+      if (otherRow.length <= 0) otherRow = Bytes.toBytes("aaa");
+      Put put2 = new Put(otherRow);
+      put2.addColumn(FAM_NAM, otherRow, otherRow);
+      table.put(put2); //cache put2's location
+
+      // Check that we are in the expected state
+      Assert.assertTrue(curServer != destServer);
+      Assert.assertNotEquals(curServer.getServerName(), destServer.getServerName());
+      Assert.assertNotEquals(toMove.getPort(), destServerName.getPort());
+      Assert.assertNotNull(curServer.getOnlineRegion(regionName));
+      Assert.assertNull(destServer.getOnlineRegion(regionName));
+      Assert.assertFalse(TEST_UTIL.getMiniHBaseCluster().getMaster().
+          getAssignmentManager().getRegionStates().isRegionsInTransition());
 
        // Moving. It's possible that we don't have all the regions online at this point, so
-       //  the test must depends only on the region we're looking at.
-       LOG.info("Move starting region="+toMove.getRegionInfo().getRegionNameAsString());
-       TEST_UTIL.getHBaseAdmin().move(
-           toMove.getRegionInfo().getEncodedNameAsBytes(),
-           destServerName.getServerName().getBytes()
-           );
-
-       while (destServer.getOnlineRegion(regionName) == null ||
-           destServer.getRegionsInTransitionInRS().containsKey(encodedRegionNameBytes) ||
-           curServer.getRegionsInTransitionInRS().containsKey(encodedRegionNameBytes) ||
-           master.getAssignmentManager().getRegionStates().isRegionsInTransition()) {
-         // wait for the move to be finished
-         Thread.sleep(1);
-        }
+      //  the test must depends only on the region we're looking at.
+      LOG.info("Move starting region="+toMove.getRegionInfo().getRegionNameAsString());
+      TEST_UTIL.getHBaseAdmin().move(
+          toMove.getRegionInfo().getEncodedNameAsBytes(),
+          destServerName.getServerName().getBytes()
+      );
+
+      while (destServer.getOnlineRegion(regionName) == null ||
+          destServer.getRegionsInTransitionInRS().containsKey(encodedRegionNameBytes) ||
+          curServer.getRegionsInTransitionInRS().containsKey(encodedRegionNameBytes) ||
+          master.getAssignmentManager().getRegionStates().isRegionsInTransition()) {
+        // wait for the move to be finished
+        Thread.sleep(1);
+      }
 
-       LOG.info("Move finished for region="+toMove.getRegionInfo().getRegionNameAsString());
+      LOG.info("Move finished for region="+toMove.getRegionInfo().getRegionNameAsString());
 
-       // Check our new state.
-       Assert.assertNull(curServer.getOnlineRegion(regionName));
-       Assert.assertNotNull(destServer.getOnlineRegion(regionName));
-       Assert.assertFalse(destServer.getRegionsInTransitionInRS().containsKey(encodedRegionNameBytes));
-       Assert.assertFalse(curServer.getRegionsInTransitionInRS().containsKey(encodedRegionNameBytes));
+      // Check our new state.
+      Assert.assertNull(curServer.getOnlineRegion(regionName));
+      Assert.assertNotNull(destServer.getOnlineRegion(regionName));
+      Assert.assertFalse(destServer.getRegionsInTransitionInRS()
+          .containsKey(encodedRegionNameBytes));
+      Assert.assertFalse(curServer.getRegionsInTransitionInRS()
+          .containsKey(encodedRegionNameBytes));
 
 
        // Cache was NOT updated and points to the wrong server
-       Assert.assertFalse(
-           conn.getCachedLocation(TABLE_NAME3, ROW_X).getRegionLocation()
-            .getPort() == destServerName.getPort());
+      Assert.assertFalse(
+          conn.getCachedLocation(TABLE_NAME3, ROW_X).getRegionLocation()
+              .getPort() == destServerName.getPort());
 
-       // Hijack the number of retry to fail after 2 tries
-       final int prevNumRetriesVal = setNumTries(conn, 2);
+      // Hijack the number of retry to fail after 2 tries
+      final int prevNumRetriesVal = setNumTries(conn, 2);
 
-       Put put3 = new Put(ROW_X);
-       put3.add(FAM_NAM, ROW_X, ROW_X);
-       Put put4 = new Put(otherRow);
-       put4.add(FAM_NAM, otherRow, otherRow);
+      Put put3 = new Put(ROW_X);
+      put3.addColumn(FAM_NAM, ROW_X, ROW_X);
+      Put put4 = new Put(otherRow);
+      put4.addColumn(FAM_NAM, otherRow, otherRow);
 
       // do multi
       ArrayList<Put> actions = Lists.newArrayList(put4, put3);
       table.batch(actions, null); // first should be a valid row,
-       // second we get RegionMovedException.
+      // second we get RegionMovedException.
 
-       setNumTries(conn, prevNumRetriesVal);
-     } finally {
-       table.close();
-     }
+      setNumTries(conn, prevNumRetriesVal);
+    } finally {
+      table.close();
+    }
   }
 
   @Ignore ("Test presumes RETRY_BACKOFF will never change; it has") @Test
@@ -1095,4 +1097,4 @@ public class TestHCM {
     table.close();
     connection.close();
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hbase/blob/de9555ce/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexer.java
index 908fcdf..9aa493c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexer.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexer.java
@@ -110,11 +110,11 @@ public class TestHTableMultiplexer {
       for (int i = 0; i < NUM_REGIONS; i++) {
         byte [] row = startRows[i];
         if (row == null || row.length <= 0) continue;
-        Put put = new Put(row).add(FAMILY, QUALIFIER, VALUE1);
+        Put put = new Put(row).addColumn(FAMILY, QUALIFIER, VALUE1);
         success = multiplexer.put(TABLE_1, put);
         assertTrue("multiplexer.put returns", success);
 
-        put = new Put(row).add(FAMILY, QUALIFIER, VALUE1);
+        put = new Put(row).addColumn(FAMILY, QUALIFIER, VALUE1);
         success = multiplexer.put(TABLE_2, put);
         assertTrue("multiplexer.put failed", success);
 
@@ -131,7 +131,7 @@ public class TestHTableMultiplexer {
         byte [] row = endRows[i];
         if (row == null || row.length <= 0) continue;
         Put put = new Put(row);
-        put.add(FAMILY, QUALIFIER, VALUE2);
+        put.addColumn(FAMILY, QUALIFIER, VALUE2);
         multiput.add(put);
       }
       failedPuts = multiplexer.put(TABLE_1, multiput);

http://git-wip-us.apache.org/repos/asf/hbase/blob/de9555ce/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexerFlushCache.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexerFlushCache.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexerFlushCache.java
index b71e881..063e376 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexerFlushCache.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexerFlushCache.java
@@ -97,7 +97,7 @@ public class TestHTableMultiplexerFlushCache {
       byte[] row = startRows[1];
       assertTrue("2nd region should not start with empty row", row != null && row.length > 0);
 
-      Put put = new Put(row).add(FAMILY, QUALIFIER1, VALUE1);
+      Put put = new Put(row).addColumn(FAMILY, QUALIFIER1, VALUE1);
       assertTrue("multiplexer.put returns", multiplexer.put(TABLE, put));
 
       checkExistence(htable, row, FAMILY, QUALIFIER1, VALUE1);

http://git-wip-us.apache.org/repos/asf/hbase/blob/de9555ce/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaWithReplicas.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaWithReplicas.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaWithReplicas.java
index 9173dc5..831738c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaWithReplicas.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaWithReplicas.java
@@ -208,7 +208,7 @@ public class TestMetaWithReplicas {
     htable = c.getTable(TABLE);
     byte[] row = "test".getBytes();
     Put put = new Put(row);
-    put.add("foo".getBytes(), row, row);
+    put.addColumn("foo".getBytes(), row, row);
     BufferedMutator m = c.getBufferedMutator(TABLE);
     m.mutate(put);
     m.flush();

http://git-wip-us.apache.org/repos/asf/hbase/blob/de9555ce/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
index 905a7db..c83b709 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
@@ -213,10 +213,10 @@ public class TestMultiParallel {
 
     List<Row> actions = new ArrayList<Row>();
     Put p = new Put(Bytes.toBytes("row1"));
-    p.add(Bytes.toBytes("bad_family"), Bytes.toBytes("qual"), Bytes.toBytes("value"));
+    p.addColumn(Bytes.toBytes("bad_family"), Bytes.toBytes("qual"), Bytes.toBytes("value"));
     actions.add(p);
     p = new Put(Bytes.toBytes("row2"));
-    p.add(BYTES_FAMILY, Bytes.toBytes("qual"), Bytes.toBytes("value"));
+    p.addColumn(BYTES_FAMILY, Bytes.toBytes("qual"), Bytes.toBytes("value"));
     actions.add(p);
 
     // row1 and row2 should be in the same region.
@@ -423,7 +423,7 @@ public class TestMultiParallel {
     for (int i = 0; i < 100; i++) {
       Put put = new Put(ONE_ROW);
       byte[] qual = Bytes.toBytes("column" + i);
-      put.add(BYTES_FAMILY, qual, VALUE);
+      put.addColumn(BYTES_FAMILY, qual, VALUE);
       puts.add(put);
     }
     Object[] results = new Object[puts.size()];
@@ -464,8 +464,8 @@ public class TestMultiParallel {
     Delete d = new Delete(ONE_ROW);
     table.delete(d);
     Put put = new Put(ONE_ROW);
-    put.add(BYTES_FAMILY, QUAL1, Bytes.toBytes("abc"));
-    put.add(BYTES_FAMILY, QUAL2, Bytes.toBytes(1L));
+    put.addColumn(BYTES_FAMILY, QUAL1, Bytes.toBytes("abc"));
+    put.addColumn(BYTES_FAMILY, QUAL2, Bytes.toBytes(1L));
     table.put(put);
 
     Increment inc = new Increment(ONE_ROW);
@@ -494,7 +494,7 @@ public class TestMultiParallel {
     final Connection connection = ConnectionFactory.createConnection(UTIL.getConfiguration());
     Table table = connection.getTable(TEST_TABLE);
     Put put = new Put(ONE_ROW);
-    put.add(BYTES_FAMILY, QUALIFIER, Bytes.toBytes(0L));
+    put.addColumn(BYTES_FAMILY, QUALIFIER, Bytes.toBytes(0L));
 
     // Replace nonce manager with the one that returns each nonce twice.
     NonceGenerator cnm = new PerClientRandomNonceGenerator() {
@@ -610,7 +610,7 @@ public class TestMultiParallel {
 
     // 2 put of new column
     Put put = new Put(KEYS[10]);
-    put.add(BYTES_FAMILY, qual2, val2);
+    put.addColumn(BYTES_FAMILY, qual2, val2);
     actions.add(put);
 
     // 3 delete
@@ -629,7 +629,7 @@ public class TestMultiParallel {
 
     // 5 put of new column
     put = new Put(KEYS[40]);
-    put.add(BYTES_FAMILY, qual2, val2);
+    put.addColumn(BYTES_FAMILY, qual2, val2);
     actions.add(put);
 
     results = new Object[actions.size()];
@@ -673,7 +673,7 @@ public class TestMultiParallel {
     List<Put> puts = new ArrayList<>();
     for (byte[] k : KEYS) {
       Put put = new Put(k);
-      put.add(BYTES_FAMILY, QUALIFIER, VALUE);
+      put.addColumn(BYTES_FAMILY, QUALIFIER, VALUE);
       puts.add(put);
     }
     return puts;

http://git-wip-us.apache.org/repos/asf/hbase/blob/de9555ce/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java
index ba6a71b..174b430 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java
@@ -475,8 +475,8 @@ public class TestMultipleTimestamps {
       for(int colIdx: columnIndexes) {
         byte column[] = Bytes.toBytes("column:" + colIdx);
         for (long version: versions) {
-          put.add(cf, column, version, Bytes.toBytes("value-version-" +
-              version));
+          put.addColumn(cf, column, version, Bytes.toBytes("value-version-" +
+                  version));
         }
       }
       ht.put(put);
@@ -496,7 +496,7 @@ public class TestMultipleTimestamps {
     put.setDurability(Durability.SKIP_WAL);
 
     for (long idx = versionStart; idx <= versionEnd; idx++) {
-      put.add(cf, column, idx, Bytes.toBytes("value-version-" + idx));
+      put.addColumn(cf, column, idx, Bytes.toBytes("value-version-" + idx));
     }
 
     ht.put(put);

http://git-wip-us.apache.org/repos/asf/hbase/blob/de9555ce/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestPutDeleteEtcCellIteration.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestPutDeleteEtcCellIteration.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestPutDeleteEtcCellIteration.java
index 9be2f64..50efed9 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestPutDeleteEtcCellIteration.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestPutDeleteEtcCellIteration.java
@@ -49,7 +49,7 @@ public class TestPutDeleteEtcCellIteration {
     Put p = new Put(ROW);
     for (int i = 0; i < COUNT; i++) {
       byte [] bytes = Bytes.toBytes(i);
-      p.add(bytes, bytes, TIMESTAMP, bytes);
+      p.addColumn(bytes, bytes, TIMESTAMP, bytes);
     }
     int index = 0;
     for (CellScanner cellScanner = p.cellScanner(); cellScanner.advance();) {
@@ -65,7 +65,7 @@ public class TestPutDeleteEtcCellIteration {
     Put p = new Put(ROW);
     for (int i = 0; i < COUNT; i++) {
       byte [] bytes = Bytes.toBytes(i);
-      p.add(bytes, bytes, TIMESTAMP, bytes);
+      p.addColumn(bytes, bytes, TIMESTAMP, bytes);
     }
     int index = 0;
     int trigger = 3;
@@ -73,7 +73,7 @@ public class TestPutDeleteEtcCellIteration {
       Cell cell = cellScanner.current();
       byte [] bytes = Bytes.toBytes(index++);
       // When we hit the trigger, try inserting a new KV; should trigger exception
-      if (trigger == 3) p.add(bytes, bytes, TIMESTAMP, bytes);
+      if (trigger == 3) p.addColumn(bytes, bytes, TIMESTAMP, bytes);
       cell.equals(new KeyValue(ROW, bytes, bytes, TIMESTAMP, bytes));
     }
     assertEquals(COUNT, index);

http://git-wip-us.apache.org/repos/asf/hbase/blob/de9555ce/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestPutWithDelete.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestPutWithDelete.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestPutWithDelete.java
index 0e819bb..0b5cd4e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestPutWithDelete.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestPutWithDelete.java
@@ -59,10 +59,10 @@ public class TestPutWithDelete {
     try {
       // put one row
       Put put = new Put(rowKey);
-      put.add(family, Bytes.toBytes("A"), Bytes.toBytes("a"));
-      put.add(family, Bytes.toBytes("B"), Bytes.toBytes("b"));
-      put.add(family, Bytes.toBytes("C"), Bytes.toBytes("c"));
-      put.add(family, Bytes.toBytes("D"), Bytes.toBytes("d"));
+      put.addColumn(family, Bytes.toBytes("A"), Bytes.toBytes("a"));
+      put.addColumn(family, Bytes.toBytes("B"), Bytes.toBytes("b"));
+      put.addColumn(family, Bytes.toBytes("C"), Bytes.toBytes("c"));
+      put.addColumn(family, Bytes.toBytes("D"), Bytes.toBytes("d"));
       table.put(put);
       // get row back and assert the values
       Get get = new Get(rowKey);
@@ -77,11 +77,11 @@ public class TestPutWithDelete {
           Bytes.toString(result.getValue(family, Bytes.toBytes("D"))).equals("d"));
       // put the same row again with C column deleted
       put = new Put(rowKey);
-      put.add(family, Bytes.toBytes("A"), Bytes.toBytes("a1"));
-      put.add(family, Bytes.toBytes("B"), Bytes.toBytes("b1"));
+      put.addColumn(family, Bytes.toBytes("A"), Bytes.toBytes("a1"));
+      put.addColumn(family, Bytes.toBytes("B"), Bytes.toBytes("b1"));
       KeyValue marker = new KeyValue(rowKey, family, Bytes.toBytes("C"),
           HConstants.LATEST_TIMESTAMP, KeyValue.Type.DeleteColumn);
-      put.add(family, Bytes.toBytes("D"), Bytes.toBytes("d1"));
+      put.addColumn(family, Bytes.toBytes("D"), Bytes.toBytes("d1"));
       put.add(marker);
       table.put(put);
       // get row back and assert the values

http://git-wip-us.apache.org/repos/asf/hbase/blob/de9555ce/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java
index 723242b..b773b46 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java
@@ -196,7 +196,7 @@ public class TestReplicaWithCluster {
         bHdt.getColumnFamilies().length + 1, nHdt.getColumnFamilies().length);
 
     p = new Put(row);
-    p.add(row, row, row);
+    p.addColumn(row, row, row);
     table.put(p);
 
     g = new Get(row);
@@ -253,7 +253,7 @@ public class TestReplicaWithCluster {
     admin.close();
 
     Put p = new Put(row);
-    p.add(row, row, row);
+    p.addColumn(row, row, row);
     final Table table = HTU.getConnection().getTable(hdt.getTableName());
     table.put(p);
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/de9555ce/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicasClient.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicasClient.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicasClient.java
index a064bcc..d2e775d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicasClient.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicasClient.java
@@ -384,7 +384,7 @@ public class TestReplicasClient {
       flushRegion(hriSecondary);
 
       Put p = new Put(row);
-      p.add(f, row, row);
+      p.addColumn(f, row, row);
       table.put(p);
 
       flushRegion(hriPrimary);
@@ -404,7 +404,7 @@ public class TestReplicasClient {
       flushRegion(hriPrimary);
 
       Put p = new Put(row);
-      p.add(f, row, row);
+      p.addColumn(f, row, row);
       table.put(p);
 
       flushRegion(hriPrimary);
@@ -422,7 +422,7 @@ public class TestReplicasClient {
       flushRegion(hriSecondary);
 
       Put p = new Put(row);
-      p.add(f, row, row);
+      p.addColumn(f, row, row);
       table.put(p);
 
       flushRegion(hriSecondary);
@@ -442,7 +442,7 @@ public class TestReplicasClient {
     try {
       // A simple put works, even if there here a second replica
       Put p = new Put(b1);
-      p.add(f, b1, b1);
+      p.addColumn(f, b1, b1);
       table.put(p);
       LOG.info("Put done");
 
@@ -534,12 +534,12 @@ public class TestReplicasClient {
       List<Put> puts = new ArrayList<Put>(2);
       byte[] b1 = Bytes.toBytes("testCancelOfMultiGet" + 0);
       Put p = new Put(b1);
-      p.add(f, b1, b1);
+      p.addColumn(f, b1, b1);
       puts.add(p);
 
       byte[] b2 = Bytes.toBytes("testCancelOfMultiGet" + 1);
       p = new Put(b2);
-      p.add(f, b2, b2);
+      p.addColumn(f, b2, b2);
       puts.add(p);
       table.put(puts);
       LOG.debug("PUT done");
@@ -619,7 +619,7 @@ public class TestReplicasClient {
       for (int i = 0; i < NUMROWS; i++) {
         byte[] b1 = Bytes.toBytes("testUseRegionWithReplica" + i);
         Put p = new Put(b1);
-        p.add(f, b1, b1);
+        p.addColumn(f, b1, b1);
         table.put(p);
       }
       LOG.debug("PUT done");

http://git-wip-us.apache.org/repos/asf/hbase/blob/de9555ce/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRpcControllerFactory.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRpcControllerFactory.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRpcControllerFactory.java
index fca34c1..c087135 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRpcControllerFactory.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRpcControllerFactory.java
@@ -135,7 +135,7 @@ public class TestRpcControllerFactory {
     Table table = connection.getTable(name);
     byte[] row = Bytes.toBytes("row");
     Put p = new Put(row);
-    p.add(fam1, fam1, Bytes.toBytes("val0"));
+    p.addColumn(fam1, fam1, Bytes.toBytes("val0"));
     table.put(p);
 
     Integer counter = 1;
@@ -147,7 +147,7 @@ public class TestRpcControllerFactory {
     counter = verifyCount(counter);
 
     Put p2 = new Put(row);
-    p2.add(fam1, Bytes.toBytes("qual"), Bytes.toBytes("val1"));
+    p2.addColumn(fam1, Bytes.toBytes("qual"), Bytes.toBytes("val1"));
     table.batch(Lists.newArrayList(p, p2), null);
     // this only goes to a single server, so we don't need to change the count here
     counter = verifyCount(counter);

http://git-wip-us.apache.org/repos/asf/hbase/blob/de9555ce/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java
index f86f248..2fb3aff 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java
@@ -68,9 +68,9 @@ public class TestScannerTimeout {
     // We need more than one region server for this test
     TEST_UTIL.startMiniCluster(2);
     Table table = TEST_UTIL.createTable(TABLE_NAME, SOME_BYTES);
-     for (int i = 0; i < NB_ROWS; i++) {
+    for (int i = 0; i < NB_ROWS; i++) {
       Put put = new Put(Bytes.toBytes(i));
-      put.add(SOME_BYTES, SOME_BYTES, SOME_BYTES);
+      put.addColumn(SOME_BYTES, SOME_BYTES, SOME_BYTES);
       table.put(put);
     }
     table.close();

http://git-wip-us.apache.org/repos/asf/hbase/blob/de9555ce/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java
index 7bff686..567e887 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java
@@ -176,15 +176,15 @@ public class TestTimestampsFilter {
     Table ht = TEST_UTIL.createTable(TableName.valueOf(TABLE), FAMILIES, Integer.MAX_VALUE);
 
     Put p = new Put(Bytes.toBytes("row"));
-    p.add(FAMILY, Bytes.toBytes("column0"), 3, Bytes.toBytes("value0-3"));
-    p.add(FAMILY, Bytes.toBytes("column1"), 3, Bytes.toBytes("value1-3"));
-    p.add(FAMILY, Bytes.toBytes("column2"), 1, Bytes.toBytes("value2-1"));
-    p.add(FAMILY, Bytes.toBytes("column2"), 2, Bytes.toBytes("value2-2"));
-    p.add(FAMILY, Bytes.toBytes("column2"), 3, Bytes.toBytes("value2-3"));
-    p.add(FAMILY, Bytes.toBytes("column3"), 2, Bytes.toBytes("value3-2"));
-    p.add(FAMILY, Bytes.toBytes("column4"), 1, Bytes.toBytes("value4-1"));
-    p.add(FAMILY, Bytes.toBytes("column4"), 2, Bytes.toBytes("value4-2"));
-    p.add(FAMILY, Bytes.toBytes("column4"), 3, Bytes.toBytes("value4-3"));
+    p.addColumn(FAMILY, Bytes.toBytes("column0"), (long) 3, Bytes.toBytes("value0-3"));
+    p.addColumn(FAMILY, Bytes.toBytes("column1"), (long) 3, Bytes.toBytes("value1-3"));
+    p.addColumn(FAMILY, Bytes.toBytes("column2"), (long) 1, Bytes.toBytes("value2-1"));
+    p.addColumn(FAMILY, Bytes.toBytes("column2"), (long) 2, Bytes.toBytes("value2-2"));
+    p.addColumn(FAMILY, Bytes.toBytes("column2"), (long) 3, Bytes.toBytes("value2-3"));
+    p.addColumn(FAMILY, Bytes.toBytes("column3"), (long) 2, Bytes.toBytes("value3-2"));
+    p.addColumn(FAMILY, Bytes.toBytes("column4"), (long) 1, Bytes.toBytes("value4-1"));
+    p.addColumn(FAMILY, Bytes.toBytes("column4"), (long) 2, Bytes.toBytes("value4-2"));
+    p.addColumn(FAMILY, Bytes.toBytes("column4"), (long) 3, Bytes.toBytes("value4-3"));
     ht.put(p);
 
     ArrayList<Long> timestamps = new ArrayList<Long>();
@@ -360,7 +360,7 @@ public class TestTimestampsFilter {
     put.setDurability(Durability.SKIP_WAL);
 
     for (long idx = versionStart; idx <= versionEnd; idx++) {
-      put.add(cf, column, idx, Bytes.toBytes("value-version-" + idx));
+      put.addColumn(cf, column, idx, Bytes.toBytes("value-version-" + idx));
     }
 
     ht.put(put);


Mime
View raw message