Mailing-List: contact commits-help@pig.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@pig.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r1789157 - in /pig/trunk: CHANGES.txt
 src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSplit.java
 test/e2e/pig/tests/negative.conf
Date: Tue, 28 Mar 2017 15:02:36 -0000
To: commits@pig.apache.org
From: knoguchi@apache.org
Message-Id: <20170328150236.6B4643A04C1@svn01-us-west.apache.org>
archived-at: Tue, 28 Mar 2017 15:02:38 -0000

Author: knoguchi
Date: Tue Mar 28 15:02:36 2017
New Revision: 1789157

URL: http://svn.apache.org/viewvc?rev=1789157&view=rev
Log:
PIG-5198: streaming job stuck with script failure when combined with split (knoguchi)

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSplit.java
    pig/trunk/test/e2e/pig/tests/negative.conf

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1789157&r1=1789156&r2=1789157&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Tue Mar 28 15:02:36 2017
@@ -91,6 +91,8 @@ OPTIMIZATIONS
 Â 
 BUG FIXES
 
+PIG-5198: streaming job stuck with script failure when combined with split (knoguchi)
+
 PIG-5183: We shall mention NATIVE instead of MAPREDUCE operator in document (daijy)
 
 PIG-5182: ant docs target is broken by PIG-5110 (daijy)

Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSplit.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSplit.java?rev=1789157&r1=1789156&r2=1789157&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSplit.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSplit.java Tue Mar 28 15:02:36 2017
@@ -241,7 +241,8 @@ public class POSplit extends PhysicalOpe
             }
         }
 
-        return (res.returnStatus == POStatus.STATUS_OK) ? res : RESULT_EMPTY;
+        return (res.returnStatus == POStatus.STATUS_OK ||
+                res.returnStatus == POStatus.STATUS_ERR ) ? res : RESULT_EMPTY;
     }
 
     private Result runPipeline(PhysicalOperator leaf) throws ExecException {

Modified: pig/trunk/test/e2e/pig/tests/negative.conf
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/tests/negative.conf?rev=1789157&r1=1789156&r2=1789157&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/tests/negative.conf (original)
+++ pig/trunk/test/e2e/pig/tests/negative.conf Tue Mar 28 15:02:36 2017
@@ -457,6 +457,20 @@ B = stream A through CMD;
 store B into ':OUTPATH:';\,
                         'expected_err_regex' => "failed with exit status: 2",
                         },
+			{
+                        'num' => 5,
+			'execonly' => 'mapred,tez',
+                        'pig' => q\
+define BADCMD `perl PigStreamingBad.pl start` ship(':SCRIPTHOMEPATH:/PigStreamingBad.pl');
+define GOODCMD `perl PigStreaming.pl` ship(':SCRIPTHOMEPATH:/PigStreaming.pl') ;
+A = load ':INPATH:/singlefile/studenttab10k';
+B = stream A through GOODCMD;
+C = stream A through BADCMD;
+store B into ':OUTPATH:.1';
+store C into ':OUTPATH:.2';\,
+                        'expected_err_regex' => "failed with exit status: 1|Error while reading from POStream and passing it to the streaming",
+                        },
+
                 ]
 		},
 		{