Author: rding Date: Thu Sep 30 20:27:37 2010 New Revision: 1003241 URL: http://svn.apache.org/viewvc?rev=1003241&view=rev Log: PIG-1651: PIG class loading mishandled
Modified: hadoop/pig/branches/branch-0.8/CHANGES.txt hadoop/pig/branches/branch-0.8/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java hadoop/pig/branches/branch-0.8/test/org/apache/pig/test/PigTestLoader.java Modified: hadoop/pig/branches/branch-0.8/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/pig/branches/branch-0.8/CHANGES.txt?rev=1003241&r1=1003240&r2=1003241&view=diff ============================================================================== --- hadoop/pig/branches/branch-0.8/CHANGES.txt (original) +++ hadoop/pig/branches/branch-0.8/CHANGES.txt Thu Sep 30 20:27:37 2010 @@ -198,6 +198,8 @@ PIG-1309: Map-side Cogroup (ashutoshc) BUG FIXES +PIG-1651: PIG class loading mishandled (rding) + PIG-1650: pig grunt shell breaks for many commands like perl , awk , pipe , 'ls -l' etc (nrai via thejas) Modified: hadoop/pig/branches/branch-0.8/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java URL: http://svn.apache.org/viewvc/hadoop/pig/branches/branch-0.8/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java?rev=1003241&r1=1003240&r2=1003241&view=diff ============================================================================== --- hadoop/pig/branches/branch-0.8/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java (original) +++ hadoop/pig/branches/branch-0.8/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java Thu Sep 30 20:27:37 2010 @@ -57,6 +57,7 @@ import org.apache.pig.backend.hadoop.exe import org.apache.pig.backend.hadoop.executionengine.physicalLayer.relationalOperators.POStore; import org.apache.pig.impl.PigContext; import org.apache.pig.impl.io.FileSpec; +import org.apache.pig.impl.logicalLayer.LogicalPlanBuilder; import org.apache.pig.impl.plan.CompilationMessageCollector; import org.apache.pig.impl.plan.PlanException; import org.apache.pig.impl.plan.VisitorException; @@ -217,7 +218,7 @@ public class MapReduceLauncher extends L Thread jcThread = new Thread(jc); jcThread.setUncaughtExceptionHandler(jctExceptionHandler); - jcThread.setContextClassLoader(pc.createCl(null)); + jcThread.setContextClassLoader(LogicalPlanBuilder.classloader); //All the setup done, now lets launch the jobs. jcThread.start(); Modified: hadoop/pig/branches/branch-0.8/test/org/apache/pig/test/PigTestLoader.java URL: http://svn.apache.org/viewvc/hadoop/pig/branches/branch-0.8/test/org/apache/pig/test/PigTestLoader.java?rev=1003241&r1=1003240&r2=1003241&view=diff ============================================================================== --- hadoop/pig/branches/branch-0.8/test/org/apache/pig/test/PigTestLoader.java (original) +++ hadoop/pig/branches/branch-0.8/test/org/apache/pig/test/PigTestLoader.java Thu Sep 30 20:27:37 2010 @@ -27,16 +27,25 @@ import org.apache.pig.builtin.PigStorage public class PigTestLoader extends PigStorage { + // This is to test PIG-1651: PIG class loading error + private static boolean test = false; + @Override public void setLocation(String location, Job job) throws IOException { super.setLocation(location, job); FileInputFormat.setInputPathFilter(job, TestPathFilter.class); + test = true; } public static class TestPathFilter implements PathFilter { + + public TestPathFilter() { + if (!test) throw new RuntimeException("Invalid static variable"); + } + @Override public boolean accept(Path p) { - String name = p.getName(); + String name = p.getName(); return !name.endsWith(".xml"); } }