Repository: hbase Updated Branches: refs/heads/master ba6d95232 -> 6ce05d44e
HBASE-16954 Unify HTable#checkAndDelete with AP (ChiaPing Tsai) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6ce05d44 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6ce05d44 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6ce05d44 Branch: refs/heads/master Commit: 6ce05d44e5f6c78df1eae79d682b49ae7d410a89 Parents: ba6d952 Author: daoye.ch <daoye...@alipay.com> Authored: Mon Oct 31 09:15:29 2016 +0800 Committer: daoye.ch <daoye...@alipay.com> Committed: Mon Oct 31 09:15:29 2016 +0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/client/HTable.java | 24 ++++---------------- .../org/apache/hadoop/hbase/SplitLogTask.java | 2 +- 2 files changed, 5 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/6ce05d44/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java index 8d024dd..b2c012d 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java +++ b/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<Row> rows = new ArrayList<Row>(); - rows.add(delete); + List<Delete> 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<Boolean> callable = new ClientServiceCallable<Boolean>(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.<Boolean> 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<Row> rows = new ArrayList<Row>(); - rows.add(delete); - + List<Delete> rows = Collections.singletonList(delete); Object[] results = new Object[1]; AsyncRequestFuture ars = multiAp.submitAll(pool, tableName, rows, null, results, callable, -1); http://git-wip-us.apache.org/repos/asf/hbase/blob/6ce05d44/hbase-server/src/main/java/org/apache/hadoop/hbase/SplitLogTask.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/SplitLogTask.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/SplitLogTask.java index 986e5bf..66493e1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/SplitLogTask.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/SplitLogTask.java @@ -153,7 +153,7 @@ public class SplitLogTask { /** * @param data Serialized date to parse. * @return An SplitLogTaskState instance made of the passed <code>data</code> - * @throws DeserializationException + * @throws DeserializationException * @see #toByteArray() */ public static SplitLogTask parseFrom(final byte [] data) throws DeserializationException {