svn commit: r1395816 - in /incubator/hcatalog/trunk: CHANGES.txt hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/PigHCatUtil.java

[travis]

Author: travis
Date: Mon Oct  8 23:37:13 2012
New Revision: 1395816

URL: http://svn.apache.org/viewvc?rev=1395816&view=rev
Log:
HCATALOG-523 PigHCatUtil should not assume map key type can be casted to String

Modified:
    incubator/hcatalog/trunk/CHANGES.txt
    
incubator/hcatalog/trunk/hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/PigHCatUtil.java

Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1395816&r1=1395815&r2=1395816&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Mon Oct  8 23:37:13 2012
@@ -121,6 +121,8 @@ Trunk (unreleased changes)
   OPTIMIZATIONS
 
   BUG FIXES
+  HCAT-523 PigHCatUtil should not assume map key type can be casted to String 
(pengfeng via traviscrawford)
+
   HCAT-522 Make HCatHadoopShims.commitJob() generic (traviscrawford)
 
   HCAT-451 Partitions are created even when Jobs are aborted (avandana)

Modified: 
incubator/hcatalog/trunk/hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/PigHCatUtil.java
URL: 
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/PigHCatUtil.java?rev=1395816&r1=1395815&r2=1395816&view=diff
==============================================================================
--- 
incubator/hcatalog/trunk/hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/PigHCatUtil.java
 (original)
+++ 
incubator/hcatalog/trunk/hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/PigHCatUtil.java
 Mon Oct  8 23:37:13 2012
@@ -363,7 +363,7 @@ public class PigHCatUtil {
             result = transformToBag((List<? extends Object>) o, hfs);
             break;
         case MAP:
-            result = transformToPigMap((Map<String, Object>) o, hfs);
+            result = transformToPigMap((Map<Object, Object>) o, hfs);
             break;
         default:
             result = o;
@@ -372,7 +372,7 @@ public class PigHCatUtil {
         return result;
     }
 
-    public static Tuple transformToTuple(List<? extends Object> objList, 
HCatFieldSchema hfs) throws Exception {
+    private static Tuple transformToTuple(List<? extends Object> objList, 
HCatFieldSchema hfs) throws Exception {
         try {
             return transformToTuple(objList, hfs.getStructSubSchema());
         } catch (Exception e) {
@@ -384,7 +384,7 @@ public class PigHCatUtil {
         }
     }
 
-    public static Tuple transformToTuple(List<? extends Object> objList, 
HCatSchema hs) throws Exception {
+    private static Tuple transformToTuple(List<? extends Object> objList, 
HCatSchema hs) throws Exception {
         if (objList == null) {
             return null;
         }
@@ -396,20 +396,21 @@ public class PigHCatUtil {
         return t;
     }
 
-    public static Map<String, Object> transformToPigMap(Map<String, Object> 
map, HCatFieldSchema hfs) throws Exception {
+    private static Map<String, Object> transformToPigMap(Map<Object, Object> 
map, HCatFieldSchema hfs) throws Exception {
         if (map == null) {
             return null;
         }
 
         Map<String, Object> result = new HashMap<String, Object>();
-        for (Entry<String, Object> entry : map.entrySet()) {
-            result.put(entry.getKey(), extractPigObject(entry.getValue(), 
hfs.getMapValueSchema().get(0)));
+        for (Entry<Object, Object> entry : map.entrySet()) {
+            // since map key for Pig has to be Strings
+            result.put(entry.getKey().toString(), 
extractPigObject(entry.getValue(), hfs.getMapValueSchema().get(0)));
         }
         return result;
     }
 
     @SuppressWarnings("unchecked")
-    public static DataBag transformToBag(List<? extends Object> list, 
HCatFieldSchema hfs) throws Exception {
+    private static DataBag transformToBag(List<? extends Object> list, 
HCatFieldSchema hfs) throws Exception {
         if (list == null) {
             return null;
         }
@@ -454,6 +455,10 @@ public class PigHCatUtil {
                 break;
             case MAP:
                 // key is only string
+                if (hcatField.getMapKeyType() != Type.STRING) {
+                    LOG.info("Converting non-String key of map " + 
hcatField.getName() + " from "
+                        + hcatField.getMapKeyType() + " to String.");
+                }
                 
validateHCatSchemaFollowsPigRules(hcatField.getMapValueSchema());
                 break;
             }