[hbase10] Modifications for HBase 2.0.0-SNAPSHOT

Remove deprecated methods:
Put.add -> Put.addColumn.
KeyValue -> Cell.

hbase10/src/main/java/com/yahoo/ycsb/db/HBaseClient10.java

@@ -28,7 +28,6 @@ import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.BufferedMutator;
 import org.apache.hadoop.hbase.client.BufferedMutatorParams;
@@ -250,7 +249,9 @@ public class HBaseClient10 extends com.yahoo.ycsb.DB
         if (r.isEmpty()) {
             return NoMatchingRecord;
         }
-        for (Cell c : r.listCells()) {
+
+        while (r.advance()) {
+            final Cell c = r.current();
             result.put(Bytes.toString(CellUtil.cloneQualifier(c)),
                     new ByteArrayByteIterator(CellUtil.cloneValue(c)));
             if (_debug) {
@@ -316,6 +317,7 @@ public class HBaseClient10 extends com.yahoo.ycsb.DB
             {
                 //get row key
                 String key = Bytes.toString(rr.getRow());
+
                 if (_debug)
                 {
                     System.out.println("Got scan result for key: "+key);
@@ -323,11 +325,13 @@ public class HBaseClient10 extends com.yahoo.ycsb.DB
 
                 HashMap<String,ByteIterator> rowResult = new HashMap<String, ByteIterator>();
 
-                for (KeyValue kv : rr.raw()) {
+                while (rr.advance()) {
+                    final Cell cell = rr.current();
                     rowResult.put(
-                            Bytes.toString(kv.getQualifier()),
-                            new ByteArrayByteIterator(kv.getValue()));
+                            Bytes.toString(CellUtil.cloneQualifier(cell)),
+                            new ByteArrayByteIterator(CellUtil.cloneValue(cell)));
                 }
+
                 //add rowResult to result vector
                 result.add(rowResult);
                 numResults++;
@@ -397,7 +401,7 @@ public class HBaseClient10 extends com.yahoo.ycsb.DB
                 System.out.println("Adding field/value " + entry.getKey() + "/"+
                         Bytes.toStringBinary(value) + " to put request");
             }
-            p.add(_columnFamilyBytes,Bytes.toBytes(entry.getKey()), value);
+            p.addColumn(_columnFamilyBytes,Bytes.toBytes(entry.getKey()), value);
         }
 
         try