Index: storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseConstants.java =================================================================== --- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseConstants.java (revision 1308412) +++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseConstants.java (working copy) @@ -18,7 +18,6 @@ package org.apache.hcatalog.hbase; -import org.apache.hadoop.hive.hbase.HBaseSerDe; import org.apache.hcatalog.common.HCatConstants; /** @@ -32,9 +31,6 @@ /** key used to define the name of the table to write to */ public static final String PROPERTY_OUTPUT_TABLE_NAME_KEY = HCatConstants.HCAT_DEFAULT_TOPIC_PREFIX+".hbase.mapreduce.outputTableName"; - /** key used to define the column mapping of hbase to hcatalog schema */ - public static final String PROPERTY_COLUMN_MAPPING_KEY = HCatConstants.HCAT_DEFAULT_TOPIC_PREFIX+"."+ HBaseSerDe.HBASE_COLUMNS_MAPPING; - /** key used to define whether bulk storage output format will be used or not */ public static final String PROPERTY_BULK_OUTPUT_MODE_KEY = HCatConstants.HCAT_DEFAULT_TOPIC_PREFIX+".hbase.output.bulkMode"; Index: storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseHCatStorageHandler.java =================================================================== --- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseHCatStorageHandler.java (revision 1308412) +++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseHCatStorageHandler.java (working copy) @@ -254,9 +254,6 @@ String hbaseColumnsMapping = tbl.getParameters().get( HBaseSerDe.HBASE_COLUMNS_MAPPING); - tbl.putToParameters(HBaseConstants.PROPERTY_COLUMN_MAPPING_KEY, - hbaseColumnsMapping); - if (hbaseColumnsMapping == null) { throw new MetaException( "No hbase.columns.mapping defined in table" @@ -564,7 +561,7 @@ private String getScanColumns(HCatTableInfo tableInfo, String outputColSchema) throws IOException { StringBuilder builder = new StringBuilder(); String hbaseColumnMapping = tableInfo.getStorerInfo().getProperties() - .getProperty(HBaseConstants.PROPERTY_COLUMN_MAPPING_KEY); + .getProperty(HBaseSerDe.HBASE_COLUMNS_MAPPING); if (outputColSchema == null) { String[] splits = hbaseColumnMapping.split("[,]"); for (int i = 0; i < splits.length; i++) { Index: storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseRevisionManagerUtil.java =================================================================== --- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseRevisionManagerUtil.java (revision 1308412) +++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseRevisionManagerUtil.java (working copy) @@ -192,7 +192,7 @@ try { rm = HBaseRevisionManagerUtil.getOpenedRevisionManager(jobConf); String hBaseColumns = tableInfo.getStorerInfo().getProperties() - .getProperty(HBaseConstants.PROPERTY_COLUMN_MAPPING_KEY); + .getProperty(HBaseSerDe.HBASE_COLUMNS_MAPPING); String[] splits = hBaseColumns.split("[,:]"); Set families = new HashSet(); for (int i = 0; i < splits.length; i += 2) { @@ -234,7 +234,7 @@ HCatSchema hcatTableSchema = hcatTableInfo.getDataColumns(); StorerInfo storeInfo = hcatTableInfo.getStorerInfo(); String hbaseColumnMapping = storeInfo.getProperties().getProperty( - HBaseConstants.PROPERTY_COLUMN_MAPPING_KEY); + HBaseSerDe.HBASE_COLUMNS_MAPPING); Map hcatHbaseColMap = new HashMap(); List columnFamilies = new ArrayList();