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/07 02:15:44 UTC
svn commit: r1100420 [1/19] - in /pig/branches/branch-0.9: ./ src/
src/org/apache/pig/
src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/
src/org/apache/pig/impl/logicalLayer/
src/org/apache/pig/impl/logicalLayer/optimizer/ src/org/apache...
Author: xuefu
Date: Sat May 7 00:15:40 2011
New Revision: 1100420
URL: http://svn.apache.org/viewvc?rev=1100420&view=rev
Log:
PIG-1775: Removal of old logical plan
Modified:
pig/branches/branch-0.9/build.xml
pig/branches/branch-0.9/src/org/apache/pig/SortInfoSetter.java
pig/branches/branch-0.9/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/LogToPhyTranslationVisitor.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/BinaryExpressionOperator.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/CastFinder.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/ColumnPruner.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/DotLOPrinter.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/ExpressionOperator.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOAdd.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOAnd.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOBinCond.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOCast.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOCogroup.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOConst.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOCross.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LODefine.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LODistinct.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LODivide.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOEqual.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOFilter.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOForEach.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOGenerate.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOGreaterThan.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOGreaterThanEqual.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOIsNull.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOJoin.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOLesserThan.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOLesserThanEqual.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOLimit.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOLoad.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOMapLookup.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOMod.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOMultiply.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LONative.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LONegative.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LONot.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LONotEqual.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOOr.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOPrinter.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOProject.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LORegexp.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOSort.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOSplit.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOSplitOutput.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOStore.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOStream.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOSubtract.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOUnion.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOUserFunc.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LOVisitor.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LogicalOperator.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LogicalPlan.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LogicalPlanCloneHelper.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/LogicalPlanCloner.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/PColFilterExtractor.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/PlanSetter.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/ProjectFixerUpper.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/ProjectStarTranslator.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/ProjectionMapCalculator.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/ProjectionMapRemover.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/RelationalOperator.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/RemoveRedundantOperators.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/ScalarFinder.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/TopLevelProjectFinder.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/UDFFinder.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/UnaryExpressionOperator.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/UnionOnSchemaSetter.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/optimizer/ImplicitSplitInserter.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/optimizer/LogicalOptimizer.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/optimizer/LogicalTransformer.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/optimizer/OpLimitOptimizer.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/optimizer/PartitionFilterOptimizer.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/optimizer/PruneColumns.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/optimizer/PushDownForeachFlatten.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/optimizer/PushUpFilter.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/optimizer/SchemaCalculator.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/optimizer/SchemaRemover.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/optimizer/TypeCastInserter.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/package.html
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/parser/grammar
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/schema/Schema.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/validators/InputOutputFileValidator.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/validators/InputOutputFileVisitor.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/validators/LogicalPlanValidationExecutor.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/validators/SchemaAliasValidator.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/validators/SchemaAliasVisitor.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/validators/TypeCheckingValidator.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/validators/TypeCheckingVisitor.java
pig/branches/branch-0.9/src/org/apache/pig/impl/logicalLayer/validators/UnionOnSchemaSetException.java
pig/branches/branch-0.9/src/org/apache/pig/impl/plan/DependencyOrderWalkerWOSeenChk.java
pig/branches/branch-0.9/src/org/apache/pig/impl/plan/OperatorPlan.java
pig/branches/branch-0.9/src/org/apache/pig/impl/plan/PlanPrinter.java
pig/branches/branch-0.9/src/org/apache/pig/impl/plan/PlanValidationExecutor.java
pig/branches/branch-0.9/src/org/apache/pig/impl/plan/PlanValidator.java
pig/branches/branch-0.9/src/org/apache/pig/impl/plan/optimizer/CommonNodeFinder.java
pig/branches/branch-0.9/src/org/apache/pig/impl/plan/optimizer/OptimizerException.java
pig/branches/branch-0.9/src/org/apache/pig/impl/plan/optimizer/PlanOptimizer.java
pig/branches/branch-0.9/src/org/apache/pig/impl/plan/optimizer/Rule.java
pig/branches/branch-0.9/src/org/apache/pig/impl/plan/optimizer/RuleMatcher.java
pig/branches/branch-0.9/src/org/apache/pig/impl/plan/optimizer/RuleOperator.java
pig/branches/branch-0.9/src/org/apache/pig/impl/plan/optimizer/RulePlan.java
pig/branches/branch-0.9/src/org/apache/pig/impl/plan/optimizer/RulePlanPrinter.java
pig/branches/branch-0.9/src/org/apache/pig/impl/plan/optimizer/RulePlanVisitor.java
pig/branches/branch-0.9/src/org/apache/pig/impl/plan/optimizer/Transformer.java
pig/branches/branch-0.9/src/org/apache/pig/impl/util/LogUtils.java
pig/branches/branch-0.9/src/org/apache/pig/newplan/logical/ForeachInnerPlanVisitor.java
pig/branches/branch-0.9/src/org/apache/pig/newplan/logical/LogicalExpPlanMigrationVistor.java
pig/branches/branch-0.9/src/org/apache/pig/newplan/logical/LogicalPlanMigrationVistor.java
pig/branches/branch-0.9/src/org/apache/pig/newplan/logical/relational/LogicalPlan.java
pig/branches/branch-0.9/src/org/apache/pig/parser/LogicalPlanBuilder.java
pig/branches/branch-0.9/src/org/apache/pig/parser/StreamingCommandUtils.java
pig/branches/branch-0.9/src/org/apache/pig/tools/grunt/Grunt.java
pig/branches/branch-0.9/src/overview.html
pig/branches/branch-0.9/test/commit-tests
pig/branches/branch-0.9/test/org/apache/pig/test/OpLimitOptimizerPrinter.java
pig/branches/branch-0.9/test/org/apache/pig/test/TestAccumulator.java
pig/branches/branch-0.9/test/org/apache/pig/test/TestConversions.java
pig/branches/branch-0.9/test/org/apache/pig/test/TestForEachNestedPlan.java
pig/branches/branch-0.9/test/org/apache/pig/test/TestForEachStar.java
pig/branches/branch-0.9/test/org/apache/pig/test/TestJoin.java
pig/branches/branch-0.9/test/org/apache/pig/test/TestLoad.java
pig/branches/branch-0.9/test/org/apache/pig/test/TestOperatorPlan.java
pig/branches/branch-0.9/test/org/apache/pig/test/TestPOCast.java
pig/branches/branch-0.9/test/org/apache/pig/test/TestPigScriptParser.java
pig/branches/branch-0.9/test/org/apache/pig/test/TestProjectRange.java
pig/branches/branch-0.9/test/org/apache/pig/test/TestProjectStarExpander.java
pig/branches/branch-0.9/test/org/apache/pig/test/TestRelationToExprProject.java
pig/branches/branch-0.9/test/org/apache/pig/test/TestStore.java
pig/branches/branch-0.9/test/org/apache/pig/test/TestStoreInstances.java
pig/branches/branch-0.9/test/org/apache/pig/test/TestTypeCheckingValidatorNewLP.java
pig/branches/branch-0.9/test/org/apache/pig/test/TestTypedMap.java
pig/branches/branch-0.9/test/org/apache/pig/test/TestUnionOnSchema.java
pig/branches/branch-0.9/test/org/apache/pig/test/TypeGraphPrinter.java
pig/branches/branch-0.9/test/org/apache/pig/test/data/GoldenFiles/MRC18.gld
pig/branches/branch-0.9/test/org/apache/pig/test/utils/dotGraph/DotGraphVisitor.java
pig/branches/branch-0.9/test/org/apache/pig/test/utils/planComparer/LogicalPlanComparer.java
pig/branches/branch-0.9/test/unit-tests
Modified: pig/branches/branch-0.9/build.xml
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/build.xml?rev=1100420&r1=1100419&r2=1100420&view=diff
==============================================================================
--- pig/branches/branch-0.9/build.xml (original)
+++ pig/branches/branch-0.9/build.xml Sat May 7 00:15:40 2011
@@ -279,8 +279,6 @@
<!-- Java Compiler Compiler, generate Parsers -->
<!-- ================================================================== -->
<target name="cc-compile" depends="init, ivy-compile" description="Create and Compile Parser">
- <jjtree target="${src.dir}/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt" outputdirectory="${src.gen.query.parser.dir}" javacchome="${javacc.home}" />
- <javacc target="${src.gen.query.parser.dir}/QueryParser.jj" outputdirectory="${src.gen.query.parser.dir}" javacchome="${javacc.home}" />
<javacc target="${src.dir}/org/apache/pig/tools/pigscript/parser/PigScriptParser.jj" outputdirectory="${src.gen.script.parser.dir}" javacchome="${javacc.home}" />
<javacc target="${src.dir}/org/apache/pig/tools/parameters/PigFileParser.jj" outputdirectory="${src.gen.param.parser.dir}" javacchome="${javacc.home}" />
<javacc target="${src.dir}/org/apache/pig/tools/parameters/ParamLoader.jj" outputdirectory="${src.gen.param.parser.dir}" javacchome="${javacc.home}" />
Modified: pig/branches/branch-0.9/src/org/apache/pig/SortInfoSetter.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/src/org/apache/pig/SortInfoSetter.java?rev=1100420&r1=1100419&r2=1100420&view=diff
==============================================================================
--- pig/branches/branch-0.9/src/org/apache/pig/SortInfoSetter.java (original)
+++ pig/branches/branch-0.9/src/org/apache/pig/SortInfoSetter.java Sat May 7 00:15:40 2011
@@ -1,84 +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;
-
-import org.apache.pig.impl.logicalLayer.FrontendException;
-import org.apache.pig.impl.logicalLayer.LOConst;
-import org.apache.pig.impl.logicalLayer.LOLimit;
-import org.apache.pig.impl.logicalLayer.LOSort;
-import org.apache.pig.impl.logicalLayer.LOSplit;
-import org.apache.pig.impl.logicalLayer.LOSplitOutput;
-import org.apache.pig.impl.logicalLayer.LOStore;
-import org.apache.pig.impl.logicalLayer.LOVisitor;
-import org.apache.pig.impl.logicalLayer.LogicalOperator;
-import org.apache.pig.impl.logicalLayer.LogicalPlan;
-import org.apache.pig.impl.plan.DependencyOrderWalker;
-import org.apache.pig.impl.plan.VisitorException;
-
-// TODO: remove this class. Added just to make test cases compile. extracted from pigserver
-public class SortInfoSetter extends LOVisitor{
-
- public SortInfoSetter(LogicalPlan plan) {
- super(plan, new DependencyOrderWalker<LogicalOperator, LogicalPlan>(plan));
- }
-
- @Override
- protected void visit(LOStore store) throws VisitorException {
-
- LogicalOperator storePred = store.getPlan().getPredecessors(store).get(0);
- if(storePred == null){
- int errCode = 2051;
- String msg = "Did not find a predecessor for Store." ;
- throw new VisitorException(msg, errCode, PigException.BUG);
- }
-
- SortInfo sortInfo = null;
- if(storePred instanceof LOLimit) {
- storePred = store.getPlan().getPredecessors(storePred).get(0);
- } else if (storePred instanceof LOSplitOutput) {
- LOSplitOutput splitOutput = (LOSplitOutput)storePred;
- // We assume this is the LOSplitOutput we injected for this case:
- // b = order a by $0; store b into '1'; store b into '2';
- // In this case, we should mark both '1' and '2' as sorted
- LogicalPlan conditionPlan = splitOutput.getConditionPlan();
- if (conditionPlan.getRoots().size()==1) {
- LogicalOperator root = conditionPlan.getRoots().get(0);
- if (root instanceof LOConst) {
- Object value = ((LOConst)root).getValue();
- if (value instanceof Boolean && (Boolean)value==true) {
- LogicalOperator split = splitOutput.getPlan().getPredecessors(splitOutput).get(0);
- if (split instanceof LOSplit) {
- storePred = store.getPlan().getPredecessors(split).get(0);
- }
- }
- }
- }
- }
- // if this predecessor is a sort, get
- // the sort info.
- if(storePred instanceof LOSort) {
- try {
- sortInfo = ((LOSort)storePred).getSortInfo();
- } catch (FrontendException e) {
- throw new VisitorException(e);
- }
- }
- store.setSortInfo(sortInfo);
- }
-}