Skip to content
Browse files

PIG-2665: Bundled Jython jar in Pig 0.10.0-RC breaks module import in…

… Python scripts with embedded Pig Latin

git-svn-id: https://svn.apache.org/repos/asf/pig/trunk@1347918 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent a4e6d83 commit 5370da4ae9ac05994117380706986973dc61696b Jianyong Dai committed Jun 8, 2012
Showing with 7 additions and 2 deletions.
  1. +2 −0 CHANGES.txt
  2. +1 −1 ivy.xml
  3. +1 −1 ivy/libraries.properties
  4. +3 −0 src/org/apache/pig/scripting/jython/JythonScriptEngine.java
View
2 CHANGES.txt
@@ -166,6 +166,8 @@ OPTIMIZATIONS
BUG FIXES
+PIG-2665: Bundled Jython jar in Pig 0.10.0-RC breaks module import in Python scripts with embedded Pig Latin (daijy)
+
PIG-2736: Support implicit cast from bytearray to boolean (jay23jack via daijy)
PIG-2508: PIG can unpredictably ignore deprecated Hadoop config options (thw via dvryaboy)
View
2 ivy.xml
@@ -189,7 +189,7 @@
<dependency org="commons-lang" name="commons-lang" rev="${commons-lang.version}"
conf="compile->master"/>
<dependency org="com.google.guava" name="guava" rev="${guava.version}" conf="compile->master" />
- <dependency org="org.python" name="jython" rev="${jython.version}" conf="compile->master"/>
+ <dependency org="org.python" name="jython-standalone" rev="${jython.version}" conf="compile->master"/>
<dependency org="rhino" name="js" rev="${rhino.version}" conf="compile->master"/>
<dependency org="org.antlr" name="antlr" rev="${antlr.version}" conf="compile->master"/>
<dependency org="org.antlr" name="antlr-runtime" rev="${antlr.version}" conf="compile->default"/>
View
2 ivy/libraries.properties
@@ -54,7 +54,7 @@ jsch.version=0.1.38
json-simple.version=1.1
junit.version=4.5
jruby.version=1.6.7
-jython.version=2.5.0
+jython.version=2.5.2
rhino.version=1.7R2
antlr.version=3.4
stringtemplate.version=4.0.4
View
3 src/org/apache/pig/scripting/jython/JythonScriptEngine.java
@@ -353,6 +353,9 @@ public static PyFunction getFunction(String path, String functionName) throws IO
@Override
protected Map<String, List<PigStats>> main(PigContext pigContext, String scriptFile)
throws IOException {
+ if (System.getProperty(PySystemState.PYTHON_CACHEDIR_SKIP)==null)
+ System.setProperty(PySystemState.PYTHON_CACHEDIR_SKIP, "false");
+
PigServer pigServer = new PigServer(pigContext, false);
// register dependencies

0 comments on commit 5370da4

Please sign in to comment.
Something went wrong with that request. Please try again.