You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by jc...@apache.org on 2012/10/24 20:51:31 UTC
svn commit: r1401820 - in /pig/trunk: CHANGES.txt
src/org/apache/pig/tools/parameters/PreprocessorContext.java
Author: jcoveney
Date: Wed Oct 24 18:51:30 2012
New Revision: 1401820
URL: http://svn.apache.org/viewvc?rev=1401820&view=rev
Log:
PIG-2998: Fix TestScriptLanguage and TestMacroExpansion (cheolsoo via jcoveney)
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/tools/parameters/PreprocessorContext.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1401820&r1=1401819&r2=1401820&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Wed Oct 24 18:51:30 2012
@@ -330,6 +330,8 @@ OPTIMIZATIONS
BUG FIXES
+PIG-2998: Fix TestScriptLanguage and TestMacroExpansion (cheolsoo via jcoveney)
+
PIG-2975: TestTypedMap.testOrderBy failing with incorrect result (knoguchi via jcoveney)
PIG-2950: Fix tiny documentation error in BagToString builtin (initialcontext via daijy)
Modified: pig/trunk/src/org/apache/pig/tools/parameters/PreprocessorContext.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/tools/parameters/PreprocessorContext.java?rev=1401820&r1=1401819&r2=1401820&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/tools/parameters/PreprocessorContext.java (original)
+++ pig/trunk/src/org/apache/pig/tools/parameters/PreprocessorContext.java Wed Oct 24 18:51:30 2012
@@ -233,7 +233,7 @@ public class PreprocessorContext {
}
val = param_val.get(key);
if (val.contains("$")) {
- val = val.replaceAll("\\$", "\\\\\\$");
+ val = val.replaceAll("(?<!\\\\)\\$", "\\\\\\$");
}
replaced_line = replaced_line.replaceFirst("\\$"+key, val);
}