Index: src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java (revision 1101351) +++ src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java (working copy) @@ -26,6 +26,8 @@ import java.io.StringWriter; import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.NavigableSet; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; @@ -341,6 +343,8 @@ return writer.toString(); } + private static final byte[] COLUMN_DIVIDER = Bytes.toBytes(":"); + /** * @param scan the scan specification * @throws Exception @@ -349,10 +353,12 @@ ScannerModel model = new ScannerModel(); model.setStartRow(scan.getStartRow()); model.setEndRow(scan.getStopRow()); - byte[][] families = scan.getFamilies(); + Map> families = scan.getFamilyMap(); if (families != null) { - for (byte[] column: families) { - model.addColumn(column); + for (Map.Entry> entry : families.entrySet()) { + for (byte[] qualifier : entry.getValue()) { + model.addColumn(Bytes.add(entry.getKey(), COLUMN_DIVIDER, qualifier)); + } } } model.setStartTime(scan.getTimeRange().getMin());