You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ro...@apache.org on 2014/07/07 22:08:16 UTC
svn commit: r1608593 [3/3] - in /pig/trunk: ./
shims/test/hadoop23/org/apache/pig/test/ src/org/apache/pig/
src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/
src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/
src/org...
Modified: pig/trunk/test/org/apache/pig/test/TestStore.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestStore.java?rev=1608593&r1=1608592&r2=1608593&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestStore.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestStore.java Mon Jul 7 20:08:14 2014
@@ -19,7 +19,6 @@ package org.apache.pig.test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.fail;
import java.io.BufferedReader;
@@ -71,7 +70,6 @@ import org.apache.pig.data.DefaultBagFac
import org.apache.pig.data.DefaultTuple;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.PigContext;
-import org.apache.pig.impl.io.FileLocalizer;
import org.apache.pig.impl.logicalLayer.FrontendException;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.impl.plan.PlanValidationException;
@@ -79,7 +77,6 @@ import org.apache.pig.impl.util.Utils;
import org.apache.pig.newplan.Operator;
import org.apache.pig.newplan.logical.relational.LOStore;
import org.apache.pig.newplan.logical.relational.LogicalPlan;
-import org.apache.pig.newplan.logical.visitor.InputOutputFileValidatorVisitor;
import org.apache.pig.parser.ParserException;
import org.apache.pig.parser.QueryParserDriver;
import org.apache.pig.test.utils.GenRandomData;
@@ -94,7 +91,7 @@ import org.junit.Test;
public class TestStore {
POStore st;
DataBag inpDB;
- static MiniCluster cluster = MiniCluster.buildCluster();
+ static MiniGenericCluster cluster = MiniGenericCluster.buildCluster();
PigContext pc;
POProject proj;
PigServer pig;
@@ -109,10 +106,11 @@ public class TestStore {
= "org.apache.pig.test.TestStore\\$FailUDF";
private static final String MAP_MAX_ATTEMPTS = "mapred.map.max.attempts";
private static final String TESTDIR = "/tmp/" + TestStore.class.getSimpleName();
+ private static ExecType[] modes = new ExecType[] { ExecType.LOCAL, cluster.getExecType() };
@Before
public void setUp() throws Exception {
- pig = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
+ pig = new PigServer(cluster.getExecType(), cluster.getProperties());
pc = pig.getPigContext();
inputFileName = TESTDIR + "/TestStore-" + new Random().nextLong() + ".txt";
outputFileName = TESTDIR + "/TestStore-output-" + new Random().nextLong() + ".txt";
@@ -122,6 +120,7 @@ public class TestStore {
@After
public void tearDown() throws Exception {
+ Util.resetStateForExecModeSwitch();
Util.deleteDirectory(new File(TESTDIR));
Util.deleteFile(cluster, TESTDIR);
}
@@ -134,7 +133,33 @@ public class TestStore {
pig.setBatchOn();
Util.registerMultiLineQuery(pig, script);
pig.executeBatch();
- Util.copyFromClusterToLocal(cluster, outputFileName + "/part-m-00000", outputFileName);
+ Path path = getFirstOutputFile(cluster.getConfiguration(),
+ new Path(outputFileName), cluster.getExecType(), true);
+ Util.copyFromClusterToLocal(
+ cluster,
+ path.toString(), outputFileName);
+ }
+
+ public static Path getFirstOutputFile(Configuration conf, Path outputDir,
+ ExecType exectype, boolean isMapOutput) throws IOException {
+ FileSystem fs = outputDir.getFileSystem(conf);
+ FileStatus[] outputFiles = fs.listStatus(outputDir,
+ Util.getSuccessMarkerPathFilter());
+
+ boolean filefound = false;
+ if (outputFiles != null && outputFiles.length != 0) {
+ String name = outputFiles[0].getPath().getName();
+ if (exectype == ExecType.LOCAL || exectype == ExecType.MAPREDUCE) {
+ if (isMapOutput) {
+ filefound = name.equals("part-m-00000");
+ } else {
+ filefound = name.equals("part-r-00000");
+ }
+ } else {
+ filefound = name.startsWith("part-");
+ }
+ }
+ return filefound ? outputFiles[0].getPath() : null;
}
@AfterClass
@@ -172,6 +197,7 @@ public class TestStore {
Util.buildLp( pig, query );
} catch (InvocationTargetException e){
FrontendException pve = (FrontendException)e.getCause();
+ pve.printStackTrace();
// Since output file is present, validation should fail
// and throw this exception
assertEquals(6000,pve.getErrorCode());
@@ -205,6 +231,7 @@ public class TestStore {
++size;
}
assertEquals(size, inpDB.size());
+ br.close();
}
/**
@@ -273,6 +300,7 @@ public class TestStore {
++size;
}
assertEquals(true, size==inpDB.size());
+ br.close();
}
@Test
@@ -328,6 +356,7 @@ public class TestStore {
t.append(flds[11].compareTo("")!=0 ? ps.getLoadCaster().bytesToCharArray(flds[10].getBytes()) : null);
assertTrue(TestHelper.tupleEquals(inputTuple, t));
}
+ br.close();
}
@Test
public void testBinStorageGetSchema() throws IOException, ParserException {
@@ -398,7 +427,6 @@ public class TestStore {
filesToVerify.put(DummyOutputCommitter.FILE_COMMITJOB_CALLED, Boolean.TRUE);
filesToVerify.put(DummyOutputCommitter.FILE_ABORTJOB_CALLED, Boolean.FALSE);
filesToVerify.put(DummyOutputCommitter.FILE_CLEANUPJOB_CALLED, Boolean.FALSE);
- ExecType[] modes = new ExecType[] { ExecType.MAPREDUCE, ExecType.LOCAL};
String[] inputData = new String[]{"hello\tworld", "bye\tworld"};
String script = "a = load '"+ inputFileName + "' as (a0:chararray, a1:chararray);" +
@@ -406,9 +434,9 @@ public class TestStore {
DUMMY_STORE_CLASS_NAME + "();";
for (ExecType execType : modes) {
- FileLocalizer.setInitialized(false);
- if(execType == ExecType.MAPREDUCE) {
- ps = new PigServer(ExecType.MAPREDUCE,
+ Util.resetStateForExecModeSwitch();
+ if(execType == cluster.getExecType()) {
+ ps = new PigServer(cluster.getExecType(),
cluster.getProperties());
} else {
Properties props = new Properties();
@@ -442,7 +470,6 @@ public class TestStore {
PigServer ps = null;
String cleanupSuccessFile = outputFileName + "_cleanupOnFailure_succeeded";
String cleanupFailFile = outputFileName + "_cleanupOnFailure_failed";
- ExecType[] modes = new ExecType[] { ExecType.LOCAL, ExecType.MAPREDUCE};
String[] inputData = new String[]{"hello\tworld", "bye\tworld"};
String script = "a = load '"+ inputFileName + "';" +
@@ -450,8 +477,9 @@ public class TestStore {
DUMMY_STORE_CLASS_NAME + "('true');";
for (ExecType execType : modes) {
- if(execType == ExecType.MAPREDUCE) {
- ps = new PigServer(ExecType.MAPREDUCE,
+ Util.resetStateForExecModeSwitch();
+ if(execType == cluster.getExecType()) {
+ ps = new PigServer(cluster.getExecType(),
cluster.getProperties());
} else {
Properties props = new Properties();
@@ -502,7 +530,6 @@ public class TestStore {
filesToVerify.put(DummyOutputCommitter.FILE_CLEANUPJOB_CALLED + "1", Boolean.FALSE);
filesToVerify.put(DummyOutputCommitter.FILE_CLEANUPJOB_CALLED + "2", Boolean.FALSE);
- ExecType[] modes = new ExecType[] { ExecType.MAPREDUCE, ExecType.LOCAL};
String[] inputData = new String[]{"hello\tworld", "bye\tworld"};
// though the second store should
@@ -514,10 +541,10 @@ public class TestStore {
"store a into '" + outputFileName2 + "' using " +
DUMMY_STORE_CLASS_NAME + "('false', '2');";
- for (ExecType execType : modes) {
- FileLocalizer.setInitialized(false);
- if(execType == ExecType.MAPREDUCE) {
- ps = new PigServer(ExecType.MAPREDUCE,
+ for (ExecType execType : new ExecType[] {cluster.getExecType(), ExecType.LOCAL}) {
+ Util.resetStateForExecModeSwitch();
+ if(execType == cluster.getExecType()) {
+ ps = new PigServer(cluster.getExecType(),
cluster.getProperties());
} else {
Properties props = new Properties();
@@ -561,7 +588,6 @@ public class TestStore {
PigServer ps = null;
try {
- ExecType[] modes = new ExecType[] { ExecType.LOCAL, ExecType.MAPREDUCE};
String[] inputData = new String[]{"hello\tworld", "hi\tworld", "bye\tworld"};
String multiStoreScript = "a = load '"+ inputFileName + "';" +
@@ -580,12 +606,9 @@ public class TestStore {
for(boolean isMultiStore: new boolean[] { true, false}) {
String script = (isMultiStore ? multiStoreScript :
singleStoreScript);
- // since we will be switching between map red and local modes
- // we will need to make sure filelocalizer is reset before each
- // run.
- FileLocalizer.setInitialized(false);
- if(execType == ExecType.MAPREDUCE) {
- ps = new PigServer(ExecType.MAPREDUCE,
+ Util.resetStateForExecModeSwitch();
+ if(execType == cluster.getExecType()) {
+ ps = new PigServer(cluster.getExecType(),
cluster.getProperties());
} else {
Properties props = new Properties();
@@ -625,7 +648,6 @@ public class TestStore {
public void testSuccessFileCreation2() throws Exception {
PigServer ps = null;
try {
- ExecType[] modes = new ExecType[] { ExecType.LOCAL, ExecType.MAPREDUCE};
String[] inputData = new String[]{"hello\tworld", "hi\tworld", "bye\tworld"};
System.err.println("XXX: " + TestStore.FailUDF.class.getName());
String multiStoreScript = "a = load '"+ inputFileName + "';" +
@@ -646,16 +668,13 @@ public class TestStore {
for(boolean isMultiStore: new boolean[] { true, false}) {
String script = (isMultiStore ? multiStoreScript :
singleStoreScript);
- // since we will be switching between map red and local modes
- // we will need to make sure filelocalizer is reset before each
- // run.
- FileLocalizer.setInitialized(false);
- if(execType == ExecType.MAPREDUCE) {
+ Util.resetStateForExecModeSwitch();
+ if(execType == cluster.getExecType()) {
// since the job is guaranteed to fail, let's set
// number of retries to 1.
Properties props = cluster.getProperties();
props.setProperty(MAP_MAX_ATTEMPTS, "1");
- ps = new PigServer(ExecType.MAPREDUCE, props);
+ ps = new PigServer(cluster.getExecType(), props);
} else {
Properties props = new Properties();
props.setProperty(MapRedUtil.FILE_SYSTEM_NAME, "file:///");
@@ -694,9 +713,9 @@ public class TestStore {
Util.deleteFile(ps.getPigContext(), TESTDIR);
}
}
-
+
/**
- * Test whether "part-m-00000" file is created on empty output when
+ * Test whether "part-m-00000" file is created on empty output when
* {@link PigConfiguration#PIG_OUTPUT_LAZY} is set and if LazyOutputFormat is
* supported by Hadoop.
* The test covers multi store and single store case in local and mapreduce mode
@@ -705,7 +724,7 @@ public class TestStore {
*/
@Test
public void testEmptyPartFileCreation() throws IOException {
-
+
boolean isLazyOutputPresent = true;
try {
Class<?> clazz = PigContext
@@ -715,14 +734,13 @@ public class TestStore {
catch (Exception e) {
isLazyOutputPresent = false;
}
-
+
//skip test if LazyOutputFormat is not supported (<= Hadoop 1.0.0)
Assume.assumeTrue("LazyOutputFormat couldn't be loaded, test is skipped", isLazyOutputPresent);
-
+
PigServer ps = null;
try {
- ExecType[] modes = new ExecType[] { ExecType.LOCAL, ExecType.MAPREDUCE};
String[] inputData = new String[]{"hello\tworld", "hi\tworld", "bye\tworld"};
String multiStoreScript = "a = load '"+ inputFileName + "';" +
@@ -741,14 +759,18 @@ public class TestStore {
for (ExecType execType : modes) {
for(boolean isMultiStore: new boolean[] { true, false}) {
- String script = (isMultiStore ? multiStoreScript :
- singleStoreScript);
- // since we will be switching between map red and local modes
- // we will need to make sure filelocalizer is reset before each
- // run.
- FileLocalizer.setInitialized(false);
- if(execType == ExecType.MAPREDUCE) {
- ps = new PigServer(ExecType.MAPREDUCE,
+ if (isMultiStore && (execType.equals(ExecType.LOCAL) ||
+ execType.equals(ExecType.MAPREDUCE))) {
+ // Skip this test for Mapreduce as MapReducePOStoreImpl
+ // does not handle LazyOutputFormat
+ continue;
+ }
+
+ String script = (isMultiStore ? multiStoreScript
+ : singleStoreScript);
+ Util.resetStateForExecModeSwitch();
+ if(execType == cluster.getExecType()) {
+ ps = new PigServer(cluster.getExecType(),
cluster.getProperties());
} else {
Properties props = new Properties();
@@ -763,10 +785,11 @@ public class TestStore {
inputFileName, inputData);
Util.registerMultiLineQuery(ps, script);
ps.executeBatch();
+ Configuration conf = ConfigurationUtil.toConfiguration(ps.getPigContext().getProperties());
for(int i = 1; i <= (isMultiStore ? 3 : 1); i++) {
- String output = "part-m-00000";
- assertFalse("For an empty output part-m-00000 should not exist in " +
- execType + " mode", Util.exists(ps.getPigContext(), output));
+ assertEquals("For an empty output part-m-00000 should not exist in " + execType + " mode",
+ null,
+ getFirstOutputFile(conf, new Path(outputFileName + "_" + i), execType, true));
}
}
}
@@ -822,17 +845,23 @@ public class TestStore {
public void storeSchema(ResourceSchema schema, String location,
Job job) throws IOException {
FileSystem fs = FileSystem.get(job.getConfiguration());
+
+ FileStatus[] outputFiles = fs.listStatus(new Path(location),
+ Util.getSuccessMarkerPathFilter());
// verify that output is available prior to storeSchema call
- Path resultPath = new Path(location, "part-m-00000");
- if (!fs.exists(resultPath)) {
+ Path resultPath = null;
+ if (outputFiles != null && outputFiles.length > 0
+ && outputFiles[0].getPath().getName().startsWith("part-")) {
+ resultPath = outputFiles[0].getPath();
+ }
+ if (resultPath == null) {
FileStatus[] listing = fs.listStatus(new Path(location));
for (FileStatus fstat : listing) {
- System.err.println(fstat.getPath());
+ System.err.println("Output File:" + fstat.getPath());
}
// not creating the marker file below fails the test
throw new IOException("" + resultPath + " not available in storeSchema");
}
-
// create a file to test that this method got called - if it gets called
// multiple times, the create will throw an Exception
fs.create(
Modified: pig/trunk/test/org/apache/pig/test/TestTmpFileCompression.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestTmpFileCompression.java?rev=1608593&r1=1608592&r2=1608593&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestTmpFileCompression.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestTmpFileCompression.java Mon Jul 7 20:08:14 2014
@@ -37,7 +37,6 @@ import org.apache.log4j.FileAppender;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.log4j.SimpleLayout;
-import org.apache.pig.ExecType;
import org.apache.pig.PigConfiguration;
import org.apache.pig.PigRunner;
import org.apache.pig.PigServer;
@@ -58,15 +57,15 @@ import org.junit.Test;
public class TestTmpFileCompression {
private PigServer pigServer;
- static MiniCluster cluster = MiniCluster.buildCluster();
+ static MiniGenericCluster cluster = MiniGenericCluster.buildCluster(MiniGenericCluster.EXECTYPE_MR);
File logFile;
@Before
public void setUp() throws Exception {
- pigServer = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
+ pigServer = new PigServer(cluster.getExecType(), cluster.getProperties());
}
- private void resetLog(Class clazz) throws Exception {
+ private void resetLog(Class<?> clazz) throws Exception {
if (logFile != null)
logFile.delete();
Logger logger = Logger.getLogger(clazz);
@@ -89,6 +88,7 @@ public class TestTmpFileCompression {
while ((line = reader.readLine()) != null) {
logMessage = logMessage + line + "\n";
}
+ reader.close();
for (int i = 0; i < messages.length; i++) {
if (!logMessage.contains(messages[i])) return false;
}
@@ -128,7 +128,7 @@ public class TestTmpFileCompression {
if (!iter.hasNext()) fail("No Output received");
int cnt = 0;
while (iter.hasNext()) {
- Tuple t = iter.next();
+ iter.next();
++cnt;
}
assertEquals(20, cnt);
@@ -230,7 +230,7 @@ public class TestTmpFileCompression {
if (!iter.hasNext()) fail("No Output received");
int cnt = 0;
while (iter.hasNext()) {
- Tuple t = iter.next();
+ iter.next();
++cnt;
}
assertEquals(20, cnt);
@@ -324,34 +324,34 @@ public class TestTmpFileCompression {
w.println("1\tthis is a test for compression of temp files");
}
w.close();
-
+
Util.copyFromLocalToCluster(cluster, "1.txt", "1.txt");
-
+
PrintWriter w1 = new PrintWriter(new FileWriter("tfile.pig"));
w1.println("A = load '1.txt' as (a0:int, a1:chararray);");
w1.println("B = group A by a0;");
w1.println("store B into 'tfile' using org.apache.pig.impl.io.TFileStorage();");
w1.close();
-
+
PrintWriter w2 = new PrintWriter(new FileWriter("tfile2.pig"));
w2.println("A = load 'tfile' using org.apache.pig.impl.io.TFileStorage() as (a:int, b:bag{(b0:int, b1:chararray)});");
w2.println("B = foreach A generate flatten($1);");
w2.println("store B into '2.txt';");
w2.close();
-
+
try {
String[] args = { "-Dpig.tmpfilecompression.codec=gz",
"-Dtfile.io.chunk.size=100", "tfile.pig" };
PigStats stats = PigRunner.run(args, null);
-
+
assertTrue(stats.isSuccessful());
-
+
String[] args2 = { "-Dpig.tmpfilecompression.codec=gz",
"-Dtfile.io.chunk.size=100", "tfile2.pig" };
PigStats stats2 = PigRunner.run(args2, null);
assertTrue(stats2.isSuccessful());
-
+
OutputStats os = stats2.result("B");
Iterator<Tuple> iter = os.iterator();
int count = 0;
@@ -361,11 +361,11 @@ public class TestTmpFileCompression {
assertEquals(expected, iter.next().toString());
}
assertEquals(30, count);
-
+
} finally {
- new File("tfile.pig").delete();
- new File("tfile2.pig").delete();
- new File("1.txt").delete();
+ new File("tfile.pig").delete();
+ new File("tfile2.pig").delete();
+ new File("1.txt").delete();
}
}
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/TEZC16.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/TEZC16.gld?rev=1608593&r1=1608592&r2=1608593&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/TEZC16.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/TEZC16.gld Mon Jul 7 20:08:14 2014
@@ -15,7 +15,7 @@ Local Rearrange[tuple]{tuple}(false) - s
| |
| Constant(DummyVal) - scope-13
|
-|---New For Each(true,true)[tuple] - scope-19
+|---New For Each(false,true)[tuple] - scope-19
| |
| Project[int][0] - scope-8
| |
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/TEZC4.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/TEZC4.gld?rev=1608593&r1=1608592&r2=1608593&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/TEZC4.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/TEZC4.gld Mon Jul 7 20:08:14 2014
@@ -2,21 +2,19 @@
# There are 1 DAGs in the session
#--------------------------------------------------
#--------------------------------------------------
-# TEZ DAG plan: scope-18
+# TEZ DAG plan: scope-15
#--------------------------------------------------
-Tez vertex scope-10 -> Tez vertex scope-13,
-Tez vertex scope-13
+Tez vertex scope-10 -> Tez vertex scope-12,
+Tez vertex scope-12
Tez vertex scope-10
# Plan on vertex
-b: Local Rearrange[tuple]{tuple}(false) - scope-12 -> scope-13
-| |
-| Project[tuple][*] - scope-11
+POValueOutputTez - scope-11 -> [scope-12]
|
|---b: Limit - scope-1
|
|---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-0
-Tez vertex scope-13
+Tez vertex scope-12
# Plan on vertex
c: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-9
|
@@ -30,10 +28,6 @@ c: Store(file:///tmp/output:org.apache.p
| |
| |---Project[bytearray][0] - scope-2
|
- |---b: Limit - scope-17
+ |---b: Limit - scope-14
|
- |---b: New For Each(true)[bag] - scope-16
- | |
- | Project[tuple][1] - scope-15
- |
- |---b: Package(Packager)[tuple]{tuple} - scope-14
+ |---POValueInputTez - scope-13 <- scope-10
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2-OPTOFF.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2-OPTOFF.gld?rev=1608593&r1=1608592&r2=1608593&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2-OPTOFF.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2-OPTOFF.gld Mon Jul 7 20:08:14 2014
@@ -2,311 +2,305 @@
# There are 1 DAGs in the session
#--------------------------------------------------
#--------------------------------------------------
-# TEZ DAG plan: scope-422
+# TEZ DAG plan: scope-416
#--------------------------------------------------
-Tez vertex scope-321 -> Tez vertex scope-323,Tez vertex scope-334,Tez vertex scope-345,
-Tez vertex scope-323 -> Tez vertex scope-326,Tez vertex scope-339,Tez vertex scope-350,
-Tez vertex scope-350 -> Tez vertex scope-353,Tez vertex scope-379,
-Tez vertex scope-379 -> Tez vertex scope-383,
-Tez vertex scope-383 -> Tez vertex scope-389,Tez vertex scope-393,
-Tez vertex scope-389
-Tez vertex scope-334 -> Tez vertex scope-337,Tez vertex scope-342,
-Tez vertex scope-337 -> Tez vertex scope-341,
+Tez vertex scope-318 -> Tez vertex scope-320,Tez vertex scope-331,Tez vertex scope-342,
+Tez vertex scope-320 -> Tez vertex scope-323,Tez vertex scope-336,Tez vertex scope-347,
+Tez vertex scope-347 -> Tez vertex scope-350,Tez vertex scope-376,
+Tez vertex scope-376 -> Tez vertex scope-379,
+Tez vertex scope-379 -> Tez vertex scope-383,Tez vertex scope-387,
+Tez vertex scope-383
+Tez vertex scope-342 -> Tez vertex scope-345,Tez vertex scope-385,
+Tez vertex scope-385 -> Tez vertex group scope-413,
+Tez vertex scope-387 -> Tez vertex group scope-413,
+Tez vertex group scope-413
+Tez vertex scope-331 -> Tez vertex scope-334,Tez vertex scope-339,
Tez vertex scope-339 -> Tez vertex scope-341,
Tez vertex scope-341
-Tez vertex scope-345 -> Tez vertex scope-348,Tez vertex scope-391,
-Tez vertex scope-348
-Tez vertex scope-342 -> Tez vertex scope-344,
-Tez vertex scope-344
-Tez vertex scope-353 -> Tez vertex scope-373,Tez vertex scope-363,
-Tez vertex scope-363 -> Tez vertex scope-373,
-Tez vertex scope-373 -> Tez vertex scope-375,
-Tez vertex scope-375
-Tez vertex scope-326 -> Tez vertex scope-328,
-Tez vertex scope-328 -> Tez vertex scope-330,Tez vertex scope-332,
-Tez vertex scope-330
-Tez vertex scope-391 -> Tez vertex scope-419,
-Tez vertex scope-393 -> Tez vertex scope-419,
-Tez vertex scope-419
-Tez vertex scope-332
+Tez vertex scope-323 -> Tez vertex scope-325,
+Tez vertex scope-325 -> Tez vertex scope-327,Tez vertex scope-329,
+Tez vertex scope-327
+Tez vertex scope-345
+Tez vertex scope-329
+Tez vertex scope-350 -> Tez vertex scope-370,Tez vertex scope-360,
+Tez vertex scope-360 -> Tez vertex scope-370,
+Tez vertex scope-370 -> Tez vertex scope-372,
+Tez vertex scope-372
+Tez vertex scope-334 -> Tez vertex scope-338,
+Tez vertex scope-336 -> Tez vertex scope-338,
+Tez vertex scope-338
-Tez vertex scope-321
+Tez vertex scope-318
# Plan on vertex
-POValueOutputTez - scope-322 -> [scope-323, scope-345, scope-334]
+POValueOutputTez - scope-319 -> [scope-320, scope-331, scope-342]
|
-|---a: New For Each(false,false)[bag] - scope-222
+|---a: New For Each(false,false)[bag] - scope-219
| |
- | Cast[int] - scope-217
+ | Cast[int] - scope-214
| |
- | |---Project[bytearray][0] - scope-216
+ | |---Project[bytearray][0] - scope-213
| |
- | Cast[int] - scope-220
+ | Cast[int] - scope-217
| |
- | |---Project[bytearray][1] - scope-219
+ | |---Project[bytearray][1] - scope-216
|
- |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-215
-Tez vertex scope-323
+ |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-212
+Tez vertex scope-320
# Plan on vertex
-POValueOutputTez - scope-325 -> [scope-339, scope-326, scope-350]
+POValueOutputTez - scope-322 -> [scope-336, scope-323, scope-347]
|
-|---b: Filter[bag] - scope-224
+|---b: Filter[bag] - scope-221
| |
- | Less Than or Equal[boolean] - scope-227
+ | Less Than or Equal[boolean] - scope-224
| |
- | |---Project[int][0] - scope-225
+ | |---Project[int][0] - scope-222
| |
- | |---Constant(5) - scope-226
+ | |---Constant(5) - scope-223
|
- |---POValueInputTez - scope-324 <- scope-321
-Tez vertex scope-350
+ |---POValueInputTez - scope-321 <- scope-318
+Tez vertex scope-347
# Plan on vertex
-POValueOutputTez - scope-352 -> [scope-379, scope-353]
+POValueOutputTez - scope-349 -> [scope-376, scope-350]
|
-|---POValueInputTez - scope-351 <- scope-323
-Tez vertex scope-379
+|---POValueInputTez - scope-348 <- scope-320
+Tez vertex scope-376
# Plan on vertex
-f1: Local Rearrange[tuple]{tuple}(false) - scope-382 -> scope-383
-| |
-| Project[tuple][*] - scope-381
+POValueOutputTez - scope-378 -> [scope-379]
|
-|---f1: Limit - scope-310
+|---f1: Limit - scope-307
|
- |---f: Filter[bag] - scope-306
+ |---f: Filter[bag] - scope-303
| |
- | Greater Than or Equal[boolean] - scope-309
+ | Greater Than or Equal[boolean] - scope-306
| |
- | |---Project[int][0] - scope-307
+ | |---Project[int][0] - scope-304
| |
- | |---Constant(3) - scope-308
+ | |---Constant(3) - scope-305
|
- |---POValueInputTez - scope-380 <- scope-350
-Tez vertex scope-383
+ |---POValueInputTez - scope-377 <- scope-347
+Tez vertex scope-379
# Plan on vertex
-POValueOutputTez - scope-388 -> [scope-393, scope-389]
+POValueOutputTez - scope-382 -> [scope-387, scope-383]
|
-|---f1: Limit - scope-387
+|---f1: Limit - scope-381
|
- |---f1: New For Each(true)[bag] - scope-386
- | |
- | Project[tuple][1] - scope-385
- |
- |---f1: Package(Packager)[tuple]{tuple} - scope-384
-Tez vertex scope-389
+ |---POValueInputTez - scope-380 <- scope-376
+Tez vertex scope-383
# Plan on vertex
-f1: Store(file:///tmp/output/f1:org.apache.pig.builtin.PigStorage) - scope-314
+f1: Store(file:///tmp/output/f1:org.apache.pig.builtin.PigStorage) - scope-311
|
-|---POValueInputTez - scope-390 <- scope-383
-Tez vertex scope-334
+|---POValueInputTez - scope-384 <- scope-379
+Tez vertex scope-342
# Plan on vertex
-POValueOutputTez - scope-336 -> [scope-337, scope-342]
+POValueOutputTez - scope-344 -> [scope-385, scope-345]
|
-|---c: Filter[bag] - scope-249
+|---d1: Filter[bag] - scope-285
| |
- | Less Than or Equal[boolean] - scope-252
+ | Equal To[boolean] - scope-288
| |
- | |---Project[int][0] - scope-250
+ | |---Project[int][0] - scope-286
| |
- | |---Constant(10) - scope-251
+ | |---Constant(5) - scope-287
|
- |---POValueInputTez - scope-335 <- scope-321
-Tez vertex scope-337
+ |---d: Filter[bag] - scope-281
+ | |
+ | Greater Than[boolean] - scope-284
+ | |
+ | |---Project[int][0] - scope-282
+ | |
+ | |---Constant(10) - scope-283
+ |
+ |---POValueInputTez - scope-343 <- scope-318
+Tez vertex scope-385
# Plan on vertex
-c1: Local Rearrange[tuple]{int}(false) - scope-262 -> scope-341
-| |
-| Project[int][0] - scope-263
+f2: Store(file:///tmp/output/f2:org.apache.pig.builtin.PigStorage) - scope-414
|
-|---POValueInputTez - scope-338 <- scope-334
-Tez vertex scope-339
+|---POValueInputTez - scope-386 <- scope-342
+Tez vertex scope-387
# Plan on vertex
-c1: Local Rearrange[tuple]{int}(false) - scope-264 -> scope-341
-| |
-| Project[int][0] - scope-265
+f2: Store(file:///tmp/output/f2:org.apache.pig.builtin.PigStorage) - scope-415
|
-|---POValueInputTez - scope-340 <- scope-323
-Tez vertex scope-341
+|---POValueInputTez - scope-388 <- scope-379
+Tez vertex group scope-413 <- [scope-385, scope-387] -> null
+# No plan on vertex group
+Tez vertex scope-331
# Plan on vertex
-c1: Store(file:///tmp/output/c1:org.apache.pig.builtin.PigStorage) - scope-269
+POValueOutputTez - scope-333 -> [scope-339, scope-334]
|
-|---c1: New For Each(true,true)[tuple] - scope-268
+|---c: Filter[bag] - scope-246
+ | |
+ | Less Than or Equal[boolean] - scope-249
| |
- | Project[bag][1] - scope-266
+ | |---Project[int][0] - scope-247
| |
- | Project[bag][2] - scope-267
+ | |---Constant(10) - scope-248
|
- |---c1: Package(Packager)[tuple]{int} - scope-261
-Tez vertex scope-345
+ |---POValueInputTez - scope-332 <- scope-318
+Tez vertex scope-339
# Plan on vertex
-POValueOutputTez - scope-347 -> [scope-391, scope-348]
+c2: Local Rearrange[tuple]{int}(false) - scope-405 -> scope-341
+| |
+| Project[int][0] - scope-407
|
-|---d1: Filter[bag] - scope-288
+|---c3: New For Each(false,false)[bag] - scope-393
| |
- | Equal To[boolean] - scope-291
+ | Project[int][0] - scope-394
| |
- | |---Project[int][0] - scope-289
+ | POUserFunc(org.apache.pig.builtin.AlgebraicMathBase$Initial)[tuple] - scope-395
| |
- | |---Constant(5) - scope-290
+ | |---Project[bag][0] - scope-396
+ | |
+ | |---Project[bag][1] - scope-397
|
- |---d: Filter[bag] - scope-284
- | |
- | Greater Than[boolean] - scope-287
- | |
- | |---Project[int][0] - scope-285
- | |
- | |---Constant(10) - scope-286
+ |---Pre Combiner Local Rearrange[tuple]{Unknown} - scope-408
|
- |---POValueInputTez - scope-346 <- scope-321
-Tez vertex scope-348
-# Plan on vertex
-d1: Store(file:///tmp/output/d1:org.apache.pig.builtin.PigStorage) - scope-295
-|
-|---POValueInputTez - scope-349 <- scope-345
-Tez vertex scope-342
-# Plan on vertex
-c2: Local Rearrange[tuple]{int}(false) - scope-411 -> scope-344
+ |---POValueInputTez - scope-340 <- scope-331
+Tez vertex scope-341
+# Combine plan on edge <scope-339>
+c2: Local Rearrange[tuple]{int}(false) - scope-409 -> scope-341
| |
-| Project[int][0] - scope-413
+| Project[int][0] - scope-411
|
-|---c3: New For Each(false,false)[bag] - scope-399
+|---c3: New For Each(false,false)[bag] - scope-398
| |
- | Project[int][0] - scope-400
+ | Project[int][0] - scope-399
| |
- | POUserFunc(org.apache.pig.builtin.AlgebraicMathBase$Initial)[tuple] - scope-401
+ | POUserFunc(org.apache.pig.builtin.LongSum$Intermediate)[tuple] - scope-400
| |
- | |---Project[bag][0] - scope-402
- | |
- | |---Project[bag][1] - scope-403
+ | |---Project[bag][1] - scope-401
|
- |---Pre Combiner Local Rearrange[tuple]{Unknown} - scope-414
- |
- |---POValueInputTez - scope-343 <- scope-334
-Tez vertex scope-344
-# Combine plan on edge <scope-342>
-c2: Local Rearrange[tuple]{int}(false) - scope-415 -> scope-344
-| |
-| Project[int][0] - scope-417
+ |---c2: Package(CombinerPackager)[tuple]{int} - scope-404
+# Plan on vertex
+c3: Store(file:///tmp/output/c1:org.apache.pig.builtin.PigStorage) - scope-280
|
-|---c3: New For Each(false,false)[bag] - scope-404
+|---c3: New For Each(false,false)[bag] - scope-279
| |
- | Project[int][0] - scope-405
+ | Project[int][0] - scope-273
| |
- | POUserFunc(org.apache.pig.builtin.LongSum$Intermediate)[tuple] - scope-406
+ | POUserFunc(org.apache.pig.builtin.LongSum$Final)[long] - scope-277
| |
- | |---Project[bag][1] - scope-407
+ | |---Project[bag][1] - scope-402
|
- |---c2: Package(CombinerPackager)[tuple]{int} - scope-410
+ |---c2: Package(CombinerPackager)[tuple]{int} - scope-270
+Tez vertex scope-323
+# Plan on vertex
+b1: Local Rearrange[tuple]{int}(false) - scope-230 -> scope-325
+| |
+| Project[int][0] - scope-231
+|
+|---POValueInputTez - scope-324 <- scope-320
+Tez vertex scope-325
+# Plan on vertex
+POValueOutputTez - scope-326 -> [scope-329, scope-327]
+|
+|---b1: Package(Packager)[tuple]{int} - scope-229
+Tez vertex scope-327
+# Plan on vertex
+b1: Store(file:///tmp/output/b1:org.apache.pig.builtin.PigStorage) - scope-235
+|
+|---POValueInputTez - scope-328 <- scope-325
+Tez vertex scope-345
+# Plan on vertex
+d1: Store(file:///tmp/output/d1:org.apache.pig.builtin.PigStorage) - scope-292
+|
+|---POValueInputTez - scope-346 <- scope-342
+Tez vertex scope-329
# Plan on vertex
-c3: Store(file:///tmp/output/c1:org.apache.pig.builtin.PigStorage) - scope-283
+b2: Store(file:///tmp/output/b2:org.apache.pig.builtin.PigStorage) - scope-245
|
-|---c3: New For Each(false,false)[bag] - scope-282
+|---b2: New For Each(false,false)[bag] - scope-244
| |
- | Project[int][0] - scope-276
+ | Project[int][0] - scope-238
| |
- | POUserFunc(org.apache.pig.builtin.LongSum$Final)[long] - scope-280
+ | POUserFunc(org.apache.pig.builtin.LongSum)[long] - scope-242
| |
- | |---Project[bag][1] - scope-408
+ | |---Project[bag][0] - scope-241
+ | |
+ | |---Project[bag][1] - scope-240
|
- |---c2: Package(CombinerPackager)[tuple]{int} - scope-273
-Tez vertex scope-353
+ |---POValueInputTez - scope-330 <- scope-325
+Tez vertex scope-350
# Plan on vertex
-Local Rearrange[tuple]{tuple}(false) - scope-357 -> scope-363
+Local Rearrange[tuple]{tuple}(false) - scope-354 -> scope-360
| |
-| Constant(DummyVal) - scope-356
+| Constant(DummyVal) - scope-353
|
-|---New For Each(true,true)[tuple] - scope-362
+|---New For Each(false,true)[tuple] - scope-359
| |
- | Project[int][0] - scope-303
+ | Project[int][0] - scope-300
| |
- | POUserFunc(org.apache.pig.impl.builtin.GetMemNumRows)[tuple] - scope-361
+ | POUserFunc(org.apache.pig.impl.builtin.GetMemNumRows)[tuple] - scope-358
| |
- | |---Project[tuple][*] - scope-360
+ | |---Project[tuple][*] - scope-357
|
- |---ReservoirSample - scope-359
+ |---ReservoirSample - scope-356
|
- |---e1: Local Rearrange[tuple]{int}(false) - scope-355 -> scope-373
+ |---e1: Local Rearrange[tuple]{int}(false) - scope-352 -> scope-370
| |
- | Project[int][0] - scope-303
+ | Project[int][0] - scope-300
|
- |---e: Filter[bag] - scope-299
+ |---e: Filter[bag] - scope-296
| |
- | Less Than[boolean] - scope-302
+ | Less Than[boolean] - scope-299
| |
- | |---Project[int][0] - scope-300
+ | |---Project[int][0] - scope-297
| |
- | |---Constant(3) - scope-301
+ | |---Constant(3) - scope-298
|
- |---POValueInputTez - scope-354 <- scope-350
-Tez vertex scope-363
+ |---POValueInputTez - scope-351 <- scope-347
+Tez vertex scope-360
# Plan on vertex
-POValueOutputTez - scope-372 -> [scope-373]
+POValueOutputTez - scope-369 -> [scope-370]
|
-|---New For Each(false)[tuple] - scope-371
+|---New For Each(false)[tuple] - scope-368
| |
- | POUserFunc(org.apache.pig.backend.hadoop.executionengine.tez.FindQuantilesTez)[tuple] - scope-370
+ | POUserFunc(org.apache.pig.backend.hadoop.executionengine.tez.FindQuantilesTez)[tuple] - scope-367
| |
- | |---Project[tuple][*] - scope-369
+ | |---Project[tuple][*] - scope-366
|
- |---New For Each(false,false)[tuple] - scope-368
+ |---New For Each(false,false)[tuple] - scope-365
| |
- | Constant(-1) - scope-367
+ | Constant(-1) - scope-364
| |
- | Project[bag][1] - scope-365
+ | Project[bag][1] - scope-362
|
- |---Package(Packager)[tuple]{bytearray} - scope-364
-Tez vertex scope-373
+ |---Package(Packager)[tuple]{bytearray} - scope-361
+Tez vertex scope-370
# Plan on vertex
-POIdentityInOutTez - scope-374 <- scope-353 -> scope-375
+POIdentityInOutTez - scope-371 <- scope-350 -> scope-372
| |
-| Project[int][0] - scope-303
-Tez vertex scope-375
+| Project[int][0] - scope-300
+Tez vertex scope-372
# Plan on vertex
-e1: Store(file:///tmp/output/e1:org.apache.pig.builtin.PigStorage) - scope-305
+e1: Store(file:///tmp/output/e1:org.apache.pig.builtin.PigStorage) - scope-302
|
-|---New For Each(true)[tuple] - scope-378
+|---New For Each(true)[tuple] - scope-375
| |
- | Project[bag][1] - scope-377
+ | Project[bag][1] - scope-374
|
- |---Package(LitePackager)[tuple]{int} - scope-376
-Tez vertex scope-326
+ |---Package(LitePackager)[tuple]{int} - scope-373
+Tez vertex scope-334
# Plan on vertex
-b1: Local Rearrange[tuple]{int}(false) - scope-233 -> scope-328
+c1: Local Rearrange[tuple]{int}(false) - scope-259 -> scope-338
| |
-| Project[int][0] - scope-234
-|
-|---POValueInputTez - scope-327 <- scope-323
-Tez vertex scope-328
-# Plan on vertex
-POValueOutputTez - scope-329 -> [scope-330, scope-332]
+| Project[int][0] - scope-260
|
-|---b1: Package(Packager)[tuple]{int} - scope-232
-Tez vertex scope-330
+|---POValueInputTez - scope-335 <- scope-331
+Tez vertex scope-336
# Plan on vertex
-b1: Store(file:///tmp/output/b1:org.apache.pig.builtin.PigStorage) - scope-238
-|
-|---POValueInputTez - scope-331 <- scope-328
-Tez vertex scope-391
-# Plan on vertex
-f2: Store(file:///tmp/output/f2:org.apache.pig.builtin.PigStorage) - scope-420
-|
-|---POValueInputTez - scope-392 <- scope-345
-Tez vertex scope-393
-# Plan on vertex
-f2: Store(file:///tmp/output/f2:org.apache.pig.builtin.PigStorage) - scope-421
+c1: Local Rearrange[tuple]{int}(false) - scope-261 -> scope-338
+| |
+| Project[int][0] - scope-262
|
-|---POValueInputTez - scope-394 <- scope-383
-Tez vertex group scope-419 <- [scope-391, scope-393] -> null
-# No plan on vertex group
-Tez vertex scope-332
+|---POValueInputTez - scope-337 <- scope-320
+Tez vertex scope-338
# Plan on vertex
-b2: Store(file:///tmp/output/b2:org.apache.pig.builtin.PigStorage) - scope-248
+c1: Store(file:///tmp/output/c1:org.apache.pig.builtin.PigStorage) - scope-266
|
-|---b2: New For Each(false,false)[bag] - scope-247
+|---c1: New For Each(true,true)[tuple] - scope-265
| |
- | Project[int][0] - scope-241
+ | Project[bag][1] - scope-263
| |
- | POUserFunc(org.apache.pig.builtin.LongSum)[long] - scope-245
- | |
- | |---Project[bag][0] - scope-244
- | |
- | |---Project[bag][1] - scope-243
+ | Project[bag][2] - scope-264
|
- |---POValueInputTez - scope-333 <- scope-328
+ |---c1: Package(Packager)[tuple]{int} - scope-258
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2.gld?rev=1608593&r1=1608592&r2=1608593&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2.gld Mon Jul 7 20:08:14 2014
@@ -2,24 +2,24 @@
# There are 1 DAGs in the session
#--------------------------------------------------
#--------------------------------------------------
-# TEZ DAG plan: scope-214
+# TEZ DAG plan: scope-211
#--------------------------------------------------
-Tez vertex scope-106 -> Tez vertex scope-119,Tez vertex scope-113,Tez vertex scope-126,Tez vertex scope-158,Tez vertex scope-148,Tez vertex scope-168,Tez vertex scope-211,
+Tez vertex scope-106 -> Tez vertex scope-119,Tez vertex scope-113,Tez vertex scope-126,Tez vertex scope-158,Tez vertex scope-148,Tez vertex scope-167,Tez vertex group scope-208,
+Tez vertex scope-167 -> Tez vertex group scope-208,
+Tez vertex group scope-208
+Tez vertex scope-113
Tez vertex scope-148 -> Tez vertex scope-158,
Tez vertex scope-158 -> Tez vertex scope-160,
Tez vertex scope-160
Tez vertex scope-119 -> Tez vertex scope-126,Tez vertex scope-129,
Tez vertex scope-126
Tez vertex scope-129
-Tez vertex scope-113
-Tez vertex scope-168 -> Tez vertex scope-211,
-Tez vertex scope-211
Tez vertex scope-106
# Plan on vertex
-1-1: Split - scope-210
+1-1: Split - scope-207
| |
-| b: Split - scope-207
+| b: Split - scope-204
| | |
| | b1: Local Rearrange[tuple]{int}(false) - scope-18 -> scope-113
| | | |
@@ -29,13 +29,13 @@ Tez vertex scope-106
| | | |
| | | Project[int][0] - scope-50
| | |
-| | 1-2: Split - scope-206
+| | 1-2: Split - scope-203
| | | |
| | | Local Rearrange[tuple]{tuple}(false) - scope-142 -> scope-148
| | | | |
| | | | Constant(DummyVal) - scope-141
| | | |
-| | | |---New For Each(true,true)[tuple] - scope-147
+| | | |---New For Each(false,true)[tuple] - scope-147
| | | | |
| | | | Project[int][0] - scope-88
| | | | |
@@ -57,9 +57,7 @@ Tez vertex scope-106
| | | | |
| | | | |---Constant(3) - scope-86
| | | |
-| | | f1: Local Rearrange[tuple]{tuple}(false) - scope-167 -> scope-168
-| | | | |
-| | | | Project[tuple][*] - scope-166
+| | | POValueOutputTez - scope-166 -> [scope-167]
| | | |
| | | |---f1: Limit - scope-95
| | | |
@@ -79,11 +77,11 @@ Tez vertex scope-106
| | |
| | |---Constant(5) - scope-11
| |
-| d1: Split - scope-209
+| d1: Split - scope-206
| | |
| | d1: Store(file:///tmp/output/d1:org.apache.pig.builtin.PigStorage) - scope-80
| | |
-| | f2: Store(file:///tmp/output/f2:org.apache.pig.builtin.PigStorage) - scope-212
+| | f2: Store(file:///tmp/output/f2:org.apache.pig.builtin.PigStorage) - scope-209
| |
| |---d1: Filter[bag] - scope-73
| | |
@@ -114,6 +112,38 @@ Tez vertex scope-106
| |---Project[bytearray][1] - scope-4
|
|---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-0
+Tez vertex scope-167
+# Plan on vertex
+f1: Split - scope-202
+| |
+| f1: Store(file:///tmp/output/f1:org.apache.pig.builtin.PigStorage) - scope-99
+| |
+| f2: Store(file:///tmp/output/f2:org.apache.pig.builtin.PigStorage) - scope-210
+|
+|---f1: Limit - scope-169
+ |
+ |---POValueInputTez - scope-168 <- scope-106
+Tez vertex group scope-208 <- [scope-106, scope-167] -> null
+# No plan on vertex group
+Tez vertex scope-113
+# Plan on vertex
+b1: Split - scope-201
+| |
+| b1: Store(file:///tmp/output/b1:org.apache.pig.builtin.PigStorage) - scope-23
+| |
+| b2: Store(file:///tmp/output/b2:org.apache.pig.builtin.PigStorage) - scope-33
+| |
+| |---b2: New For Each(false,false)[bag] - scope-32
+| | |
+| | Project[int][0] - scope-26
+| | |
+| | POUserFunc(org.apache.pig.builtin.LongSum)[long] - scope-30
+| | |
+| | |---Project[bag][0] - scope-29
+| | |
+| | |---Project[bag][1] - scope-28
+|
+|---b1: Package(Packager)[tuple]{int} - scope-17
Tez vertex scope-148
# Plan on vertex
POValueOutputTez - scope-157 -> [scope-158]
@@ -147,27 +177,27 @@ e1: Store(file:///tmp/output/e1:org.apac
|---Package(LitePackager)[tuple]{int} - scope-161
Tez vertex scope-119
# Plan on vertex
-c: Split - scope-208
+c: Split - scope-205
| |
| c1: Local Rearrange[tuple]{int}(false) - scope-47 -> scope-126
| | |
| | Project[int][0] - scope-48
| |
-| c2: Local Rearrange[tuple]{int}(false) - scope-196 -> scope-129
+| c2: Local Rearrange[tuple]{int}(false) - scope-193 -> scope-129
| | |
-| | Project[int][0] - scope-198
+| | Project[int][0] - scope-195
| |
-| |---c3: New For Each(false,false)[bag] - scope-184
+| |---c3: New For Each(false,false)[bag] - scope-181
| | |
-| | Project[int][0] - scope-185
+| | Project[int][0] - scope-182
| | |
-| | POUserFunc(org.apache.pig.builtin.AlgebraicMathBase$Initial)[tuple] - scope-186
+| | POUserFunc(org.apache.pig.builtin.AlgebraicMathBase$Initial)[tuple] - scope-183
| | |
-| | |---Project[bag][0] - scope-187
+| | |---Project[bag][0] - scope-184
| | |
-| | |---Project[bag][1] - scope-188
+| | |---Project[bag][1] - scope-185
| |
-| |---Pre Combiner Local Rearrange[tuple]{Unknown} - scope-199
+| |---Pre Combiner Local Rearrange[tuple]{Unknown} - scope-196
|
|---c: Filter[bag] - scope-34
| |
@@ -191,19 +221,19 @@ c1: Store(file:///tmp/output/c1:org.apac
|---c1: Package(Packager)[tuple]{int} - scope-46
Tez vertex scope-129
# Combine plan on edge <scope-119>
-c2: Local Rearrange[tuple]{int}(false) - scope-200 -> scope-129
+c2: Local Rearrange[tuple]{int}(false) - scope-197 -> scope-129
| |
-| Project[int][0] - scope-202
+| Project[int][0] - scope-199
|
-|---c3: New For Each(false,false)[bag] - scope-189
+|---c3: New For Each(false,false)[bag] - scope-186
| |
- | Project[int][0] - scope-190
+ | Project[int][0] - scope-187
| |
- | POUserFunc(org.apache.pig.builtin.LongSum$Intermediate)[tuple] - scope-191
+ | POUserFunc(org.apache.pig.builtin.LongSum$Intermediate)[tuple] - scope-188
| |
- | |---Project[bag][1] - scope-192
+ | |---Project[bag][1] - scope-189
|
- |---c2: Package(CombinerPackager)[tuple]{int} - scope-195
+ |---c2: Package(CombinerPackager)[tuple]{int} - scope-192
# Plan on vertex
c3: Store(file:///tmp/output/c1:org.apache.pig.builtin.PigStorage) - scope-68
|
@@ -213,42 +243,6 @@ c3: Store(file:///tmp/output/c1:org.apac
| |
| POUserFunc(org.apache.pig.builtin.LongSum$Final)[long] - scope-65
| |
- | |---Project[bag][1] - scope-193
+ | |---Project[bag][1] - scope-190
|
|---c2: Package(CombinerPackager)[tuple]{int} - scope-58
-Tez vertex scope-113
-# Plan on vertex
-b1: Split - scope-204
-| |
-| b1: Store(file:///tmp/output/b1:org.apache.pig.builtin.PigStorage) - scope-23
-| |
-| b2: Store(file:///tmp/output/b2:org.apache.pig.builtin.PigStorage) - scope-33
-| |
-| |---b2: New For Each(false,false)[bag] - scope-32
-| | |
-| | Project[int][0] - scope-26
-| | |
-| | POUserFunc(org.apache.pig.builtin.LongSum)[long] - scope-30
-| | |
-| | |---Project[bag][0] - scope-29
-| | |
-| | |---Project[bag][1] - scope-28
-|
-|---b1: Package(Packager)[tuple]{int} - scope-17
-Tez vertex scope-168
-# Plan on vertex
-f1: Split - scope-205
-| |
-| f1: Store(file:///tmp/output/f1:org.apache.pig.builtin.PigStorage) - scope-99
-| |
-| f2: Store(file:///tmp/output/f2:org.apache.pig.builtin.PigStorage) - scope-213
-|
-|---f1: Limit - scope-172
- |
- |---f1: New For Each(true)[bag] - scope-171
- | |
- | Project[tuple][1] - scope-170
- |
- |---f1: Package(Packager)[tuple]{tuple} - scope-169
-Tez vertex group scope-211 <- [scope-106, scope-168] -> null
-# No plan on vertex group
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Rank-2.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Rank-2.gld?rev=1608593&r1=1608592&r2=1608593&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Rank-2.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Rank-2.gld Mon Jul 7 20:08:14 2014
@@ -35,7 +35,7 @@ Local Rearrange[tuple]{tuple}(false) - s
| |
| Constant(DummyVal) - scope-26
|
-|---New For Each(true,true)[tuple] - scope-32
+|---New For Each(false,true)[tuple] - scope-32
| |
| Project[int][0] - scope-15
| |
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1.gld?rev=1608593&r1=1608592&r2=1608593&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1.gld Mon Jul 7 20:08:14 2014
@@ -4,9 +4,9 @@
#--------------------------------------------------
# TEZ DAG plan: scope-27
#--------------------------------------------------
-Tez vertex scope-18 -> Tez vertex scope-24,
-Tez vertex scope-19 -> Tez vertex scope-24,
-Tez vertex scope-24
+Tez vertex scope-18 -> Tez vertex group scope-24,
+Tez vertex scope-19 -> Tez vertex group scope-24,
+Tez vertex group scope-24
Tez vertex scope-18
# Plan on vertex
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10.gld?rev=1608593&r1=1608592&r2=1608593&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10.gld Mon Jul 7 20:08:14 2014
@@ -4,10 +4,10 @@
#--------------------------------------------------
# TEZ DAG plan: scope-53
#--------------------------------------------------
-Tez vertex scope-37 -> Tez vertex scope-43,
-Tez vertex scope-31 -> Tez vertex scope-43,
-Tez vertex scope-32 -> Tez vertex scope-43,
-Tez vertex scope-43 -> Tez vertex scope-42,
+Tez vertex scope-37 -> Tez vertex group scope-43,
+Tez vertex scope-31 -> Tez vertex group scope-43,
+Tez vertex scope-32 -> Tez vertex group scope-43,
+Tez vertex group scope-43 -> Tez vertex scope-42,
Tez vertex scope-42
Tez vertex scope-37
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2.gld?rev=1608593&r1=1608592&r2=1608593&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2.gld Mon Jul 7 20:08:14 2014
@@ -4,9 +4,9 @@
#--------------------------------------------------
# TEZ DAG plan: scope-72
#--------------------------------------------------
-Tez vertex scope-29 -> Tez vertex scope-55,
-Tez vertex scope-30 -> Tez vertex scope-55,
-Tez vertex scope-55 -> Tez vertex scope-35,
+Tez vertex scope-29 -> Tez vertex group scope-55,
+Tez vertex scope-30 -> Tez vertex group scope-55,
+Tez vertex group scope-55 -> Tez vertex scope-35,
Tez vertex scope-35
Tez vertex scope-29
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3.gld?rev=1608593&r1=1608592&r2=1608593&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3.gld Mon Jul 7 20:08:14 2014
@@ -5,9 +5,9 @@
# TEZ DAG plan: scope-50
#--------------------------------------------------
Tez vertex scope-43 -> Tez vertex scope-44,
-Tez vertex scope-37 -> Tez vertex scope-45,
-Tez vertex scope-38 -> Tez vertex scope-45,
-Tez vertex scope-45 -> Tez vertex scope-44,
+Tez vertex scope-37 -> Tez vertex group scope-45,
+Tez vertex scope-38 -> Tez vertex group scope-45,
+Tez vertex group scope-45 -> Tez vertex scope-44,
Tez vertex scope-44
Tez vertex scope-43
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-5.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-5.gld?rev=1608593&r1=1608592&r2=1608593&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-5.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-5.gld Mon Jul 7 20:08:14 2014
@@ -4,9 +4,9 @@
#--------------------------------------------------
# TEZ DAG plan: scope-130
#--------------------------------------------------
-Tez vertex scope-119 -> Tez vertex scope-125,
-Tez vertex scope-120 -> Tez vertex scope-125,
-Tez vertex scope-125 -> Tez vertex scope-118,
+Tez vertex scope-119 -> Tez vertex group scope-125,
+Tez vertex scope-120 -> Tez vertex group scope-125,
+Tez vertex group scope-125 -> Tez vertex scope-118,
Tez vertex scope-118
Tez vertex scope-119
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-6.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-6.gld?rev=1608593&r1=1608592&r2=1608593&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-6.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-6.gld Mon Jul 7 20:08:14 2014
@@ -4,11 +4,11 @@
#--------------------------------------------------
# TEZ DAG plan: scope-85
#--------------------------------------------------
-Tez vertex scope-29 -> Tez vertex scope-63,Tez vertex scope-64,
-Tez vertex scope-30 -> Tez vertex scope-63,Tez vertex scope-64,
-Tez vertex scope-64 -> Tez vertex scope-43,
+Tez vertex scope-29 -> Tez vertex group scope-63,Tez vertex group scope-64,
+Tez vertex scope-30 -> Tez vertex group scope-63,Tez vertex group scope-64,
+Tez vertex group scope-64 -> Tez vertex scope-43,
Tez vertex scope-43 -> Tez vertex scope-53,Tez vertex scope-35,
-Tez vertex scope-63 -> Tez vertex scope-53,
+Tez vertex group scope-63 -> Tez vertex scope-53,
Tez vertex scope-53 -> Tez vertex scope-57,
Tez vertex scope-35 -> Tez vertex scope-57,
Tez vertex scope-57
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7-OPTOFF.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7-OPTOFF.gld?rev=1608593&r1=1608592&r2=1608593&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7-OPTOFF.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7-OPTOFF.gld Mon Jul 7 20:08:14 2014
@@ -47,7 +47,7 @@ Local Rearrange[tuple]{tuple}(false) - s
| |
| Constant(DummyVal) - scope-101
|
-|---New For Each(true,true)[tuple] - scope-107
+|---New For Each(false,true)[tuple] - scope-107
| |
| Project[int][0] - scope-91
| |
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7.gld?rev=1608593&r1=1608592&r2=1608593&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7.gld Mon Jul 7 20:08:14 2014
@@ -4,11 +4,11 @@
#--------------------------------------------------
# TEZ DAG plan: scope-73
#--------------------------------------------------
-Tez vertex scope-20 -> Tez vertex scope-51,Tez vertex scope-52,
-Tez vertex scope-21 -> Tez vertex scope-51,Tez vertex scope-52,
-Tez vertex scope-52 -> Tez vertex scope-34,
+Tez vertex scope-20 -> Tez vertex group scope-51,Tez vertex group scope-52,
+Tez vertex scope-21 -> Tez vertex group scope-51,Tez vertex group scope-52,
+Tez vertex group scope-52 -> Tez vertex scope-34,
Tez vertex scope-34 -> Tez vertex scope-44,
-Tez vertex scope-51 -> Tez vertex scope-44,
+Tez vertex group scope-51 -> Tez vertex scope-44,
Tez vertex scope-44 -> Tez vertex scope-46,
Tez vertex scope-46
@@ -18,7 +18,7 @@ Local Rearrange[tuple]{tuple}(false) - s
| |
| Constant(DummyVal) - scope-55
|
-|---New For Each(true,true)[tuple] - scope-62
+|---New For Each(false,true)[tuple] - scope-62
| |
| Project[int][0] - scope-59
| |
@@ -49,7 +49,7 @@ Local Rearrange[tuple]{tuple}(false) - s
| |
| Constant(DummyVal) - scope-65
|
-|---New For Each(true,true)[tuple] - scope-72
+|---New For Each(false,true)[tuple] - scope-72
| |
| Project[int][0] - scope-69
| |
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8-OPTOFF.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8-OPTOFF.gld?rev=1608593&r1=1608592&r2=1608593&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8-OPTOFF.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8-OPTOFF.gld Mon Jul 7 20:08:14 2014
@@ -2,96 +2,78 @@
# There are 1 DAGs in the session
#--------------------------------------------------
#--------------------------------------------------
-# TEZ DAG plan: scope-108
+# TEZ DAG plan: scope-88
#--------------------------------------------------
-Tez vertex scope-81 -> Tez vertex scope-84,
-Tez vertex scope-84 -> Tez vertex scope-97,
-Tez vertex scope-89 -> Tez vertex scope-92,
-Tez vertex scope-92 -> Tez vertex scope-97,
-Tez vertex scope-97 -> Tez vertex scope-103,
-Tez vertex scope-103
+Tez vertex scope-70 -> Tez vertex scope-72,
+Tez vertex scope-72 -> Tez vertex scope-80,
+Tez vertex scope-75 -> Tez vertex scope-77,
+Tez vertex scope-77 -> Tez vertex scope-80,
+Tez vertex scope-80 -> Tez vertex scope-85,
+Tez vertex scope-85
-Tez vertex scope-81
+Tez vertex scope-70
# Plan on vertex
-Local Rearrange[tuple]{tuple}(false) - scope-83 -> scope-84
-| |
-| Project[tuple][*] - scope-82
+POValueOutputTez - scope-71 -> [scope-72]
|
-|---Limit - scope-59
+|---Limit - scope-48
|
- |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-58
-Tez vertex scope-84
+ |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-47
+Tez vertex scope-72
# Plan on vertex
-POValueOutputTez - scope-99 -> [scope-97]
+POValueOutputTez - scope-82 -> [scope-80]
|
-|---a: New For Each(false,false)[bag] - scope-67
+|---a: New For Each(false,false)[bag] - scope-56
| |
- | Cast[int] - scope-62
+ | Cast[int] - scope-51
| |
- | |---Project[bytearray][0] - scope-61
+ | |---Project[bytearray][0] - scope-50
| |
- | Cast[chararray] - scope-65
+ | Cast[chararray] - scope-54
| |
- | |---Project[bytearray][1] - scope-64
+ | |---Project[bytearray][1] - scope-53
|
- |---Limit - scope-60
+ |---Limit - scope-49
|
- |---Limit - scope-88
+ |---Limit - scope-74
|
- |---New For Each(true)[bag] - scope-87
- | |
- | Project[tuple][1] - scope-86
- |
- |---Package(Packager)[tuple]{tuple} - scope-85
-Tez vertex scope-89
+ |---POValueInputTez - scope-73 <- scope-70
+Tez vertex scope-75
# Plan on vertex
-Local Rearrange[tuple]{tuple}(false) - scope-91 -> scope-92
-| |
-| Project[tuple][*] - scope-90
+POValueOutputTez - scope-76 -> [scope-77]
|
-|---Limit - scope-69
+|---Limit - scope-58
|
- |---b: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-68
-Tez vertex scope-92
+ |---b: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-57
+Tez vertex scope-77
# Plan on vertex
-POValueOutputTez - scope-100 -> [scope-97]
+POValueOutputTez - scope-83 -> [scope-80]
|
-|---c: New For Each(false,false)[bag] - scope-77
+|---c: New For Each(false,false)[bag] - scope-66
| |
- | Cast[int] - scope-72
+ | Cast[int] - scope-61
| |
- | |---Project[bytearray][1] - scope-71
+ | |---Project[bytearray][1] - scope-60
| |
- | Cast[chararray] - scope-75
+ | Cast[chararray] - scope-64
| |
- | |---Project[bytearray][0] - scope-74
+ | |---Project[bytearray][0] - scope-63
|
- |---Limit - scope-70
+ |---Limit - scope-59
|
- |---Limit - scope-96
+ |---Limit - scope-79
|
- |---New For Each(true)[bag] - scope-95
- | |
- | Project[tuple][1] - scope-94
- |
- |---Package(Packager)[tuple]{tuple} - scope-93
-Tez vertex scope-97
+ |---POValueInputTez - scope-78 <- scope-75
+Tez vertex scope-80
# Plan on vertex
-d: Local Rearrange[tuple]{tuple}(false) - scope-102 -> scope-103
-| |
-| Project[tuple][*] - scope-101
+POValueOutputTez - scope-84 -> [scope-85]
|
-|---d: Limit - scope-79
+|---d: Limit - scope-68
|
- |---POShuffledValueInputTez - scope-98 <- [scope-92, scope-84]
-Tez vertex scope-103
+ |---POShuffledValueInputTez - scope-81 <- [scope-77, scope-72]
+Tez vertex scope-85
# Plan on vertex
-d: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-80
+d: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-69
|
-|---d: Limit - scope-107
+|---d: Limit - scope-87
|
- |---d: New For Each(true)[bag] - scope-106
- | |
- | Project[tuple][1] - scope-105
- |
- |---d: Package(Packager)[tuple]{tuple} - scope-104
+ |---POValueInputTez - scope-86 <- scope-80
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8.gld?rev=1608593&r1=1608592&r2=1608593&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8.gld Mon Jul 7 20:08:14 2014
@@ -2,31 +2,27 @@
# There are 1 DAGs in the session
#--------------------------------------------------
#--------------------------------------------------
-# TEZ DAG plan: scope-57
+# TEZ DAG plan: scope-46
#--------------------------------------------------
-Tez vertex scope-23 -> Tez vertex scope-26,
-Tez vertex scope-26 -> Tez vertex scope-50,
-Tez vertex scope-31 -> Tez vertex scope-34,
-Tez vertex scope-34 -> Tez vertex scope-50,
-Tez vertex scope-50 -> Tez vertex scope-45,
-Tez vertex scope-45
+Tez vertex scope-23 -> Tez vertex scope-25,
+Tez vertex scope-25 -> Tez vertex group scope-41,
+Tez vertex scope-28 -> Tez vertex scope-30,
+Tez vertex scope-30 -> Tez vertex group scope-41,
+Tez vertex group scope-41 -> Tez vertex scope-38,
+Tez vertex scope-38
Tez vertex scope-23
# Plan on vertex
-Local Rearrange[tuple]{tuple}(false) - scope-25 -> scope-26
-| |
-| Project[tuple][*] - scope-24
+POValueOutputTez - scope-24 -> [scope-25]
|
|---Limit - scope-1
|
|---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-0
-Tez vertex scope-26
+Tez vertex scope-25
# Plan on vertex
-d: Local Rearrange[tuple]{tuple}(false) - scope-51 -> scope-45
-| |
-| Project[tuple][*] - scope-52
+POValueOutputTez - scope-42 -> [scope-38]
|
-|---d: Limit - scope-53
+|---d: Limit - scope-43
|
|---a: New For Each(false,false)[bag] - scope-9
| |
@@ -40,29 +36,21 @@ d: Local Rearrange[tuple]{tuple}(false)
|
|---Limit - scope-2
|
- |---Limit - scope-30
+ |---Limit - scope-27
|
- |---New For Each(true)[bag] - scope-29
- | |
- | Project[tuple][1] - scope-28
- |
- |---Package(Packager)[tuple]{tuple} - scope-27
-Tez vertex scope-31
+ |---POValueInputTez - scope-26 <- scope-23
+Tez vertex scope-28
# Plan on vertex
-Local Rearrange[tuple]{tuple}(false) - scope-33 -> scope-34
-| |
-| Project[tuple][*] - scope-32
+POValueOutputTez - scope-29 -> [scope-30]
|
|---Limit - scope-11
|
|---b: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-10
-Tez vertex scope-34
+Tez vertex scope-30
# Plan on vertex
-d: Local Rearrange[tuple]{tuple}(false) - scope-54 -> scope-45
-| |
-| Project[tuple][*] - scope-55
+POValueOutputTez - scope-44 -> [scope-38]
|
-|---d: Limit - scope-56
+|---d: Limit - scope-45
|
|---c: New For Each(false,false)[bag] - scope-19
| |
@@ -76,23 +64,15 @@ d: Local Rearrange[tuple]{tuple}(false)
|
|---Limit - scope-12
|
- |---Limit - scope-38
+ |---Limit - scope-32
|
- |---New For Each(true)[bag] - scope-37
- | |
- | Project[tuple][1] - scope-36
- |
- |---Package(Packager)[tuple]{tuple} - scope-35
-Tez vertex group scope-50 <- [scope-26, scope-34] -> scope-45
+ |---POValueInputTez - scope-31 <- scope-28
+Tez vertex group scope-41 <- [scope-25, scope-30] -> scope-38
# No plan on vertex group
-Tez vertex scope-45
+Tez vertex scope-38
# Plan on vertex
d: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-22
|
-|---d: Limit - scope-49
+|---d: Limit - scope-40
|
- |---d: New For Each(true)[bag] - scope-48
- | |
- | Project[tuple][1] - scope-47
- |
- |---d: Package(Packager)[tuple]{tuple} - scope-46
+ |---POValueInputTez - scope-39 <- scope-41
Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-9.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-9.gld?rev=1608593&r1=1608592&r2=1608593&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-9.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-9.gld Mon Jul 7 20:08:14 2014
@@ -4,10 +4,10 @@
#--------------------------------------------------
# TEZ DAG plan: scope-62
#--------------------------------------------------
-Tez vertex scope-40 -> Tez vertex scope-58,Tez vertex scope-59,
-Tez vertex scope-46 -> Tez vertex scope-58,Tez vertex scope-59,
-Tez vertex scope-59
-Tez vertex scope-58
+Tez vertex scope-40 -> Tez vertex group scope-58,Tez vertex group scope-59,
+Tez vertex scope-46 -> Tez vertex group scope-58,Tez vertex group scope-59,
+Tez vertex group scope-59
+Tez vertex group scope-58
Tez vertex scope-40
# Plan on vertex
Modified: pig/trunk/test/tez-tests
URL: http://svn.apache.org/viewvc/pig/trunk/test/tez-tests?rev=1608593&r1=1608592&r2=1608593&view=diff
==============================================================================
--- pig/trunk/test/tez-tests (original)
+++ pig/trunk/test/tez-tests Mon Jul 7 20:08:14 2014
@@ -9,6 +9,7 @@
**/TestCompressedFiles.java
**/TestCustomPartitioner.java
**/TestEvalPipeline.java
+**/TestEvalPipeline2.java
**/TestFilterUDF.java
**/TestFinish.java
**/TestForEachNestedPlan.java
@@ -22,21 +23,27 @@
**/TestKeyTypeDiscoveryVisitor.java
**/TestLoad.java
**/TestLocalRearrange.java
+**/TestLimitAdjuster.java
+**/TestLimitVariable.java
**/TestMapReduce.java
**/TestMapReduce2.java
**/TestNestedForeach.java
**/TestNewPlanImplicitSplit.java
+**/TestParser.java
**/TestPigContext.java
**/TestPigServer.java
**/TestPigServerWithMacros.java
+**/TestPigSplit.java
**/TestPigStorage.java
**/TestRegisteredJarVisibility.java
**/TestSample.java
+**/TestScalarAliases.java
**/TestSchema.java
**/TestScriptLanguageJavaScript.java
**/TestScriptUDF.java
**/TestSkewedJoin.java
**/TestSplitStore.java
+**/TestStore.java
**/TestStoreInstances.java
**/TestStoreOld.java
**/TestStreaming.java