Author: gates
Date: Thu Apr 12 18:14:51 2012
New Revision: 1325419
URL: http://svn.apache.org/viewvc?rev=1325419&view=rev
Log:
HCATALOG-304 Remove hcat.hbase.column.mapping table property
Modified:
incubator/hcatalog/branches/branch-0.4/CHANGES.txt
incubator/hcatalog/branches/branch-0.4/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseConstants.java
incubator/hcatalog/branches/branch-0.4/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseHCatStorageHandler.java
incubator/hcatalog/branches/branch-0.4/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseRevisionManagerUtil.java
Modified: incubator/hcatalog/branches/branch-0.4/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.4/CHANGES.txt?rev=1325419&r1=1325418&r2=1325419&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.4/CHANGES.txt (original)
+++ incubator/hcatalog/branches/branch-0.4/CHANGES.txt Thu Apr 12 18:14:51 2012
@@ -31,6 +31,8 @@ Release 0.4.1 - Unreleased
Release 0.4.0 - Unreleased
INCOMPATIBLE CHANGES
+ HCAT-304 Remove hcat.hbase.column.mapping table property (rohini via gates)
+
HCAT-358 Remove externed hive code from HCat code and use maven instead (thw
and gates via gates)
HCAT-359 hcatalog tar.gz should only have hcatalog binaries (gkesavan via
gates)
Modified:
incubator/hcatalog/branches/branch-0.4/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseConstants.java
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.4/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseConstants.java?rev=1325419&r1=1325418&r2=1325419&view=diff
==============================================================================
---
incubator/hcatalog/branches/branch-0.4/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseConstants.java
(original)
+++
incubator/hcatalog/branches/branch-0.4/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseConstants.java
Thu Apr 12 18:14:51 2012
@@ -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 @@ class HBaseConstants {
/** 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";
Modified:
incubator/hcatalog/branches/branch-0.4/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseHCatStorageHandler.java
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.4/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseHCatStorageHandler.java?rev=1325419&r1=1325418&r2=1325419&view=diff
==============================================================================
---
incubator/hcatalog/branches/branch-0.4/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseHCatStorageHandler.java
(original)
+++
incubator/hcatalog/branches/branch-0.4/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseHCatStorageHandler.java
Thu Apr 12 18:14:51 2012
@@ -254,9 +254,6 @@ public class HBaseHCatStorageHandler ext
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 @@ public class HBaseHCatStorageHandler ext
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++) {
Modified:
incubator/hcatalog/branches/branch-0.4/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseRevisionManagerUtil.java
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.4/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseRevisionManagerUtil.java?rev=1325419&r1=1325418&r2=1325419&view=diff
==============================================================================
---
incubator/hcatalog/branches/branch-0.4/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseRevisionManagerUtil.java
(original)
+++
incubator/hcatalog/branches/branch-0.4/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseRevisionManagerUtil.java
Thu Apr 12 18:14:51 2012
@@ -192,7 +192,7 @@ class HBaseRevisionManagerUtil {
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<String> families = new HashSet<String>();
for (int i = 0; i < splits.length; i += 2) {
@@ -234,7 +234,7 @@ class HBaseRevisionManagerUtil {
HCatSchema hcatTableSchema = hcatTableInfo.getDataColumns();
StorerInfo storeInfo = hcatTableInfo.getStorerInfo();
String hbaseColumnMapping = storeInfo.getProperties().getProperty(
- HBaseConstants.PROPERTY_COLUMN_MAPPING_KEY);
+ HBaseSerDe.HBASE_COLUMNS_MAPPING);
Map<String, String> hcatHbaseColMap = new HashMap<String, String>();
List<String> columnFamilies = new ArrayList<String>();
