Repository: hbase Updated Branches: refs/heads/hbase-12439 3abd52bdc -> d5080e82f
HBASE-16299 Update REST API scanner with ability to do reverse scan (Minwoo Kang) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6fdf3aa2 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6fdf3aa2 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6fdf3aa2 Branch: refs/heads/hbase-12439 Commit: 6fdf3aa216d34f2f6fc1ffe7bfea94b8e4bc3f8a Parents: 0eaf3ed Author: Ramkrishna <ramkrishna.s.vasude...@intel.com> Authored: Thu Aug 4 11:17:34 2016 +0530 Committer: Ramkrishna <ramkrishna.s.vasude...@intel.com> Committed: Thu Aug 4 11:17:34 2016 +0530 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/rest/Constants.java | 3 +- .../apache/hadoop/hbase/rest/TableResource.java | 2 + .../apache/hadoop/hbase/rest/TestTableScan.java | 52 ++++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/6fdf3aa2/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/Constants.java ---------------------------------------------------------------------- diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/Constants.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/Constants.java index 505dbb3..54ce117 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/Constants.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/Constants.java @@ -68,7 +68,8 @@ public interface Constants { String SCAN_BATCH_SIZE = "batchsize"; String SCAN_LIMIT = "limit"; String SCAN_FETCH_SIZE = "hbase.rest.scan.fetchsize"; - String SCAN_FILTER = "filter"; + String SCAN_FILTER = "filter"; + String SCAN_REVERSED = "reversed"; String CUSTOM_FILTERS = "hbase.rest.custom.filters"; String ROW_KEYS_PARAM_NAME = "row"; http://git-wip-us.apache.org/repos/asf/hbase/blob/6fdf3aa2/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/TableResource.java ---------------------------------------------------------------------- diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/TableResource.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/TableResource.java index 45e7caf..9eb21ec 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/TableResource.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/TableResource.java @@ -134,6 +134,7 @@ public class TableResource extends ResourceBase { @DefaultValue("0") @QueryParam(Constants.SCAN_START_TIME) long startTime, @DefaultValue(Long.MAX_VALUE + "") @QueryParam(Constants.SCAN_END_TIME) long endTime, @DefaultValue("true") @QueryParam(Constants.SCAN_BATCH_SIZE) boolean cacheBlocks, + @DefaultValue("false") @QueryParam(Constants.SCAN_REVERSED) boolean reversed, @DefaultValue("") @QueryParam(Constants.SCAN_FILTER) String filters) { try { Filter filter = null; @@ -200,6 +201,7 @@ public class TableResource extends ResourceBase { } int fetchSize = this.servlet.getConfiguration().getInt(Constants.SCAN_FETCH_SIZE, 10); tableScan.setCaching(fetchSize); + tableScan.setReversed(reversed); return new TableScanResource(hTable.getScanner(tableScan), userRequestedLimit); } catch (IOException exp) { servlet.getMetrics().incrementFailedScanRequests(1); http://git-wip-us.apache.org/repos/asf/hbase/blob/6fdf3aa2/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableScan.java ---------------------------------------------------------------------- diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableScan.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableScan.java index 789e9e1..7924aed 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableScan.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableScan.java @@ -29,6 +29,8 @@ import java.io.InputStream; import java.io.Serializable; import java.net.URLEncoder; import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; import java.util.List; import javax.ws.rs.core.MediaType; @@ -548,6 +550,56 @@ public class TestTableScan { assertEquals(0, count); } + @Test + public void testReversed() throws IOException, JAXBException { + StringBuilder builder = new StringBuilder(); + builder.append("/*"); + builder.append("?"); + builder.append(Constants.SCAN_COLUMN + "=" + COLUMN_1); + builder.append("&"); + builder.append(Constants.SCAN_START_ROW + "=aaa"); + builder.append("&"); + builder.append(Constants.SCAN_END_ROW + "=aay"); + Response response = client.get("/" + TABLE + builder.toString(), Constants.MIMETYPE_XML); + assertEquals(200, response.getCode()); + JAXBContext ctx = JAXBContext.newInstance(CellSetModel.class); + Unmarshaller ush = ctx.createUnmarshaller(); + CellSetModel model = (CellSetModel) ush.unmarshal(response.getStream()); + int count = TestScannerResource.countCellSet(model); + assertEquals(24, count); + List<RowModel> rowModels = model.getRows().subList(1, count); + + //reversed + builder = new StringBuilder(); + builder.append("/*"); + builder.append("?"); + builder.append(Constants.SCAN_COLUMN + "=" + COLUMN_1); + builder.append("&"); + builder.append(Constants.SCAN_START_ROW + "=aay"); + builder.append("&"); + builder.append(Constants.SCAN_END_ROW + "=aaa"); + builder.append("&"); + builder.append(Constants.SCAN_REVERSED + "=true"); + response = client.get("/" + TABLE + builder.toString(), Constants.MIMETYPE_XML); + assertEquals(200, response.getCode()); + model = (CellSetModel) ush.unmarshal(response.getStream()); + count = TestScannerResource.countCellSet(model); + assertEquals(24, count); + List<RowModel> reversedRowModels = model.getRows().subList(1, count); + + Collections.reverse(reversedRowModels); + assertEquals(rowModels.size(), reversedRowModels.size()); + for (int i = 0; i < rowModels.size(); i++) { + RowModel rowModel = rowModels.get(i); + RowModel reversedRowModel = reversedRowModels.get(i); + + assertEquals(new String(rowModel.getKey(), "UTF-8"), + new String(reversedRowModel.getKey(), "UTF-8")); + assertEquals(new String(rowModel.getCells().get(0).getValue(), "UTF-8"), + new String(reversedRowModel.getCells().get(0).getValue(), "UTF-8")); + } + } + public static class CustomFilter extends PrefixFilter { private byte[] key = null;
