You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2011/03/26 01:38:09 UTC

svn commit: r1085614 - in /pig/trunk: CHANGES.txt contrib/zebra/src/java/org/apache/hadoop/zebra/pig/SchemaConverter.java contrib/zebra/src/java/org/apache/hadoop/zebra/schema/ColumnType.java

Author: daijy
Date: Sat Mar 26 00:38:08 2011
New Revision: 1085614

URL: http://svn.apache.org/viewvc?rev=1085614&view=rev
Log:
PIG-1934: Fix zebra test TestCheckin1, TestCheckin4

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/SchemaConverter.java
    pig/trunk/contrib/zebra/src/java/org/apache/hadoop/zebra/schema/ColumnType.java

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1085614&r1=1085613&r2=1085614&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Sat Mar 26 00:38:08 2011
@@ -118,6 +118,8 @@ PIG-1696: Performance: Use System.arrayc
 
 BUG FIXES
 
+PIG-1934: Fix zebra test TestCheckin1, TestCheckin4 (daijy)
+
 PIG-1931: Integrate Macro Expansion with New Parser (rding)
 
 PIG-1933: Hints such as 'collected' and 'skewed' for "group by" or "join by" 

Modified: pig/trunk/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/SchemaConverter.java
URL: http://svn.apache.org/viewvc/pig/trunk/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/SchemaConverter.java?rev=1085614&r1=1085613&r2=1085614&view=diff
==============================================================================
--- pig/trunk/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/SchemaConverter.java (original)
+++ pig/trunk/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/SchemaConverter.java Sat Mar 26 00:38:08 2011
@@ -163,7 +163,7 @@ class SchemaConverter {
 
         if( cSchema.getType() ==ColumnType.ANY && cSchema.getName().isEmpty() ) { // For anonymous column
             field.setName( null );
-            field.setType(  DataType.UNKNOWN );
+            field.setType(  DataType.BYTEARRAY );
             field.setSchema( null );
         } else {
             field.setName( cSchema.getName() );

Modified: pig/trunk/contrib/zebra/src/java/org/apache/hadoop/zebra/schema/ColumnType.java
URL: http://svn.apache.org/viewvc/pig/trunk/contrib/zebra/src/java/org/apache/hadoop/zebra/schema/ColumnType.java?rev=1085614&r1=1085613&r2=1085614&view=diff
==============================================================================
--- pig/trunk/contrib/zebra/src/java/org/apache/hadoop/zebra/schema/ColumnType.java (original)
+++ pig/trunk/contrib/zebra/src/java/org/apache/hadoop/zebra/schema/ColumnType.java Sat Mar 26 00:38:08 2011
@@ -35,7 +35,7 @@ public enum ColumnType {
    */
   ANY("any") {
 	  public byte pigDataType() {
-		  return DataType.UNKNOWN;
+		  return DataType.BYTEARRAY;
 	  }
   },
   /**