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/11/07 22:08:27 UTC

svn commit: r1637447 [3/4] - in /pig/trunk: ./ src/org/apache/pig/ src/org/apache/pig/backend/executionengine/ src/org/apache/pig/backend/hadoop/executionengine/ src/org/apache/pig/backend/hadoop/executionengine/tez/ src/org/apache/pig/backend/hadoop/e...

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1-OPTOFF.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1-OPTOFF.gld?rev=1637447&r1=1637446&r2=1637447&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1-OPTOFF.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1-OPTOFF.gld Fri Nov  7 21:08:25 2014
@@ -2,64 +2,64 @@
 # There are 1 DAGs in the session
 #--------------------------------------------------
 #--------------------------------------------------
-# TEZ DAG plan: scope-66
+# TEZ DAG plan: pig-0_scope-1
 #--------------------------------------------------
-Tez vertex scope-58	->	Tez vertex scope-60,Tez vertex scope-62,Tez vertex scope-64,
-Tez vertex scope-64
-Tez vertex scope-62
-Tez vertex scope-60
+Tez vertex scope-57	->	Tez vertex scope-59,Tez vertex scope-61,Tez vertex scope-63,
+Tez vertex scope-59
+Tez vertex scope-63
+Tez vertex scope-61
 
-Tez vertex scope-58
+Tez vertex scope-57
 # Plan on vertex
-POValueOutputTez - scope-59	->	 [scope-64, scope-62, scope-60]
+POValueOutputTez - scope-58	->	 [scope-59, scope-63, scope-61]
 |
-|---a: New For Each(false,false)[bag] - scope-41
+|---a: New For Each(false,false)[bag] - scope-40
     |   |
-    |   Cast[int] - scope-36
+    |   Cast[int] - scope-35
     |   |
-    |   |---Project[bytearray][0] - scope-35
+    |   |---Project[bytearray][0] - scope-34
     |   |
-    |   Cast[int] - scope-39
+    |   Cast[int] - scope-38
     |   |
-    |   |---Project[bytearray][1] - scope-38
+    |   |---Project[bytearray][1] - scope-37
     |
-    |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-34
-Tez vertex scope-64
+    |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-33
+Tez vertex scope-59
 # Plan on vertex
