diff --git core/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormat.java core/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormat.java index 7dba46c..e8a0515 100644 --- core/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormat.java +++ core/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormat.java @@ -28,6 +28,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Scan; +import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.util.StringUtils; /** @@ -42,6 +43,8 @@ implements Configurable { public static final String INPUT_TABLE = "hbase.mapreduce.inputtable"; /** Base-64 encoded scanner. All other SCAN_ confs are ignored if this is specified. */ public static final String SCAN = "hbase.mapreduce.scan"; + /** Column Family to Scan */ + public static final String SCAN_COLUMN_FAMILY = "hbase.mapreduce.scan.column.family"; /** Space delimited list of columns to scan. */ public static final String SCAN_COLUMNS = "hbase.mapreduce.scan.columns"; /** The timestamp used to filter columns with a specific timestamp. */ @@ -105,6 +108,10 @@ implements Configurable { scan.addColumns(conf.get(SCAN_COLUMNS)); } + if (conf.get(SCAN_COLUMN_FAMILY) != null) { + scan.addFamily(Bytes.toBytes(conf.get(SCAN_COLUMN_FAMILY))); + } + if (conf.get(SCAN_TIMESTAMP) != null) { scan.setTimeStamp(Long.parseLong(conf.get(SCAN_TIMESTAMP))); }