Author: gates
Date: Fri Nov 9 11:34:07 2007
New Revision: 593630
URL: http://svn.apache.org/viewvc?rev=593630&view=rev
Log:
PIG-23 Make pig work with java 1.5.
Modified:
incubator/pig/trunk/CHANGES.txt
incubator/pig/trunk/build.xml
incubator/pig/trunk/src/org/apache/pig/builtin/MAX.java
incubator/pig/trunk/src/org/apache/pig/builtin/MIN.java
incubator/pig/trunk/src/org/apache/pig/impl/PigContext.java
incubator/pig/trunk/src/org/apache/pig/impl/mapreduceExec/PigSplit.java
Modified: incubator/pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/CHANGES.txt?rev=593630&r1=593629&r2=593630&view=diff
==============================================================================
--- incubator/pig/trunk/CHANGES.txt (original)
+++ incubator/pig/trunk/CHANGES.txt Fri Nov 9 11:34:07 2007
@@ -16,4 +16,6 @@
PIG-25 com.yahoo.pig dir left under pig/test by mistake. removed it
(olgan@)
+ PIG-23 Made pig work with java 1.5. (milindb via gates)
+
Modified: incubator/pig/trunk/build.xml
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/build.xml?rev=593630&r1=593629&r2=593630&view=diff
==============================================================================
--- incubator/pig/trunk/build.xml (original)
+++ incubator/pig/trunk/build.xml Fri Nov 9 11:34:07 2007
@@ -50,10 +50,10 @@
<delete
file="${src.dir}/org/apache/pig/tools/grunt/TokenMgrError.java" />
</target>
- <target name="compile" depends="cc-compile">
+ <target name="compile" depends="cc-compile, lib-compile">
<mkdir dir="${dist.dir}" />
<echo>*** Building Main Sources ***</echo>
- <javac srcdir="${src.dir};${shock.src.dir};${bzip2.src.dir}"
destdir="${dist.dir}" target="1.5" debug="on">
+ <javac srcdir="${src.dir}" destdir="${dist.dir}" target="1.5"
debug="on">
<classpath refid="classpath" />
</javac>
<echo>*** Building Test Sources ***</echo>
@@ -75,6 +75,14 @@
target="${src.dir}/org/apache/pig/tools/grunt/GruntParser.jj"
outputdirectory="${src.dir}/org/apache/pig/tools/grunt"
javacchome="${basedir}/lib" />
+ </target>
+
+ <target name="lib-compile">
+ <mkdir dir="${dist.dir}" />
+ <echo>*** Building Library Sources ***</echo>
+ <javac srcdir="${shock.src.dir};${bzip2.src.dir}"
destdir="${dist.dir}" target="1.5" debug="on">
+ <classpath refid="classpath" />
+ </javac>
</target>
<target name="jar" depends="compile">
Modified: incubator/pig/trunk/src/org/apache/pig/builtin/MAX.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/src/org/apache/pig/builtin/MAX.java?rev=593630&r1=593629&r2=593630&view=diff
==============================================================================
--- incubator/pig/trunk/src/org/apache/pig/builtin/MAX.java (original)
+++ incubator/pig/trunk/src/org/apache/pig/builtin/MAX.java Fri Nov 9 11:34:07
2007
@@ -73,7 +73,9 @@
try {
curMax = java.lang.Math.max(curMax,
t.getAtomField(0).numval());
}catch(RuntimeException exp) {
- throw new IOException("Error processing: " +
t.toString(), exp);
+ IOException newE = new IOException("Error
processing: " + t.toString() + exp.getMessage());
+ newE.initCause(exp);
+ throw newE;
}
}
Modified: incubator/pig/trunk/src/org/apache/pig/builtin/MIN.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/src/org/apache/pig/builtin/MIN.java?rev=593630&r1=593629&r2=593630&view=diff
==============================================================================
--- incubator/pig/trunk/src/org/apache/pig/builtin/MIN.java (original)
+++ incubator/pig/trunk/src/org/apache/pig/builtin/MIN.java Fri Nov 9 11:34:07
2007
@@ -73,7 +73,9 @@
try {
curMin = java.lang.Math.min(curMin,
t.getAtomField(0).numval());
}catch(RuntimeException exp) {
- throw new IOException("Error processing: " +
t.toString(), exp);
+ IOException newE = new IOException("Error
processing: " + t.toString() + exp.getMessage());
+ newE.initCause(exp);
+ throw newE;
}
}
Modified: incubator/pig/trunk/src/org/apache/pig/impl/PigContext.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/src/org/apache/pig/impl/PigContext.java?rev=593630&r1=593629&r2=593630&view=diff
==============================================================================
--- incubator/pig/trunk/src/org/apache/pig/impl/PigContext.java (original)
+++ incubator/pig/trunk/src/org/apache/pig/impl/PigContext.java Fri Nov 9
11:34:07 2007
@@ -500,7 +500,9 @@
// create ClassNotFoundException exception and attach to
IOException
// so that we don't need to buble interface changes throughout
the code
ClassNotFoundException e = new ClassNotFoundException("Could
not resolve " + name + " using imports: " + packageImportList);
- throw new IOException(e);
+ IOException newE = new IOException(e.getMessage());
+ newE.initCause(e);
+ throw newE;
}
private static List<String> parseArguments(String argString){
@@ -542,7 +544,9 @@
ret = objClass.newInstance();
}
}catch(Throwable e){
- throw new IOException(e);
+ IOException newE = new IOException(e.getMessage());
+ newE.initCause(e);
+ throw newE;
}
return ret;
}
Modified:
incubator/pig/trunk/src/org/apache/pig/impl/mapreduceExec/PigSplit.java
URL:
http://svn.apache.org/viewvc/incubator/pig/trunk/src/org/apache/pig/impl/mapreduceExec/PigSplit.java?rev=593630&r1=593629&r2=593630&view=diff
==============================================================================
--- incubator/pig/trunk/src/org/apache/pig/impl/mapreduceExec/PigSplit.java
(original)
+++ incubator/pig/trunk/src/org/apache/pig/impl/mapreduceExec/PigSplit.java Fri
Nov 9 11:34:07 2007
@@ -161,7 +161,9 @@
try{
return ois.readObject();
}catch (ClassNotFoundException cnfe){
- throw new IOException(cnfe);
+ IOException newE = new IOException(cnfe.getMessage());
+ newE.initCause(cnfe);
+ throw newE;
}
}
