Modified: hadoop/pig/branches/multiquery/test/org/apache/pig/test/TestUnion.java URL: http://svn.apache.org/viewvc/hadoop/pig/branches/multiquery/test/org/apache/pig/test/TestUnion.java?rev=767728&r1=767727&r2=767728&view=diff ============================================================================== --- hadoop/pig/branches/multiquery/test/org/apache/pig/test/TestUnion.java (original) +++ hadoop/pig/branches/multiquery/test/org/apache/pig/test/TestUnion.java Wed Apr 22 23:54:17 2009 @@ -224,11 +224,12 @@ Util.createInputFile(cluster, "input1.txt", new String[] {"dummy"}); Util.createInputFile(cluster, "input2.txt", new String[] {"dummy"}); PigServer pig = new PigServer(ExecType.MAPREDUCE, cluster.getProperties()); - Util.registerQuery(pig, "a = load 'input1.txt' ;" + + Util.registerQuery(pig, "a = load 'input1.txt';" + "b = load 'input2.txt';" + "c = foreach a generate 1, {(1, 'str1')};" + "d = foreach b generate 2, {(2, 'str2')};" + - "e = union c,d"); + "e = union c,d;" + + ""); Iterator<Tuple> it = pig.openIterator("e"); Object[] expected = new Object[] { Util.getPigConstant("(1, {(1, 'str1')})"), Util.getPigConstant("(2, {(2, 'str2')})")};
Modified: hadoop/pig/branches/multiquery/test/org/apache/pig/test/Util.java URL: http://svn.apache.org/viewvc/hadoop/pig/branches/multiquery/test/org/apache/pig/test/Util.java?rev=767728&r1=767727&r2=767728&view=diff ============================================================================== --- hadoop/pig/branches/multiquery/test/org/apache/pig/test/Util.java (original) +++ hadoop/pig/branches/multiquery/test/org/apache/pig/test/Util.java Wed Apr 22 23:54:17 2009 @@ -17,16 +17,22 @@ */ package org.apache.pig.test; +import static java.util.regex.Matcher.quoteReplacement; + +import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileOutputStream; -import java.io.OutputStreamWriter; +import java.io.FileReader; import java.io.IOException; +import java.io.OutputStreamWriter; import java.io.PrintWriter; +import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; +import java.util.List; import java.util.Map; -import static java.util.regex.Matcher.quoteReplacement; + import junit.framework.Assert; import org.apache.hadoop.fs.FSDataOutputStream; @@ -38,13 +44,17 @@ import org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.plans.MROperPlan; import org.apache.pig.backend.hadoop.executionengine.physicalLayer.LogToPhyTranslationVisitor; import org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhysicalPlan; -import org.apache.pig.data.*; +import org.apache.pig.data.BagFactory; +import org.apache.pig.data.DataBag; +import org.apache.pig.data.DataByteArray; +import org.apache.pig.data.DataType; +import org.apache.pig.data.Tuple; +import org.apache.pig.data.TupleFactory; import org.apache.pig.impl.PigContext; import org.apache.pig.impl.logicalLayer.LogicalPlan; import org.apache.pig.impl.logicalLayer.parser.ParseException; import org.apache.pig.impl.logicalLayer.parser.QueryParser; import org.apache.pig.impl.logicalLayer.schema.Schema; -import org.apache.pig.impl.plan.VisitorException; public class Util { private static BagFactory mBagFactory = BagFactory.getInstance(); @@ -254,6 +264,24 @@ Assert.assertEquals(expected, actual); } } + + /** + * Utility method to copy a file form local filesystem to the dfs on + * the minicluster for testing in mapreduce mode + * @param cluster a reference to the minicluster + * @param localFileName the pathname of local file + * @param fileNameOnCluster the name with which the file should be created on the minicluster + * @throws IOException + */ + static public void copyFromLocalToCluster(MiniCluster cluster, String localFileName, String fileNameOnCluster) throws IOException { + BufferedReader reader = new BufferedReader(new FileReader(localFileName)); + String line = null; + List<String> contents = new ArrayList<String>(); + while((line = reader.readLine()) != null) { + contents.add(line); + } + Util.createInputFile(cluster, fileNameOnCluster, contents.toArray(new String[0])); + } static public void printQueryOutput(Iterator<Tuple> actualResults, Tuple[] expectedResults) { @@ -342,9 +370,10 @@ } public static void registerQuery(PigServer pigServer, String query) throws IOException { - String[] queryLines = query.split(";"); - for (String line : queryLines) { - pigServer.registerQuery(line + ";"); - } + File f = File.createTempFile("tmp", ""); + PrintWriter pw = new PrintWriter(f); + pw.println(query); + pw.close(); + pigServer.registerScript(f.getCanonicalPath()); } } Modified: hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/DotFiles/optlimitplan4.dot URL: http://svn.apache.org/viewvc/hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/DotFiles/optlimitplan4.dot?rev=767728&r1=767727&r2=767728&view=diff ============================================================================== --- hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/DotFiles/optlimitplan4.dot (original) +++ hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/DotFiles/optlimitplan4.dot Wed Apr 22 23:54:17 2009 @@ -1,7 +1,7 @@ digraph graph1 { - LOLoad31 -> LOCogroup33; - LOCogroup33 -> LOForEach37; - LOForEach37 [hasflat="true"]; - LOForEach37 -> LOLimit38; - LOLimit38 [limit="100"]; + LOLoad1029 -> LOCogroup1031; + LOCogroup1031 -> LOForEach1035; + LOForEach1035 [hasflat="true"]; + LOForEach1035 -> LOLimit1036; + LOLimit1036 [limit="100"]; } Modified: hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/DotFiles/optlimitplan5.dot URL: http://svn.apache.org/viewvc/hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/DotFiles/optlimitplan5.dot?rev=767728&r1=767727&r2=767728&view=diff ============================================================================== --- hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/DotFiles/optlimitplan5.dot (original) +++ hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/DotFiles/optlimitplan5.dot Wed Apr 22 23:54:17 2009 @@ -1,6 +1,6 @@ digraph graph1 { - LOLoad39 -> LOLimit44; - LOLimit44 [limit="100"]; - LOLimit44 -> LOForEach43; - LOForEach43 [hasflat="false"]; + LOLoad1037 -> LOLimit1042; + LOLimit1042 [limit="100"]; + LOLimit1042 -> LOForEach1041; + LOForEach1041 [hasflat="false"]; } Modified: hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/DotFiles/optlimitplan6.dot URL: http://svn.apache.org/viewvc/hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/DotFiles/optlimitplan6.dot?rev=767728&r1=767727&r2=767728&view=diff ============================================================================== --- hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/DotFiles/optlimitplan6.dot (original) +++ hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/DotFiles/optlimitplan6.dot Wed Apr 22 23:54:17 2009 @@ -1,4 +1,4 @@ digraph graph1 { - LOLoad45 -> LOLimit46; - LOLimit46 [limit="20"]; + LOLoad1043 -> LOLimit1044; + LOLimit1044 [limit="20"]; } Modified: hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/DotFiles/optlimitplan7.dot URL: http://svn.apache.org/viewvc/hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/DotFiles/optlimitplan7.dot?rev=767728&r1=767727&r2=767728&view=diff ============================================================================== --- hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/DotFiles/optlimitplan7.dot (original) +++ hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/DotFiles/optlimitplan7.dot Wed Apr 22 23:54:17 2009 @@ -1,6 +1,6 @@ digraph graph1 { - LOLoad49 -> LOForEach53; - LOForEach53 [hasflat="true"]; - LOForEach53 -> LOLimit54; - LOLimit54 [limit="100"]; + LOLoad1047 -> LOForEach1051; + LOForEach1051 [hasflat="true"]; + LOForEach1051 -> LOLimit1052; + LOLimit1052 [limit="100"]; } Modified: hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/DotFiles/optlimitplan8.dot URL: http://svn.apache.org/viewvc/hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/DotFiles/optlimitplan8.dot?rev=767728&r1=767727&r2=767728&view=diff ============================================================================== --- hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/DotFiles/optlimitplan8.dot (original) +++ hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/DotFiles/optlimitplan8.dot Wed Apr 22 23:54:17 2009 @@ -1,6 +1,6 @@ digraph graph1 { - LOLoad55 -> LOSort57; - LOSort57 [limit="-1"]; - LOSort57 -> LOLimit58; - LOLimit58 [limit="10"]; + LOLoad1053 -> LOSort1055; + LOSort1055 [limit="-1"]; + LOSort1055 -> LOLimit1056; + LOLimit1056 [limit="10"]; } Modified: hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/DotFiles/optlimitplan9.dot URL: http://svn.apache.org/viewvc/hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/DotFiles/optlimitplan9.dot?rev=767728&r1=767727&r2=767728&view=diff ============================================================================== --- hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/DotFiles/optlimitplan9.dot (original) +++ hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/DotFiles/optlimitplan9.dot Wed Apr 22 23:54:17 2009 @@ -1,4 +1,4 @@ digraph graph1 { - LOLoad59 -> LOSort61; - LOSort61 [limit="10"]; + LOLoad1057 -> LOSort1059; + LOSort1059 [limit="10"]; } Modified: hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/GoldenFiles/ComplexForeach.gld URL: http://svn.apache.org/viewvc/hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/GoldenFiles/ComplexForeach.gld?rev=767728&r1=767727&r2=767728&view=diff ============================================================================== --- hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/GoldenFiles/ComplexForeach.gld (original) +++ hadoop/pig/branches/multiquery/test/org/apache/pig/test/data/GoldenFiles/ComplexForeach.gld Wed Apr 22 23:54:17 2009 @@ -1,6 +1,6 @@ New For Each(false)[bag] - Test-Plan-Builder-22 | | -| Project[bag][*] - Test-Plan-Builder-21 +| RelationToExpressionProject[bag][*] - Test-Plan-Builder-21 | | | |---Filter[bag] - Test-Plan-Builder-17 | | | Propchange: hadoop/pig/branches/multiquery/test/org/apache/pig/test/utils/dotGraph/DOTParser.jjt ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Apr 22 23:54:17 2009 @@ -1 +1 @@ -/hadoop/pig/trunk/test/org/apache/pig/test/utils/dotGraph/DOTParser.jjt:758070-764920 +/hadoop/pig/trunk/test/org/apache/pig/test/utils/dotGraph/DOTParser.jjt:758070-767341