-d: Store(file:///tmp/output/d:org.apache.pig.builtin.PigStorage) - scope-57
+b: Store(file:///tmp/output/b:org.apache.pig.builtin.PigStorage) - scope-46
 |
-|---d: Filter[bag] - scope-53
+|---b: Filter[bag] - scope-42
     |   |
-    |   Greater Than[boolean] - scope-56
+    |   Less Than or Equal[boolean] - scope-45
     |   |
-    |   |---Project[int][0] - scope-54
+    |   |---Project[int][0] - scope-43
     |   |
-    |   |---Constant(10) - scope-55
+    |   |---Constant(5) - scope-44
     |
-    |---POValueInputTez - scope-65	<-	 scope-58
-Tez vertex scope-62
+    |---POValueInputTez - scope-60	<-	 scope-57
+Tez vertex scope-63
 # Plan on vertex
-c: Store(file:///tmp/output/c:org.apache.pig.builtin.PigStorage) - scope-52
+d: Store(file:///tmp/output/d:org.apache.pig.builtin.PigStorage) - scope-56
 |
-|---c: Filter[bag] - scope-48
+|---d: Filter[bag] - scope-52
     |   |
-    |   Less Than or Equal[boolean] - scope-51
+    |   Greater Than[boolean] - scope-55
     |   |
-    |   |---Project[int][0] - scope-49
+    |   |---Project[int][0] - scope-53
     |   |
-    |   |---Constant(10) - scope-50
+    |   |---Constant(10) - scope-54
     |
-    |---POValueInputTez - scope-63	<-	 scope-58
-Tez vertex scope-60
+    |---POValueInputTez - scope-64	<-	 scope-57
+Tez vertex scope-61
 # Plan on vertex
-b: Store(file:///tmp/output/b:org.apache.pig.builtin.PigStorage) - scope-47
+c: Store(file:///tmp/output/c:org.apache.pig.builtin.PigStorage) - scope-51
 |
-|---b: Filter[bag] - scope-43
+|---c: Filter[bag] - scope-47
     |   |
-    |   Less Than or Equal[boolean] - scope-46
+    |   Less Than or Equal[boolean] - scope-50
     |   |
-    |   |---Project[int][0] - scope-44
+    |   |---Project[int][0] - scope-48
     |   |
-    |   |---Constant(5) - scope-45
+    |   |---Constant(10) - scope-49
     |
-    |---POValueInputTez - scope-61	<-	 scope-58
+    |---POValueInputTez - scope-62	<-	 scope-57

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1.gld?rev=1637447&r1=1637446&r2=1637447&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1.gld Fri Nov  7 21:08:25 2014
@@ -2,13 +2,13 @@
 # There are 1 DAGs in the session
 #--------------------------------------------------
 #--------------------------------------------------
-# TEZ DAG plan: scope-32
+# TEZ DAG plan: pig-0_scope-0
 #--------------------------------------------------
 Tez vertex scope-24
 
 Tez vertex scope-24
 # Plan on vertex
-1-1: Split - scope-33
+1-1: Split - scope-32
 |   |
 |   b: Store(file:///tmp/output/b:org.apache.pig.builtin.PigStorage) - scope-13
 |   |

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=1637447&r1=1637446&r2=1637447&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 Fri Nov  7 21:08:25 2014
@@ -2,305 +2,305 @@
 # There are 1 DAGs in the session
 #--------------------------------------------------
 #--------------------------------------------------
-# TEZ DAG plan: scope-393
+# TEZ DAG plan: pig-0_scope-1
 #--------------------------------------------------
-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-414,
-Tez vertex scope-387	->	Tez vertex group scope-414,
-Tez vertex group scope-414
-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-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-317	->	Tez vertex scope-319,Tez vertex scope-330,Tez vertex scope-341,
+Tez vertex scope-341	->	Tez vertex scope-344,Tez vertex scope-384,
+Tez vertex scope-384	->	Tez vertex group scope-412,
+Tez vertex scope-319	->	Tez vertex scope-322,Tez vertex scope-335,Tez vertex scope-346,
+Tez vertex scope-346	->	Tez vertex scope-349,Tez vertex scope-375,
+Tez vertex scope-375	->	Tez vertex scope-378,
+Tez vertex scope-378	->	Tez vertex scope-382,Tez vertex scope-386,
+Tez vertex scope-386	->	Tez vertex group scope-412,
+Tez vertex group scope-412
+Tez vertex scope-382
+Tez vertex scope-330	->	Tez vertex scope-333,Tez vertex scope-338,
+Tez vertex scope-338	->	Tez vertex scope-340,
+Tez vertex scope-340
+Tez vertex scope-322	->	Tez vertex scope-324,
+Tez vertex scope-324	->	Tez vertex scope-326,Tez vertex scope-328,
+Tez vertex scope-326
+Tez vertex scope-344
+Tez vertex scope-328
+Tez vertex scope-349	->	Tez vertex scope-369,Tez vertex scope-359,
+Tez vertex scope-359	->	Tez vertex scope-369,
+Tez vertex scope-369	->	Tez vertex scope-371,
+Tez vertex scope-371
+Tez vertex scope-333	->	Tez vertex scope-337,
+Tez vertex scope-335	->	Tez vertex scope-337,
+Tez vertex scope-337
 
-Tez vertex scope-318
+Tez vertex scope-317
 # Plan on vertex
-POValueOutputTez - scope-319	->	 [scope-320, scope-331, scope-342]
+POValueOutputTez - scope-318	->	 [scope-341, scope-319, scope-330]
 |
-|---a: New For Each(false,false)[bag] - scope-219
+|---a: New For Each(false,false)[bag] - scope-218
     |   |
-    |   Cast[int] - scope-214
+    |   Cast[int] - scope-213
     |   |
-    |   |---Project[bytearray][0] - scope-213
+    |   |---Project[bytearray][0] - scope-212
     |   |
-    |   Cast[int] - scope-217
+    |   Cast[int] - scope-216
     |   |
-    |   |---Project[bytearray][1] - scope-216
+    |   |---Project[bytearray][1] - scope-215
     |
-    |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-212
-Tez vertex scope-320
+    |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-211
+Tez vertex scope-341
 # Plan on vertex
-POValueOutputTez - scope-322	->	 [scope-336, scope-323, scope-347]
+POValueOutputTez - scope-343	->	 [scope-384, scope-344]
 |
-|---b: Filter[bag] - scope-221
+|---d1: Filter[bag] - scope-284
     |   |
-    |   Less Than or Equal[boolean] - scope-224
+    |   Equal To[boolean] - scope-287
     |   |
-    |   |---Project[int][0] - scope-222
+    |   |---Project[int][0] - scope-285
     |   |
-    |   |---Constant(5) - scope-223
+    |   |---Constant(5) - scope-286
     |
-    |---POValueInputTez - scope-321	<-	 scope-318
-Tez vertex scope-347
-# Plan on vertex
-POValueOutputTez - scope-349	->	 [scope-376, scope-350]
-|
-|---POValueInputTez - scope-348	<-	 scope-320
-Tez vertex scope-376
-# Plan on vertex
-POValueOutputTez - scope-378	->	 [scope-379]
-|
-|---f1: Limit - scope-307
-    |
-    |---f: Filter[bag] - scope-303
+    |---d: Filter[bag] - scope-280
         |   |
-        |   Greater Than or Equal[boolean] - scope-306
+        |   Greater Than[boolean] - scope-283
         |   |
-        |   |---Project[int][0] - scope-304
+        |   |---Project[int][0] - scope-281
         |   |
-        |   |---Constant(3) - scope-305
+        |   |---Constant(10) - scope-282
         |
-        |---POValueInputTez - scope-377	<-	 scope-347
-Tez vertex scope-379
-# Plan on vertex
-POValueOutputTez - scope-382	->	 [scope-387, scope-383]
-|
-|---f1: Limit - scope-381
-    |
-    |---POValueInputTez - scope-380	<-	 scope-376
-Tez vertex scope-383
+        |---POValueInputTez - scope-342	<-	 scope-317
+Tez vertex scope-384
 # Plan on vertex
-f1: Store(file:///tmp/output/f1:org.apache.pig.builtin.PigStorage) - scope-311
+f2: Store(file:///tmp/output/f2:org.apache.pig.builtin.PigStorage) - scope-413
 |
-|---POValueInputTez - scope-384	<-	 scope-379
-Tez vertex scope-342
+|---POValueInputTez - scope-385	<-	 scope-341
+Tez vertex scope-319
 # Plan on vertex
-POValueOutputTez - scope-344	->	 [scope-385, scope-345]
+POValueOutputTez - scope-321	->	 [scope-335, scope-322, scope-346]
 |
-|---d1: Filter[bag] - scope-285
+|---b: Filter[bag] - scope-220
     |   |
-    |   Equal To[boolean] - scope-288
+    |   Less Than or Equal[boolean] - scope-223
     |   |
-    |   |---Project[int][0] - scope-286
+    |   |---Project[int][0] - scope-221
     |   |
-    |   |---Constant(5) - scope-287
+    |   |---Constant(5) - scope-222
     |
-    |---d: Filter[bag] - scope-281
+    |---POValueInputTez - scope-320	<-	 scope-317
+Tez vertex scope-346
+# Plan on vertex
+POValueOutputTez - scope-348	->	 [scope-375, scope-349]
+|
+|---POValueInputTez - scope-347	<-	 scope-319
+Tez vertex scope-375
+# Plan on vertex
+POValueOutputTez - scope-377	->	 [scope-378]
+|
+|---f1: Limit - scope-306
+    |
+    |---f: Filter[bag] - scope-302
         |   |
-        |   Greater Than[boolean] - scope-284
+        |   Greater Than or Equal[boolean] - scope-305
         |   |
-        |   |---Project[int][0] - scope-282
+        |   |---Project[int][0] - scope-303
         |   |
-        |   |---Constant(10) - scope-283
+        |   |---Constant(3) - scope-304
         |
-        |---POValueInputTez - scope-343	<-	 scope-318
-Tez vertex scope-385
+        |---POValueInputTez - scope-376	<-	 scope-346
+Tez vertex scope-378
 # Plan on vertex
-f2: Store(file:///tmp/output/f2:org.apache.pig.builtin.PigStorage) - scope-415
+POValueOutputTez - scope-381	->	 [scope-386, scope-382]
 |
-|---POValueInputTez - scope-386	<-	 scope-342
-Tez vertex scope-387
+|---f1: Limit - scope-380
+    |
+    |---POValueInputTez - scope-379	<-	 scope-375
+Tez vertex scope-386
 # Plan on vertex
-f2: Store(file:///tmp/output/f2:org.apache.pig.builtin.PigStorage) - scope-416
+f2: Store(file:///tmp/output/f2:org.apache.pig.builtin.PigStorage) - scope-414
 |
-|---POValueInputTez - scope-388	<-	 scope-379
-Tez vertex group scope-414	<-	 [scope-385, scope-387]	->	 null
+|---POValueInputTez - scope-387	<-	 scope-378
+Tez vertex group scope-412	<-	 [scope-384, scope-386]	->	 null
 # No plan on vertex group
-Tez vertex scope-331
+Tez vertex scope-382
 # Plan on vertex
-POValueOutputTez - scope-333	->	 [scope-339, scope-334]
+f1: Store(file:///tmp/output/f1:org.apache.pig.builtin.PigStorage) - scope-310
 |
-|---c: Filter[bag] - scope-246
+|---POValueInputTez - scope-383	<-	 scope-378
+Tez vertex scope-330
+# Plan on vertex
+POValueOutputTez - scope-332	->	 [scope-338, scope-333]
+|
+|---c: Filter[bag] - scope-245
     |   |
-    |   Less Than or Equal[boolean] - scope-249
+    |   Less Than or Equal[boolean] - scope-248
     |   |
-    |   |---Project[int][0] - scope-247
+    |   |---Project[int][0] - scope-246
     |   |
-    |   |---Constant(10) - scope-248
+    |   |---Constant(10) - scope-247
     |
-    |---POValueInputTez - scope-332	<-	 scope-318
-Tez vertex scope-339
+    |---POValueInputTez - scope-331	<-	 scope-317
+Tez vertex scope-338
 # Plan on vertex
-c2: Local Rearrange[tuple]{int}(false) - scope-406	->	 scope-341
+c2: Local Rearrange[tuple]{int}(false) - scope-404	->	 scope-340
 |   |
-|   Project[int][0] - scope-408
+|   Project[int][0] - scope-406
 |
-|---c3: New For Each(false,false)[bag] - scope-394
+|---c3: New For Each(false,false)[bag] - scope-392
     |   |
-    |   Project[int][0] - scope-395
+    |   Project[int][0] - scope-393
     |   |
-    |   POUserFunc(org.apache.pig.builtin.AlgebraicMathBase$Initial)[tuple] - scope-396
+    |   POUserFunc(org.apache.pig.builtin.AlgebraicMathBase$Initial)[tuple] - scope-394
     |   |
-    |   |---Project[bag][0] - scope-397
+    |   |---Project[bag][0] - scope-395
     |       |
-    |       |---Project[bag][1] - scope-398
+    |       |---Project[bag][1] - scope-396
     |
-    |---Pre Combiner Local Rearrange[tuple]{Unknown} - scope-409
+    |---Pre Combiner Local Rearrange[tuple]{Unknown} - scope-407
         |
-        |---POValueInputTez - scope-340	<-	 scope-331
-Tez vertex scope-341
-# Combine plan on edge <scope-339>
-c2: Local Rearrange[tuple]{int}(false) - scope-410	->	 scope-341
+        |---POValueInputTez - scope-339	<-	 scope-330
+Tez vertex scope-340
+# Combine plan on edge <scope-338>
+c2: Local Rearrange[tuple]{int}(false) - scope-408	->	 scope-340
 |   |
-|   Project[int][0] - scope-412
+|   Project[int][0] - scope-410
 |
-|---c3: New For Each(false,false)[bag] - scope-399
+|---c3: New For Each(false,false)[bag] - scope-397
     |   |
-    |   Project[int][0] - scope-400
+    |   Project[int][0] - scope-398
     |   |
-    |   POUserFunc(org.apache.pig.builtin.LongSum$Intermediate)[tuple] - scope-401
+    |   POUserFunc(org.apache.pig.builtin.LongSum$Intermediate)[tuple] - scope-399
     |   |
-    |   |---Project[bag][1] - scope-402
+    |   |---Project[bag][1] - scope-400
     |
-    |---c2: Package(CombinerPackager)[tuple]{int} - scope-405
+    |---c2: Package(CombinerPackager)[tuple]{int} - scope-403
 # Plan on vertex
-c3: Store(file:///tmp/output/c1:org.apache.pig.builtin.PigStorage) - scope-280
+c3: Store(file:///tmp/output/c1:org.apache.pig.builtin.PigStorage) - scope-279
 |
-|---c3: New For Each(false,false)[bag] - scope-279
+|---c3: New For Each(false,false)[bag] - scope-278
     |   |
-    |   Project[int][0] - scope-273
+    |   Project[int][0] - scope-272
     |   |
-    |   POUserFunc(org.apache.pig.builtin.LongSum$Final)[long] - scope-277
+    |   POUserFunc(org.apache.pig.builtin.LongSum$Final)[long] - scope-276
     |   |
-    |   |---Project[bag][1] - scope-403
+    |   |---Project[bag][1] - scope-401
     |
-    |---c2: Package(CombinerPackager)[tuple]{int} - scope-270
-Tez vertex scope-323
+    |---c2: Package(CombinerPackager)[tuple]{int} - scope-269
+Tez vertex scope-322
 # Plan on vertex
-b1: Local Rearrange[tuple]{int}(false) - scope-230	->	 scope-325
+b1: Local Rearrange[tuple]{int}(false) - scope-229	->	 scope-324
 |   |
-|   Project[int][0] - scope-231
+|   Project[int][0] - scope-230
 |
-|---POValueInputTez - scope-324	<-	 scope-320
-Tez vertex scope-325
+|---POValueInputTez - scope-323	<-	 scope-319
+Tez vertex scope-324
 # Plan on vertex
-POValueOutputTez - scope-326	->	 [scope-329, scope-327]
+POValueOutputTez - scope-325	->	 [scope-328, scope-326]
 |
-|---b1: Package(Packager)[tuple]{int} - scope-229
-Tez vertex scope-327
+|---b1: Package(Packager)[tuple]{int} - scope-228
+Tez vertex scope-326
 # Plan on vertex
-b1: Store(file:///tmp/output/b1:org.apache.pig.builtin.PigStorage) - scope-235
+b1: Store(file:///tmp/output/b1:org.apache.pig.builtin.PigStorage) - scope-234
 |
-|---POValueInputTez - scope-328	<-	 scope-325
-Tez vertex scope-345
+|---POValueInputTez - scope-327	<-	 scope-324
+Tez vertex scope-344
 # Plan on vertex
-d1: Store(file:///tmp/output/d1:org.apache.pig.builtin.PigStorage) - scope-292
+d1: Store(file:///tmp/output/d1:org.apache.pig.builtin.PigStorage) - scope-291
 |
-|---POValueInputTez - scope-346	<-	 scope-342
-Tez vertex scope-329
+|---POValueInputTez - scope-345	<-	 scope-341
+Tez vertex scope-328
 # Plan on vertex
-b2: Store(file:///tmp/output/b2:org.apache.pig.builtin.PigStorage) - scope-245
+b2: Store(file:///tmp/output/b2:org.apache.pig.builtin.PigStorage) - scope-244
 |
-|---b2: New For Each(false,false)[bag] - scope-244
+|---b2: New For Each(false,false)[bag] - scope-243
     |   |
-    |   Project[int][0] - scope-238
+    |   Project[int][0] - scope-237
     |   |
-    |   POUserFunc(org.apache.pig.builtin.LongSum)[long] - scope-242
+    |   POUserFunc(org.apache.pig.builtin.LongSum)[long] - scope-241
     |   |
-    |   |---Project[bag][0] - scope-241
+    |   |---Project[bag][0] - scope-240
     |       |
-    |       |---Project[bag][1] - scope-240
+    |       |---Project[bag][1] - scope-239
     |
-    |---POValueInputTez - scope-330	<-	 scope-325
-Tez vertex scope-350
+    |---POValueInputTez - scope-329	<-	 scope-324
+Tez vertex scope-349
 # Plan on vertex
-Local Rearrange[tuple]{tuple}(false) - scope-354	->	 scope-360
+Local Rearrange[tuple]{tuple}(false) - scope-353	->	 scope-359
 |   |
-|   Constant(DummyVal) - scope-353
+|   Constant(DummyVal) - scope-352
 |
-|---New For Each(false,true)[tuple] - scope-359
+|---New For Each(false,true)[tuple] - scope-358
     |   |
-    |   Project[int][0] - scope-300
+    |   Project[int][0] - scope-299
     |   |
-    |   POUserFunc(org.apache.pig.impl.builtin.GetMemNumRows)[tuple] - scope-358
+    |   POUserFunc(org.apache.pig.impl.builtin.GetMemNumRows)[tuple] - scope-357
     |   |
-    |   |---Project[tuple][*] - scope-357
+    |   |---Project[tuple][*] - scope-356
     |
-    |---ReservoirSample - scope-356
+    |---ReservoirSample - scope-355
         |
-        |---e1: Local Rearrange[tuple]{int}(false) - scope-352	->	 scope-370
+        |---e1: Local Rearrange[tuple]{int}(false) - scope-351	->	 scope-369
             |   |
-            |   Project[int][0] - scope-300
+            |   Project[int][0] - scope-299
             |
-            |---e: Filter[bag] - scope-296
+            |---e: Filter[bag] - scope-295
                 |   |
-                |   Less Than[boolean] - scope-299
+                |   Less Than[boolean] - scope-298
                 |   |
-                |   |---Project[int][0] - scope-297
+                |   |---Project[int][0] - scope-296
                 |   |
-                |   |---Constant(3) - scope-298
+                |   |---Constant(3) - scope-297
                 |
-                |---POValueInputTez - scope-351	<-	 scope-347
-Tez vertex scope-360
+                |---POValueInputTez - scope-350	<-	 scope-346
+Tez vertex scope-359
 # Plan on vertex
-POValueOutputTez - scope-369	->	 [scope-370]
+POValueOutputTez - scope-368	->	 [scope-369]
 |
-|---New For Each(false)[tuple] - scope-368
+|---New For Each(false)[tuple] - scope-367
     |   |
-    |   POUserFunc(org.apache.pig.backend.hadoop.executionengine.tez.plan.udf.FindQuantilesTez)[tuple] - scope-367
+    |   POUserFunc(org.apache.pig.backend.hadoop.executionengine.tez.plan.udf.FindQuantilesTez)[tuple] - scope-366
     |   |
-    |   |---Project[tuple][*] - scope-366
+    |   |---Project[tuple][*] - scope-365
     |
-    |---New For Each(false,false)[tuple] - scope-365
+    |---New For Each(false,false)[tuple] - scope-364
         |   |
-        |   Constant(-1) - scope-364
+        |   Constant(-1) - scope-363
         |   |
-        |   Project[bag][1] - scope-362
+        |   Project[bag][1] - scope-361
         |
-        |---Package(Packager)[tuple]{bytearray} - scope-361
-Tez vertex scope-370
+        |---Package(Packager)[tuple]{bytearray} - scope-360
+Tez vertex scope-369
 # Plan on vertex
-POIdentityInOutTez - scope-371	<-	 scope-350	->	 scope-372
+POIdentityInOutTez - scope-370	<-	 scope-349	->	 scope-371
 |   |
-|   Project[int][0] - scope-300
-Tez vertex scope-372
+|   Project[int][0] - scope-299
+Tez vertex scope-371
 # Plan on vertex
-e1: Store(file:///tmp/output/e1:org.apache.pig.builtin.PigStorage) - scope-302
+e1: Store(file:///tmp/output/e1:org.apache.pig.builtin.PigStorage) - scope-301
 |
-|---New For Each(true)[tuple] - scope-375
+|---New For Each(true)[tuple] - scope-374
     |   |
-    |   Project[bag][1] - scope-374
+    |   Project[bag][1] - scope-373
     |
-    |---Package(LitePackager)[tuple]{int} - scope-373
-Tez vertex scope-334
+    |---Package(LitePackager)[tuple]{int} - scope-372
+Tez vertex scope-333
 # Plan on vertex
-c1: Local Rearrange[tuple]{int}(false) - scope-259	->	 scope-338
+c1: Local Rearrange[tuple]{int}(false) - scope-258	->	 scope-337
 |   |
-|   Project[int][0] - scope-260
+|   Project[int][0] - scope-259
 |
-|---POValueInputTez - scope-335	<-	 scope-331
-Tez vertex scope-336
+|---POValueInputTez - scope-334	<-	 scope-330
+Tez vertex scope-335
 # Plan on vertex
-c1: Local Rearrange[tuple]{int}(false) - scope-261	->	 scope-338
+c1: Local Rearrange[tuple]{int}(false) - scope-260	->	 scope-337
 |   |
-|   Project[int][0] - scope-262
+|   Project[int][0] - scope-261
 |
-|---POValueInputTez - scope-337	<-	 scope-320
-Tez vertex scope-338
+|---POValueInputTez - scope-336	<-	 scope-319
+Tez vertex scope-337
 # Plan on vertex
-c1: Store(file:///tmp/output/c1:org.apache.pig.builtin.PigStorage) - scope-266
+c1: Store(file:///tmp/output/c1:org.apache.pig.builtin.PigStorage) - scope-265
 |
-|---c1: New For Each(true,true)[tuple] - scope-265
+|---c1: New For Each(true,true)[tuple] - scope-264
     |   |
-    |   Project[bag][1] - scope-263
+    |   Project[bag][1] - scope-262
     |   |
-    |   Project[bag][2] - scope-264
+    |   Project[bag][2] - scope-263
     |
-    |---c1: Package(Packager)[tuple]{int} - scope-258
+    |---c1: Package(Packager)[tuple]{int} - scope-257

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=1637447&r1=1637446&r2=1637447&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 Fri Nov  7 21:08:25 2014
@@ -2,11 +2,11 @@
 # There are 1 DAGs in the session
 #--------------------------------------------------
 #--------------------------------------------------
-# TEZ DAG plan: scope-181
+# TEZ DAG plan: pig-0_scope-0
 #--------------------------------------------------
-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-209,
-Tez vertex scope-167	->	Tez vertex group scope-209,
-Tez vertex group scope-209
+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,
@@ -17,9 +17,9 @@ Tez vertex scope-129
 
 Tez vertex scope-106
 # Plan on vertex
-1-1: Split - scope-208
+1-1: Split - scope-207
 |   |
-|   b: Split - scope-205
+|   b: Split - scope-204
 |   |   |
 |   |   b1: Local Rearrange[tuple]{int}(false) - scope-18	->	 scope-113
 |   |   |   |
@@ -29,7 +29,7 @@ Tez vertex scope-106
 |   |   |   |
 |   |   |   Project[int][0] - scope-50
 |   |   |
-|   |   1-2: Split - scope-204
+|   |   1-2: Split - scope-203
 |   |   |   |
 |   |   |   Local Rearrange[tuple]{tuple}(false) - scope-142	->	 scope-148
 |   |   |   |   |
@@ -77,11 +77,11 @@ Tez vertex scope-106
 |       |   |
 |       |   |---Constant(5) - scope-11
 |   |
-|   d1: Split - scope-207
+|   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-210
+|   |   f2: Store(file:///tmp/output/f2:org.apache.pig.builtin.PigStorage) - scope-209
 |   |
 |   |---d1: Filter[bag] - scope-73
 |       |   |
@@ -114,20 +114,20 @@ Tez vertex scope-106
     |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-0
 Tez vertex scope-167
 # Plan on vertex
-f1: Split - scope-203
+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-211
+|   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-209	<-	 [scope-106, scope-167]	->	 null
+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-202
+b1: Split - scope-201
 |   |
 |   b1: Store(file:///tmp/output/b1:org.apache.pig.builtin.PigStorage) - scope-23
 |   |
@@ -177,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-206
+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-194	->	 scope-129
+|   c2: Local Rearrange[tuple]{int}(false) - scope-193	->	 scope-129
 |   |   |
-|   |   Project[int][0] - scope-196
+|   |   Project[int][0] - scope-195
 |   |
-|   |---c3: New For Each(false,false)[bag] - scope-182
+|   |---c3: New For Each(false,false)[bag] - scope-181
 |       |   |
-|       |   Project[int][0] - scope-183
+|       |   Project[int][0] - scope-182
 |       |   |
-|       |   POUserFunc(org.apache.pig.builtin.AlgebraicMathBase$Initial)[tuple] - scope-184
+|       |   POUserFunc(org.apache.pig.builtin.AlgebraicMathBase$Initial)[tuple] - scope-183
 |       |   |
-|       |   |---Project[bag][0] - scope-185
+|       |   |---Project[bag][0] - scope-184
 |       |       |
-|       |       |---Project[bag][1] - scope-186
+|       |       |---Project[bag][1] - scope-185
 |       |
-|       |---Pre Combiner Local Rearrange[tuple]{Unknown} - scope-197
+|       |---Pre Combiner Local Rearrange[tuple]{Unknown} - scope-196
 |
 |---c: Filter[bag] - scope-34
     |   |
@@ -221,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-198	->	 scope-129
+c2: Local Rearrange[tuple]{int}(false) - scope-197	->	 scope-129
 |   |
-|   Project[int][0] - scope-200
+|   Project[int][0] - scope-199
 |
-|---c3: New For Each(false,false)[bag] - scope-187
+|---c3: New For Each(false,false)[bag] - scope-186
     |   |
-    |   Project[int][0] - scope-188
+    |   Project[int][0] - scope-187
     |   |
-    |   POUserFunc(org.apache.pig.builtin.LongSum$Intermediate)[tuple] - scope-189
+    |   POUserFunc(org.apache.pig.builtin.LongSum$Intermediate)[tuple] - scope-188
     |   |
-    |   |---Project[bag][1] - scope-190
+    |   |---Project[bag][1] - scope-189
     |
-    |---c2: Package(CombinerPackager)[tuple]{int} - scope-193
+    |---c2: Package(CombinerPackager)[tuple]{int} - scope-192
 # Plan on vertex
 c3: Store(file:///tmp/output/c1:org.apache.pig.builtin.PigStorage) - scope-68
 |
@@ -243,6 +243,6 @@ c3: Store(file:///tmp/output/c1:org.apac
     |   |
     |   POUserFunc(org.apache.pig.builtin.LongSum$Final)[long] - scope-65
     |   |
-    |   |---Project[bag][1] - scope-191
+    |   |---Project[bag][1] - scope-190
     |
     |---c2: Package(CombinerPackager)[tuple]{int} - scope-58

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3-OPTOFF.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3-OPTOFF.gld?rev=1637447&r1=1637446&r2=1637447&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3-OPTOFF.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3-OPTOFF.gld Fri Nov  7 21:08:25 2014
@@ -2,118 +2,118 @@
 # There are 1 DAGs in the session
 #--------------------------------------------------
 #--------------------------------------------------
-# TEZ DAG plan: scope-134
+# TEZ DAG plan: pig-0_scope-1
 #--------------------------------------------------
-Tez vertex scope-126	->	Tez vertex scope-128,Tez vertex scope-131,
-Tez vertex scope-131	->	Tez vertex scope-133,
-Tez vertex scope-133
-Tez vertex scope-128	->	Tez vertex scope-130,
-Tez vertex scope-130
+Tez vertex scope-125	->	Tez vertex scope-127,Tez vertex scope-130,
+Tez vertex scope-127	->	Tez vertex scope-129,
+Tez vertex scope-129
+Tez vertex scope-130	->	Tez vertex scope-132,
+Tez vertex scope-132
 
-Tez vertex scope-126
+Tez vertex scope-125
 # Plan on vertex
-POValueOutputTez - scope-127	->	 [scope-128, scope-131]
+POValueOutputTez - scope-126	->	 [scope-127, scope-130]
 |
-|---a: New For Each(false,false)[bag] - scope-95
+|---a: New For Each(false,false)[bag] - scope-94
     |   |
-    |   Cast[int] - scope-90
+    |   Cast[int] - scope-89
     |   |
-    |   |---Project[bytearray][0] - scope-89
+    |   |---Project[bytearray][0] - scope-88
     |   |
-    |   Cast[int] - scope-93
+    |   Cast[int] - scope-92
     |   |
-    |   |---Project[bytearray][1] - scope-92
+    |   |---Project[bytearray][1] - scope-91
     |
-    |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-88
-Tez vertex scope-131
+    |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-87
+Tez vertex scope-127
 # Plan on vertex
-c: Local Rearrange[tuple]{tuple}(false) - scope-166	->	 scope-133
+b: Local Rearrange[tuple]{int}(false) - scope-145	->	 scope-129
 |   |
-|   Project[tuple][0] - scope-169
+|   Project[int][0] - scope-147
 |
-|---c: New For Each(false,false)[bag] - scope-154
+|---b: New For Each(false,false)[bag] - scope-133
     |   |
-    |   Project[tuple][0] - scope-155
+    |   Project[int][0] - scope-134
     |   |
-    |   POUserFunc(org.apache.pig.builtin.COUNT$Initial)[tuple] - scope-156
+    |   POUserFunc(org.apache.pig.builtin.COUNT$Initial)[tuple] - scope-135
     |   |
-    |   |---Project[bag][1] - scope-157
+    |   |---Project[bag][0] - scope-136
     |       |
-    |       |---Project[bag][1] - scope-158
+    |       |---Project[bag][1] - scope-137
     |
-    |---Pre Combiner Local Rearrange[tuple]{Unknown} - scope-170
+    |---Pre Combiner Local Rearrange[tuple]{Unknown} - scope-148
         |
-        |---POValueInputTez - scope-132	<-	 scope-126
-Tez vertex scope-133
-# Combine plan on edge <scope-131>
-c: Local Rearrange[tuple]{tuple}(false) - scope-171	->	 scope-133
+        |---POValueInputTez - scope-128	<-	 scope-125
+Tez vertex scope-129
+# Combine plan on edge <scope-127>
+b: Local Rearrange[tuple]{int}(false) - scope-149	->	 scope-129
 |   |
-|   Project[tuple][0] - scope-174
+|   Project[int][0] - scope-151
 |
-|---c: New For Each(false,false)[bag] - scope-159
+|---b: New For Each(false,false)[bag] - scope-138
     |   |
-    |   Project[tuple][0] - scope-160
+    |   Project[int][0] - scope-139
     |   |
-    |   POUserFunc(org.apache.pig.builtin.COUNT$Intermediate)[tuple] - scope-161
+    |   POUserFunc(org.apache.pig.builtin.COUNT$Intermediate)[tuple] - scope-140
     |   |
-    |   |---Project[bag][1] - scope-162
+    |   |---Project[bag][1] - scope-141
     |
-    |---c: Package(CombinerPackager)[tuple]{tuple} - scope-165
+    |---b: Package(CombinerPackager)[tuple]{int} - scope-144
 # Plan on vertex
-c: Store(file:///tmp/output/c:org.apache.pig.builtin.PigStorage) - scope-125
+b: Store(file:///tmp/output/b:org.apache.pig.builtin.PigStorage) - scope-109
 |
-|---c: New For Each(false,false)[bag] - scope-124
+|---b: New For Each(false,false)[bag] - scope-108
     |   |
-    |   Project[tuple][0] - scope-118
+    |   Project[int][0] - scope-102
     |   |
-    |   POUserFunc(org.apache.pig.builtin.COUNT$Final)[long] - scope-122
+    |   POUserFunc(org.apache.pig.builtin.COUNT$Final)[long] - scope-106
     |   |
-    |   |---Project[bag][1] - scope-163
+    |   |---Project[bag][1] - scope-142
     |
-    |---c: Package(CombinerPackager)[tuple]{tuple} - scope-114
-Tez vertex scope-128
+    |---b: Package(CombinerPackager)[tuple]{int} - scope-99
+Tez vertex scope-130
 # Plan on vertex
-b: Local Rearrange[tuple]{int}(false) - scope-147	->	 scope-130
+c: Local Rearrange[tuple]{tuple}(false) - scope-164	->	 scope-132
 |   |
-|   Project[int][0] - scope-149
+|   Project[tuple][0] - scope-167
 |
-|---b: New For Each(false,false)[bag] - scope-135
+|---c: New For Each(false,false)[bag] - scope-152
     |   |
-    |   Project[int][0] - scope-136
+    |   Project[tuple][0] - scope-153
     |   |
-    |   POUserFunc(org.apache.pig.builtin.COUNT$Initial)[tuple] - scope-137
+    |   POUserFunc(org.apache.pig.builtin.COUNT$Initial)[tuple] - scope-154
     |   |
-    |   |---Project[bag][0] - scope-138
+    |   |---Project[bag][1] - scope-155
     |       |
-    |       |---Project[bag][1] - scope-139
+    |       |---Project[bag][1] - scope-156
     |
-    |---Pre Combiner Local Rearrange[tuple]{Unknown} - scope-150
+    |---Pre Combiner Local Rearrange[tuple]{Unknown} - scope-168
         |
-        |---POValueInputTez - scope-129	<-	 scope-126
-Tez vertex scope-130
-# Combine plan on edge <scope-128>
-b: Local Rearrange[tuple]{int}(false) - scope-151	->	 scope-130
+        |---POValueInputTez - scope-131	<-	 scope-125
+Tez vertex scope-132
+# Combine plan on edge <scope-130>
+c: Local Rearrange[tuple]{tuple}(false) - scope-169	->	 scope-132
 |   |
-|   Project[int][0] - scope-153
+|   Project[tuple][0] - scope-172
 |
-|---b: New For Each(false,false)[bag] - scope-140
+|---c: New For Each(false,false)[bag] - scope-157
     |   |
-    |   Project[int][0] - scope-141
+    |   Project[tuple][0] - scope-158
     |   |
-    |   POUserFunc(org.apache.pig.builtin.COUNT$Intermediate)[tuple] - scope-142
+    |   POUserFunc(org.apache.pig.builtin.COUNT$Intermediate)[tuple] - scope-159
     |   |
-    |   |---Project[bag][1] - scope-143
+    |   |---Project[bag][1] - scope-160
     |
-    |---b: Package(CombinerPackager)[tuple]{int} - scope-146
+    |---c: Package(CombinerPackager)[tuple]{tuple} - scope-163
 # Plan on vertex
-b: Store(file:///tmp/output/b:org.apache.pig.builtin.PigStorage) - scope-110
+c: Store(file:///tmp/output/c:org.apache.pig.builtin.PigStorage) - scope-124
 |
-|---b: New For Each(false,false)[bag] - scope-109
+|---c: New For Each(false,false)[bag] - scope-123
     |   |
-    |   Project[int][0] - scope-103
+    |   Project[tuple][0] - scope-117
     |   |
-    |   POUserFunc(org.apache.pig.builtin.COUNT$Final)[long] - scope-107
+    |   POUserFunc(org.apache.pig.builtin.COUNT$Final)[long] - scope-121
     |   |
-    |   |---Project[bag][1] - scope-144
+    |   |---Project[bag][1] - scope-161
     |
-    |---b: Package(CombinerPackager)[tuple]{int} - scope-100
+    |---c: Package(CombinerPackager)[tuple]{tuple} - scope-113

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3.gld?rev=1637447&r1=1637446&r2=1637447&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3.gld Fri Nov  7 21:08:25 2014
@@ -2,7 +2,7 @@
 # There are 1 DAGs in the session
 #--------------------------------------------------
 #--------------------------------------------------
-# TEZ DAG plan: scope-46
+# TEZ DAG plan: pig-0_scope-0
 #--------------------------------------------------
 Tez vertex scope-38	->	Tez vertex scope-42,Tez vertex scope-45,
 Tez vertex scope-45
@@ -10,39 +10,39 @@ Tez vertex scope-42
 
 Tez vertex scope-38
 # Plan on vertex
-a: Split - scope-87
+a: Split - scope-86
 |   |
-|   b: Local Rearrange[tuple]{int}(false) - scope-59	->	 scope-42
+|   b: Local Rearrange[tuple]{int}(false) - scope-58	->	 scope-42
 |   |   |
-|   |   Project[int][0] - scope-61
+|   |   Project[int][0] - scope-60
 |   |
-|   |---b: New For Each(false,false)[bag] - scope-47
+|   |---b: New For Each(false,false)[bag] - scope-46
 |       |   |
-|       |   Project[int][0] - scope-48
+|       |   Project[int][0] - scope-47
 |       |   |
-|       |   POUserFunc(org.apache.pig.builtin.COUNT$Initial)[tuple] - scope-49
+|       |   POUserFunc(org.apache.pig.builtin.COUNT$Initial)[tuple] - scope-48
 |       |   |
-|       |   |---Project[bag][0] - scope-50
+|       |   |---Project[bag][0] - scope-49
 |       |       |
-|       |       |---Project[bag][1] - scope-51
+|       |       |---Project[bag][1] - scope-50
 |       |
-|       |---Pre Combiner Local Rearrange[tuple]{Unknown} - scope-62
+|       |---Pre Combiner Local Rearrange[tuple]{Unknown} - scope-61
 |   |
-|   c: Local Rearrange[tuple]{tuple}(false) - scope-78	->	 scope-45
+|   c: Local Rearrange[tuple]{tuple}(false) - scope-77	->	 scope-45
 |   |   |
-|   |   Project[tuple][0] - scope-81
+|   |   Project[tuple][0] - scope-80
 |   |
-|   |---c: New For Each(false,false)[bag] - scope-66
+|   |---c: New For Each(false,false)[bag] - scope-65
 |       |   |
-|       |   Project[tuple][0] - scope-67
+|       |   Project[tuple][0] - scope-66
 |       |   |
-|       |   POUserFunc(org.apache.pig.builtin.COUNT$Initial)[tuple] - scope-68
+|       |   POUserFunc(org.apache.pig.builtin.COUNT$Initial)[tuple] - scope-67
 |       |   |
-|       |   |---Project[bag][1] - scope-69
+|       |   |---Project[bag][1] - scope-68
 |       |       |
-|       |       |---Project[bag][1] - scope-70
+|       |       |---Project[bag][1] - scope-69
 |       |
-|       |---Pre Combiner Local Rearrange[tuple]{Unknown} - scope-82
+|       |---Pre Combiner Local Rearrange[tuple]{Unknown} - scope-81
 |
 |---a: New For Each(false,false)[bag] - scope-7
     |   |
@@ -57,19 +57,19 @@ a: Split - scope-87
     |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-0
 Tez vertex scope-45
 # Combine plan on edge <scope-38>
-c: Local Rearrange[tuple]{tuple}(false) - scope-83	->	 scope-45
+c: Local Rearrange[tuple]{tuple}(false) - scope-82	->	 scope-45
 |   |
-|   Project[tuple][0] - scope-86
+|   Project[tuple][0] - scope-85
 |
-|---c: New For Each(false,false)[bag] - scope-71
+|---c: New For Each(false,false)[bag] - scope-70
     |   |
-    |   Project[tuple][0] - scope-72
+    |   Project[tuple][0] - scope-71
     |   |
-    |   POUserFunc(org.apache.pig.builtin.COUNT$Intermediate)[tuple] - scope-73
+    |   POUserFunc(org.apache.pig.builtin.COUNT$Intermediate)[tuple] - scope-72
     |   |
-    |   |---Project[bag][1] - scope-74
+    |   |---Project[bag][1] - scope-73
     |
-    |---c: Package(CombinerPackager)[tuple]{tuple} - scope-77
+    |---c: Package(CombinerPackager)[tuple]{tuple} - scope-76
 # Plan on vertex
 c: Store(file:///tmp/output/c:org.apache.pig.builtin.PigStorage) - scope-37
 |
@@ -79,24 +79,24 @@ c: Store(file:///tmp/output/c:org.apache
     |   |
     |   POUserFunc(org.apache.pig.builtin.COUNT$Final)[long] - scope-34
     |   |
-    |   |---Project[bag][1] - scope-75
+    |   |---Project[bag][1] - scope-74
     |
     |---c: Package(CombinerPackager)[tuple]{tuple} - scope-26
 Tez vertex scope-42
 # Combine plan on edge <scope-38>
-b: Local Rearrange[tuple]{int}(false) - scope-63	->	 scope-42
+b: Local Rearrange[tuple]{int}(false) - scope-62	->	 scope-42
 |   |
-|   Project[int][0] - scope-65
+|   Project[int][0] - scope-64
 |
-|---b: New For Each(false,false)[bag] - scope-52
+|---b: New For Each(false,false)[bag] - scope-51
     |   |
-    |   Project[int][0] - scope-53
+    |   Project[int][0] - scope-52
     |   |
-    |   POUserFunc(org.apache.pig.builtin.COUNT$Intermediate)[tuple] - scope-54
+    |   POUserFunc(org.apache.pig.builtin.COUNT$Intermediate)[tuple] - scope-53
     |   |
-    |   |---Project[bag][1] - scope-55
+    |   |---Project[bag][1] - scope-54
     |
-    |---b: Package(CombinerPackager)[tuple]{int} - scope-58
+    |---b: Package(CombinerPackager)[tuple]{int} - scope-57
 # Plan on vertex
 b: Store(file:///tmp/output/b:org.apache.pig.builtin.PigStorage) - scope-22
 |
@@ -106,6 +106,6 @@ b: Store(file:///tmp/output/b:org.apache
     |   |
     |   POUserFunc(org.apache.pig.builtin.COUNT$Final)[long] - scope-19
     |   |
-    |   |---Project[bag][1] - scope-56
+    |   |---Project[bag][1] - scope-55
     |
     |---b: Package(CombinerPackager)[tuple]{int} - scope-12

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4-OPTOFF.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4-OPTOFF.gld?rev=1637447&r1=1637446&r2=1637447&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4-OPTOFF.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4-OPTOFF.gld Fri Nov  7 21:08:25 2014
@@ -2,90 +2,90 @@
 # There are 1 DAGs in the session
 #--------------------------------------------------
 #--------------------------------------------------
-# TEZ DAG plan: scope-128
+# TEZ DAG plan: pig-0_scope-1
 #--------------------------------------------------
-Tez vertex scope-118	->	Tez vertex scope-120,
-Tez vertex scope-119	->	Tez vertex scope-120,
-Tez vertex scope-120	->	Tez vertex scope-122,Tez vertex scope-124,Tez vertex scope-126,
-Tez vertex scope-122
-Tez vertex scope-124
-Tez vertex scope-126
+Tez vertex scope-117	->	Tez vertex scope-119,
+Tez vertex scope-118	->	Tez vertex scope-119,
+Tez vertex scope-119	->	Tez vertex scope-121,Tez vertex scope-123,Tez vertex scope-125,
+Tez vertex scope-123
+Tez vertex scope-125
+Tez vertex scope-121
 
-Tez vertex scope-118
+Tez vertex scope-117
 # Plan on vertex
-c: Local Rearrange[tuple]{int}(false) - scope-85	->	 scope-120
+c: Local Rearrange[tuple]{int}(false) - scope-84	->	 scope-119
 |   |
-|   Project[int][0] - scope-86
+|   Project[int][0] - scope-85
 |
-|---a: New For Each(false,false)[bag] - scope-72
+|---a: New For Each(false,false)[bag] - scope-71
     |   |
-    |   Cast[int] - scope-67
+    |   Cast[int] - scope-66
     |   |
-    |   |---Project[bytearray][0] - scope-66
+    |   |---Project[bytearray][0] - scope-65
     |   |
-    |   Cast[int] - scope-70
+    |   Cast[int] - scope-69
     |   |
-    |   |---Project[bytearray][1] - scope-69
+    |   |---Project[bytearray][1] - scope-68
     |
-    |---a: Load(file:///tmp/input1:org.apache.pig.builtin.PigStorage) - scope-65
-Tez vertex scope-119
+    |---a: Load(file:///tmp/input1:org.apache.pig.builtin.PigStorage) - scope-64
+Tez vertex scope-118
 # Plan on vertex
-c: Local Rearrange[tuple]{int}(false) - scope-87	->	 scope-120
+c: Local Rearrange[tuple]{int}(false) - scope-86	->	 scope-119
 |   |
-|   Project[int][0] - scope-88
+|   Project[int][0] - scope-87
 |
-|---b: New For Each(false,false)[bag] - scope-80
+|---b: New For Each(false,false)[bag] - scope-79
     |   |
-    |   Cast[int] - scope-75
+    |   Cast[int] - scope-74
     |   |
-    |   |---Project[bytearray][0] - scope-74
+    |   |---Project[bytearray][0] - scope-73
     |   |
-    |   Cast[int] - scope-78
+    |   Cast[int] - scope-77
     |   |
-    |   |---Project[bytearray][1] - scope-77
+    |   |---Project[bytearray][1] - scope-76
     |
-    |---b: Load(file:///tmp/input2:org.apache.pig.builtin.PigStorage) - scope-73
-Tez vertex scope-120
+    |---b: Load(file:///tmp/input2:org.apache.pig.builtin.PigStorage) - scope-72
+Tez vertex scope-119
 # Plan on vertex
-POValueOutputTez - scope-121	->	 [scope-122, scope-124, scope-126]
+POValueOutputTez - scope-120	->	 [scope-123, scope-125, scope-121]
 |
-|---c: New For Each(true,true)[tuple] - scope-91
+|---c: New For Each(true,true)[tuple] - scope-90
     |   |
-    |   Project[bag][1] - scope-89
+    |   Project[bag][1] - scope-88
     |   |
-    |   Project[bag][2] - scope-90
+    |   Project[bag][2] - scope-89
     |
-    |---c: Package(Packager)[tuple]{int} - scope-84
-Tez vertex scope-122
+    |---c: Package(Packager)[tuple]{int} - scope-83
+Tez vertex scope-123
 # Plan on vertex
-c: Store(file:///tmp/output/c:org.apache.pig.builtin.PigStorage) - scope-95
+d: Store(file:///tmp/output/d:org.apache.pig.builtin.PigStorage) - scope-104
 |
-|---POValueInputTez - scope-123	<-	 scope-120
-Tez vertex scope-124
-# Plan on vertex
-d: Store(file:///tmp/output/d:org.apache.pig.builtin.PigStorage) - scope-105
-|
-|---d: New For Each(false,false,false)[bag] - scope-104
+|---d: New For Each(false,false,false)[bag] - scope-103
     |   |
-    |   Project[int][0] - scope-98
+    |   Project[int][0] - scope-97
     |   |
-    |   Project[int][1] - scope-100
+    |   Project[int][1] - scope-99
     |   |
-    |   Project[int][3] - scope-102
+    |   Project[int][3] - scope-101
     |
-    |---POValueInputTez - scope-125	<-	 scope-120
-Tez vertex scope-126
+    |---POValueInputTez - scope-124	<-	 scope-119
+Tez vertex scope-125
 # Plan on vertex
-e: Store(file:///tmp/output/e:org.apache.pig.builtin.PigStorage) - scope-117
+e: Store(file:///tmp/output/e:org.apache.pig.builtin.PigStorage) - scope-116
 |
-|---e: New For Each(false,false,false,false)[bag] - scope-116
+|---e: New For Each(false,false,false,false)[bag] - scope-115
     |   |
-    |   Project[int][0] - scope-108
+    |   Project[int][0] - scope-107
     |   |
-    |   Project[int][1] - scope-110
+    |   Project[int][1] - scope-109
     |   |
-    |   Project[int][2] - scope-112
+    |   Project[int][2] - scope-111
     |   |
-    |   Project[int][3] - scope-114
+    |   Project[int][3] - scope-113
     |
-    |---POValueInputTez - scope-127	<-	 scope-120
+    |---POValueInputTez - scope-126	<-	 scope-119
+Tez vertex scope-121
+# Plan on vertex
+c: Store(file:///tmp/output/c:org.apache.pig.builtin.PigStorage) - scope-94
+|
+|---POValueInputTez - scope-122	<-	 scope-119

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4.gld?rev=1637447&r1=1637446&r2=1637447&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4.gld Fri Nov  7 21:08:25 2014
@@ -2,7 +2,7 @@
 # There are 1 DAGs in the session
 #--------------------------------------------------
 #--------------------------------------------------
-# TEZ DAG plan: scope-63
+# TEZ DAG plan: pig-0_scope-0
 #--------------------------------------------------
 Tez vertex scope-53	->	Tez vertex scope-55,
 Tez vertex scope-54	->	Tez vertex scope-55,
@@ -44,7 +44,7 @@ c: Local Rearrange[tuple]{int}(false) - 
     |---b: Load(file:///tmp/input2:org.apache.pig.builtin.PigStorage) - scope-8
 Tez vertex scope-55
 # Plan on vertex
-c: Split - scope-64
+c: Split - scope-63
 |   |
 |   c: Store(file:///tmp/output/c:org.apache.pig.builtin.PigStorage) - scope-30
 |   |

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5-OPTOFF.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5-OPTOFF.gld?rev=1637447&r1=1637446&r2=1637447&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5-OPTOFF.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5-OPTOFF.gld Fri Nov  7 21:08:25 2014
@@ -2,80 +2,80 @@
 # There are 1 DAGs in the session
 #--------------------------------------------------
 #--------------------------------------------------
-# TEZ DAG plan: scope-117
+# TEZ DAG plan: pig-0_scope-1
 #--------------------------------------------------
-Tez vertex scope-103	->	Tez vertex scope-104,
-Tez vertex scope-104	->	Tez vertex scope-106,Tez vertex scope-108,Tez vertex scope-110,
-Tez vertex scope-110	->	Tez vertex scope-113,Tez vertex scope-115,
-Tez vertex scope-113
-Tez vertex scope-115
-Tez vertex scope-106
-Tez vertex scope-108
+Tez vertex scope-102	->	Tez vertex scope-103,
+Tez vertex scope-103	->	Tez vertex scope-105,Tez vertex scope-107,Tez vertex scope-109,
+Tez vertex scope-109	->	Tez vertex scope-112,Tez vertex scope-114,
+Tez vertex scope-114
+Tez vertex scope-112
+Tez vertex scope-107
+Tez vertex scope-105
 
-Tez vertex scope-103
+Tez vertex scope-102
 # Plan on vertex
-b: Local Rearrange[tuple]{int}(false) - scope-70	->	 scope-104
+b: Local Rearrange[tuple]{int}(false) - scope-69	->	 scope-103
 |   |
-|   Project[int][0] - scope-71
+|   Project[int][0] - scope-70
 |
-|---a: New For Each(false,false)[bag] - scope-67
+|---a: New For Each(false,false)[bag] - scope-66
     |   |
-    |   Cast[int] - scope-62
+    |   Cast[int] - scope-61
     |   |
-    |   |---Project[bytearray][0] - scope-61
+    |   |---Project[bytearray][0] - scope-60
     |   |
-    |   Cast[int] - scope-65
+    |   Cast[int] - scope-64
     |   |
-    |   |---Project[bytearray][1] - scope-64
+    |   |---Project[bytearray][1] - scope-63
     |
-    |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-60
-Tez vertex scope-104
+    |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-59
+Tez vertex scope-103
 # Plan on vertex
-POValueOutputTez - scope-105	->	 [scope-106, scope-108, scope-110]
+POValueOutputTez - scope-104	->	 [scope-107, scope-109, scope-105]
 |
-|---b: Package(Packager)[tuple]{int} - scope-69
-Tez vertex scope-110
+|---b: Package(Packager)[tuple]{int} - scope-68
+Tez vertex scope-109
 # Plan on vertex
-POValueOutputTez - scope-112	->	 [scope-113, scope-115]
+POValueOutputTez - scope-111	->	 [scope-114, scope-112]
 |
-|---d: New For Each(true)[bag] - scope-90
+|---d: New For Each(true)[bag] - scope-89
     |   |
-    |   Project[bag][1] - scope-88
+    |   Project[bag][1] - scope-87
     |
-    |---POValueInputTez - scope-111	<-	 scope-104
-Tez vertex scope-113
-# Plan on vertex
-d: Store(file:///tmp/output/d:org.apache.pig.builtin.PigStorage) - scope-94
-|
-|---POValueInputTez - scope-114	<-	 scope-110
-Tez vertex scope-115
+    |---POValueInputTez - scope-110	<-	 scope-103
+Tez vertex scope-114
 # Plan on vertex
-e: Store(file:///tmp/output/e:org.apache.pig.builtin.PigStorage) - scope-102
+e: Store(file:///tmp/output/e:org.apache.pig.builtin.PigStorage) - scope-101
 |
-|---e: New For Each(false,false)[bag] - scope-101
+|---e: New For Each(false,false)[bag] - scope-100
     |   |
-    |   Project[int][0] - scope-97
+    |   Project[int][0] - scope-96
     |   |
-    |   Project[int][1] - scope-99
+    |   Project[int][1] - scope-98
     |
-    |---POValueInputTez - scope-116	<-	 scope-110
-Tez vertex scope-106
+    |---POValueInputTez - scope-115	<-	 scope-109
+Tez vertex scope-112
 # Plan on vertex
-b: Store(file:///tmp/output/b:org.apache.pig.builtin.PigStorage) - scope-75
+d: Store(file:///tmp/output/d:org.apache.pig.builtin.PigStorage) - scope-93
 |
-|---POValueInputTez - scope-107	<-	 scope-104
-Tez vertex scope-108
+|---POValueInputTez - scope-113	<-	 scope-109
+Tez vertex scope-107
 # Plan on vertex
-c: Store(file:///tmp/output/c:org.apache.pig.builtin.PigStorage) - scope-85
+c: Store(file:///tmp/output/c:org.apache.pig.builtin.PigStorage) - scope-84
 |
-|---c: New For Each(false,false)[bag] - scope-84
+|---c: New For Each(false,false)[bag] - scope-83
     |   |
-    |   Project[bag][0] - scope-79
+    |   Project[bag][0] - scope-78
     |   |
-    |   |---Project[bag][1] - scope-78
+    |   |---Project[bag][1] - scope-77
     |   |
-    |   Project[bag][1] - scope-82
+    |   Project[bag][1] - scope-81
     |   |
-    |   |---Project[bag][1] - scope-81
+    |   |---Project[bag][1] - scope-80
     |
-    |---POValueInputTez - scope-109	<-	 scope-104
+    |---POValueInputTez - scope-108	<-	 scope-103
+Tez vertex scope-105
+# Plan on vertex
+b: Store(file:///tmp/output/b:org.apache.pig.builtin.PigStorage) - scope-74
+|
+|---POValueInputTez - scope-106	<-	 scope-103

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5.gld?rev=1637447&r1=1637446&r2=1637447&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5.gld Fri Nov  7 21:08:25 2014
@@ -2,7 +2,7 @@
 # There are 1 DAGs in the session
 #--------------------------------------------------
 #--------------------------------------------------
-# TEZ DAG plan: scope-57
+# TEZ DAG plan: pig-0_scope-0
 #--------------------------------------------------
 Tez vertex scope-43	->	Tez vertex scope-44,
 Tez vertex scope-44
@@ -26,7 +26,7 @@ b: Local Rearrange[tuple]{int}(false) - 
     |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-0
 Tez vertex scope-44
 # Plan on vertex
-b: Split - scope-59
+b: Split - scope-58
 |   |
 |   b: Store(file:///tmp/output/b:org.apache.pig.builtin.PigStorage) - scope-15
 |   |
@@ -42,7 +42,7 @@ b: Split - scope-59
 |       |   |
 |       |   |---Project[bag][1] - scope-21
 |   |
-|   d: Split - scope-58
+|   d: Split - scope-57
 |   |   |
 |   |   d: Store(file:///tmp/output/d:org.apache.pig.builtin.PigStorage) - scope-34
 |   |   |

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Order-1.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Order-1.gld?rev=1637447&r1=1637446&r2=1637447&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Order-1.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Order-1.gld Fri Nov  7 21:08:25 2014
@@ -2,7 +2,7 @@
 # There are 1 DAGs in the session
 #--------------------------------------------------
 #--------------------------------------------------
-# TEZ DAG plan: scope-36
+# TEZ DAG plan: pig-0_scope-0
 #--------------------------------------------------
 Tez vertex scope-11	->	Tez vertex scope-30,Tez vertex scope-20,
 Tez vertex scope-20	->	Tez vertex scope-30,

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Rank-1.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Rank-1.gld?rev=1637447&r1=1637446&r2=1637447&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Rank-1.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Rank-1.gld Fri Nov  7 21:08:25 2014
@@ -2,7 +2,7 @@
 # There are 1 DAGs in the session
 #--------------------------------------------------
 #--------------------------------------------------
-# TEZ DAG plan: scope-15
+# TEZ DAG plan: pig-0_scope-0
 #--------------------------------------------------
 Tez vertex scope-11	->	Tez vertex scope-14,Tez vertex scope-12,
 Tez vertex scope-12	->	Tez vertex scope-14,

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=1637447&r1=1637446&r2=1637447&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 Fri Nov  7 21:08:25 2014
@@ -2,7 +2,7 @@
 # There are 1 DAGs in the session
 #--------------------------------------------------
 #--------------------------------------------------
-# TEZ DAG plan: scope-52
+# TEZ DAG plan: pig-0_scope-0
 #--------------------------------------------------
 Tez vertex scope-23	->	Tez vertex scope-24,
 Tez vertex scope-24	->	Tez vertex scope-43,Tez vertex scope-33,

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SecKeySort-1.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SecKeySort-1.gld?rev=1637447&r1=1637446&r2=1637447&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SecKeySort-1.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SecKeySort-1.gld Fri Nov  7 21:08:25 2014
@@ -2,7 +2,7 @@
 # There are 1 DAGs in the session
 #--------------------------------------------------
 #--------------------------------------------------
-# TEZ DAG plan: scope-28
+# TEZ DAG plan: pig-0_scope-0
 #--------------------------------------------------
 Tez vertex scope-26	->	Tez vertex scope-27,
 Tez vertex scope-27

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SecKeySort-2.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SecKeySort-2.gld?rev=1637447&r1=1637446&r2=1637447&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SecKeySort-2.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SecKeySort-2.gld Fri Nov  7 21:08:25 2014
@@ -2,52 +2,52 @@
 # There are 1 DAGs in the session
 #--------------------------------------------------
 #--------------------------------------------------
-# TEZ DAG plan: scope-58
+# TEZ DAG plan: pig-0_scope-1
 #--------------------------------------------------
-Tez vertex scope-56	->	Tez vertex scope-57,
-Tez vertex scope-57
-
+Tez vertex scope-55	->	Tez vertex scope-56,
 Tez vertex scope-56
+
+Tez vertex scope-55
 # Plan on vertex
-b: Local Rearrange[tuple]{int}(false) - scope-43	->	 scope-57
+b: Local Rearrange[tuple]{int}(false) - scope-42	->	 scope-56
 |   |
-|   Project[int][0] - scope-44
+|   Project[int][0] - scope-43
 |
-|---a: New For Each(false,false,false)[bag] - scope-40
+|---a: New For Each(false,false,false)[bag] - scope-39
     |   |
-    |   Cast[int] - scope-32
+    |   Cast[int] - scope-31
     |   |
-    |   |---Project[bytearray][0] - scope-31
+    |   |---Project[bytearray][0] - scope-30
     |   |
-    |   Cast[int] - scope-35
+    |   Cast[int] - scope-34
     |   |
-    |   |---Project[bytearray][1] - scope-34
+    |   |---Project[bytearray][1] - scope-33
     |   |
-    |   Cast[int] - scope-38
+    |   Cast[int] - scope-37
     |   |
-    |   |---Project[bytearray][2] - scope-37
+    |   |---Project[bytearray][2] - scope-36
     |
-    |---a: Load(file:///tmp/input:PigStorage(',')) - scope-30
-Tez vertex scope-57
+    |---a: Load(file:///tmp/input:PigStorage(',')) - scope-29
+Tez vertex scope-56
 # Plan on vertex
-c: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-55
+c: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-54
 |
-|---c: New For Each(false,false)[bag] - scope-54
+|---c: New For Each(false,false)[bag] - scope-53
     |   |
-    |   Project[int][0] - scope-45
+    |   Project[int][0] - scope-44
     |   |
-    |   RelationToExpressionProject[bag][*] - scope-47
+    |   RelationToExpressionProject[bag][*] - scope-46
     |   |
-    |   |---f: POSort[bag]() - scope-53
+    |   |---f: POSort[bag]() - scope-52
     |       |   |
-    |       |   Project[int][0] - scope-52
+    |       |   Project[int][0] - scope-51
     |       |
-    |       |---e: POSort[bag]() - scope-51
+    |       |---e: POSort[bag]() - scope-50
     |           |   |
-    |           |   Project[int][1] - scope-50
+    |           |   Project[int][1] - scope-49
     |           |
-    |           |---d: Limit - scope-49
+    |           |---d: Limit - scope-48
     |               |
-    |               |---Project[bag][1] - scope-48
+    |               |---Project[bag][1] - scope-47
     |
-    |---b: Package(Packager)[tuple]{int} - scope-42
+    |---b: Package(Packager)[tuple]{int} - scope-41

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SkewJoin-1.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SkewJoin-1.gld?rev=1637447&r1=1637446&r2=1637447&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SkewJoin-1.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-SkewJoin-1.gld Fri Nov  7 21:08:25 2014
@@ -2,7 +2,7 @@
 # There are 1 DAGs in the session
 #--------------------------------------------------
 #--------------------------------------------------
-# TEZ DAG plan: scope-55
+# TEZ DAG plan: pig-0_scope-0
 #--------------------------------------------------
 Tez vertex scope-27	->	Tez vertex scope-46,Tez vertex scope-36,
 Tez vertex scope-36	->	Tez vertex scope-46,Tez vertex scope-28,

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Stream-1.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Stream-1.gld?rev=1637447&r1=1637446&r2=1637447&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Stream-1.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Stream-1.gld Fri Nov  7 21:08:25 2014
@@ -2,7 +2,7 @@
 # There are 1 DAGs in the session
 #--------------------------------------------------
 #--------------------------------------------------
-# TEZ DAG plan: scope-11
+# TEZ DAG plan: pig-0_scope-0
 #--------------------------------------------------
 Tez vertex scope-10
 

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1-OPTOFF.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1-OPTOFF.gld?rev=1637447&r1=1637446&r2=1637447&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1-OPTOFF.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1-OPTOFF.gld Fri Nov  7 21:08:25 2014
@@ -2,44 +2,44 @@
 # There are 1 DAGs in the session
 #--------------------------------------------------
 #--------------------------------------------------
-# TEZ DAG plan: scope-52
+# TEZ DAG plan: pig-0_scope-1
 #--------------------------------------------------
-Tez vertex scope-46	->	Tez vertex scope-48,
-Tez vertex scope-47	->	Tez vertex scope-48,
-Tez vertex scope-48
+Tez vertex scope-45	->	Tez vertex scope-47,
+Tez vertex scope-46	->	Tez vertex scope-47,
+Tez vertex scope-47
 
-Tez vertex scope-46
+Tez vertex scope-45
 # Plan on vertex
-POValueOutputTez - scope-50	->	 [scope-48]
+POValueOutputTez - scope-49	->	 [scope-47]
 |
-|---a: New For Each(false,false)[bag] - scope-35
+|---a: New For Each(false,false)[bag] - scope-34
     |   |
-    |   Cast[int] - scope-30
+    |   Cast[int] - scope-29
     |   |
-    |   |---Project[bytearray][0] - scope-29
+    |   |---Project[bytearray][0] - scope-28
     |   |
-    |   Cast[chararray] - scope-33
+    |   Cast[chararray] - scope-32
     |   |
-    |   |---Project[bytearray][1] - scope-32
+    |   |---Project[bytearray][1] - scope-31
     |
-    |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-28
-Tez vertex scope-47
+    |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-27
+Tez vertex scope-46
 # Plan on vertex
-POValueOutputTez - scope-51	->	 [scope-48]
+POValueOutputTez - scope-50	->	 [scope-47]
 |
-|---c: New For Each(false,false)[bag] - scope-43
+|---c: New For Each(false,false)[bag] - scope-42
     |   |
-    |   Cast[int] - scope-38
+    |   Cast[int] - scope-37
     |   |
-    |   |---Project[bytearray][1] - scope-37
+    |   |---Project[bytearray][1] - scope-36
     |   |
-    |   Cast[chararray] - scope-41
+    |   Cast[chararray] - scope-40
     |   |
-    |   |---Project[bytearray][0] - scope-40
+    |   |---Project[bytearray][0] - scope-39
     |
-    |---b: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-36
-Tez vertex scope-48
+    |---b: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-35
+Tez vertex scope-47
 # Plan on vertex
-c: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-45
+c: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-44
 |
-|---POShuffledValueInputTez - scope-49	<-	 [scope-46, scope-47]
+|---POShuffledValueInputTez - scope-48	<-	 [scope-46, scope-45]

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=1637447&r1=1637446&r2=1637447&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 Fri Nov  7 21:08:25 2014
@@ -2,15 +2,15 @@
 # There are 1 DAGs in the session
 #--------------------------------------------------
 #--------------------------------------------------
-# TEZ DAG plan: scope-24
+# TEZ DAG plan: pig-0_scope-0
 #--------------------------------------------------
-Tez vertex scope-18	->	Tez vertex group scope-25,
-Tez vertex scope-19	->	Tez vertex group scope-25,
-Tez vertex group scope-25
+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
-c: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-26
+c: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-25
 |
 |---a: New For Each(false,false)[bag] - scope-7
     |   |
@@ -25,7 +25,7 @@ c: Store(file:///tmp/output:org.apache.p
     |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-0
 Tez vertex scope-19
 # Plan on vertex
-c: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-27
+c: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-26
 |
 |---c: New For Each(false,false)[bag] - scope-15
     |   |
@@ -38,5 +38,5 @@ c: Store(file:///tmp/output:org.apache.p
     |   |---Project[bytearray][0] - scope-12
     |
     |---b: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-8
-Tez vertex group scope-25	<-	 [scope-18, scope-19]	->	 null
+Tez vertex group scope-24	<-	 [scope-18, scope-19]	->	 null
 # No plan on vertex group

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10-OPTOFF.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10-OPTOFF.gld?rev=1637447&r1=1637446&r2=1637447&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10-OPTOFF.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10-OPTOFF.gld Fri Nov  7 21:08:25 2014
@@ -2,7 +2,7 @@
 # There are 1 DAGs in the session
 #--------------------------------------------------
 #--------------------------------------------------
-# TEZ DAG plan: scope-43
+# TEZ DAG plan: pig-0_scope-0
 #--------------------------------------------------
 Tez vertex scope-31	->	Tez vertex scope-33,
 Tez vertex scope-32	->	Tez vertex scope-33,

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=1637447&r1=1637446&r2=1637447&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 Fri Nov  7 21:08:25 2014
@@ -2,19 +2,19 @@
 # There are 1 DAGs in the session
 #--------------------------------------------------
 #--------------------------------------------------
-# TEZ DAG plan: scope-43
+# TEZ DAG plan: pig-0_scope-0
 #--------------------------------------------------
-Tez vertex scope-37	->	Tez vertex group scope-44,
-Tez vertex scope-31	->	Tez vertex group scope-44,
-Tez vertex scope-32	->	Tez vertex group scope-44,
-Tez vertex group scope-44	->	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
 # Plan on vertex
-f: Local Rearrange[tuple]{int}(false) - scope-47	->	 scope-42
+f: Local Rearrange[tuple]{int}(false) - scope-46	->	 scope-42
 |   |
-|   Project[int][0] - scope-48
+|   Project[int][0] - scope-47
 |
 |---d: New For Each(false,false)[bag] - scope-24
     |   |
@@ -29,9 +29,9 @@ f: Local Rearrange[tuple]{int}(false) - 
     |---d: Load(file:///tmp/input1:org.apache.pig.builtin.PigStorage) - scope-17
 Tez vertex scope-31
 # Plan on vertex
-f: Local Rearrange[tuple]{int}(false) - scope-50	->	 scope-42
+f: Local Rearrange[tuple]{int}(false) - scope-49	->	 scope-42
 |   |
-|   Project[int][0] - scope-51
+|   Project[int][0] - scope-50
 |
 |---a: New For Each(false,false)[bag] - scope-7
     |   |
@@ -46,9 +46,9 @@ f: Local Rearrange[tuple]{int}(false) - 
     |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-0
 Tez vertex scope-32
 # Plan on vertex
-f: Local Rearrange[tuple]{int}(false) - scope-52	->	 scope-42
+f: Local Rearrange[tuple]{int}(false) - scope-51	->	 scope-42
 |   |
-|   Project[int][0] - scope-53
+|   Project[int][0] - scope-52
 |
 |---c: New For Each(false,false)[bag] - scope-15
     |   |
@@ -61,7 +61,7 @@ f: Local Rearrange[tuple]{int}(false) - 
     |   |---Project[bytearray][0] - scope-12
     |
     |---b: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-8
-Tez vertex group scope-44	<-	 [scope-37, scope-31, scope-32]	->	 scope-42
+Tez vertex group scope-43	<-	 [scope-37, scope-31, scope-32]	->	 scope-42
 # No plan on vertex group
 Tez vertex scope-42
 # Plan on vertex

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2-OPTOFF.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2-OPTOFF.gld?rev=1637447&r1=1637446&r2=1637447&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2-OPTOFF.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2-OPTOFF.gld Fri Nov  7 21:08:25 2014
@@ -2,86 +2,86 @@
 # There are 1 DAGs in the session
 #--------------------------------------------------
 #--------------------------------------------------
-# TEZ DAG plan: scope-109
+# TEZ DAG plan: pig-0_scope-1
 #--------------------------------------------------
-Tez vertex scope-102	->	Tez vertex scope-104,
-Tez vertex scope-103	->	Tez vertex scope-104,
-Tez vertex scope-104	->	Tez vertex scope-108,
-Tez vertex scope-108
+Tez vertex scope-101	->	Tez vertex scope-103,
+Tez vertex scope-102	->	Tez vertex scope-103,
+Tez vertex scope-103	->	Tez vertex scope-107,
+Tez vertex scope-107
 
-Tez vertex scope-102
+Tez vertex scope-101
 # Plan on vertex
-POValueOutputTez - scope-106	->	 [scope-104]
+POValueOutputTez - scope-105	->	 [scope-103]
 |
-|---a: New For Each(false,false)[bag] - scope-80
+|---a: New For Each(false,false)[bag] - scope-79
     |   |
-    |   Cast[int] - scope-75
+    |   Cast[int] - scope-74
     |   |
-    |   |---Project[bytearray][0] - scope-74
+    |   |---Project[bytearray][0] - scope-73
     |   |
-    |   Cast[int] - scope-78
+    |   Cast[int] - scope-77
     |   |
-    |   |---Project[bytearray][1] - scope-77
+    |   |---Project[bytearray][1] - scope-76
     |
-    |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-73
-Tez vertex scope-103
+    |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-72
+Tez vertex scope-102
 # Plan on vertex
-POValueOutputTez - scope-107	->	 [scope-104]
+POValueOutputTez - scope-106	->	 [scope-103]
 |
-|---c: New For Each(false,false)[bag] - scope-88
+|---c: New For Each(false,false)[bag] - scope-87
     |   |
-    |   Cast[int] - scope-83
+    |   Cast[int] - scope-82
     |   |
-    |   |---Project[bytearray][1] - scope-82
+    |   |---Project[bytearray][1] - scope-81
     |   |
-    |   Cast[int] - scope-86
+    |   Cast[int] - scope-85
     |   |
-    |   |---Project[bytearray][0] - scope-85
+    |   |---Project[bytearray][0] - scope-84
     |
-    |---b: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-81
-Tez vertex scope-104
+    |---b: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-80
+Tez vertex scope-103
 # Plan on vertex
-d: Local Rearrange[tuple]{int}(false) - scope-122	->	 scope-108
+d: Local Rearrange[tuple]{int}(false) - scope-120	->	 scope-107
 |   |
-|   Project[int][0] - scope-124
+|   Project[int][0] - scope-122
 |
-|---e: New For Each(false,false)[bag] - scope-110
+|---e: New For Each(false,false)[bag] - scope-108
     |   |
-    |   Project[int][0] - scope-111
+    |   Project[int][0] - scope-109
     |   |
-    |   POUserFunc(org.apache.pig.builtin.AlgebraicMathBase$Initial)[tuple] - scope-112
+    |   POUserFunc(org.apache.pig.builtin.AlgebraicMathBase$Initial)[tuple] - scope-110
     |   |
-    |   |---Project[bag][1] - scope-113
+    |   |---Project[bag][1] - scope-111
     |       |
-    |       |---Project[bag][1] - scope-114
+    |       |---Project[bag][1] - scope-112
     |
-    |---Pre Combiner Local Rearrange[tuple]{Unknown} - scope-125
+    |---Pre Combiner Local Rearrange[tuple]{Unknown} - scope-123
         |
-        |---POShuffledValueInputTez - scope-105	<-	 [scope-102, scope-103]
-Tez vertex scope-108
-# Combine plan on edge <scope-104>
-d: Local Rearrange[tuple]{int}(false) - scope-126	->	 scope-108
+        |---POShuffledValueInputTez - scope-104	<-	 [scope-102, scope-101]
+Tez vertex scope-107
+# Combine plan on edge <scope-103>
+d: Local Rearrange[tuple]{int}(false) - scope-124	->	 scope-107
 |   |
-|   Project[int][0] - scope-128
+|   Project[int][0] - scope-126
 |
-|---e: New For Each(false,false)[bag] - scope-115
+|---e: New For Each(false,false)[bag] - scope-113
     |   |
-    |   Project[int][0] - scope-116
+    |   Project[int][0] - scope-114
     |   |
-    |   POUserFunc(org.apache.pig.builtin.LongSum$Intermediate)[tuple] - scope-117
+    |   POUserFunc(org.apache.pig.builtin.LongSum$Intermediate)[tuple] - scope-115
     |   |
-    |   |---Project[bag][1] - scope-118
+    |   |---Project[bag][1] - scope-116
     |
-    |---d: Package(CombinerPackager)[tuple]{int} - scope-121
+    |---d: Package(CombinerPackager)[tuple]{int} - scope-119
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-101
+e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-100
 |
-|---e: New For Each(false,false)[bag] - scope-100
+|---e: New For Each(false,false)[bag] - scope-99
     |   |
-    |   Project[int][0] - scope-94
+    |   Project[int][0] - scope-93
     |   |
-    |   POUserFunc(org.apache.pig.builtin.LongSum$Final)[long] - scope-98
+    |   POUserFunc(org.apache.pig.builtin.LongSum$Final)[long] - scope-97
     |   |
-    |   |---Project[bag][1] - scope-119
+    |   |---Project[bag][1] - scope-117
     |
-    |---d: Package(CombinerPackager)[tuple]{int} - scope-91
+    |---d: Package(CombinerPackager)[tuple]{int} - scope-90

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=1637447&r1=1637446&r2=1637447&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 Fri Nov  7 21:08:25 2014
@@ -2,30 +2,30 @@
 # There are 1 DAGs in the session
 #--------------------------------------------------
 #--------------------------------------------------
-# TEZ DAG plan: scope-36
+# TEZ DAG plan: pig-0_scope-0
 #--------------------------------------------------
-Tez vertex scope-29	->	Tez vertex group scope-56,
-Tez vertex scope-30	->	Tez vertex group scope-56,
-Tez vertex group scope-56	->	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
 # Plan on vertex
-d: Local Rearrange[tuple]{int}(false) - scope-57	->	 scope-35
+d: Local Rearrange[tuple]{int}(false) - scope-56	->	 scope-35
 |   |
-|   Project[int][0] - scope-58
+|   Project[int][0] - scope-57
 |
-|---e: New For Each(false,false)[bag] - scope-63
+|---e: New For Each(false,false)[bag] - scope-62
     |   |
-    |   Project[int][0] - scope-59
+    |   Project[int][0] - scope-58
     |   |
-    |   POUserFunc(org.apache.pig.builtin.AlgebraicMathBase$Initial)[tuple] - scope-60
+    |   POUserFunc(org.apache.pig.builtin.AlgebraicMathBase$Initial)[tuple] - scope-59
     |   |
-    |   |---Project[bag][1] - scope-62
+    |   |---Project[bag][1] - scope-60
     |       |
     |       |---Project[bag][1] - scope-61
     |
-    |---Pre Combiner Local Rearrange[tuple]{Unknown} - scope-64
+    |---Pre Combiner Local Rearrange[tuple]{Unknown} - scope-63
         |
         |---a: New For Each(false,false)[bag] - scope-7
             |   |
@@ -40,21 +40,21 @@ d: Local Rearrange[tuple]{int}(false) - 
             |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-0
 Tez vertex scope-30
 # Plan on vertex
-d: Local Rearrange[tuple]{int}(false) - scope-65	->	 scope-35
+d: Local Rearrange[tuple]{int}(false) - scope-64	->	 scope-35
 |   |
-|   Project[int][0] - scope-66
+|   Project[int][0] - scope-65
 |
-|---e: New For Each(false,false)[bag] - scope-71
+|---e: New For Each(false,false)[bag] - scope-70
     |   |
-    |   Project[int][0] - scope-67
+    |   Project[int][0] - scope-66
     |   |
-    |   POUserFunc(org.apache.pig.builtin.AlgebraicMathBase$Initial)[tuple] - scope-68
+    |   POUserFunc(org.apache.pig.builtin.AlgebraicMathBase$Initial)[tuple] - scope-67
     |   |
-    |   |---Project[bag][1] - scope-70
+    |   |---Project[bag][1] - scope-68
     |       |
     |       |---Project[bag][1] - scope-69
     |
-    |---Pre Combiner Local Rearrange[tuple]{Unknown} - scope-72
+    |---Pre Combiner Local Rearrange[tuple]{Unknown} - scope-71
         |
         |---c: New For Each(false,false)[bag] - scope-15
             |   |
@@ -67,37 +67,37 @@ d: Local Rearrange[tuple]{int}(false) - 
             |   |---Project[bytearray][0] - scope-12
             |
             |---b: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-8
-Tez vertex group scope-56	<-	 [scope-29, scope-30]	->	 scope-35
+Tez vertex group scope-55	<-	 [scope-29, scope-30]	->	 scope-35
 # No plan on vertex group
 Tez vertex scope-35
 # Combine plan on edge <scope-30>
-d: Local Rearrange[tuple]{int}(false) - scope-53	->	 scope-35
+d: Local Rearrange[tuple]{int}(false) - scope-52	->	 scope-35
 |   |
-|   Project[int][0] - scope-55
+|   Project[int][0] - scope-54
 |
-|---e: New For Each(false,false)[bag] - scope-42
+|---e: New For Each(false,false)[bag] - scope-41
     |   |
-    |   Project[int][0] - scope-43
+    |   Project[int][0] - scope-42
     |   |
-    |   POUserFunc(org.apache.pig.builtin.LongSum$Intermediate)[tuple] - scope-44
+    |   POUserFunc(org.apache.pig.builtin.LongSum$Intermediate)[tuple] - scope-43
     |   |
-    |   |---Project[bag][1] - scope-45
+    |   |---Project[bag][1] - scope-44
     |
-    |---d: Package(CombinerPackager)[tuple]{int} - scope-48
+    |---d: Package(CombinerPackager)[tuple]{int} - scope-47
 # Combine plan on edge <scope-29>
-d: Local Rearrange[tuple]{int}(false) - scope-53	->	 scope-35
+d: Local Rearrange[tuple]{int}(false) - scope-52	->	 scope-35
 |   |
-|   Project[int][0] - scope-55
+|   Project[int][0] - scope-54
 |
-|---e: New For Each(false,false)[bag] - scope-42
+|---e: New For Each(false,false)[bag] - scope-41
     |   |
-    |   Project[int][0] - scope-43
+    |   Project[int][0] - scope-42
     |   |
-    |   POUserFunc(org.apache.pig.builtin.LongSum$Intermediate)[tuple] - scope-44
+    |   POUserFunc(org.apache.pig.builtin.LongSum$Intermediate)[tuple] - scope-43
     |   |
-    |   |---Project[bag][1] - scope-45
+    |   |---Project[bag][1] - scope-44
     |
-    |---d: Package(CombinerPackager)[tuple]{int} - scope-48
+    |---d: Package(CombinerPackager)[tuple]{int} - scope-47
 # Plan on vertex
 e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-28
 |
@@ -107,6 +107,6 @@ e: Store(file:///tmp/output:org.apache.p
     |   |
     |   POUserFunc(org.apache.pig.builtin.LongSum$Final)[long] - scope-25
     |   |
-    |   |---Project[bag][1] - scope-46
+    |   |---Project[bag][1] - scope-45
     |
     |---d: Package(CombinerPackager)[tuple]{int} - scope-18

Modified: pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3-OPTOFF.gld
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3-OPTOFF.gld?rev=1637447&r1=1637446&r2=1637447&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3-OPTOFF.gld (original)
+++ pig/trunk/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3-OPTOFF.gld Fri Nov  7 21:08:25 2014
@@ -2,76 +2,76 @@
 # There are 1 DAGs in the session
 #--------------------------------------------------
 #--------------------------------------------------
-# TEZ DAG plan: scope-96
+# TEZ DAG plan: pig-0_scope-1
 #--------------------------------------------------
-Tez vertex scope-88	->	Tez vertex scope-90,
-Tez vertex scope-89	->	Tez vertex scope-90,
-Tez vertex scope-90	->	Tez vertex scope-95,
-Tez vertex scope-94	->	Tez vertex scope-95,
-Tez vertex scope-95
+Tez vertex scope-87	->	Tez vertex scope-89,
+Tez vertex scope-88	->	Tez vertex scope-89,
+Tez vertex scope-89	->	Tez vertex scope-94,
+Tez vertex scope-93	->	Tez vertex scope-94,
+Tez vertex scope-94
 
-Tez vertex scope-88
+Tez vertex scope-87
 # Plan on vertex
-POValueOutputTez - scope-92	->	 [scope-90]
+POValueOutputTez - scope-91	->	 [scope-89]
 |
-|---a: New For Each(false,false)[bag] - scope-58
+|---a: New For Each(false,false)[bag] - scope-57
     |   |
-    |   Cast[int] - scope-53
+    |   Cast[int] - scope-52
     |   |
-    |   |---Project[bytearray][0] - scope-52
+    |   |---Project[bytearray][0] - scope-51
     |   |
-    |   Cast[chararray] - scope-56
+    |   Cast[chararray] - scope-55
     |   |
-    |   |---Project[bytearray][1] - scope-55
+    |   |---Project[bytearray][1] - scope-54
     |
-    |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-51
-Tez vertex scope-89
+    |---a: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-50
+Tez vertex scope-88
 # Plan on vertex
-POValueOutputTez - scope-93	->	 [scope-90]
+POValueOutputTez - scope-92	->	 [scope-89]
 |
-|---c: New For Each(false,false)[bag] - scope-66
+|---c: New For Each(false,false)[bag] - scope-65
     |   |
-    |   Cast[int] - scope-61
+    |   Cast[int] - scope-60
     |   |
-    |   |---Project[bytearray][1] - scope-60
+    |   |---Project[bytearray][1] - scope-59
     |   |
-    |   Cast[chararray] - scope-64
+    |   Cast[chararray] - scope-63
     |   |
-    |   |---Project[bytearray][0] - scope-63
+    |   |---Project[bytearray][0] - scope-62
     |
-    |---b: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-59
-Tez vertex scope-90
+    |---b: Load(file:///tmp/input:org.apache.pig.builtin.PigStorage) - scope-58
+Tez vertex scope-89
 # Plan on vertex
-e: Local Rearrange[tuple]{int}(false) - scope-80	->	 scope-95
+e: Local Rearrange[tuple]{int}(false) - scope-79	->	 scope-94
 |   |
-|   Project[int][0] - scope-81
+|   Project[int][0] - scope-80
 |
-|---POShuffledValueInputTez - scope-91	<-	 [scope-88, scope-89]
-Tez vertex scope-94
+|---POShuffledValueInputTez - scope-90	<-	 [scope-87, scope-88]
+Tez vertex scope-93
 # Plan on vertex
-e: Local Rearrange[tuple]{int}(false) - scope-82	->	 scope-95
+e: Local Rearrange[tuple]{int}(false) - scope-81	->	 scope-94
 |   |
-|   Project[int][0] - scope-83
+|   Project[int][0] - scope-82
 |
-|---d: New For Each(false,false)[bag] - scope-75
+|---d: New For Each(false,false)[bag] - scope-74
     |   |
-    |   Cast[int] - scope-70
+    |   Cast[int] - scope-69
     |   |
-    |   |---Project[bytearray][0] - scope-69
+    |   |---Project[bytearray][0] - scope-68
     |   |
-    |   Cast[chararray] - scope-73
+    |   Cast[chararray] - scope-72
     |   |
-    |   |---Project[bytearray][1] - scope-72
+    |   |---Project[bytearray][1] - scope-71
     |
-    |---d: Load(file:///tmp/input1:org.apache.pig.builtin.PigStorage) - scope-68
-Tez vertex scope-95
+    |---d: Load(file:///tmp/input1:org.apache.pig.builtin.PigStorage) - scope-67
+Tez vertex scope-94
 # Plan on vertex
-e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-87
+e: Store(file:///tmp/output:org.apache.pig.builtin.PigStorage) - scope-86
 |
-|---e: New For Each(true,true)[tuple] - scope-86
+|---e: New For Each(true,true)[tuple] - scope-85
     |   |
-    |   Project[bag][1] - scope-84
+    |   Project[bag][1] - scope-83
     |   |
-    |   Project[bag][2] - scope-85
+    |   Project[bag][2] - scope-84
     |
-    |---e: Package(Packager)[tuple]{int} - scope-79
+    |---e: Package(Packager)[tuple]{int} - scope-78