Author: rohini
Date: Wed Jan 28 17:34:51 2015
New Revision: 1655402
URL: http://svn.apache.org/r1655402
Log:
PIG-4394: Fix Split_9 and Union_5 e2e failures (rohini)
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POReservoirSample.java
Modified: pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1655402&r1=1655401&r2=1655402&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Wed Jan 28 17:34:51 2015
@@ -44,6 +44,8 @@ PIG-4333: Split BigData tests into multi
BUG FIXES
+PIG-4394: Fix Split_9 and Union_5 e2e failures (rohini)
+
PIG-4391: Fix TestPigStats test failure (rohini)
PIG-4387: Honor yarn settings in tez-site.xml and optimize dag status fetch
(rohini)
Modified:
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POReservoirSample.java
URL:
http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POReservoirSample.java?rev=1655402&r1=1655401&r2=1655402&view=diff
==============================================================================
---
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POReservoirSample.java
(original)
+++
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POReservoirSample.java
Wed Jan 28 17:34:51 2015
@@ -108,7 +108,7 @@ public class POReservoirSample extends P
}
}
- if (res.returnStatus != POStatus.STATUS_EOP) {
+ if (res == null || res.returnStatus != POStatus.STATUS_EOP) {
Random randGen = new Random();
while (true) {
// pick this as sample
@@ -142,7 +142,7 @@ public class POReservoirSample extends P
if (lastSample.returnStatus==POStatus.STATUS_EOP) {
return lastSample;
}
-
+
Result currentSample = retrieveSample();
// If this is the last sample, tag with number of rows
if (currentSample.returnStatus == POStatus.STATUS_EOP) {
