You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2014/09/16 04:37:41 UTC
svn commit: r1625205 -
/pig/trunk/src/org/apache/pig/newplan/logical/rules/ConstantCalculator.java
Author: daijy
Date: Tue Sep 16 02:37:41 2014
New Revision: 1625205
URL: http://svn.apache.org/r1625205
Log:
PIG-4169: NPE in ConstantCalculator
Modified:
pig/trunk/src/org/apache/pig/newplan/logical/rules/ConstantCalculator.java
Modified: pig/trunk/src/org/apache/pig/newplan/logical/rules/ConstantCalculator.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/newplan/logical/rules/ConstantCalculator.java?rev=1625205&r1=1625204&r2=1625205&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/newplan/logical/rules/ConstantCalculator.java (original)
+++ pig/trunk/src/org/apache/pig/newplan/logical/rules/ConstantCalculator.java Tue Sep 16 02:37:41 2014
@@ -26,8 +26,8 @@ import java.util.Map;
import org.apache.pig.backend.executionengine.ExecException;
import org.apache.pig.backend.hadoop.datastorage.ConfigurationUtil;
+import org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.PigHadoopLogger;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.PhysicalOperator;
-import org.apache.pig.backend.hadoop.executionengine.physicalLayer.Result;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhysicalPlan;
import org.apache.pig.impl.PigContext;
import org.apache.pig.impl.logicalLayer.FrontendException;
@@ -149,15 +149,14 @@ public abstract class ConstantCalculator
PhysicalOperator root = expPhysicalPlan.getLeaves().get(0);
try {
UDFContext.getUDFContext().addJobConf(ConfigurationUtil.toConfiguration(pc.getProperties(), true));
- Result ret= root.getNext(root.getResultType());
- if (ret.result != null) {
- val = ret.result;
- valSet = true;
- }
+ PigHadoopLogger pigHadoopLogger = PigHadoopLogger.getInstance();
+ PhysicalOperator.setPigLogger(pigHadoopLogger);
+ val = root.getNext(root.getResultType()).result;
UDFContext.getUDFContext().addJobConf(null);
} catch (ExecException e) {
throw new FrontendException(e);
}
+ valSet = true;
} else if (op instanceof UserFuncExpression) {
// If solo UDF, calculate UDF
UserFuncExpression udf = (UserFuncExpression)op;