Index: src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java (revision 1306010) +++ src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java (working copy) @@ -612,12 +612,12 @@ } @Override - public void batch(List actions, Object[] results) throws IOException { + public void batch(List actions, Object[] results) throws IOException { throw new IOException("batch not supported"); } @Override - public Object[] batch(List actions) throws IOException { + public Object[] batch(List actions) throws IOException { throw new IOException("batch not supported"); } Index: src/main/java/org/apache/hadoop/hbase/client/Mutation.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/client/Mutation.java (revision 1306010) +++ src/main/java/org/apache/hadoop/hbase/client/Mutation.java (working copy) @@ -31,7 +31,7 @@ import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.util.Bytes; -public abstract class Mutation extends OperationWithAttributes { +public abstract class Mutation extends OperationWithAttributes implements Row { // Attribute used in Mutations to indicate the originating cluster. private static final String CLUSTER_ID_ATTR = "_c.id_"; @@ -148,6 +148,7 @@ * Method for retrieving the delete's row * @return row */ + @Override public byte [] getRow() { return this.row; } Index: src/main/java/org/apache/hadoop/hbase/client/Delete.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/client/Delete.java (revision 1306010) +++ src/main/java/org/apache/hadoop/hbase/client/Delete.java (working copy) @@ -65,7 +65,7 @@ * timestamp. The constructor timestamp is not referenced. */ public class Delete extends Mutation - implements Writable, Row, Comparable { + implements Writable, Comparable { private static final byte DELETE_VERSION = (byte)3; /** Constructor for Writable. DO NOT USE */ Index: src/main/java/org/apache/hadoop/hbase/client/Append.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/client/Append.java (revision 1306010) +++ src/main/java/org/apache/hadoop/hbase/client/Append.java (working copy) @@ -41,8 +41,7 @@ * row to append to. At least one column to append must be specified using the * {@link #add(byte[], byte[], byte[])} method. */ -public class Append extends Mutation implements Row { - // TODO: refactor to derive from Put? +public class Append extends Mutation { private static final String RETURN_RESULTS = "_rr_"; private static final byte APPEND_VERSION = (byte)1; Index: src/main/java/org/apache/hadoop/hbase/client/Put.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/client/Put.java (revision 1306010) +++ src/main/java/org/apache/hadoop/hbase/client/Put.java (working copy) @@ -44,7 +44,7 @@ * {@link #add(byte[], byte[], long, byte[]) add} if setting the timestamp. */ public class Put extends Mutation - implements HeapSize, Writable, Row, Comparable { + implements HeapSize, Writable, Comparable { private static final byte PUT_VERSION = (byte)2; private static final long OVERHEAD = ClassSize.align( Index: src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java (revision 1306010) +++ src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java (working copy) @@ -88,7 +88,7 @@ * @throws IOException * @since 0.90.0 */ - void batch(final List actions, final Object[] results) throws IOException, InterruptedException; + void batch(final List actions, final Object[] results) throws IOException, InterruptedException; /** * Same as {@link #batch(List, Object[])}, but returns an array of @@ -100,7 +100,7 @@ * @throws IOException * @since 0.90.0 */ - Object[] batch(final List actions) throws IOException, InterruptedException; + Object[] batch(final List actions) throws IOException, InterruptedException; /** * Extracts certain cells from a given row. Index: src/main/java/org/apache/hadoop/hbase/client/HTablePool.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/client/HTablePool.java (revision 1306010) +++ src/main/java/org/apache/hadoop/hbase/client/HTablePool.java (working copy) @@ -350,13 +350,13 @@ } @Override - public void batch(List actions, Object[] results) throws IOException, + public void batch(List actions, Object[] results) throws IOException, InterruptedException { table.batch(actions, results); } @Override - public Object[] batch(List actions) throws IOException, + public Object[] batch(List actions) throws IOException, InterruptedException { return table.batch(actions); } Index: src/main/java/org/apache/hadoop/hbase/client/HTable.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/client/HTable.java (revision 1306010) +++ src/main/java/org/apache/hadoop/hbase/client/HTable.java (working copy) @@ -690,7 +690,7 @@ * {@inheritDoc} */ @Override - public synchronized void batch(final List actions, final Object[] results) + public synchronized void batch(final List actions, final Object[] results) throws InterruptedException, IOException { connection.processBatch(actions, tableName, pool, results); } @@ -699,7 +699,7 @@ * {@inheritDoc} */ @Override - public synchronized Object[] batch(final List actions) throws InterruptedException, IOException { + public synchronized Object[] batch(final List actions) throws InterruptedException, IOException { Object[] results = new Object[actions.size()]; connection.processBatch(actions, tableName, pool, results); return results; Index: src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java (revision 1306010) +++ src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java (working copy) @@ -466,13 +466,13 @@ } @Override - public void batch(List actions, Object[] results) + public void batch(List actions, Object[] results) throws IOException, InterruptedException { table.batch(actions, results); } @Override - public Object[] batch(List actions) + public Object[] batch(List actions) throws IOException, InterruptedException { return table.batch(actions); }