diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java index 8d024dd..b2c012d 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java @@ -529,8 +529,7 @@ public class HTable implements Table { return ResponseConverter.getResult(request, response, getRpcControllerCellScanner()); } }; - List rows = new ArrayList(); - rows.add(delete); + List rows = Collections.singletonList(delete); AsyncRequestFuture ars = multiAp.submitAll(pool, tableName, rows, null, null, callable, writeRpcTimeout); ars.waitUntilDone(); @@ -762,21 +761,8 @@ public class HTable implements Table { */ @Override public boolean checkAndDelete(final byte [] row, final byte [] family, final byte [] qualifier, - final byte [] value, final Delete delete) - throws IOException { - ClientServiceCallable callable = new ClientServiceCallable(this.connection, getName(), row, - this.rpcControllerFactory.newController()) { - @Override - protected Boolean rpcCall() throws Exception { - MutateRequest request = RequestConverter.buildMutateRequest( - getLocation().getRegionInfo().getRegionName(), row, family, qualifier, - new BinaryComparator(value), CompareType.EQUAL, delete); - MutateResponse response = doMutate(request); - return Boolean.valueOf(response.getProcessed()); - } - }; - return rpcCallerFactory. newCaller(this.writeRpcTimeout). - callWithRetries(callable, this.operationTimeout); + final byte [] value, final Delete delete) throws IOException { + return checkAndDelete(row, family, qualifier, CompareOp.EQUAL, value, delete); } /** @@ -801,9 +787,7 @@ public class HTable implements Table { return ResponseConverter.getResult(request, response, getRpcControllerCellScanner()); } }; - List rows = new ArrayList(); - rows.add(delete); - + List rows = Collections.singletonList(delete); Object[] results = new Object[1]; AsyncRequestFuture ars = multiAp.submitAll(pool, tableName, rows, null, results, callable, -1);