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/11/01 06:38:51 UTC
svn commit: r1635893 - in /pig/trunk: CHANGES.txt
src/org/apache/pig/impl/PigContext.java
src/org/apache/pig/scripting/jython/JythonScriptEngine.java
Author: daijy
Date: Sat Nov 1 05:38:51 2014
New Revision: 1635893
URL: http://svn.apache.org/r1635893
Log:
PIG-4182: e2e tests Scripting_[1-12] fail on Windows
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/impl/PigContext.java
pig/trunk/src/org/apache/pig/scripting/jython/JythonScriptEngine.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1635893&r1=1635892&r2=1635893&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Sat Nov 1 05:38:51 2014
@@ -122,8 +122,6 @@ PIG-4166: Collected group drops last rec
PIG-2495: Using merge JOIN from a HBaseStorage produces an error (bridiver via daijy)
-PIG-4182: e2e tests Scripting_[1-12] fail on Windows (daijy)
-
PIG-4235: Fix unit test failures on Windows (daijy)
PIG-4245: 1-1 edge vertices should use same jvm opts (rohini)
Modified: pig/trunk/src/org/apache/pig/impl/PigContext.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/impl/PigContext.java?rev=1635893&r1=1635892&r2=1635893&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/impl/PigContext.java (original)
+++ pig/trunk/src/org/apache/pig/impl/PigContext.java Sat Nov 1 05:38:51 2014
@@ -334,7 +334,7 @@ public class PigContext implements Seria
*/
public void addScriptFile(String name, String path) {
if (path != null) {
- aliasedScriptFiles.put(name.replaceAll(":", ""), new File(path));
+ aliasedScriptFiles.put(name.replaceFirst("^/", "").replaceAll(":", ""), new File(path));
}
}
Modified: pig/trunk/src/org/apache/pig/scripting/jython/JythonScriptEngine.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/scripting/jython/JythonScriptEngine.java?rev=1635893&r1=1635892&r2=1635893&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/scripting/jython/JythonScriptEngine.java (original)
+++ pig/trunk/src/org/apache/pig/scripting/jython/JythonScriptEngine.java Sat Nov 1 05:38:51 2014
@@ -300,7 +300,7 @@ public class JythonScriptEngine extends
// determine the relative path that the file should have in the jar
int pos = apath.lastIndexOf(File.separatorChar + name.replace('.', File.separatorChar));
if (pos > 0) {
- files.put(apath.substring(pos + 1), apath);
+ files.put(apath.substring(pos), apath);
} else {
files.put(apath, apath);
}