svn commit: r1668935 - in /pig/trunk: CHANGES.txt src/org/apache/pig/impl/util/avro/AvroMapWrapper.java test/org/apache/pig/builtin/TestAvroStorage.java

[daijy]

Author: daijy
Date: Tue Mar 24 16:46:16 2015
New Revision: 1668935

URL: http://svn.apache.org/r1668935
Log:
PIG-4475: Keys in AvroMapWrapper are not proper Pig types

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/src/org/apache/pig/impl/util/avro/AvroMapWrapper.java
    pig/trunk/test/org/apache/pig/builtin/TestAvroStorage.java

Modified: pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1668935&r1=1668934&r2=1668935&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Tue Mar 24 16:46:16 2015
@@ -56,6 +56,8 @@ PIG-4333: Split BigData tests into multi
  
 BUG FIXES
 
+PIG-4475: Keys in AvroMapWrapper are not proper Pig types (rdsr via daijy)
+
 PIG-4478: TestCSVExcelStorage fails with jdk8 (rohini)
 
 PIG-4474: Increasing intermediate parallelism has issue with default 
parallelism (rohini)

Modified: pig/trunk/src/org/apache/pig/impl/util/avro/AvroMapWrapper.java
URL: 
http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/impl/util/avro/AvroMapWrapper.java?rev=1668935&r1=1668934&r2=1668935&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/impl/util/avro/AvroMapWrapper.java (original)
+++ pig/trunk/src/org/apache/pig/impl/util/avro/AvroMapWrapper.java Tue Mar 24 
16:46:16 2015
@@ -20,6 +20,7 @@ package org.apache.pig.impl.util.avro;
 
 import java.util.AbstractMap;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
@@ -65,6 +66,10 @@ public final class AvroMapWrapper implem
 
   @Override
   public boolean containsKey(final Object key) {
+    if (isUtf8key && !(key instanceof  Utf8)) {
+      // Assuming keys can either be utf8 or string
+      return innerMap.containsKey(new Utf8((String) key));
+    }
     return innerMap.containsKey(key);
   }
 
@@ -107,6 +112,13 @@ public final class AvroMapWrapper implem
 
   @Override
   public Set<CharSequence> keySet() {
+    if (isUtf8key) {
+      final Set<CharSequence> keySet = new HashSet<CharSequence>();
+      for (CharSequence cs : innerMap.keySet()) {
+        keySet.add(cs.toString());
+      }
+      return keySet;
+    }
     return innerMap.keySet();
   }
 

Modified: pig/trunk/test/org/apache/pig/builtin/TestAvroStorage.java
URL: 
http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/builtin/TestAvroStorage.java?rev=1668935&r1=1668934&r2=1668935&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/builtin/TestAvroStorage.java (original)
+++ pig/trunk/test/org/apache/pig/builtin/TestAvroStorage.java Tue Mar 24 
16:46:16 2015
@@ -926,9 +926,11 @@ public class TestAvroStorage {
             assertTrue(isValidPigObject(o));
         }
         for (CharSequence k : amw.keySet()) {
+            assertTrue(isValidPigObject(k));
             assertTrue(isValidPigObject(amw.get(k)));
         }
         for (Map.Entry<CharSequence, Object> e : amw.entrySet()) {
+            assertTrue(isValidPigObject(e.getKey()));
             assertTrue(isValidPigObject(e.getValue()));
         }
     }