svn commit: r644850 - in /incubator/pig/trunk: CHANGES.txt src/org/apache/pig/backend/hadoop/executionengine/POMapreduce.java src/org/apache/pig/impl/eval/CompositeEvalSpec.java src/org/apache/pig/impl/physicalLayer/POTreePrinter.java

[olga]

Author: olga
Date: Fri Apr  4 12:43:02 2008
New Revision: 644850

URL: http://svn.apache.org/viewvc?rev=644850&view=rev
Log:
PIG-181: streaming bug fix

Modified:
    incubator/pig/trunk/CHANGES.txt
    
incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/POMapreduce.java
    incubator/pig/trunk/src/org/apache/pig/impl/eval/CompositeEvalSpec.java
    incubator/pig/trunk/src/org/apache/pig/impl/physicalLayer/POTreePrinter.java

Modified: incubator/pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/pig/trunk/CHANGES.txt?rev=644850&r1=644849&r2=644850&view=diff
==============================================================================
--- incubator/pig/trunk/CHANGES.txt (original)
+++ incubator/pig/trunk/CHANGES.txt Fri Apr  4 12:43:02 2008
@@ -199,4 +199,7 @@
     PIG-94: M3 code update for streaming (arunc via olgan)
     
     PIG-55: added custom splitter (groves via olgan)
-    PIG-74,180: bug fixes in streaming (arunc via olgan)
+
+    PIG-174,180: bug fixes in streaming (arunc via olgan)
+
+    PIG-181: streaming bug fixing (arunc via olgan)

Modified: 
incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/POMapreduce.java
URL: 
http://svn.apache.org/viewvc/incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/POMapreduce.java?rev=644850&r1=644849&r2=644850&view=diff
==============================================================================
--- 
incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/POMapreduce.java
 (original)
+++ 
incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/POMapreduce.java
 Fri Apr  4 12:43:02 2008
@@ -158,6 +158,7 @@
     public void addInputFile(FileSpec fileSpec, EvalSpec evalSpec){
         inputFileSpecs.add(fileSpec);
         toMap.add(evalSpec);
+        properties.putAll(evalSpec.getProperties());
     }
     
     
@@ -227,6 +228,7 @@
             copy.inputs = inputs;
             copy.opTable = srcOpTable;
             copy.id = id;
+            copy.properties = properties;
             return copy;
         }catch(IOException e){
             throw new RuntimeException(e);

Modified: 
incubator/pig/trunk/src/org/apache/pig/impl/eval/CompositeEvalSpec.java
URL: 
http://svn.apache.org/viewvc/incubator/pig/trunk/src/org/apache/pig/impl/eval/CompositeEvalSpec.java?rev=644850&r1=644849&r2=644850&view=diff
==============================================================================
--- incubator/pig/trunk/src/org/apache/pig/impl/eval/CompositeEvalSpec.java 
(original)
+++ incubator/pig/trunk/src/org/apache/pig/impl/eval/CompositeEvalSpec.java Fri 
Apr  4 12:43:02 2008
@@ -40,7 +40,8 @@
     private List<EvalSpec> specs = new ArrayList<EvalSpec>();
     
     public CompositeEvalSpec(EvalSpec spec){
-        specs.add(spec);
+        specs.add(spec);
+        properties.putAll(spec.getProperties());
     }
         
     @Override
@@ -63,7 +64,8 @@
     
     @Override
     public EvalSpec addSpec(EvalSpec spec){
-        specs.add(spec);
+        specs.add(spec);
+        properties.putAll(spec.getProperties());
         return this;
     }
     

Modified: 
incubator/pig/trunk/src/org/apache/pig/impl/physicalLayer/POTreePrinter.java
URL: 
http://svn.apache.org/viewvc/incubator/pig/trunk/src/org/apache/pig/impl/physicalLayer/POTreePrinter.java?rev=644850&r1=644849&r2=644850&view=diff
==============================================================================
--- 
incubator/pig/trunk/src/org/apache/pig/impl/physicalLayer/POTreePrinter.java 
(original)
+++ 
incubator/pig/trunk/src/org/apache/pig/impl/physicalLayer/POTreePrinter.java 
Fri Apr  4 12:43:02 2008
@@ -98,6 +98,19 @@
         }
        mStream.println() ;
        
+       // properties
+       adjustContentIdent();
+       mStream.print("Properties : ");
+       Iterator<Map.Entry<Object, Object>> pi = 
p.properties.entrySet().iterator();
+       while (pi.hasNext()) {
+           Map.Entry<Object, Object> e = pi.next();
+           mStream.print((String)e.getKey() + ":" + (String)e.getValue());
+           if (pi.hasNext()) {
+               mStream.print(", ");
+           }
+       }
+        mStream.println() ;
+
        depthFirstSearchVisit(p) ;
     }