Author: rohini
Date: Fri Nov 13 19:28:02 2015
New Revision: 1714256
URL: http://svn.apache.org/viewvc?rev=1714256&view=rev
Log:
PIG-4722: [Pig on Tez] NPE while running Combiner (rohini)
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PhysicalOperator.java
Modified: pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1714256&r1=1714255&r2=1714256&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri Nov 13 19:28:02 2015
@@ -69,6 +69,8 @@ PIG-4639: Add better parser for Apache H
BUG FIXES
+PIG-4722: [Pig on Tez] NPE while running Combiner (rohini)
+
PIG-4730: [Pig on Tez] Total parallelism estimation does not account load
parallelism (rohini)
PIG-4689: CSV Writes incorrect header if two CSV files are created in one
script (nielsbasjes via daijy)
Modified:
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PhysicalOperator.java
URL:
http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PhysicalOperator.java?rev=1714256&r1=1714255&r2=1714256&view=diff
==============================================================================
---
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PhysicalOperator.java
(original)
+++
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PhysicalOperator.java
Fri Nov 13 19:28:02 2015
@@ -299,8 +299,9 @@ public abstract class PhysicalOperator e
}
// Should be removed once the model is clear
- if (getReporter() != null) {
- getReporter().progress();
+ PigProgressable progRep = getReporter();
+ if (progRep != null) {
+ progRep.progress();
}
if (!isInputAttached()) {
