You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ro...@apache.org on 2014/04/11 15:56:56 UTC
svn commit: r1586657 - in /pig/trunk: CHANGES.txt
src/org/apache/pig/PigServer.java
src/org/apache/pig/tools/grunt/GruntParser.java
Author: rohini
Date: Fri Apr 11 13:56:56 2014
New Revision: 1586657
URL: http://svn.apache.org/r1586657
Log:
PIG-3882: Multiquery off mode execution is not done in batch and very inefficient (rohini)
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/PigServer.java
pig/trunk/src/org/apache/pig/tools/grunt/GruntParser.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1586657&r1=1586656&r2=1586657&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri Apr 11 13:56:56 2014
@@ -100,6 +100,8 @@ PIG-3117: A debug mode in which pig does
PIG-3484: Make the size of pig.script property configurable (cheolsoo)
OPTIMIZATIONS
+
+PIG-3882: Multiquery off mode execution is not done in batch and very inefficient (rohini)
BUG FIXES
Modified: pig/trunk/src/org/apache/pig/PigServer.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/PigServer.java?rev=1586657&r1=1586656&r2=1586657&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/PigServer.java (original)
+++ pig/trunk/src/org/apache/pig/PigServer.java Fri Apr 11 13:56:56 2014
@@ -99,12 +99,12 @@ import org.apache.pig.parser.QueryParser
import org.apache.pig.pen.ExampleGenerator;
import org.apache.pig.scripting.ScriptEngine;
import org.apache.pig.tools.grunt.GruntParser;
+import org.apache.pig.tools.pigstats.EmptyPigStats;
import org.apache.pig.tools.pigstats.JobStats;
import org.apache.pig.tools.pigstats.OutputStats;
import org.apache.pig.tools.pigstats.PigStats;
import org.apache.pig.tools.pigstats.PigStats.JobGraph;
import org.apache.pig.tools.pigstats.ScriptState;
-import org.apache.pig.tools.pigstats.EmptyPigStats;
import org.apache.pig.validator.BlackAndWhitelistFilter;
import org.apache.pig.validator.BlackAndWhitelistValidator;
import org.apache.pig.validator.PigCommandFilter;
@@ -152,8 +152,6 @@ public class PigServer {
protected final String scope = constructScope();
-
- private boolean isMultiQuery = true;
private boolean aggregateWarning = true;
private boolean validateEachStatement = false;
@@ -224,7 +222,6 @@ public class PigServer {
currDAG = new Graph(false);
aggregateWarning = "true".equalsIgnoreCase(pigContext.getProperties().getProperty("aggregate.warning"));
- isMultiQuery = "true".equalsIgnoreCase(pigContext.getProperties().getProperty("opt.multiquery","true"));
jobName = pigContext.getProperties().getProperty(
PigContext.JOB_NAME,
@@ -335,7 +332,7 @@ public class PigServer {
if (currDAG != null) {
graphs.push(currDAG);
}
- currDAG = new Graph(isMultiQuery);
+ currDAG = new Graph(true);
}
/**
@@ -408,13 +405,7 @@ public class PigServer {
parseAndBuild();
}
- PigStats stats = null;
- if( !isMultiQuery ) {
- // ignore if multiquery is off
- stats = PigStats.get();
- } else {
- stats = execute();
- }
+ PigStats stats = execute();
return getJobs(stats);
}
Modified: pig/trunk/src/org/apache/pig/tools/grunt/GruntParser.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/tools/grunt/GruntParser.java?rev=1586657&r1=1586656&r2=1586657&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/tools/grunt/GruntParser.java (original)
+++ pig/trunk/src/org/apache/pig/tools/grunt/GruntParser.java Fri Apr 11 13:56:56 2014
@@ -177,7 +177,7 @@ public class GruntParser extends PigScri
mNumFailedJobs++;
Exception exp = (js.getException() != null) ? js.getException()
: new ExecException(
- "Job failed, hadoop does not return any error message",
+ "Job " + js.getName() + " failed, hadoop does not return any error message",
2244);
LogUtils.writeLog(exp,
mPigServer.getPigContext().getProperties().getProperty("pig.logfile"),
@@ -360,12 +360,6 @@ public class GruntParser extends PigScri
mExplain = new ExplainState(alias, target, script, isVerbose, format);
if (script != null) {
- if (!"true".equalsIgnoreCase(mPigServer.
- getPigContext()
- .getProperties().
- getProperty("opt.multiquery","true"))) {
- throw new ParseException("Cannot explain script if multiquery is disabled.");
- }
setBatchOn();
try {
loadScript(script, true, true, false, params, files);
@@ -1335,7 +1329,7 @@ public class GruntParser extends PigScri
private int mNumSucceededJobs;
private FsShell shell;
private boolean mScriptIllustrate;
-
+
//For Testing Only
protected void setExplainState(ExplainState explainState) {
this.mExplain = explainState;