pig-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jcove...@apache.org
Subject svn commit: r1401821 - in /pig/branches/branch-0.11: CHANGES.txt src/org/apache/pig/tools/parameters/PreprocessorContext.java
Date Wed, 24 Oct 2012 18:52:30 GMT
Author: jcoveney
Date: Wed Oct 24 18:52:30 2012
New Revision: 1401821

URL: http://svn.apache.org/viewvc?rev=1401821&view=rev
Log:
PIG-2998: Fix TestScriptLanguage and TestMacroExpansion (cheolsoo via jcoveney)

Modified:
    pig/branches/branch-0.11/CHANGES.txt
    pig/branches/branch-0.11/src/org/apache/pig/tools/parameters/PreprocessorContext.java

Modified: pig/branches/branch-0.11/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.11/CHANGES.txt?rev=1401821&r1=1401820&r2=1401821&view=diff
==============================================================================
--- pig/branches/branch-0.11/CHANGES.txt (original)
+++ pig/branches/branch-0.11/CHANGES.txt Wed Oct 24 18:52:30 2012
@@ -308,6 +308,8 @@ OPTIMIZATIONS
 
 BUG FIXES
 
+PIG-2998: PIG-2998: Fix TestScriptLanguage and TestMacroExpansion (cheolsoo via jcoveney)
+
 PIG-2975: TestTypedMap.testOrderBy failing with incorrect result (knoguchi via jcoveney)
 
 PIG-1283: COUNT on null bag causes failure (analog.sony via jcoveney)

Modified: pig/branches/branch-0.11/src/org/apache/pig/tools/parameters/PreprocessorContext.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.11/src/org/apache/pig/tools/parameters/PreprocessorContext.java?rev=1401821&r1=1401820&r2=1401821&view=diff
==============================================================================
--- pig/branches/branch-0.11/src/org/apache/pig/tools/parameters/PreprocessorContext.java
(original)
+++ pig/branches/branch-0.11/src/org/apache/pig/tools/parameters/PreprocessorContext.java
Wed Oct 24 18:52: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);
             }



Mime
View raw message