svn commit: r727859 - in /hadoop/pig/branches/types: ./ src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/ test/org/apache/pig/test/ test/org/apache/pig/test/data/GoldenFiles/

[olga]

Author: olga
Date: Thu Dec 18 15:58:38 2008
New Revision: 727859

URL: http://svn.apache.org/viewvc?rev=727859&view=rev
Log:
PIG-522: fix for negation operator

Modified:
    hadoop/pig/branches/types/CHANGES.txt
    
hadoop/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/LogToPhyTranslationVisitor.java
    hadoop/pig/branches/types/test/org/apache/pig/test/TestPONegative.java
    
hadoop/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Generate.gld

Modified: hadoop/pig/branches/types/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/pig/branches/types/CHANGES.txt?rev=727859&r1=727858&r2=727859&view=diff
==============================================================================
--- hadoop/pig/branches/types/CHANGES.txt (original)
+++ hadoop/pig/branches/types/CHANGES.txt Thu Dec 18 15:58:38 2008
@@ -341,3 +341,5 @@
        reporter being passed to EvalFuncs. (gates)
 
        PIG-6: Add load support from hbase (hustlmsp via gates).
+
+    PIG-522: make negation work (pradeepk via olgan)

Modified: 
hadoop/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/LogToPhyTranslationVisitor.java
URL: 
http://svn.apache.org/viewvc/hadoop/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/LogToPhyTranslationVisitor.java?rev=727859&r1=727858&r2=727859&view=diff
==============================================================================
--- 
hadoop/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/LogToPhyTranslationVisitor.java
 (original)
+++ 
hadoop/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/LogToPhyTranslationVisitor.java
 Thu Dec 18 15:58:38 2008
@@ -1087,6 +1087,7 @@
         ExpressionOperator from = (ExpressionOperator) LogToPhyMap.get(op
                 .getPlan().getPredecessors(op).get(0));
         ((PONegative) physOp).setExpr(from);
+        ((PONegative) physOp).setResultType(op.getType());
         try {
             currentPlan.connect(from, physOp);
         } catch (PlanException e) {

Modified: hadoop/pig/branches/types/test/org/apache/pig/test/TestPONegative.java
URL: 
http://svn.apache.org/viewvc/hadoop/pig/branches/types/test/org/apache/pig/test/TestPONegative.java?rev=727859&r1=727858&r2=727859&view=diff
==============================================================================
--- hadoop/pig/branches/types/test/org/apache/pig/test/TestPONegative.java 
(original)
+++ hadoop/pig/branches/types/test/org/apache/pig/test/TestPONegative.java Thu 
Dec 18 15:58:38 2008
@@ -17,9 +17,12 @@
  */
 package org.apache.pig.test;
 
+import java.io.File;
 import java.util.Iterator;
 import java.util.Random;
 
+import org.apache.pig.ExecType;
+import org.apache.pig.PigServer;
 import org.apache.pig.backend.executionengine.ExecException;
 import org.apache.pig.data.BagFactory;
 import org.apache.pig.data.DataBag;
@@ -40,6 +43,7 @@
     DataBag bag = BagFactory.getInstance().newDefaultBag();
     Random r = new Random();
     TupleFactory tf = TupleFactory.getInstance();
+    MiniCluster miniCluster = MiniCluster.buildCluster();
     final int MAX = 10;
     
     public void testPONegInt () throws PlanException, ExecException {
@@ -314,5 +318,20 @@
         }
         
     }
+    
+    public void testPONegType() throws Exception {
+        PigServer pig = new PigServer(ExecType.MAPREDUCE, 
miniCluster.getProperties());
+        File f = Util.createInputFile("tmp", "", new String[] {"a", "b", "c"});
+        pig.registerQuery("a = load '" + Util.generateURI(f.toString()) + 
"';");
+        // -1 is modeled as POnegative with Constant(1)
+        pig.registerQuery("b = foreach a generate SIZE(-1);");
+        Iterator<Tuple> it = pig.openIterator("b");
+        int i = 0;
+        while(it.hasNext()) {
+            assertEquals(1L, it.next().get(0));
+            i++;
+        }
+        assertEquals(3, i);
+    }
 
 }

Modified: 
hadoop/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Generate.gld
URL: 
http://svn.apache.org/viewvc/hadoop/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Generate.gld?rev=727859&r1=727858&r2=727859&view=diff
==============================================================================
--- 
hadoop/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Generate.gld
 (original)
+++ 
hadoop/pig/branches/types/test/org/apache/pig/test/data/GoldenFiles/Generate.gld
 Thu Dec 18 15:58:38 2008
@@ -30,7 +30,7 @@
 |   |
 |   |---Project[bytearray][2] - Test-Plan-Builder-216
 |   |
-|   PONegative[tuple] - Test-Plan-Builder-219
+|   PONegative[bytearray] - Test-Plan-Builder-219
 |   |
 |   |---Project[bytearray][1] - Test-Plan-Builder-218
 |