Author: gates
Date: Tue May 27 09:11:41 2008
New Revision: 660577

URL: http://svn.apache.org/viewvc?rev=660577&view=rev
Log:
PIG-143 Pi's FixSchemaChange patch, fixed usage of != where it should have been 
!(equalTo()).


Modified:
    
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt
    
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/schema/Schema.java
    incubator/pig/branches/types/test/org/apache/pig/test/TestTypeChecking.java

Modified: 
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt
URL: 
http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt?rev=660577&r1=660576&r2=660577&view=diff
==============================================================================
--- 
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt
 (original)
+++ 
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt
 Tue May 27 09:11:41 2008
@@ -43,6 +43,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.pig.impl.plan.MultiMap;
+import org.apache.pig.impl.plan.NodeIdGenerator;
+import org.apache.pig.impl.plan.OperatorKey;
 import org.apache.pig.impl.plan.PlanException;
 import org.apache.pig.data.TupleFactory;
 import org.apache.pig.data.Tuple;

Modified: 
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/schema/Schema.java
URL: 
http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/schema/Schema.java?rev=660577&r1=660576&r2=660577&view=diff
==============================================================================
--- 
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/schema/Schema.java
 (original)
+++ 
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/schema/Schema.java
 Tue May 27 09:11:41 2008
@@ -157,7 +157,7 @@
                 return false ;
             }
 
-            if ( (!relaxAlias) && (fschema.alias != fother.alias) ) {
+            if ( (!relaxAlias) && (!fschema.alias.equals(fother.alias)) ) {
                 return false ;
             }
 
@@ -535,7 +535,7 @@
             FieldSchema myFs = i.next() ;
             FieldSchema otherFs = j.next() ;
 
-            if ( (!relaxAlias) && (myFs.alias != otherFs.alias) ) {
+            if ( (!relaxAlias) && (!myFs.alias.equals(otherFs.alias)) ) {
                 return false ;
             }
 

Modified: 
incubator/pig/branches/types/test/org/apache/pig/test/TestTypeChecking.java
URL: 
http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/TestTypeChecking.java?rev=660577&r1=660576&r2=660577&view=diff
==============================================================================
--- incubator/pig/branches/types/test/org/apache/pig/test/TestTypeChecking.java 
(original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/TestTypeChecking.java 
Tue May 27 09:11:41 2008
@@ -23,6 +23,7 @@
 import org.apache.pig.impl.logicalLayer.validators.TypeCheckingValidator;
 import org.apache.pig.impl.PigContext;
 import org.apache.pig.impl.plan.CompilationMessageCollector;
+import org.apache.pig.impl.plan.OperatorKey;
 import org.apache.pig.impl.plan.PlanValidationException;
 import org.apache.pig.ExecType;
 import org.apache.pig.test.utils.TypeCheckingTestUtil;


Reply via email to