svn commit: r887318 - in /hadoop/pig/trunk: CHANGES.txt src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/ExpressionOperator.java test/org/apache/pig/test/TestAccumulator.java

[olga]

Author: olga
Date: Fri Dec  4 18:49:21 2009
New Revision: 887318

URL: http://svn.apache.org/viewvc?rev=887318&view=rev
Log:
PIG-1118: expression with aggregate functions returning null, with accumulate
interface (yinghe via olgan)

Modified:
    hadoop/pig/trunk/CHANGES.txt
    
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/ExpressionOperator.java
    hadoop/pig/trunk/test/org/apache/pig/test/TestAccumulator.java

Modified: hadoop/pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/pig/trunk/CHANGES.txt?rev=887318&r1=887317&r2=887318&view=diff
==============================================================================
--- hadoop/pig/trunk/CHANGES.txt (original)
+++ hadoop/pig/trunk/CHANGES.txt Fri Dec  4 18:49:21 2009
@@ -47,6 +47,9 @@
 
 BUG FIXES
 
+PIG-1118: expression with aggregate functions returning null, with accumulate
+interface (yinghe via olgan)
+
 PIG-1068:  COGROUP fails with 'Type mismatch in key from map: expected
                   org.apache.pig.impl.io.NullableText, recieved
                   org.apache.pig.impl.io.NullableTuple' (rding via gates)

Modified: 
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/ExpressionOperator.java
URL: 
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/ExpressionOperator.java?rev=887318&r1=887317&r2=887318&view=diff
==============================================================================
--- 
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/ExpressionOperator.java
 (original)
+++ 
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/ExpressionOperator.java
 Fri Dec  4 18:49:21 2009
@@ -98,7 +98,9 @@
         List<ExpressionOperator> l = getChildExpressions();
         if (l != null) {
             for(ExpressionOperator e: l) {
-                return e.containUDF();                                 
+                if (e.containUDF()) {
+                    return true;
+                }
             }
         }
         

Modified: hadoop/pig/trunk/test/org/apache/pig/test/TestAccumulator.java
URL: 
http://svn.apache.org/viewvc/hadoop/pig/trunk/test/org/apache/pig/test/TestAccumulator.java?rev=887318&r1=887317&r2=887318&view=diff
==============================================================================
--- hadoop/pig/trunk/test/org/apache/pig/test/TestAccumulator.java (original)
+++ hadoop/pig/trunk/test/org/apache/pig/test/TestAccumulator.java Fri Dec  4 
18:49:21 2009
@@ -427,4 +427,18 @@
             }            
         }    
     }
+    
+    public void testAccumWithMultiBuildin() throws IOException{
+        pigServer.registerQuery("A = load '" + INPUT_FILE + "' as (id:int, 
c:chararray);");
+        pigServer.registerQuery("C = group A by 1;");
+        pigServer.registerQuery("D = foreach C generate SUM(A.id), 
1+SUM(A.id)+SUM(A.id);");                     
+
+        Iterator<Tuple> iter = pigServer.openIterator("D");
+        
+        while(iter.hasNext()) {
+            Tuple t = iter.next();    
+            t.get(0).toString().equals("1700");
+            t.get(1).toString().equals("3401");   
+        }    
+    }
 }