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 2013/10/03 20:09:55 UTC
svn commit: r1528954 - in /pig/branches/branch-0.12: CHANGES.txt
src/org/apache/pig/parser/DryRunGruntParser.java
src/org/apache/pig/tools/grunt/GruntParser.java
src/org/apache/pig/tools/pigscript/parser/PigScriptParser.jj
Author: daijy
Date: Thu Oct 3 18:09:55 2013
New Revision: 1528954
URL: http://svn.apache.org/r1528954
Log:
PIG-3470: Print configuration variables in grunt
Modified:
pig/branches/branch-0.12/CHANGES.txt
pig/branches/branch-0.12/src/org/apache/pig/parser/DryRunGruntParser.java
pig/branches/branch-0.12/src/org/apache/pig/tools/grunt/GruntParser.java
pig/branches/branch-0.12/src/org/apache/pig/tools/pigscript/parser/PigScriptParser.jj
Modified: pig/branches/branch-0.12/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.12/CHANGES.txt?rev=1528954&r1=1528953&r2=1528954&view=diff
==============================================================================
--- pig/branches/branch-0.12/CHANGES.txt (original)
+++ pig/branches/branch-0.12/CHANGES.txt Thu Oct 3 18:09:55 2013
@@ -28,6 +28,8 @@ PIG-3174: Remove rpm and deb artifacts f
IMPROVEMENTS
+PIG-3470: Print configuration variables in grunt (lbendig via daijy)
+
PIG-3493: Add max/min for datetime (tyro89 via daijy)
PIG-3479: Fix BigInt, BigDec, Date serialization. Improve perf of PigNullableWritable deserilization (dvryaboy)
Modified: pig/branches/branch-0.12/src/org/apache/pig/parser/DryRunGruntParser.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.12/src/org/apache/pig/parser/DryRunGruntParser.java?rev=1528954&r1=1528953&r2=1528954&view=diff
==============================================================================
--- pig/branches/branch-0.12/src/org/apache/pig/parser/DryRunGruntParser.java (original)
+++ pig/branches/branch-0.12/src/org/apache/pig/parser/DryRunGruntParser.java Thu Oct 3 18:09:55 2013
@@ -168,6 +168,11 @@ public class DryRunGruntParser extends P
ParseException {
sb.append("set ").append(key).append(" ").append(value).append("\n");
}
+
+ @Override
+ protected void processSet() throws IOException {
+ sb.append("set\n");
+ }
@Override
protected void processCat(String path) throws IOException {
Modified: pig/branches/branch-0.12/src/org/apache/pig/tools/grunt/GruntParser.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.12/src/org/apache/pig/tools/grunt/GruntParser.java?rev=1528954&r1=1528953&r2=1528954&view=diff
==============================================================================
--- pig/branches/branch-0.12/src/org/apache/pig/tools/grunt/GruntParser.java (original)
+++ pig/branches/branch-0.12/src/org/apache/pig/tools/grunt/GruntParser.java Thu Oct 3 18:09:55 2013
@@ -33,6 +33,7 @@ import java.io.StringReader;
import java.util.AbstractList;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.Date;
import java.util.Enumeration;
import java.util.HashSet;
@@ -80,6 +81,7 @@ import org.apache.pig.tools.pigstats.Pig
import org.apache.pig.tools.pigstats.PigStats.JobGraph;
import org.fusesource.jansi.Ansi;
import org.fusesource.jansi.AnsiConsole;
+import org.python.google.common.collect.Lists;
public class GruntParser extends PigScriptParser {
@@ -633,6 +635,31 @@ public class GruntParser extends PigScri
//log.info("PIG-2508: keys dropped from properties: " + keysBefore);
}
}
+
+ @Override
+ protected void processSet() throws IOException, ParseException {
+ Properties jobProps = mPigServer.getPigContext().getProperties();
+ Properties sysProps = System.getProperties();
+
+ List<String> jobPropsList = Lists.newArrayList();
+ List<String> sysPropsList = Lists.newArrayList();
+
+ for (Object key : jobProps.keySet()) {
+ String propStr = key + "=" + jobProps.getProperty((String)key);
+ if (sysProps.containsKey(key)) {
+ sysPropsList.add("system: " + propStr);
+ }
+ else {
+ jobPropsList.add(propStr);
+ }
+ }
+ Collections.sort(jobPropsList);
+ Collections.sort(sysPropsList);
+ jobPropsList.addAll(sysPropsList);
+ for (String prop : jobPropsList) {
+ System.out.println(prop);
+ }
+ }
@Override
protected void processCat(String path) throws IOException
Modified: pig/branches/branch-0.12/src/org/apache/pig/tools/pigscript/parser/PigScriptParser.jj
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.12/src/org/apache/pig/tools/pigscript/parser/PigScriptParser.jj?rev=1528954&r1=1528953&r2=1528954&view=diff
==============================================================================
--- pig/branches/branch-0.12/src/org/apache/pig/tools/pigscript/parser/PigScriptParser.jj (original)
+++ pig/branches/branch-0.12/src/org/apache/pig/tools/pigscript/parser/PigScriptParser.jj Thu Oct 3 18:09:55 2013
@@ -84,6 +84,8 @@ public abstract class PigScriptParser
abstract protected void processSet(String key, String value) throws IOException, ParseException;
+ abstract protected void processSet() throws IOException, ParseException;
+
abstract protected void processHistory(boolean withNumbers);
abstract protected void processCat(String path) throws IOException;
@@ -591,6 +593,8 @@ void parse() throws IOException:
t1 = GetKey()
t2 = GetValue()
{processSet(t1.image, unquote(t2.image));}
+ |
+ {processSet();}
)
|
<EOF>