Repository: hbase Updated Branches: refs/heads/0.98 f0a38ba29 -> 3dd365859
Amend HBASE-15323 Commit changes staged for 0.98 but not committed Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3dd36585 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3dd36585 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3dd36585 Branch: refs/heads/0.98 Commit: 3dd36585985b950e036e196767dc7794ab1a8c98 Parents: f0a38ba Author: Andrew Purtell <[email protected]> Authored: Tue Mar 15 22:57:40 2016 -0700 Committer: Andrew Purtell <[email protected]> Committed: Tue Mar 15 22:57:40 2016 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/rest/RowResource.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/3dd36585/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RowResource.java ---------------------------------------------------------------------- diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RowResource.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RowResource.java index 3a62db4..e7b46c9 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RowResource.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RowResource.java @@ -591,9 +591,9 @@ public class RowResource extends ResourceBase { if (parts.length == 1) { // Only Column Family is specified - delete.addFamily(parts[0], cell.getTimestamp()); + delete.deleteFamily(parts[0], cell.getTimestamp()); } else if (parts.length == 2) { - delete.addColumn(parts[0], parts[1], cell.getTimestamp()); + delete.deleteColumn(parts[0], parts[1], cell.getTimestamp()); } else { servlet.getMetrics().incrementFailedDeleteRequests(1); return Response.status(Response.Status.BAD_REQUEST) @@ -610,14 +610,14 @@ public class RowResource extends ResourceBase { // To support backcompat of deleting a cell // if that is the only cell passed to the rest api if(cellModelCount == 1) { - delete.addColumns(parts[0], parts[1]); + delete.deleteColumns(parts[0], parts[1]); } retValue = table.checkAndDelete(key, parts[0], parts[1], valueToDeleteCell.getValue(), delete); } else { // The case of empty qualifier. if(cellModelCount == 1) { - delete.addColumns(parts[0], Bytes.toBytes(StringUtils.EMPTY)); + delete.deleteColumns(parts[0], Bytes.toBytes(StringUtils.EMPTY)); } retValue = table.checkAndDelete(key, parts[0], Bytes.toBytes(StringUtils.EMPTY), valueToDeleteCell.getValue(), delete);
