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/01/24 22:29:40 UTC

svn commit: r1062988 - /pig/trunk/src/org/apache/pig/ResourceSchema.java

Author: daijy
Date: Mon Jan 24 21:29:39 2011
New Revision: 1062988

URL: http://svn.apache.org/viewvc?rev=1062988&view=rev
Log:
Fix piggybank unit test failure TestPigStorageSchema

Modified:
    pig/trunk/src/org/apache/pig/ResourceSchema.java

Modified: pig/trunk/src/org/apache/pig/ResourceSchema.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/ResourceSchema.java?rev=1062988&r1=1062987&r2=1062988&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/ResourceSchema.java (original)
+++ pig/trunk/src/org/apache/pig/ResourceSchema.java Mon Jan 24 21:29:39 2011
@@ -392,6 +392,15 @@ public class ResourceSchema implements S
         if (rfs1.length != rfs2.length) return false;
         
         for (int i=0; i<rfs1.length; i++) {
+            if (rfs1[i].getName()==null && rfs2[i].getName()!=null ||
+                    rfs1[i].getName()!=null && rfs2[i].getName()==null)
+                return false;
+            if (rfs1[i].getName()==null && rfs2[i].getName()==null) {
+                if (rfs1[i].getType() == rfs2[i].getType())
+                    return true;
+                else
+                    return false;
+            }
             if (!rfs1[i].getName().equals(rfs2[i].getName()) 
                     || rfs1[i].getType() != rfs2[i].getType()) {
                 return false;