You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by xu...@apache.org on 2011/05/03 18:58:21 UTC
svn commit: r1099123 [15/16] - in /pig/branches/branch-0.9: ./
src/org/apache/pig/ src/org/apache/pig/backend/hadoop/executionengine/
src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/
src/org/apache/pig/impl/ src/org/apache/pig/impl/log...
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/TestTypeCheckingValidatorNewLP.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/TestTypeCheckingValidatorNewLP.java?rev=1099123&r1=1099122&r2=1099123&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/TestTypeCheckingValidatorNewLP.java (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/TestTypeCheckingValidatorNewLP.java Tue May 3 16:58:19 2011
@@ -115,7 +115,6 @@ import org.apache.pig.newplan.logical.vi
import org.apache.pig.newplan.logical.visitor.TypeCheckingRelVisitor;
import org.apache.pig.newplan.logical.visitor.UnionOnSchemaSetter;
import org.apache.pig.parser.ParserTestingUtils;
-import org.apache.pig.test.utils.LogicalPlanTester;
import org.junit.Before;
import org.junit.Test;
import static org.apache.pig.test.Util.*;
@@ -123,7 +122,6 @@ import static org.apache.pig.test.Util.*
public class TestTypeCheckingValidatorNewLP {
PigContext pc = new PigContext(ExecType.LOCAL, new Properties());
- LogicalPlanTester planTester;
private static final String CAST_LOAD_NOT_FOUND =
"Cannot resolve load function to use for casting from bytearray";
@@ -133,10 +131,6 @@ public class TestTypeCheckingValidatorNe
*/
@Before
public void setUp() throws Exception {
- // create a new instance of the plan tester
- // for each test so that different tests do not
- // interact with each other's plans
- planTester = new LogicalPlanTester(pc) ;
}
private static final String simpleEchoStreamingCommand;
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/TestTypeCheckingValidatorNoSchema.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/TestTypeCheckingValidatorNoSchema.java?rev=1099123&r1=1099122&r2=1099123&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/TestTypeCheckingValidatorNoSchema.java (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/TestTypeCheckingValidatorNoSchema.java Tue May 3 16:58:19 2011
@@ -1,961 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.pig.test;
-
-import junit.framework.TestCase;
-import org.junit.Test;
-import org.apache.pig.FuncSpec;
-import org.apache.pig.impl.logicalLayer.*;
-import org.apache.pig.impl.logicalLayer.validators.TypeCheckingValidator;
-import org.apache.pig.impl.logicalLayer.schema.Schema;
-import org.apache.pig.impl.io.FileSpec;
-import org.apache.pig.impl.plan.CompilationMessageCollector;
-import org.apache.pig.impl.plan.PlanValidationException;
-import org.apache.pig.impl.util.MultiMap;
-import org.apache.pig.backend.hadoop.datastorage.ConfigurationUtil;
-import org.apache.pig.builtin.PigStorage;
-import org.apache.pig.data.DataType;
-import org.apache.pig.impl.logicalLayer.schema.Schema.FieldSchema ;
-import static org.apache.pig.test.utils.TypeCheckingTestUtil.* ;
-import org.apache.pig.test.utils.TypeCheckingTestUtil;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Properties;
-
-public class TestTypeCheckingValidatorNoSchema extends TestCase {
-
-
- @Test
- public void testUnion1() throws Throwable {
-
- printCurrentMethodName();
- LogicalPlan plan = new LogicalPlan() ;
-
- LOLoad load1 = genDummyLOLoad(plan) ;
- LOLoad load2 = genDummyLOLoad(plan) ;
-
- // set schemas
- load1.setEnforcedSchema(null) ;
- load2.setEnforcedSchema(null) ;
-
- // create union operator
- ArrayList<LogicalOperator> inputList = new ArrayList<LogicalOperator>() ;
- inputList.add(load1) ;
- inputList.add(load2) ;
- LOUnion union = new LOUnion(plan, genNewOperatorKey()) ;
-
- // wiring
- plan.add(load1) ;
- plan.add(load2) ;
- plan.add(union) ;
-
- plan.connect(load1, union);
- plan.connect(load2, union);
-
- // validate
- CompilationMessageCollector collector = new CompilationMessageCollector() ;
- TypeCheckingValidator typeValidator = new TypeCheckingValidator() ;
- typeValidator.validate(plan, collector) ;
- printMessageCollector(collector) ;
- printTypeGraph(plan) ;
-
- // check end result schema
- Schema outputSchema = union.getSchema() ;
- assertEquals(outputSchema, null);
-
- }
-
-
- @Test
- public void testUnion2() throws Throwable {
-
- printCurrentMethodName();
- LogicalPlan plan = new LogicalPlan() ;
-
- LOLoad load1 = genDummyLOLoad(plan) ;
- LOLoad load2 = genDummyLOLoad(plan) ;
-
- String[] aliases = new String[]{ "a", "b", "c" } ;
- byte[] types = new byte[] { DataType.INTEGER, DataType.LONG, DataType.BYTEARRAY } ;
- Schema schema1 = genFlatSchema(aliases, types) ;
-
- // set schemas
- load1.setEnforcedSchema(schema1) ;
- load2.setEnforcedSchema(null) ;
-
- // create union operator
- ArrayList<LogicalOperator> inputList = new ArrayList<LogicalOperator>() ;
- inputList.add(load1) ;
- inputList.add(load2) ;
- LOUnion union = new LOUnion(plan, genNewOperatorKey()) ;
-
- // wiring
- plan.add(load1) ;
- plan.add(load2) ;
- plan.add(union) ;
-
- plan.connect(load1, union);
- plan.connect(load2, union);
-
- // validate
- CompilationMessageCollector collector = new CompilationMessageCollector() ;
- TypeCheckingValidator typeValidator = new TypeCheckingValidator() ;
- typeValidator.validate(plan, collector) ;
- printMessageCollector(collector) ;
- printTypeGraph(plan) ;
-
- // check end result schema
- Schema outputSchema = union.getSchema() ;
- assertEquals(outputSchema, null);
-
- }
-
-
- // Positive expression cond columns
- @Test
- public void testSplitWithInnerPlan1() throws Throwable {
-
- printCurrentMethodName();
- // Create outer plan
- LogicalPlan plan = new LogicalPlan() ;
-
- LOLoad load1 = genDummyLOLoad(plan) ;
-
- // set schemas
- load1.setEnforcedSchema(null) ;
-
- // Create expression inner plan #1
- LogicalPlan innerPlan1 = new LogicalPlan() ;
- LOProject project11 = new LOProject(innerPlan1, genNewOperatorKey(), load1, 0) ;
- project11.setSentinel(true);
- LOProject project12 = new LOProject(innerPlan1, genNewOperatorKey(), load1, 1) ;
- project11.setSentinel(true);
- LONotEqual notequal1 = new LONotEqual(innerPlan1, genNewOperatorKey()) ;
-
- innerPlan1.add(project11) ;
- innerPlan1.add(project12) ;
- innerPlan1.add(notequal1) ;
-
- innerPlan1.connect(project11, notequal1);
- innerPlan1.connect(project12, notequal1);
-
- // Create expression inner plan #2
- LogicalPlan innerPlan2 = new LogicalPlan() ;
- LOProject project21 = new LOProject(innerPlan2, genNewOperatorKey(), load1, 0) ;
- project21.setSentinel(true);
- LOConst const21 = new LOConst(innerPlan2, genNewOperatorKey(), 26) ;
- const21.setType(DataType.LONG);
- LOLesserThanEqual lesser21 = new LOLesserThanEqual(innerPlan2,
- genNewOperatorKey()) ;
-
- innerPlan2.add(project21) ;
- innerPlan2.add(const21) ;
- innerPlan2.add(lesser21) ;
-
- innerPlan2.connect(project21, lesser21);
- innerPlan2.connect(const21, lesser21) ;
-
- // List of innerplans
- List<LogicalPlan> innerPlans = new ArrayList<LogicalPlan>() ;
- innerPlans.add(innerPlan1) ;
- innerPlans.add(innerPlan2) ;
-
- // split
- LOSplit split1 = new LOSplit(plan,
- genNewOperatorKey(),
- new ArrayList<LogicalOperator>());
-
- // output1
- LOSplitOutput splitOutput1 = new LOSplitOutput(plan, genNewOperatorKey(), 0, innerPlan1) ;
- split1.addOutput(splitOutput1);
-
- // output2
- LOSplitOutput splitOutput2 = new LOSplitOutput(plan, genNewOperatorKey(), 1, innerPlan2) ;
- split1.addOutput(splitOutput2);
-
- plan.add(load1);
- plan.add(split1);
- plan.add(splitOutput1);
- plan.add(splitOutput2);
-
- plan.connect(load1, split1) ;
- plan.connect(split1, splitOutput1) ;
- plan.connect(split1, splitOutput2) ;
-
- CompilationMessageCollector collector = new CompilationMessageCollector() ;
- TypeCheckingValidator typeValidator = new TypeCheckingValidator() ;
- typeValidator.validate(plan, collector) ;
- printMessageCollector(collector) ;
- printTypeGraph(plan) ;
-
- if (collector.hasError()) {
- throw new AssertionError("Expect no error") ;
- }
-
- // check split itself
- assertEquals(split1.getSchema(), null) ;
-
- // check split output #1
- assertEquals(splitOutput1.getSchema(), null) ;
- assertEquals(splitOutput2.getSchema(), null) ;
-
- // inner conditions: all have to be boolean
- assertEquals(innerPlan1.getSingleLeafPlanOutputType(), DataType.BOOLEAN);
- assertEquals(innerPlan2.getSingleLeafPlanOutputType(), DataType.BOOLEAN);
-
- }
-
-
- // Negative test in cond plan
- @Test
- public void testSplitWithInnerPlan2() throws Throwable {
-
- printCurrentMethodName();
- // Create outer plan
- LogicalPlan plan = new LogicalPlan() ;
-
- LOLoad load1 = genDummyLOLoad(plan) ;
-
- // set schemas
- load1.setEnforcedSchema(null) ;
-
- // Create expression inner plan #1
- LogicalPlan innerPlan1 = new LogicalPlan() ;
- LOProject project11 = new LOProject(innerPlan1, genNewOperatorKey(), load1, 0) ;
- project11.setSentinel(true);
- LOProject project12 = new LOProject(innerPlan1, genNewOperatorKey(), load1, 1) ;
- project11.setSentinel(true);
- LONotEqual notequal1 = new LONotEqual(innerPlan1, genNewOperatorKey()) ;
-
- innerPlan1.add(project11) ;
- innerPlan1.add(project12) ;
- innerPlan1.add(notequal1) ;
-
- innerPlan1.connect(project11, notequal1);
- innerPlan1.connect(project12, notequal1);
-
- // Create expression inner plan #2
- LogicalPlan innerPlan2 = new LogicalPlan() ;
- LOProject project21 = new LOProject(innerPlan2, genNewOperatorKey(), load1, 0) ;
- project21.setSentinel(true);
- LOConst const21 = new LOConst(innerPlan2, genNewOperatorKey(), 26) ;
- const21.setType(DataType.LONG);
- LOAdd add21 = new LOAdd(innerPlan2, genNewOperatorKey()) ;
- LOConst const22 = new LOConst(innerPlan2, genNewOperatorKey(), "hoho") ;
- const22.setType(DataType.CHARARRAY);
- LOSubtract subtract21 = new LOSubtract(innerPlan2, genNewOperatorKey()) ;
-
- innerPlan2.add(project21) ;
- innerPlan2.add(const21) ;
- innerPlan2.add(add21) ;
- innerPlan2.add(const22) ;
- innerPlan2.add(subtract21) ;
-
- innerPlan2.connect(project21, add21);
- innerPlan2.connect(const21, add21) ;
- innerPlan2.connect(add21, subtract21) ;
- innerPlan2.connect(const22, subtract21) ;
-
- // List of innerplans
- List<LogicalPlan> innerPlans = new ArrayList<LogicalPlan>() ;
- innerPlans.add(innerPlan1) ;
- innerPlans.add(innerPlan2) ;
-
- // split
- LOSplit split1 = new LOSplit(plan,
- genNewOperatorKey(),
- new ArrayList<LogicalOperator>());
-
- // output1
- LOSplitOutput splitOutput1 = new LOSplitOutput(plan, genNewOperatorKey(), 0, innerPlan1) ;
- split1.addOutput(splitOutput1);
-
- // output2
- LOSplitOutput splitOutput2 = new LOSplitOutput(plan, genNewOperatorKey(), 1, innerPlan2) ;
- split1.addOutput(splitOutput2);
-
- plan.add(load1);
- plan.add(split1);
- plan.add(splitOutput1);
- plan.add(splitOutput2);
-
- plan.connect(load1, split1) ;
- plan.connect(split1, splitOutput1) ;
- plan.connect(split1, splitOutput2) ;
-
- CompilationMessageCollector collector = new CompilationMessageCollector() ;
- try {
- TypeCheckingValidator typeValidator = new TypeCheckingValidator() ;
- typeValidator.validate(plan, collector) ;
- fail("Exception expected") ;
- }
- catch(PlanValidationException pve) {
- // good
- }
-
- printMessageCollector(collector) ;
- printTypeGraph(plan) ;
-
- }
-
-
- @Test
- public void testDistinct1() throws Throwable {
-
- printCurrentMethodName();
- LogicalPlan plan = new LogicalPlan() ;
-
- LOLoad load1 = genDummyLOLoad(plan) ;
-
- // set schemas
- load1.setEnforcedSchema(null) ;
-
- // create union operator
- ArrayList<LogicalOperator> inputList = new ArrayList<LogicalOperator>() ;
- inputList.add(load1) ;
- LODistinct distinct1 = new LODistinct(plan, genNewOperatorKey()) ;
-
- // wiring
- plan.add(load1) ;
- plan.add(distinct1) ;
-
- plan.connect(load1, distinct1);
-
- // validate
- CompilationMessageCollector collector = new CompilationMessageCollector() ;
- TypeCheckingValidator typeValidator = new TypeCheckingValidator() ;
- typeValidator.validate(plan, collector) ;
- printMessageCollector(collector) ;
- printTypeGraph(plan) ;
-
- // check end result schema
- assertEquals(distinct1.getSchema(), null);
- }
-
- // Positive expression sort columns
- @Test
- public void testSort1() throws Throwable {
-
- printCurrentMethodName();
- // Create outer plan
- LogicalPlan plan = new LogicalPlan() ;
-
- LOLoad load1 = genDummyLOLoad(plan) ;
-
- // set schemas
- load1.setEnforcedSchema(null) ;
-
- // Create expression inner plan #1
- LogicalPlan innerPlan1 = new LogicalPlan() ;
- LOProject project11 = new LOProject(innerPlan1, genNewOperatorKey(), load1, 0) ;
- project11.setSentinel(true);
- LOProject project12 = new LOProject(innerPlan1, genNewOperatorKey(), load1, 1) ;
- project11.setSentinel(true);
- LOMultiply mul1 = new LOMultiply(innerPlan1, genNewOperatorKey()) ;
-
- innerPlan1.add(project11) ;
- innerPlan1.add(project12) ;
- innerPlan1.add(mul1) ;
-
- innerPlan1.connect(project11, mul1);
- innerPlan1.connect(project12, mul1);
-
- // Create expression inner plan #2
- LogicalPlan innerPlan2 = new LogicalPlan() ;
- LOProject project21 = new LOProject(innerPlan2, genNewOperatorKey(), load1, 0) ;
- project21.setSentinel(true);
- LOConst const21 = new LOConst(innerPlan2, genNewOperatorKey(), 26) ;
- const21.setType(DataType.LONG);
- LOMod mod21 = new LOMod(innerPlan2, genNewOperatorKey()) ;
-
- innerPlan2.add(project21) ;
- innerPlan2.add(const21) ;
- innerPlan2.add(mod21) ;
-
- innerPlan2.connect(project21, mod21);
- innerPlan2.connect(const21, mod21) ;
-
- // List of innerplans
- List<LogicalPlan> innerPlans = new ArrayList<LogicalPlan>() ;
- innerPlans.add(innerPlan1) ;
- innerPlans.add(innerPlan2) ;
-
- // List of ASC flags
- List<Boolean> ascList = new ArrayList<Boolean>() ;
- ascList.add(true);
- ascList.add(true);
-
- // Sort
- LOSort sort1 = new LOSort(plan, genNewOperatorKey(), innerPlans, ascList, null) ;
-
-
- plan.add(load1);
- plan.add(sort1);
- plan.connect(load1, sort1) ;
-
- CompilationMessageCollector collector = new CompilationMessageCollector() ;
- TypeCheckingValidator typeValidator = new TypeCheckingValidator() ;
- typeValidator.validate(plan, collector) ;
- TypeCheckingTestUtil.printMessageCollector(collector) ;
- TypeCheckingTestUtil.printTypeGraph(plan) ;
-
- if (collector.hasError()) {
- throw new AssertionError("Expect no error") ;
- }
-
- assertEquals(sort1.getSchema(), null) ;
-
- }
-
- // Positive expression column
- @Test
- public void testFilter1() throws Throwable {
-
- printCurrentMethodName();
- // Create outer plan
- LogicalPlan plan = new LogicalPlan() ;
-
- String pigStorage = PigStorage.class.getName() ;
-
- LOLoad load1 = new LOLoad(plan,
- genNewOperatorKey(),
- new FileSpec("pi", new FuncSpec(pigStorage)),
- ConfigurationUtil.toConfiguration(new Properties())) ;
-
- // set schemas
- load1.setEnforcedSchema(null) ;
-
- // Create inner plan
- LogicalPlan innerPlan = new LogicalPlan() ;
- LOProject project1 = new LOProject(innerPlan, genNewOperatorKey(), load1, 0) ;
- project1.setSentinel(true);
- LOProject project2 = new LOProject(innerPlan, genNewOperatorKey(), load1, 1) ;
- project2.setSentinel(true);
- LOAdd add1 = new LOAdd(innerPlan, genNewOperatorKey()) ;
- LOConst const1 = new LOConst(innerPlan, genNewOperatorKey(), 10) ;
- const1.setType(DataType.LONG);
-
- LOGreaterThan gt1 = new LOGreaterThan(innerPlan,
- genNewOperatorKey()) ;
-
- innerPlan.add(project1) ;
- innerPlan.add(project2) ;
- innerPlan.add(add1) ;
- innerPlan.add(const1) ;
- innerPlan.add(gt1) ;
-
- innerPlan.connect(project1, add1) ;
- innerPlan.connect(project2, add1) ;
- innerPlan.connect(add1, gt1) ;
- innerPlan.connect(const1, gt1) ;
-
- // filter
- LOFilter filter1 = new LOFilter(plan, genNewOperatorKey(), innerPlan) ;
-
- plan.add(load1);
- plan.add(filter1);
- plan.connect(load1, filter1) ;
-
- CompilationMessageCollector collector = new CompilationMessageCollector() ;
- TypeCheckingValidator typeValidator = new TypeCheckingValidator() ;
- typeValidator.validate(plan, collector) ;
- TypeCheckingTestUtil.printMessageCollector(collector) ;
- TypeCheckingTestUtil.printTypeGraph(plan) ;
-
- if (collector.hasError()) {
- throw new AssertionError("Expect no error") ;
- }
-
- assertEquals(filter1.getSchema(), null) ;
-
- }
-
-
- // Negative expression column
- @Test
- public void testFilter2() throws Throwable {
-
- printCurrentMethodName();
- // Create outer plan
- LogicalPlan plan = new LogicalPlan() ;
-
- String pigStorage = PigStorage.class.getName() ;
-
- LOLoad load1 = new LOLoad(plan,
- genNewOperatorKey(),
- new FileSpec("pi", new FuncSpec(pigStorage)),
- ConfigurationUtil.toConfiguration(new Properties())) ;
-
- // set schemas
- load1.setEnforcedSchema(null) ;
-
- // Create inner plan
- LogicalPlan innerPlan = new LogicalPlan() ;
- LOProject project1 = new LOProject(innerPlan, genNewOperatorKey(), load1, 0) ;
- project1.setSentinel(true);
- LOProject project2 = new LOProject(innerPlan, genNewOperatorKey(), load1, 1) ;
- project2.setSentinel(true);
- LOAdd add1 = new LOAdd(innerPlan, genNewOperatorKey()) ;
- LOConst const1 = new LOConst(innerPlan, genNewOperatorKey(), "10") ;
- const1.setType(DataType.CHARARRAY);
-
- LOGreaterThan gt1 = new LOGreaterThan(innerPlan,
- genNewOperatorKey()) ;
-
- innerPlan.add(project1) ;
- innerPlan.add(project2) ;
- innerPlan.add(add1) ;
- innerPlan.add(const1) ;
- innerPlan.add(gt1) ;
-
- innerPlan.connect(project1, add1) ;
- innerPlan.connect(project2, add1) ;
- innerPlan.connect(add1, gt1) ;
- innerPlan.connect(const1, gt1) ;
-
- // filter
- LOFilter filter1 = new LOFilter(plan, genNewOperatorKey(), innerPlan) ;
-
- plan.add(load1);
- plan.add(filter1);
- plan.connect(load1, filter1) ;
-
- CompilationMessageCollector collector = new CompilationMessageCollector() ;
- TypeCheckingValidator typeValidator = new TypeCheckingValidator() ;
- try {
- typeValidator.validate(plan, collector) ;
- fail("Exception expected") ;
- }
- catch(PlanValidationException pve) {
- // good
- }
-
- TypeCheckingTestUtil.printMessageCollector(collector) ;
- TypeCheckingTestUtil.printTypeGraph(plan) ;
-
- if (!collector.hasError()) {
- throw new AssertionError("Expect an error") ;
- }
-
- }
-
- @Test
- public void testCross1() throws Throwable {
-
- printCurrentMethodName();
- LogicalPlan plan = new LogicalPlan() ;
-
- LOLoad load1 = genDummyLOLoad(plan) ;
- LOLoad load2 = genDummyLOLoad(plan) ;
-
- // schema for input#1
- Schema inputSchema1 = null ;
- {
- List<FieldSchema> fsList1 = new ArrayList<FieldSchema>() ;
- fsList1.add(new FieldSchema("field1a", DataType.INTEGER)) ;
- fsList1.add(new FieldSchema("field2a", DataType.BYTEARRAY)) ;
- inputSchema1 = new Schema(fsList1) ;
- }
-
- // set schemas
- load1.setEnforcedSchema(inputSchema1) ;
- load2.setEnforcedSchema(null) ;
-
- // create union operator
- ArrayList<LogicalOperator> inputList = new ArrayList<LogicalOperator>() ;
- inputList.add(load1) ;
- inputList.add(load2) ;
- LOCross cross = new LOCross(plan, genNewOperatorKey()) ;
-
- // wiring
- plan.add(load1) ;
- plan.add(load2) ;
- plan.add(cross) ;
-
- plan.connect(load1, cross);
- plan.connect(load2, cross);
-
- // validate
- CompilationMessageCollector collector = new CompilationMessageCollector() ;
- TypeCheckingValidator typeValidator = new TypeCheckingValidator() ;
- typeValidator.validate(plan, collector) ;
-
- printMessageCollector(collector) ;
- printTypeGraph(plan) ;
-
- assertEquals(cross.getSchema(), null);
-
- }
-
-
- @Test
- public void testCross2() throws Throwable {
-
- printCurrentMethodName();
- LogicalPlan plan = new LogicalPlan() ;
-
- LOLoad load1 = genDummyLOLoad(plan) ;
- LOLoad load2 = genDummyLOLoad(plan) ;
-
- // set schemas
- load1.setEnforcedSchema(null) ;
- load2.setEnforcedSchema(null) ;
-
- // create union operator
- ArrayList<LogicalOperator> inputList = new ArrayList<LogicalOperator>() ;
- inputList.add(load1) ;
- inputList.add(load2) ;
- LOCross cross = new LOCross(plan, genNewOperatorKey()) ;
-
- // wiring
- plan.add(load1) ;
- plan.add(load2) ;
- plan.add(cross) ;
-
- plan.connect(load1, cross);
- plan.connect(load2, cross);
-
- // validate
- CompilationMessageCollector collector = new CompilationMessageCollector() ;
- TypeCheckingValidator typeValidator = new TypeCheckingValidator() ;
- typeValidator.validate(plan, collector) ;
-
- printMessageCollector(collector) ;
- printTypeGraph(plan) ;
-
- assertEquals(cross.getSchema(), null);
-
- }
-
-
- // Positive test
- @Test
- public void testCOGroupByAtom1() throws Throwable {
-
- printCurrentMethodName();
- LogicalPlan plan = new LogicalPlan() ;
-
- LOLoad load1 = genDummyLOLoad(plan) ;
- LOLoad load2 = genDummyLOLoad(plan) ;
-
- // set schemas
- load1.setEnforcedSchema(null) ;
- load2.setEnforcedSchema(null) ;
-
- // Create expression inner plan #1 of input #1
- LogicalPlan innerPlan11 = new LogicalPlan() ;
- LOProject project111 = new LOProject(innerPlan11, genNewOperatorKey(), load1, 0) ;
- project111.setSentinel(true);
- LOConst const111 = new LOConst(innerPlan11, genNewOperatorKey(), 26F) ;
- const111.setType(DataType.FLOAT);
- LOSubtract subtract111 = new LOSubtract(innerPlan11,
- genNewOperatorKey()) ;
-
- innerPlan11.add(project111) ;
- innerPlan11.add(const111) ;
- innerPlan11.add(subtract111) ;
-
- innerPlan11.connect(project111, subtract111);
- innerPlan11.connect(const111, subtract111) ;
-
- // Create expression inner plan #1 of input #2
- LogicalPlan innerPlan12 = new LogicalPlan() ;
- LOProject project121 = new LOProject(innerPlan12, genNewOperatorKey(), load2, 0) ;
- project121.setSentinel(true);
- LOConst const121 = new LOConst(innerPlan12, genNewOperatorKey(), 26) ;
- const121.setType(DataType.INTEGER);
- LOSubtract subtract121 = new LOSubtract(innerPlan12,
- genNewOperatorKey()) ;
-
- innerPlan12.add(project121) ;
- innerPlan12.add(const121) ;
- innerPlan12.add(subtract121) ;
-
- innerPlan12.connect(project121, subtract121);
- innerPlan12.connect(const121, subtract121) ;
-
- // Create Cogroup
- ArrayList<LogicalOperator> inputs = new ArrayList<LogicalOperator>() ;
- inputs.add(load1) ;
- inputs.add(load2) ;
-
- MultiMap<LogicalOperator, LogicalPlan> maps
- = new MultiMap<LogicalOperator, LogicalPlan>() ;
- maps.put(load1, innerPlan11);
- maps.put(load2, innerPlan12);
-
- boolean[] isInner = new boolean[inputs.size()] ;
- for (int i=0; i < isInner.length ; i++) {
- isInner[i] = false ;
- }
-
- LOCogroup cogroup1 = new LOCogroup(plan,
- genNewOperatorKey(),
- maps,
- isInner) ;
-
- // construct the main plan
- plan.add(load1) ;
- plan.add(load2) ;
- plan.add(cogroup1) ;
-
- plan.connect(load1, cogroup1);
- plan.connect(load2, cogroup1);
-
- CompilationMessageCollector collector = new CompilationMessageCollector() ;
- TypeCheckingValidator typeValidator = new TypeCheckingValidator() ;
- typeValidator.validate(plan, collector) ;
- printMessageCollector(collector) ;
- printTypeGraph(plan) ;
-
- if (collector.hasError()) {
- throw new AssertionError("Expect no error") ;
- }
-
- // check outer schema
- Schema endResultSchema = cogroup1.getSchema() ;
-
- // Tuple group column
- assertEquals(endResultSchema.getField(0).type, DataType.FLOAT) ;
-
- // check inner schema1
- assertEquals(endResultSchema.getField(1).schema, null);
- assertEquals(endResultSchema.getField(2).schema, null);
-
- // check group by col end result
- assertEquals(innerPlan11.getSingleLeafPlanOutputType(), DataType.FLOAT) ;
- assertEquals(innerPlan12.getSingleLeafPlanOutputType(), DataType.FLOAT) ;
- }
-
-
- // Positive test
- @Test
- public void testCOGroupByTuple1() throws Throwable {
-
- printCurrentMethodName();
- LogicalPlan plan = new LogicalPlan() ;
-
- LOLoad load1 = genDummyLOLoad(plan) ;
- LOLoad load2 = genDummyLOLoad(plan) ;
-
- // set schemas
- load1.setEnforcedSchema(null) ;
- load2.setEnforcedSchema(null) ;
-
- // Create expression inner plan #1 of input #1
- LogicalPlan innerPlan11 = new LogicalPlan() ;
- LOProject project111 = new LOProject(innerPlan11, genNewOperatorKey(), load1, 0) ;
- project111.setSentinel(true);
- LOConst const111 = new LOConst(innerPlan11, genNewOperatorKey(), 26F) ;
- const111.setType(DataType.FLOAT);
- LOSubtract subtract111 = new LOSubtract(innerPlan11,
- genNewOperatorKey()) ;
-
- innerPlan11.add(project111) ;
- innerPlan11.add(const111) ;
- innerPlan11.add(subtract111) ;
-
- innerPlan11.connect(project111, subtract111);
- innerPlan11.connect(const111, subtract111) ;
-
- // Create expression inner plan #2 of input #1
- LogicalPlan innerPlan21 = new LogicalPlan() ;
- LOProject project211 = new LOProject(innerPlan21, genNewOperatorKey(), load1, 0) ;
- project211.setSentinel(true);
- LOProject project212 = new LOProject(innerPlan21, genNewOperatorKey(), load1, 1) ;
- project212.setSentinel(true);
-
- LOAdd add211 = new LOAdd(innerPlan21,
- genNewOperatorKey()) ;
-
- innerPlan21.add(project211) ;
- innerPlan21.add(project212) ;
- innerPlan21.add(add211) ;
-
- innerPlan21.connect(project211, add211);
- innerPlan21.connect(project212, add211) ;
-
-
- // Create expression inner plan #1 of input #2
- LogicalPlan innerPlan12 = new LogicalPlan() ;
- LOProject project121 = new LOProject(innerPlan12, genNewOperatorKey(), load2, 0) ;
- project121.setSentinel(true);
- LOConst const121 = new LOConst(innerPlan12, genNewOperatorKey(), 26) ;
- const121.setType(DataType.INTEGER);
- LOSubtract subtract121 = new LOSubtract(innerPlan12,
- genNewOperatorKey()) ;
-
- innerPlan12.add(project121) ;
- innerPlan12.add(const121) ;
- innerPlan12.add(subtract121) ;
-
- innerPlan12.connect(project121, subtract121);
- innerPlan12.connect(const121, subtract121) ;
-
- // Create expression inner plan #2 of input #2
- LogicalPlan innerPlan22 = new LogicalPlan() ;
- LOConst const122 = new LOConst(innerPlan22, genNewOperatorKey(), 26) ;
- const122.setType(DataType.INTEGER);
- innerPlan22.add(const122) ;
-
- // Create Cogroup
- ArrayList<LogicalOperator> inputs = new ArrayList<LogicalOperator>() ;
- inputs.add(load1) ;
- inputs.add(load2) ;
-
- MultiMap<LogicalOperator, LogicalPlan> maps
- = new MultiMap<LogicalOperator, LogicalPlan>() ;
- maps.put(load1, innerPlan11);
- maps.put(load1, innerPlan21);
- maps.put(load2, innerPlan12);
- maps.put(load2, innerPlan22);
-
- boolean[] isInner = new boolean[inputs.size()] ;
- for (int i=0; i < isInner.length ; i++) {
- isInner[i] = false ;
- }
-
- LOCogroup cogroup1 = new LOCogroup(plan,
- genNewOperatorKey(),
- maps,
- isInner) ;
-
- // construct the main plan
- plan.add(load1) ;
- plan.add(load2) ;
- plan.add(cogroup1) ;
-
- plan.connect(load1, cogroup1);
- plan.connect(load2, cogroup1);
-
- CompilationMessageCollector collector = new CompilationMessageCollector() ;
- TypeCheckingValidator typeValidator = new TypeCheckingValidator() ;
- typeValidator.validate(plan, collector) ;
- TypeCheckingTestUtil.printMessageCollector(collector) ;
- TypeCheckingTestUtil.printTypeGraph(plan) ;
-
- if (collector.hasError()) {
- throw new AssertionError("Expect no error") ;
- }
-
- // check outer schema
- Schema endResultSchema = cogroup1.getSchema() ;
-
- // Tuple group column
- assertEquals(endResultSchema.getField(0).type, DataType.TUPLE) ;
- assertEquals(endResultSchema.getField(0).schema.getField(0).type, DataType.FLOAT) ;
- assertEquals(endResultSchema.getField(0).schema.getField(1).type, DataType.DOUBLE);
-
- assertEquals(endResultSchema.getField(1).type, DataType.BAG) ;
- assertEquals(endResultSchema.getField(2).type, DataType.BAG) ;
-
- // check inner schema1
- assertEquals(endResultSchema.getField(1).schema, null);
- assertEquals(endResultSchema.getField(2).schema, null);
-
- // check group by col end result
- assertEquals(innerPlan11.getSingleLeafPlanOutputType(), DataType.FLOAT) ;
- assertEquals(innerPlan21.getSingleLeafPlanOutputType(), DataType.DOUBLE) ;
- assertEquals(innerPlan12.getSingleLeafPlanOutputType(), DataType.FLOAT) ;
- assertEquals(innerPlan22.getSingleLeafPlanOutputType(), DataType.DOUBLE) ;
- }
-
-
-
- // Positive test
- @Test
- public void testForEachGenerate1() throws Throwable {
-
- printCurrentMethodName() ;
-
- LogicalPlan plan = new LogicalPlan() ;
- LOLoad load1 = genDummyLOLoad(plan) ;
-
- // set schemas
- load1.setEnforcedSchema(null) ;
-
- // Create expression inner plan #1
- LogicalPlan innerPlan1 = new LogicalPlan() ;
- LOProject project11 = new LOProject(innerPlan1, genNewOperatorKey(), load1, 0) ;
- project11.setSentinel(true);
- LOConst const11 = new LOConst(innerPlan1, genNewOperatorKey(), 26F) ;
- const11.setType(DataType.FLOAT);
- LOSubtract subtract11 = new LOSubtract(innerPlan1,
- genNewOperatorKey()) ;
-
- innerPlan1.add(project11) ;
- innerPlan1.add(const11) ;
- innerPlan1.add(subtract11) ;
-
- innerPlan1.connect(project11, subtract11);
- innerPlan1.connect(const11, subtract11) ;
-
- // Create expression inner plan #2
- LogicalPlan innerPlan2 = new LogicalPlan() ;
- LOProject project21 = new LOProject(innerPlan2, genNewOperatorKey(), load1, 0) ;
- project21.setSentinel(true);
- LOProject project22 = new LOProject(innerPlan2, genNewOperatorKey(), load1, 1) ;
- project21.setSentinel(true);
- LOAdd add21 = new LOAdd(innerPlan2,
- genNewOperatorKey()) ;
-
- innerPlan2.add(project21) ;
- innerPlan2.add(project22) ;
- innerPlan2.add(add21) ;
-
- innerPlan2.connect(project21, add21);
- innerPlan2.connect(project22, add21);
-
- // List of plans
- ArrayList<LogicalPlan> generatePlans = new ArrayList<LogicalPlan>() ;
- generatePlans.add(innerPlan1);
- generatePlans.add(innerPlan2);
-
- // List of flatten flags
- ArrayList<Boolean> flattens = new ArrayList<Boolean>() ;
- flattens.add(true) ;
- flattens.add(false) ;
-
- // Create LOForEach
- LOForEach foreach1 = new LOForEach(plan, genNewOperatorKey(), generatePlans, flattens) ;
-
- // construct the main plan
- plan.add(load1) ;
- plan.add(foreach1) ;
-
- plan.connect(load1, foreach1);
-
- CompilationMessageCollector collector = new CompilationMessageCollector() ;
- TypeCheckingValidator typeValidator = new TypeCheckingValidator() ;
- typeValidator.validate(plan, collector) ;
- printMessageCollector(collector) ;
- printTypeGraph(plan) ;
-
- if (collector.hasError()) {
- throw new AssertionError("Expect no error") ;
- }
-
- // check outer schema
- Schema endResultSchema = foreach1.getSchema() ;
-
- assertEquals(endResultSchema.getField(0).type, DataType.FLOAT) ;
- assertEquals(endResultSchema.getField(1).type, DataType.DOUBLE) ;
- }
-}
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/Util.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/Util.java?rev=1099123&r1=1099122&r2=1099123&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/Util.java (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/Util.java Tue May 3 16:58:19 2011
@@ -65,7 +65,6 @@ import org.apache.pig.backend.hadoop.dat
import org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.MRCompiler;
import org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.MapReduceLauncher;
import org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.plans.MROperPlan;
-import org.apache.pig.backend.hadoop.executionengine.physicalLayer.LogToPhyTranslationVisitor;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhysicalPlan;
import org.apache.pig.backend.hadoop.executionengine.util.MapRedUtil;
import org.apache.pig.data.BagFactory;
@@ -77,15 +76,15 @@ import org.apache.pig.data.TupleFactory;
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.LogicalPlan;
import org.apache.pig.impl.logicalLayer.parser.ParseException;
import org.apache.pig.impl.logicalLayer.parser.QueryParser;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.impl.plan.CompilationMessageCollector;
import org.apache.pig.impl.util.LogUtils;
-import org.apache.pig.newplan.logical.LogicalPlanMigrationVistor;
import org.apache.pig.newplan.logical.optimizer.LogicalPlanPrinter;
import org.apache.pig.newplan.logical.optimizer.SchemaResetter;
+import org.apache.pig.newplan.logical.relational.LogToPhyTranslationVisitor;
+import org.apache.pig.newplan.logical.relational.LogicalPlan;
import org.apache.pig.newplan.logical.optimizer.UidResetter;
import org.apache.pig.newplan.logical.rules.LoadStoreFuncDupSignatureValidator;
import org.apache.pig.newplan.logical.visitor.CastLineageSetter;
@@ -649,38 +648,14 @@ public class Util {
return f;
}
- public static PhysicalPlan buildPhysicalPlan(LogicalPlan lp, PigContext pc) throws Exception {
- LogToPhyTranslationVisitor visitor = new LogToPhyTranslationVisitor(lp);
- visitor.setPigContext(pc);
- visitor.visit();
- return visitor.getPhysicalPlan();
- }
-
- /**
- * migrate old logical plan to new logical plan
- * @param lp
- * @return new logical plan
- * @throws FrontendException
- */
- public static org.apache.pig.newplan.logical.relational.LogicalPlan migrateToNewLP(LogicalPlan lp)
- throws FrontendException{
- LogicalPlanMigrationVistor visitor = new LogicalPlanMigrationVistor(lp);
- visitor.visit();
- org.apache.pig.newplan.logical.relational.LogicalPlan newPlan = visitor.getNewLogicalPlan();
-
- SchemaResetter schemaResetter = new SchemaResetter(newPlan);
- schemaResetter.visit();
- return newPlan;
- }
-
/**
* Run default set of optimizer rules on new logical plan
* @param lp
* @return optimized logical plan
* @throws FrontendException
*/
- public static org.apache.pig.newplan.logical.relational.LogicalPlan optimizeNewLP(
- org.apache.pig.newplan.logical.relational.LogicalPlan lp)
+ public static LogicalPlan optimizeNewLP(
+ LogicalPlan lp)
throws FrontendException{
UidResetter uidResetter = new UidResetter( lp );
uidResetter.visit();
@@ -714,20 +689,14 @@ public class Util {
* @throws Exception
*/
public static PhysicalPlan buildPhysicalPlanFromNewLP(
- org.apache.pig.newplan.logical.relational.LogicalPlan lp, PigContext pc)
+ LogicalPlan lp, PigContext pc)
throws Exception {
- org.apache.pig.newplan.logical.relational.LogToPhyTranslationVisitor visitor =
- new org.apache.pig.newplan.logical.relational.LogToPhyTranslationVisitor(lp);
+ LogToPhyTranslationVisitor visitor = new LogToPhyTranslationVisitor(lp);
visitor.setPigContext(pc);
visitor.visit();
return visitor.getPhysicalPlan();
}
- public static PhysicalPlan getNewOptimizedPhysicalPlan(LogicalPlan lp, PigContext pc)
- throws FrontendException, Exception{
- return buildPhysicalPlanFromNewLP(optimizeNewLP(migrateToNewLP(lp)), pc);
- }
-
public static MROperPlan buildMRPlan(PhysicalPlan pp, PigContext pc) throws Exception{
MRCompiler comp = new MRCompiler(pp, pc);
comp.compile();
@@ -835,7 +804,7 @@ public class Util {
return readOutput(FileSystem.get(conf), fileName);
}
- public static void printPlan(org.apache.pig.newplan.logical.relational.LogicalPlan logicalPlan ) throws Exception {
+ public static void printPlan(LogicalPlan logicalPlan ) throws Exception {
ByteArrayOutputStream out = new ByteArrayOutputStream();
PrintStream ps = new PrintStream(out);
LogicalPlanPrinter pp = new LogicalPlanPrinter(logicalPlan,ps);
@@ -843,13 +812,6 @@ public class Util {
System.err.println(out.toString());
}
- public static void printPlan(LogicalPlan logicalPlan) throws Exception {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- PrintStream ps = new PrintStream(out);
- logicalPlan.explain(ps, "text", true);
- System.err.println(out.toString());
- }
-
public static void printPlan(PhysicalPlan physicalPlan) throws Exception {
ByteArrayOutputStream out = new ByteArrayOutputStream();
PrintStream ps = new PrintStream(out);
@@ -930,7 +892,26 @@ public class Util {
}
}
- public static org.apache.pig.newplan.logical.relational.LogicalPlan parse(String query, PigContext pc) throws FrontendException {
+ public static LogicalPlan buildLp(PigServer pigServer, String query)
+ throws Exception {
+ pigServer.setBatchOn();
+ pigServer.registerQuery( query );
+ java.lang.reflect.Method buildLp = pigServer.getClass().getDeclaredMethod("buildLp");
+ buildLp.setAccessible(true);
+ return (LogicalPlan ) buildLp.invoke( pigServer );
+ }
+
+ public static PhysicalPlan buildPp(PigServer pigServer, String query)
+ throws Exception {
+ buildLp( pigServer, query );
+ java.lang.reflect.Method compilePp = pigServer.getClass().getDeclaredMethod("compilePp" );
+ compilePp.setAccessible(true);
+
+ return (PhysicalPlan)compilePp.invoke( pigServer );
+
+ }
+
+ public static LogicalPlan parse(String query, PigContext pc) throws FrontendException {
Map<String, String> fileNameMap = new HashMap<String, String>();
QueryParserDriver parserDriver = new QueryParserDriver( pc, "test", fileNameMap );
org.apache.pig.newplan.logical.relational.LogicalPlan lp = parserDriver.parse( query );
@@ -948,7 +929,7 @@ public class Util {
return lp;
}
- public static org.apache.pig.newplan.logical.relational.LogicalPlan parseAndPreprocess(String query, PigContext pc) throws FrontendException {
+ public static LogicalPlan parseAndPreprocess(String query, PigContext pc) throws FrontendException {
Map<String, String> fileNameMap = new HashMap<String, String>();
QueryParserDriver parserDriver = new QueryParserDriver( pc, "test", fileNameMap );
org.apache.pig.newplan.logical.relational.LogicalPlan lp = parserDriver.parse( query );
@@ -965,4 +946,5 @@ public class Util {
new CastLineageSetter(lp, collector).visit();
return lp;
}
+
}
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/data/DotFiles/new-optlimitplan10.dot
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/data/DotFiles/new-optlimitplan10.dot?rev=1099123&r1=1099122&r2=1099123&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/data/DotFiles/new-optlimitplan10.dot (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/data/DotFiles/new-optlimitplan10.dot Tue May 3 16:58:19 2011
@@ -4,4 +4,5 @@ digraph graph1 {
LOLimit -> LOForEach;
LOForEach [hasflat="false"];
LOForEach -> LOCogroup;
+ LOCogroup -> LOStore;
}
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/data/DotFiles/new-optlimitplan3.dot
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/data/DotFiles/new-optlimitplan3.dot?rev=1099123&r1=1099122&r2=1099123&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/data/DotFiles/new-optlimitplan3.dot (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/data/DotFiles/new-optlimitplan3.dot Tue May 3 16:58:19 2011
@@ -7,4 +7,5 @@ digraph graph1 {
LOLimit -> LOCross;
LOCross -> LOLimit;
LOLimit [limit="100"];
+ LOLimit -> LOStore;
}
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/data/DotFiles/new-optlimitplan4.dot
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/data/DotFiles/new-optlimitplan4.dot?rev=1099123&r1=1099122&r2=1099123&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/data/DotFiles/new-optlimitplan4.dot (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/data/DotFiles/new-optlimitplan4.dot Tue May 3 16:58:19 2011
@@ -4,4 +4,5 @@ digraph graph1 {
LOForEach [hasflat="true"];
LOForEach -> LOLimit;
LOLimit [limit="100"];
+ LOLimit -> LOStore;
}
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/data/DotFiles/new-optlimitplan7.dot
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/data/DotFiles/new-optlimitplan7.dot?rev=1099123&r1=1099122&r2=1099123&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/data/DotFiles/new-optlimitplan7.dot (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/data/DotFiles/new-optlimitplan7.dot Tue May 3 16:58:19 2011
@@ -3,4 +3,5 @@ digraph graph1 {
LOForEach [hasflat="true"];
LOForEach -> LOLimit;
LOLimit [limit="100"];
+ LOLimit -> LOStore;
}
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Arithmetic.gld
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Arithmetic.gld?rev=1099123&r1=1099122&r2=1099123&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Arithmetic.gld (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Arithmetic.gld Tue May 3 16:58:19 2011
@@ -1,25 +1,37 @@
-New For Each(false,false,false)[bag] - Test-Plan-Builder-103
-| |
-| Add[chararray] - Test-Plan-Builder-96
-| |
-| |---Add[bytearray] - Test-Plan-Builder-94
-| | |
-| | |---Project[bytearray][0] - Test-Plan-Builder-92
-| | |
-| | |---Project[bytearray][1] - Test-Plan-Builder-93
-| |
-| |---Constant(5) - Test-Plan-Builder-95
-| |
-| Subtract[chararray] - Test-Plan-Builder-101
-| |
-| |---Subtract[chararray] - Test-Plan-Builder-99
-| | |
-| | |---Project[bytearray][0] - Test-Plan-Builder-97
-| | |
-| | |---Constant(5) - Test-Plan-Builder-98
-| |
-| |---Project[bytearray][1] - Test-Plan-Builder-100
-| |
-| Constant(hello) - Test-Plan-Builder-102
+test-12: Store()
|
-|---66: Load(file:///homes/rding/apache-pig/trunk/A:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-91
+|---A: New For Each(false,false,false)[bag] - scope-64
+ | |
+ | Add[double] - scope-51
+ | |
+ | |---Add[double] - scope-48
+ | | |
+ | | |---Cast[double] - scope-45
+ | | | |
+ | | | |---Project[bytearray][0] - scope-44
+ | | |
+ | | |---Cast[double] - scope-47
+ | | |
+ | | |---Project[bytearray][1] - scope-46
+ | |
+ | |---Cast[double] - scope-50
+ | |
+ | |---Constant(5) - scope-49
+ | |
+ | Subtract[int] - scope-60
+ | |
+ | |---Subtract[int] - scope-57
+ | | |
+ | | |---Cast[int] - scope-55
+ | | | |
+ | | | |---Project[bytearray][0] - scope-54
+ | | |
+ | | |---Constant(5) - scope-56
+ | |
+ | |---Cast[int] - scope-59
+ | |
+ | |---Project[bytearray][1] - scope-58
+ | |
+ | Constant(hello) - scope-63
+ |
+ |---test-11: Load()
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/BinCond.gld
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/BinCond.gld?rev=1099123&r1=1099122&r2=1099123&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/BinCond.gld (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/BinCond.gld Tue May 3 16:58:19 2011
@@ -1,23 +1,35 @@
-New For Each(false)[bag] - Test-Plan-Builder-164
-| |
-| POBinCond[bytearray] - Test-Plan-Builder-163
-| |
-| |---Equal To[boolean] - Test-Plan-Builder-156
-| | |
-| | |---Project[bytearray][1] - Test-Plan-Builder-154
-| | |
-| | |---Constant(3) - Test-Plan-Builder-155
-| |
-| |---Add[bytearray] - Test-Plan-Builder-159
-| | |
-| | |---Project[bytearray][2] - Test-Plan-Builder-157
-| | |
-| | |---Project[bytearray][3] - Test-Plan-Builder-158
-| |
-| |---Subtract[bytearray] - Test-Plan-Builder-162
-| |
-| |---Project[bytearray][2] - Test-Plan-Builder-160
-| |
-| |---Project[bytearray][3] - Test-Plan-Builder-161
+test-16: Store()
|
-|---130: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-153
+|---A: New For Each(false)[bag] - scope-106
+ | |
+ | POBinCond[double] - scope-100
+ | |
+ | |---Equal To[boolean] - scope-89
+ | | |
+ | | |---Cast[chararray] - scope-87
+ | | | |
+ | | | |---Project[bytearray][1] - scope-86
+ | | |
+ | | |---Constant(3) - scope-88
+ | |
+ | |---Add[double] - scope-94
+ | | |
+ | | |---Cast[double] - scope-91
+ | | | |
+ | | | |---Project[bytearray][2] - scope-90
+ | | |
+ | | |---Cast[double] - scope-93
+ | | |
+ | | |---Project[bytearray][3] - scope-92
+ | |
+ | |---Subtract[double] - scope-99
+ | |
+ | |---Cast[double] - scope-96
+ | | |
+ | | |---Project[bytearray][2] - scope-95
+ | |
+ | |---Cast[double] - scope-98
+ | |
+ | |---Project[bytearray][3] - scope-97
+ |
+ |---test-15: Load()
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Cogroup.gld
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Cogroup.gld?rev=1099123&r1=1099122&r2=1099123&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Cogroup.gld (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Cogroup.gld Tue May 3 16:58:19 2011
@@ -1,35 +1,53 @@
-Package[tuple]{tuple} - Test-Plan-Builder-51
+test-10: Store()
|
-|---Global Rearrange[tuple] - Test-Plan-Builder-50
+|---A: Package[tuple]{tuple} - scope-19
|
- |---Local Rearrange[tuple]{tuple}(false) - Test-Plan-Builder-52
- | | |
- | | Add[bytearray] - Test-Plan-Builder-55
- | | |
- | | |---Project[bytearray][0] - Test-Plan-Builder-53
- | | |
- | | |---Project[bytearray][1] - Test-Plan-Builder-54
- | | |
- | | Subtract[bytearray] - Test-Plan-Builder-58
- | | |
- | | |---Project[bytearray][0] - Test-Plan-Builder-56
- | | |
- | | |---Project[bytearray][1] - Test-Plan-Builder-57
- | |
- | |---33: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-48
- |
- |---Local Rearrange[tuple]{tuple}(false) - Test-Plan-Builder-59
- | |
- | Add[bytearray] - Test-Plan-Builder-62
- | |
- | |---Project[bytearray][0] - Test-Plan-Builder-60
- | |
- | |---Project[bytearray][1] - Test-Plan-Builder-61
- | |
- | Subtract[bytearray] - Test-Plan-Builder-65
- | |
- | |---Project[bytearray][0] - Test-Plan-Builder-63
+ |---A: Global Rearrange[tuple] - scope-18
+ |
+ |---A: Local Rearrange[tuple]{tuple}(false) - scope-20
+ | | |
+ | | Add[double] - scope-25
+ | | |
+ | | |---Cast[double] - scope-22
+ | | | |
+ | | | |---Project[bytearray][0] - scope-21
+ | | |
+ | | |---Cast[double] - scope-24
+ | | |
+ | | |---Project[bytearray][1] - scope-23
+ | | |
+ | | Subtract[double] - scope-30
+ | | |
+ | | |---Cast[double] - scope-27
+ | | | |
+ | | | |---Project[bytearray][0] - scope-26
+ | | |
+ | | |---Cast[double] - scope-29
+ | | |
+ | | |---Project[bytearray][1] - scope-28
| |
- | |---Project[bytearray][1] - Test-Plan-Builder-64
+ | |---test-8: Load()
|
- |---40: Load(file:///homes/rding/apache-pig/trunk/b:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-49
+ |---A: Local Rearrange[tuple]{tuple}(false) - scope-31
+ | |
+ | Add[double] - scope-36
+ | |
+ | |---Cast[double] - scope-33
+ | | |
+ | | |---Project[bytearray][0] - scope-32
+ | |
+ | |---Cast[double] - scope-35
+ | |
+ | |---Project[bytearray][1] - scope-34
+ | |
+ | Subtract[double] - scope-41
+ | |
+ | |---Cast[double] - scope-38
+ | | |
+ | | |---Project[bytearray][0] - scope-37
+ | |
+ | |---Cast[double] - scope-40
+ | |
+ | |---Project[bytearray][1] - scope-39
+ |
+ |---test-9: Load()
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Comparison.gld
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Comparison.gld?rev=1099123&r1=1099122&r2=1099123&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Comparison.gld (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Comparison.gld Tue May 3 16:58:19 2011
@@ -1,25 +1,37 @@
-Filter[bag] - Test-Plan-Builder-118
-| |
-| Greater Than[boolean] - Test-Plan-Builder-129
-| |
-| |---Add[bytearray] - Test-Plan-Builder-121
-| | |
-| | |---Project[bytearray][0] - Test-Plan-Builder-119
-| | |
-| | |---Project[bytearray][1] - Test-Plan-Builder-120
-| |
-| |---Multiply[chararray] - Test-Plan-Builder-128
-| |
-| |---Subtract[bytearray] - Test-Plan-Builder-124
-| | |
-| | |---Project[bytearray][0] - Test-Plan-Builder-122
-| | |
-| | |---Project[bytearray][1] - Test-Plan-Builder-123
-| |
-| |---Divide[chararray] - Test-Plan-Builder-127
-| |
-| |---Constant(4) - Test-Plan-Builder-125
-| |
-| |---Constant(2) - Test-Plan-Builder-126
+test-14: Store()
|
-|---104: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage(':')) - Test-Plan-Builder-117
+|---A: Filter[bag] - scope-67
+ | |
+ | Greater Than[boolean] - scope-83
+ | |
+ | |---Add[double] - scope-72
+ | | |
+ | | |---Cast[double] - scope-69
+ | | | |
+ | | | |---Project[bytearray][0] - scope-68
+ | | |
+ | | |---Cast[double] - scope-71
+ | | |
+ | | |---Project[bytearray][1] - scope-70
+ | |
+ | |---Multiply[double] - scope-82
+ | |
+ | |---Subtract[double] - scope-77
+ | | |
+ | | |---Cast[double] - scope-74
+ | | | |
+ | | | |---Project[bytearray][0] - scope-73
+ | | |
+ | | |---Cast[double] - scope-76
+ | | |
+ | | |---Project[bytearray][1] - scope-75
+ | |
+ | |---Cast[double] - scope-81
+ | |
+ | |---Divide[int] - scope-80
+ | |
+ | |---Constant(4) - scope-78
+ | |
+ | |---Constant(2) - scope-79
+ |
+ |---test-13: Load()
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/ComplexForeach.gld
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/ComplexForeach.gld?rev=1099123&r1=1099122&r2=1099123&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/ComplexForeach.gld (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/ComplexForeach.gld Tue May 3 16:58:19 2011
@@ -1,15 +1,17 @@
-New For Each(false)[bag] - Test-Plan-Builder-22
-| |
-| RelationToExpressionProject[bag][*] - Test-Plan-Builder-21
-| |
-| |---B: Filter[bag] - Test-Plan-Builder-17
-| | |
-| | Equal To[boolean] - Test-Plan-Builder-20
-| | |
-| | |---Project[Unknown][1] - Test-Plan-Builder-18
-| | |
-| | |---Project[Unknown][2] - Test-Plan-Builder-19
-| |
-| |---Project[tuple][0] - Test-Plan-Builder-16
+test-1: Store()
|
-|---0: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-15
+|---C: New For Each(false)[bag] - scope-7
+ | |
+ | RelationToExpressionProject[bag][*] - scope-1
+ | |
+ | |---B: Filter[bag] - scope-3
+ | | |
+ | | Equal To[boolean] - scope-6
+ | | |
+ | | |---Project[bytearray][1] - scope-4
+ | | |
+ | | |---Project[bytearray][2] - scope-5
+ | |
+ | |---Project[bag][0] - scope-2
+ |
+ |---test-0: Load()
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Distinct.gld
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Distinct.gld?rev=1099123&r1=1099122&r2=1099123&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Distinct.gld (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Distinct.gld Tue May 3 16:58:19 2011
@@ -1,3 +1,5 @@
-PODistinct[bag] - Test-Plan-Builder-32
+test-7: Store()
|
-|---29: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-31
+|---test-6: PODistinct[bag] - scope-14
+ |
+ |---test-5: Load()
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Generate.gld
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Generate.gld?rev=1099123&r1=1099122&r2=1099123&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Generate.gld (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Generate.gld Tue May 3 16:58:19 2011
@@ -1,37 +1,61 @@
-New For Each(false,false,false,false,false,false)[bag] - Test-Plan-Builder-220
-| |
-| Add[bytearray] - Test-Plan-Builder-205
-| |
-| |---Project[bytearray][1] - Test-Plan-Builder-203
-| |
-| |---Project[bytearray][2] - Test-Plan-Builder-204
-| |
-| Subtract[bytearray] - Test-Plan-Builder-208
-| |
-| |---Project[bytearray][1] - Test-Plan-Builder-206
-| |
-| |---Project[bytearray][2] - Test-Plan-Builder-207
-| |
-| Multiply[bytearray] - Test-Plan-Builder-211
-| |
-| |---Project[bytearray][1] - Test-Plan-Builder-209
-| |
-| |---Project[bytearray][2] - Test-Plan-Builder-210
-| |
-| Divide[bytearray] - Test-Plan-Builder-214
-| |
-| |---Project[bytearray][1] - Test-Plan-Builder-212
-| |
-| |---Project[bytearray][2] - Test-Plan-Builder-213
-| |
-| Mod[bytearray] - Test-Plan-Builder-217
-| |
-| |---Project[bytearray][1] - Test-Plan-Builder-215
-| |
-| |---Project[bytearray][2] - Test-Plan-Builder-216
-| |
-| PONegative[bytearray] - Test-Plan-Builder-219
-| |
-| |---Project[bytearray][1] - Test-Plan-Builder-218
+test-18: Store()
|
-|---165: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-202
+|---A: New For Each(false,false,false,false,false,false)[bag] - scope-148
+ | |
+ | Add[double] - scope-113
+ | |
+ | |---Cast[double] - scope-110
+ | | |
+ | | |---Project[bytearray][1] - scope-109
+ | |
+ | |---Cast[double] - scope-112
+ | |
+ | |---Project[bytearray][2] - scope-111
+ | |
+ | Subtract[double] - scope-120
+ | |
+ | |---Cast[double] - scope-117
+ | | |
+ | | |---Project[bytearray][1] - scope-116
+ | |
+ | |---Cast[double] - scope-119
+ | |
+ | |---Project[bytearray][2] - scope-118
+ | |
+ | Multiply[double] - scope-127
+ | |
+ | |---Cast[double] - scope-124
+ | | |
+ | | |---Project[bytearray][1] - scope-123
+ | |
+ | |---Cast[double] - scope-126
+ | |
+ | |---Project[bytearray][2] - scope-125
+ | |
+ | Divide[double] - scope-134
+ | |
+ | |---Cast[double] - scope-131
+ | | |
+ | | |---Project[bytearray][1] - scope-130
+ | |
+ | |---Cast[double] - scope-133
+ | |
+ | |---Project[bytearray][2] - scope-132
+ | |
+ | Mod[int] - scope-141
+ | |
+ | |---Cast[int] - scope-138
+ | | |
+ | | |---Project[bytearray][1] - scope-137
+ | |
+ | |---Cast[int] - scope-140
+ | |
+ | |---Project[bytearray][2] - scope-139
+ | |
+ | PONegative[double] - scope-146
+ | |
+ | |---Cast[double] - scope-145
+ | |
+ | |---Project[bytearray][1] - scope-144
+ |
+ |---test-17: Load()
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/IsNull1.gld
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/IsNull1.gld?rev=1099123&r1=1099122&r2=1099123&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/IsNull1.gld (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/IsNull1.gld Tue May 3 16:58:19 2011
@@ -1,21 +1,23 @@
-x: Filter[tuple] - Test-Plan-Builder-258
+y: Filter[bag] - scope-170
| |
-| POIsNull[tuple] - Test-Plan-Builder-260
+| Not[boolean] - scope-173
| |
-| |---Project[bytearray][0] - Test-Plan-Builder-259
+| |---POIsNull[boolean] - scope-172
+| |
+| |---Project[bytearray][0] - scope-171
|
-|---Split - Test-Plan-Builder-257
+|---test-27: Split - scope-169
|
- |---248: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-256
+ |---test-26: Load()
-y: Filter[tuple] - Test-Plan-Builder-261
-| |
-| Not[boolean] - Test-Plan-Builder-264
-| |
-| |---POIsNull[tuple] - Test-Plan-Builder-263
-| |
-| |---Project[bytearray][0] - Test-Plan-Builder-262
+test-28: Store()
|
-|---Split - Test-Plan-Builder-257
+|---x: Filter[bag] - scope-174
+ | |
+ | POIsNull[boolean] - scope-176
+ | |
+ | |---Project[bytearray][0] - scope-175
|
- |---248: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-256
+ |---test-27: Split - scope-169
+ |
+ |---test-26: Load()
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Limit.gld
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Limit.gld?rev=1099123&r1=1099122&r2=1099123&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Limit.gld (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Limit.gld Tue May 3 16:58:19 2011
@@ -1,3 +1,5 @@
-Limit - Test-Plan-Builder-268
+test-31: Store()
|
-|---265: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-267
+|---test-30: Limit - scope-179
+ |
+ |---test-29: Load()
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/MRC18.gld
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/MRC18.gld?rev=1099123&r1=1099122&r2=1099123&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/MRC18.gld (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/MRC18.gld Tue May 3 16:58:19 2011
@@ -1,21 +1,21 @@
-MapReduce(-1,PigStorage) - scope-124:
+MapReduce(-1,PigStorage) - scope-109:
Reduce Plan Empty
-| c: Store(/tmp:org.apache.pig.builtin.PigStorage) - scope-123
+| c: Store(/tmp/output1:org.apache.pig.builtin.PigStorage) - scope-108
| |
-| |---c: MergeJoin[tuple] - scope-120
+| |---c: MergeJoin[tuple] - scope-105
| |
-| |---a: Load(/tmp/input1:org.apache.pig.builtin.PigStorage) - scope-116
+| |---a: Load(/tmp/input1:org.apache.pig.builtin.PigStorage) - scope-101
|
-|---MapReduce(1,PigStorage) - scope-125:
- | Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - scope-131
+|---MapReduce(1,PigStorage) - scope-110:
+ | Store(file:/tmp/temp-1456742965/tmp-1456742965:org.apache.pig.impl.io.InterStorage) - scope-116
| |
- | |---New For Each(true)[bag] - scope-130
+ | |---New For Each(true)[bag] - scope-115
| | |
- | | Project[tuple][1] - scope-129
+ | | Project[tuple][1] - scope-114
| |
- | |---Package[tuple]{tuple} - scope-128
- | Local Rearrange[tuple]{tuple}(false) - scope-127
+ | |---Package[tuple]{tuple} - scope-113
+ | Local Rearrange[tuple]{tuple}(false) - scope-112
| | |
- | | Project[tuple][*] - scope-126
+ | | Project[tuple][*] - scope-111
| |
- | |---b: Load(/tmp/input2:org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.MergeJoinIndexer('org.apache.pig.builtin.PigStorage','kmonaaafhdhcaabdgkgbhggbcohfhegjgmcoebhchcgbhjemgjhdhehiibncbnjjmhgbjnadaaabejaaaehdgjhkgfhihaaaaaaaabhhaeaaaaaaabhdhcaaeogphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccohagmgbgohdcofagihjhdgjgdgbgmfagmgbgoaaaaaaaaaaaaaaabacaaacfkaaangfgogeepggebgmgmejgohahfheemaaafgphagngbhaheaacdemgphcghcpgbhagbgdgigfcphagjghcpgjgnhagmcphfhegjgmcpenhfgmhegjengbhadlhihcaacfgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcfagmgbgoeaondlnechegpmlgacaaaiemaaakgneghcgpgnefgeghgfhdhbaahoaaademaaafgnelgfhjhdheaaapemgkgbhggbcphfhegjgmcpengbhadlemaaahgnemgfgbhggfhdheaabaemgkgbhggbcphfhegjgmcpemgjhdhedlemaaaegnephahdhbaahoaaafemaaaggnfcgpgphehdhbaahoaaagemaaaognfdgpggheeghcgpgnefgeghgfhdhbaahoaaademaaamgnfdgpgghefegpefgeghgfhdhbaahoaaademaaaignfegpefgeghgfhdhbaahoaaad
hihahdhcaacbgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohfhegjgmcoenhfgmhegjengbhaaaaaaaaaaaaaaaacacaaabemaaaegnengbhahbaahoaaafhihahdhcaabbgkgbhggbcohfhegjgmcoeigbhdgiengbhaafahnkmbmdbgganbadaaacegaaakgmgpgbgeeggbgdhegphcejaaajhegihcgfhdgigpgmgehihadpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaabhdhcaacegphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcelgfhjaaaaaaaaaaaaaaabacaaacekaaacgjgeemaaafhdgdgphagfheaabcemgkgbhggbcpgmgbgoghcpfdhehcgjgoghdlhihaaaaaaaaaaaaaaahhheaaafhdgdgphagfhdhcaafjgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccogfhihahcgfhdhdgjgpgoephagfhcgbhegphchdcofaepfahcgpgkgfgdheaaaaaaaaaaaaaaabacaaagfkaaaogjhdfahcgpgkgfgdhefegpefgogefkaaakgphggfhcgmgpgbgegfgefkaabfhahcgpgdgfhdhdgjgoghecgbghepggfehfhagmgfhdfkaabehcgfhdhfgmhefdgjgoghgmgffehfhagmgfecgbghejaaaihdhegbhcheedgpgmemaaahgdgpgmhfgngohdheaabfemgkgbhggbcphfhegjgmcpebhchcgbhjemgjhdhed
lhihcaagcgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccogfhihahcgfhdhdgjgpgoephagfhcgbhegphchdcoefhihahcgfhdhdgjgpgoephagfhcgbhegphcaaaaaaaaaaaaaaabacaaaahihcaaemgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccofagihjhdgjgdgbgmephagfhcgbhegphcaaaaaaaaaaaaaaabacaaalfkaaafgbgdgdhfgnfkaaangjgohahfheebhehegbgdgigfgeejaabehcgfhbhfgfhdhegfgefagbhcgbgmgmgfgmgjhdgnecaaakhcgfhdhfgmhefehjhagfemaaafgbgmgjgbhdhbaahoaaaoemaaafgjgohahfheheaablemgphcghcpgbhagbgdgigfcphagjghcpgegbhegbcpfehfhagmgfdlemaaaggjgohahfhehdhbaahoaaagemaaangmgjgogfgbghgffehcgbgdgfhcheaachemgphcghcpgbhagbgdgigfcphagjghcphagfgocphfhegjgmcpemgjgogfgbghgffehcgbgdgfhcdlemaaahgphfhehahfhehdhbaahoaaagemaaakhagbhcgfgohefagmgbgoheaafaemgphcghcpgbhagbgdgigfcphagjghcpgcgbgdglgfgogecpgigbgegpgphacpgfhigfgdhfhegjgpgogfgoghgjgogfcphagihjhdgjgdgbgmemgbhjgfhccphagmgbgohdcpfagihjhdgjgdgbgmfa
gmgbgodlemaaadhcgfhdheaaeeemgphcghcpgbhagbgdgigfcphagjghcpgcgbgdglgfgogecpgigbgegpgphacpgfhigfgdhfhegjgpgogfgoghgjgogfcphagihjhdgjgdgbgmemgbhjgfhccpfcgfhdhfgmhedlhihcaacbgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcaaaaaaaaaaaaaaabacaaabemaaaegnelgfhjheaacgemgphcghcpgbhagbgdgigfcphagjghcpgjgnhagmcphagmgbgocpephagfhcgbhegphcelgfhjdlhihahbaahoaaapaaaappppppppdchahahahahahahdhcaaecgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccofcgfhdhfgmheaaaaaaaaaaaaaaabacaaacecaaamhcgfhehfhcgofdhegbhehfhdemaaaghcgfhdhfgmheheaabcemgkgbhggbcpgmgbgoghcpepgcgkgfgdhedlhihaachaaaaaaaaaaaaaaaaahdhbaahoaaaaaaaaaaabhhaeaaaaaaabhdhcaabbgkgbhggbcogmgbgoghcoejgohegfghgfhcbcockakephibihdiacaaabejaaafhggbgmhfgfhihcaabagkgbhggbcogmgbgoghcoeohfgngcgfhcigkmjfbnaljeoailacaaaahihaaaaaaaaahihihdhbaahoaaaaaaaaaaabhhaeaaaaaaakhbaahoaablhihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaabhbaahoaablhbaahoaaaphihdhbaahoaaaaaaa
aaaaahhaeaaaaaaakhihdhbaahoaaaihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahihdhbaahoaaaihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahihdhbaahoaaaihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahiaahahi','','b','scope','true')) - scope-117
\ No newline at end of file
+ | |---b: Load(/tmp/input2:org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.MergeJoinIndexer('org.apache.pig.builtin.PigStorage','kmonaaafhdhcaabdgkgbhggbcohfhegjgmcoebhchcgbhjemgjhdhehiibncbnjjmhgbjnadaaabejaaaehdgjhkgfhihaaaaaaaabhhaeaaaaaaabhdhcaaeogphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccohagmgbgohdcofagihjhdgjgdgbgmfagmgbgoaaaaaaaaaaaaaaabacaaacfkaaangfgogeepggebgmgmejgohahfheemaaafgphagngbhaheaacdemgphcghcpgbhagbgdgigfcphagjghcpgjgnhagmcphfhegjgmcpenhfgmhegjengbhadlhihcaacfgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcfagmgbgoeaondlnechegpmlgacaaaiemaaakgneghcgpgnefgeghgfhdhbaahoaaademaaafgnelgfhjhdheaaapemgkgbhggbcphfhegjgmcpengbhadlemaaahgnemgfgbhggfhdheaabaemgkgbhggbcphfhegjgmcpemgjhdhedlemaaaegnephahdhbaahoaaafemaaaggnfcgpgphehdhbaahoaaagemaaaognfdgpggheeghcgpgnefgeghgfhdhbaahoaaademaaamgnfdgpgghefegpefgeghgfhdhbaahoaaademaaaignfegpefgeghgfhdhbaahoaaad
hihahdhcaacbgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohfhegjgmcoenhfgmhegjengbhaaaaaaaaaaaaaaaacacaaabemaaaegnengbhahbaahoaaafhihahdhcaabbgkgbhggbcohfhegjgmcoeigbhdgiengbhaafahnkmbmdbgganbadaaacegaaakgmgpgbgeeggbgdhegphcejaaajhegihcgfhdgigpgmgehihadpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaabhdhcaacegphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcelgfhjaaaaaaaaaaaaaaabacaaacekaaacgjgeemaaafhdgdgphagfheaabcemgkgbhggbcpgmgbgoghcpfdhehcgjgoghdlhihaaaaaaaaaaaaaaagiheaaafhdgdgphagfhdhcaafjgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccogfhihahcgfhdhdgjgpgoephagfhcgbhegphchdcofaepfahcgpgkgfgdheaaaaaaaaaaaaaaabacaaagfkaaaogjhdfahcgpgkgfgdhefegpefgogefkaaakgphggfhcgmgpgbgegfgefkaabfhahcgpgdgfhdhdgjgoghecgbghepggfehfhagmgfhdfkaabehcgfhdhfgmhefdgjgoghgmgffehfhagmgfecgbghejaaaihdhegbhcheedgpgmemaaahgdgpgmhfgngohdheaabfemgkgbhggbcphfhegjgmcpebhchcgbhjemgjhdhed
lhihcaagcgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccogfhihahcgfhdhdgjgpgoephagfhcgbhegphchdcoefhihahcgfhdhdgjgpgoephagfhcgbhegphcaaaaaaaaaaaaaaabacaaaahihcaaemgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccofagihjhdgjgdgbgmephagfhcgbhegphcaaaaaaaaaaaaaaabacaaalfkaaafgbgdgdhfgnfkaaangjgohahfheebhehegbgdgigfgeejaabehcgfhbhfgfhdhegfgefagbhcgbgmgmgfgmgjhdgnecaaakhcgfhdhfgmhefehjhagfemaaafgbgmgjgbhdhbaahoaaaoemaaafgjgohahfheheaablemgphcghcpgbhagbgdgigfcphagjghcpgegbhegbcpfehfhagmgfdlemaaaggjgohahfhehdhbaahoaaagemaaangmgjgogfgbghgffehcgbgdgfhcheaachemgphcghcpgbhagbgdgigfcphagjghcphagfgocphfhegjgmcpemgjgogfgbghgffehcgbgdgfhcdlemaaahgphfhehahfhehdhbaahoaaagemaaakhagbhcgfgohefagmgbgoheaafaemgphcghcpgbhagbgdgigfcphagjghcpgcgbgdglgfgogecpgigbgegpgphacpgfhigfgdhfhegjgpgogfgoghgjgogfcphagihjhdgjgdgbgmemgbhjgfhccphagmgbgohdcpfagihjhdgjgdgbgmfa
gmgbgodlemaaadhcgfhdheaaeeemgphcghcpgbhagbgdgigfcphagjghcpgcgbgdglgfgogecpgigbgegpgphacpgfhigfgdhfhegjgpgogfgoghgjgogfcphagihjhdgjgdgbgmemgbhjgfhccpfcgfhdhfgmhedlhihcaacbgphcghcogbhagbgdgigfcohagjghcogjgnhagmcohagmgbgocoephagfhcgbhegphcaaaaaaaaaaaaaaabacaaabemaaaegnelgfhjheaacgemgphcghcpgbhagbgdgigfcphagjghcpgjgnhagmcphagmgbgocpephagfhcgbhegphcelgfhjdlhihahbaahoaaapaaaappppppppdchahahahahahahdhcaaecgphcghcogbhagbgdgigfcohagjghcogcgbgdglgfgogecogigbgegpgphacogfhigfgdhfhegjgpgogfgoghgjgogfcohagihjhdgjgdgbgmemgbhjgfhccofcgfhdhfgmheaaaaaaaaaaaaaaabacaaacecaaamhcgfhehfhcgofdhegbhehfhdemaaaghcgfhdhfgmheheaabcemgkgbhggbcpgmgbgoghcpepgcgkgfgdhedlhihaachaaaaaaaaaaaaaaaaahdhbaahoaaaaaaaaaaabhhaeaaaaaaakhdhcaabbgkgbhggbcogmgbgoghcoejgohegfghgfhcbcockakephibihdiacaaabejaaafhggbgmhfgfhihcaabagkgbhggbcogmgbgoghcoeohfgngcgfhcigkmjfbnaljeoailacaaaahihaaaaaaaaahihihdhbaahoaaaaaaaaaaabhhaeaaaaaaakhbaahoaablhihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaabhbaahoaablhbaahoaaaphihdhbaahoaaaaaaa
aaaaahhaeaaaaaaakhihdhbaahoaaaihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahihdhbaahoaaaihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahihdhbaahoaaaihdhbaahoaaakdpeaaaaaaaaaaaamhhaiaaaaaabaaaaaaaaahiaahahi','','b','scope','true')) - scope-102
\ No newline at end of file
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Sort.gld
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Sort.gld?rev=1099123&r1=1099122&r2=1099123&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Sort.gld (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Sort.gld Tue May 3 16:58:19 2011
@@ -1,5 +1,7 @@
-POSort[bag]() - Test-Plan-Builder-28
-| |
-| Project[bytearray][0] - Test-Plan-Builder-27
+test-4: Store()
|
-|---23: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-26
+|---test-3: POSort[bag]() - scope-11
+ | |
+ | Project[bytearray][0] - scope-10
+ |
+ |---test-2: Load()
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Split1.gld
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Split1.gld?rev=1099123&r1=1099122&r2=1099123&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Split1.gld (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Split1.gld Tue May 3 16:58:19 2011
@@ -1,23 +1,29 @@
-y: Filter[tuple] - Test-Plan-Builder-240
+y: Filter[bag] - scope-157
| |
-| Greater Than[boolean] - Test-Plan-Builder-243
+| Greater Than[boolean] - scope-161
| |
-| |---Project[bytearray][0] - Test-Plan-Builder-241
+| |---Cast[chararray] - scope-159
+| | |
+| | |---Project[bytearray][0] - scope-158
| |
-| |---Constant(7) - Test-Plan-Builder-242
+| |---Constant(7) - scope-160
|
-|---Split - Test-Plan-Builder-239
+|---test-24: Split - scope-156
|
- |---229: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-238
+ |---test-23: Load()
-x: Filter[tuple] - Test-Plan-Builder-244
-| |
-| Less Than[boolean] - Test-Plan-Builder-247
-| |
-| |---Project[bytearray][0] - Test-Plan-Builder-245
-| |
-| |---Constant(7) - Test-Plan-Builder-246
+test-25: Store()
|
-|---Split - Test-Plan-Builder-239
+|---x: Filter[bag] - scope-162
+ | |
+ | Less Than[boolean] - scope-166
+ | |
+ | |---Cast[chararray] - scope-164
+ | | |
+ | | |---Project[bytearray][0] - scope-163
+ | |
+ | |---Constant(7) - scope-165
|
- |---229: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-238
+ |---test-24: Split - scope-156
+ |
+ |---test-23: Load()
Modified: pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Union.gld
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Union.gld?rev=1099123&r1=1099122&r2=1099123&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Union.gld (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/Union.gld Tue May 3 16:58:19 2011
@@ -1,7 +1,9 @@
-Union[bag] - Test-Plan-Builder-228
+test-22: Store()
|
-|---221: Load(file:///homes/rding/apache-pig/trunk/a:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-225
-|
-|---222: Load(file:///homes/rding/apache-pig/trunk/b:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-226
-|
-|---223: Load(file:///homes/rding/apache-pig/trunk/c:org.apache.pig.builtin.PigStorage) - Test-Plan-Builder-227
+|---A: Union[bag] - scope-153
+ |
+ |---test-19: Load()
+ |
+ |---test-20: Load()
+ |
+ |---test-21: Load()