diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftHBaseServiceHandler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftHBaseServiceHandler.java index 3dd35f7b91f..61679ed1864 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftHBaseServiceHandler.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftHBaseServiceHandler.java @@ -19,7 +19,6 @@ package org.apache.hadoop.hbase.thrift2; import static org.apache.hadoop.hbase.thrift2.ThriftUtilities.deleteFromThrift; -import static org.apache.hadoop.hbase.thrift2.ThriftUtilities.deletesFromHBase; import static org.apache.hadoop.hbase.thrift2.ThriftUtilities.deletesFromThrift; import static org.apache.hadoop.hbase.thrift2.ThriftUtilities.getFromThrift; import static org.apache.hadoop.hbase.thrift2.ThriftUtilities.getsFromThrift; @@ -36,6 +35,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.nio.ByteBuffer; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -261,15 +261,14 @@ public class ThriftHBaseServiceHandler implements THBaseService.Iface { @Override public List deleteMultiple(ByteBuffer table, List deletes) throws TIOError, TException { HTableInterface htable = getTable(table.array()); - List tempDeletes = deletesFromThrift(deletes); try { - htable.delete(tempDeletes); + htable.delete(deletesFromThrift(deletes)); } catch (IOException e) { throw getTIOError(e); } finally { closeTable(htable); } - return deletesFromHBase(tempDeletes); + return Collections.emptyList(); } @Override diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftUtilities.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftUtilities.java index 8154f20db47..0edfcd2b466 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftUtilities.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftUtilities.java @@ -282,18 +282,6 @@ public class ThriftUtilities { return out; } - public static List deletesFromHBase(List in) { - List out = new ArrayList(in.size()); - for (Delete delete : in) { - if (delete == null) { - out.add(null); - } else { - out.add(deleteFromHBase(delete)); - } - } - return out; - } - public static Scan scanFromThrift(TScan in) throws IOException { Scan out = new Scan(); diff --git a/hbase-server/src/main/resources/org/apache/hadoop/hbase/thrift2/hbase.thrift b/hbase-server/src/main/resources/org/apache/hadoop/hbase/thrift2/hbase.thrift index 5bb0f51cbd3..8357e67679a 100644 --- a/hbase-server/src/main/resources/org/apache/hadoop/hbase/thrift2/hbase.thrift +++ b/hbase-server/src/main/resources/org/apache/hadoop/hbase/thrift2/hbase.thrift @@ -314,9 +314,9 @@ service THBaseService { /** * Bulk commit a List of TDeletes to the table. * - * This returns a list of TDeletes that were not - * executed. So if everything succeeds you'll - * receive an empty list. + * Throws a TIOError if any of the deletes fail. + * + * Always returns an empty list for backwards compatibility. */ list deleteMultiple( /** the table to delete from */