You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ga...@apache.org on 2008/04/19 00:32:25 UTC
svn commit: r649715 [1/2] - in /incubator/pig/branches/types: ./
src/org/apache/pig/impl/logicalLayer/
src/org/apache/pig/impl/physicalLayer/plans/
src/org/apache/pig/impl/physicalLayer/topLevelOperators/
src/org/apache/pig/impl/physicalLayer/topLevelO...
Author: gates
Date: Fri Apr 18 15:32:08 2008
New Revision: 649715
URL: http://svn.apache.org/viewvc?rev=649715&view=rev
Log:
Split out walkers from visitors to allow visitors to keep a stack of walkers to walk nested plans.
Added framework for rudimentary optimizer.
Changed ParseException to VisitorException throughout visitors.
Added:
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/FrontendException.java
incubator/pig/branches/types/src/org/apache/pig/impl/plan/DependencyOrderWalker.java
incubator/pig/branches/types/src/org/apache/pig/impl/plan/DepthFirstWalker.java
incubator/pig/branches/types/src/org/apache/pig/impl/plan/PlanWalker.java
incubator/pig/branches/types/src/org/apache/pig/impl/plan/VisitorException.java
incubator/pig/branches/types/src/org/apache/pig/impl/plan/optimizer/
incubator/pig/branches/types/src/org/apache/pig/impl/plan/optimizer/PlanOptimizer.java
incubator/pig/branches/types/src/org/apache/pig/impl/plan/optimizer/Rule.java
incubator/pig/branches/types/src/org/apache/pig/impl/plan/optimizer/RuleMatcher.java
incubator/pig/branches/types/src/org/apache/pig/impl/plan/optimizer/Transformer.java
Modified:
incubator/pig/branches/types/build.xml
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/BinaryExpressionOperator.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOAdd.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOAnd.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOBinCond.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOCast.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOCogroup.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOConst.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LODistinct.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LODivide.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOEqual.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOFilter.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOForEach.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOGenerate.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOGreaterThan.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOGreaterThanEqual.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOLesserThan.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOLesserThanEqual.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOLoad.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOMapLookup.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOMod.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOMultiply.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LONegative.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LONot.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LONotEqual.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOOr.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOPrinter.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOProject.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOSort.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOSplit.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOStore.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOSubtract.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOUnion.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOUserFunc.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOVisitor.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LogicalOperator.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/UnaryExpressionOperator.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/plans/ExprPlanVisitor.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/plans/PhyPlanVisitor.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POFilter.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POForEach.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POGenerate.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POLoad.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POLocalRearrange.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POPackage.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POStore.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/PhysicalOperator.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/ConstantExpression.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/ExpressionOperator.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/POProject.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/arithmeticOperators/Add.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/arithmeticOperators/Divide.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/arithmeticOperators/Mod.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/arithmeticOperators/Multiply.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/arithmeticOperators/Subtract.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/comparators/EqualToExpr.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/comparators/GTOrEqualToExpr.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/comparators/GreaterThanExpr.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/comparators/LTOrEqualToExpr.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/comparators/LessThanExpr.java
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/comparators/NotEqualToExpr.java
incubator/pig/branches/types/src/org/apache/pig/impl/plan/Operator.java
incubator/pig/branches/types/src/org/apache/pig/impl/plan/PlanVisitor.java
incubator/pig/branches/types/test/org/apache/pig/test/TestOperatorPlan.java
Modified: incubator/pig/branches/types/build.xml
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/build.xml?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/build.xml (original)
+++ incubator/pig/branches/types/build.xml Fri Apr 18 15:32:08 2008
@@ -133,7 +133,7 @@
<target name="compile-sources">
<javac encoding="${build.encoding}" srcdir="${sources}"
- includes="**/plan/*.java, **/data/*.java, **/pig/builtin/*.java,
+ includes="**/plan/*.java, **/plan/optimizer/*.java, **/data/*.java, **/pig/builtin/*.java,
**/test/utils/*.java, **/test/TestOperatorPlan.java, **/test/TestBuiltin.java,
**/test/TestConstExpr.java, **/test/TestFilter.java, **/test/TestPhyOp.java,
**/test/TestAdd.java, **/test/TestSubtract.java, **/test/TestMultiply.java,
@@ -146,8 +146,9 @@
**/test/FakeFSInputStream.java, **/test/Util.java,
**/logicalLayer/*.java,
**/logicalLayer/schema/*.java, **/physicalLayer/topLevelOperators/*.java,
- **/physicalLayer/topLevelOperator/**/*.java, **/physicalLayer/plans/*.java,
- **/physicalLayer/Result.java, **/physicalLayer/POStatus.java"
+ **/physicalLayer/topLevelOperators/**/*.java, **/physicalLayer/plans/*.java,
+ **/physicalLayer/Result.java,
+ **/physicalLayer/POStatus.java, **/bzip2r/*.java"
destdir="${dist}" debug="${javac.debug}" optimize="${javac.optimize}" target="${javac.version}" source="${javac.version}" deprecation="${javac.deprecation}">
<compilerarg line="${javac.args} ${javac.args.warnings}" />
<classpath refid="${cp}" />
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/BinaryExpressionOperator.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/BinaryExpressionOperator.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/BinaryExpressionOperator.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/BinaryExpressionOperator.java Fri Apr 18 15:32:08 2008
@@ -18,8 +18,8 @@
package org.apache.pig.impl.logicalLayer;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
import org.apache.pig.impl.plan.PlanVisitor;
+import org.apache.pig.impl.plan.VisitorException;
/**
* This abstract class represents the logical Binary Expression Operator
@@ -62,7 +62,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
@@ -71,4 +71,4 @@
return true;
}
-}
\ No newline at end of file
+}
Added: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/FrontendException.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/FrontendException.java?rev=649715&view=auto
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/FrontendException.java (added)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/FrontendException.java Fri Apr 18 15:32:08 2008
@@ -0,0 +1,37 @@
+/*
+ * 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.impl.logicalLayer;
+
+public class FrontendException extends Exception {
+
+ public FrontendException (String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public FrontendException() {
+ this(null, null);
+ }
+
+ public FrontendException(String message) {
+ this(message, null);
+ }
+
+ public FrontendException(Throwable cause) {
+ this(null, cause);
+ }
+}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOAdd.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOAdd.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOAdd.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOAdd.java Fri Apr 18 15:32:08 2008
@@ -18,7 +18,7 @@
package org.apache.pig.impl.logicalLayer;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.plan.PlanVisitor;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -55,7 +55,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOAnd.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOAnd.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOAnd.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOAnd.java Fri Apr 18 15:32:08 2008
@@ -18,7 +18,7 @@
package org.apache.pig.impl.logicalLayer;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.plan.PlanVisitor;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -51,7 +51,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOBinCond.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOBinCond.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOBinCond.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOBinCond.java Fri Apr 18 15:32:08 2008
@@ -20,7 +20,7 @@
import java.io.IOException;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.plan.PlanVisitor;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -75,7 +75,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOCast.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOCast.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOCast.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOCast.java Fri Apr 18 15:32:08 2008
@@ -18,7 +18,7 @@
package org.apache.pig.impl.logicalLayer;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.plan.PlanVisitor;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -55,7 +55,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOCogroup.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOCogroup.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOCogroup.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOCogroup.java Fri Apr 18 15:32:08 2008
@@ -23,7 +23,7 @@
import java.util.Map;
import org.apache.pig.data.DataType;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.impl.plan.PlanVisitor;
@@ -103,7 +103,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOConst.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOConst.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOConst.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOConst.java Fri Apr 18 15:32:08 2008
@@ -18,7 +18,7 @@
package org.apache.pig.impl.logicalLayer;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.plan.PlanVisitor;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -51,7 +51,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LODistinct.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LODistinct.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LODistinct.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LODistinct.java Fri Apr 18 15:32:08 2008
@@ -23,7 +23,7 @@
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.impl.plan.PlanVisitor;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
public class LODistinct extends LogicalOperator {
@@ -81,7 +81,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LODivide.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LODivide.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LODivide.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LODivide.java Fri Apr 18 15:32:08 2008
@@ -18,7 +18,7 @@
package org.apache.pig.impl.logicalLayer;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.plan.PlanVisitor;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -55,7 +55,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOEqual.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOEqual.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOEqual.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOEqual.java Fri Apr 18 15:32:08 2008
@@ -18,7 +18,7 @@
package org.apache.pig.impl.logicalLayer;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.plan.PlanVisitor;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -51,7 +51,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOFilter.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOFilter.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOFilter.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOFilter.java Fri Apr 18 15:32:08 2008
@@ -21,7 +21,7 @@
import java.util.List;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.impl.plan.PlanVisitor;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
public class LOFilter extends LogicalOperator {
@@ -90,7 +90,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOForEach.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOForEach.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOForEach.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOForEach.java Fri Apr 18 15:32:08 2008
@@ -22,7 +22,7 @@
import java.util.List;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.impl.plan.PlanVisitor;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
public class LOForEach extends LogicalOperator {
@@ -92,7 +92,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOGenerate.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOGenerate.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOGenerate.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOGenerate.java Fri Apr 18 15:32:08 2008
@@ -22,7 +22,7 @@
import java.util.List;
import org.apache.pig.data.DataType;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.impl.plan.PlanVisitor;
@@ -97,7 +97,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOGreaterThan.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOGreaterThan.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOGreaterThan.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOGreaterThan.java Fri Apr 18 15:32:08 2008
@@ -18,7 +18,7 @@
package org.apache.pig.impl.logicalLayer;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.plan.PlanVisitor;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -51,7 +51,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOGreaterThanEqual.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOGreaterThanEqual.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOGreaterThanEqual.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOGreaterThanEqual.java Fri Apr 18 15:32:08 2008
@@ -18,7 +18,7 @@
package org.apache.pig.impl.logicalLayer;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.plan.PlanVisitor;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -51,7 +51,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOLesserThan.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOLesserThan.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOLesserThan.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOLesserThan.java Fri Apr 18 15:32:08 2008
@@ -18,7 +18,7 @@
package org.apache.pig.impl.logicalLayer;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.plan.PlanVisitor;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -51,7 +51,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOLesserThanEqual.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOLesserThanEqual.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOLesserThanEqual.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOLesserThanEqual.java Fri Apr 18 15:32:08 2008
@@ -18,7 +18,7 @@
package org.apache.pig.impl.logicalLayer;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.plan.PlanVisitor;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -51,7 +51,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOLoad.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOLoad.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOLoad.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOLoad.java Fri Apr 18 15:32:08 2008
@@ -26,7 +26,7 @@
import org.apache.pig.LoadFunc; // import org.apache.pig.impl.PigContext;
import org.apache.pig.impl.io.FileSpec;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.impl.plan.PlanVisitor;
@@ -111,7 +111,7 @@
return false;
}
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOMapLookup.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOMapLookup.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOMapLookup.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOMapLookup.java Fri Apr 18 15:32:08 2008
@@ -24,6 +24,7 @@
import org.apache.pig.impl.logicalLayer.parser.ParseException;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.impl.plan.PlanVisitor;
+import org.apache.pig.impl.plan.VisitorException;
public class LOMapLookup extends ExpressionOperator {
private static final long serialVersionUID = 2L;
@@ -110,7 +111,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOMod.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOMod.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOMod.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOMod.java Fri Apr 18 15:32:08 2008
@@ -18,7 +18,7 @@
package org.apache.pig.impl.logicalLayer;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.plan.PlanVisitor;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -51,7 +51,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOMultiply.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOMultiply.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOMultiply.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOMultiply.java Fri Apr 18 15:32:08 2008
@@ -18,7 +18,7 @@
package org.apache.pig.impl.logicalLayer;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.plan.PlanVisitor;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -55,7 +55,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LONegative.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LONegative.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LONegative.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LONegative.java Fri Apr 18 15:32:08 2008
@@ -18,7 +18,7 @@
package org.apache.pig.impl.logicalLayer;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.plan.PlanVisitor;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -49,7 +49,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LONot.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LONot.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LONot.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LONot.java Fri Apr 18 15:32:08 2008
@@ -18,7 +18,7 @@
package org.apache.pig.impl.logicalLayer;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.plan.PlanVisitor;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -49,7 +49,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LONotEqual.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LONotEqual.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LONotEqual.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LONotEqual.java Fri Apr 18 15:32:08 2008
@@ -18,7 +18,7 @@
package org.apache.pig.impl.logicalLayer;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.plan.PlanVisitor;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -51,7 +51,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOOr.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOOr.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOOr.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOOr.java Fri Apr 18 15:32:08 2008
@@ -18,7 +18,7 @@
package org.apache.pig.impl.logicalLayer;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.plan.PlanVisitor;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -51,7 +51,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOPrinter.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOPrinter.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOPrinter.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOPrinter.java Fri Apr 18 15:32:08 2008
@@ -22,8 +22,9 @@
import java.util.Iterator;
import java.io.PrintStream;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
import org.apache.pig.impl.logicalLayer.schema.Schema;
+import org.apache.pig.impl.plan.DepthFirstWalker;
+import org.apache.pig.impl.plan.VisitorException;
/**
* A visitor mechanism printing out the logical plan.
@@ -31,10 +32,8 @@
public class LOPrinter extends LOVisitor {
public LOPrinter(LogicalPlan plan) {
- super(plan);
+ super(plan, new DepthFirstWalker(plan));
}
-
- public void visit() throws ParseException {}
// TODO FIX
/*
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOProject.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOProject.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOProject.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOProject.java Fri Apr 18 15:32:08 2008
@@ -22,7 +22,7 @@
import java.util.List;
import org.apache.pig.data.DataType;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.impl.plan.PlanVisitor;
@@ -102,7 +102,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOSort.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOSort.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOSort.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOSort.java Fri Apr 18 15:32:08 2008
@@ -23,7 +23,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.impl.plan.PlanVisitor;
@@ -110,7 +110,7 @@
return false;
}
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOSplit.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOSplit.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOSplit.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOSplit.java Fri Apr 18 15:32:08 2008
@@ -24,7 +24,7 @@
import java.io.IOException;
import java.util.Set;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.impl.plan.PlanVisitor;
@@ -99,7 +99,7 @@
return true;
}
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOStore.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOStore.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOStore.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOStore.java Fri Apr 18 15:32:08 2008
@@ -25,7 +25,7 @@
import org.apache.pig.StoreFunc; // import org.apache.pig.impl.PigContext;
import org.apache.pig.impl.io.FileSpec;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.impl.plan.PlanVisitor;
@@ -96,7 +96,7 @@
return false;
}
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOSubtract.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOSubtract.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOSubtract.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOSubtract.java Fri Apr 18 15:32:08 2008
@@ -18,7 +18,7 @@
package org.apache.pig.impl.logicalLayer;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.plan.PlanVisitor;
import org.apache.pig.impl.logicalLayer.schema.Schema;
@@ -55,7 +55,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOUnion.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOUnion.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOUnion.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOUnion.java Fri Apr 18 15:32:08 2008
@@ -21,7 +21,7 @@
import java.util.List;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.impl.plan.PlanVisitor;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
public class LOUnion extends LogicalOperator {
@@ -66,7 +66,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOUserFunc.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOUserFunc.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOUserFunc.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOUserFunc.java Fri Apr 18 15:32:08 2008
@@ -19,7 +19,7 @@
import java.util.List;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.impl.plan.PlanVisitor;
@@ -68,7 +68,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOVisitor.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOVisitor.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOVisitor.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOVisitor.java Fri Apr 18 15:32:08 2008
@@ -22,7 +22,8 @@
import java.util.Set;
import org.apache.pig.impl.plan.PlanVisitor;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.PlanWalker;
+import org.apache.pig.impl.plan.VisitorException;
/**
* A visitor mechanism for navigating and operating on a tree of Logical
@@ -44,17 +45,18 @@
*/
abstract public class LOVisitor extends PlanVisitor<LogicalOperator, LogicalPlan> {
- public LOVisitor(LogicalPlan plan) {
- super(plan);
+ public LOVisitor(LogicalPlan plan,
+ PlanWalker<LogicalOperator, LogicalPlan> walker) {
+ super(plan, walker);
}
/**
* @param lOp
* the logical operator that has to be visited
- * @throws ParseException
+ * @throws VisitorException
*/
void visit(LogicalOperator lOp)
- throws ParseException {
+ throws VisitorException {
//
// Do Nothing
//
@@ -63,10 +65,10 @@
/**
* @param eOp
* the logical expression operator that has to be visited
- * @throws ParseException
+ * @throws VisitorException
*/
void visit(ExpressionOperator eOp)
- throws ParseException {
+ throws VisitorException {
//
// Do Nothing
//
@@ -75,10 +77,10 @@
/**
* @param binOp
* the logical binary expression operator that has to be visited
- * @throws ParseException
+ * @throws VisitorException
*/
void visit(BinaryExpressionOperator binOp)
- throws ParseException {
+ throws VisitorException {
//
// Visit the left hand side operand followed by the right hand side
// operand
@@ -92,9 +94,9 @@
*
* @param uniOp
* the logical unary operator that has to be visited
- * @throws ParseException
+ * @throws VisitorException
*/
- void visit(UnaryExpressionOperator uniOp) throws ParseException {
+ void visit(UnaryExpressionOperator uniOp) throws VisitorException {
// Visit the operand
uniOp.getOperand().visit(this);
@@ -104,9 +106,9 @@
*
* @param cg
* the logical cogroup operator that has to be visited
- * @throws ParseException
+ * @throws VisitorException
*/
- void visit(LOCogroup cg) throws ParseException {
+ void visit(LOCogroup cg) throws VisitorException {
// Visit each of the inputs of cogroup.
Iterator<ExpressionOperator> i = cg.getGroupByCols().iterator();
while (i.hasNext()) {
@@ -118,9 +120,9 @@
*
* @param g
* the logical generate operator that has to be visited
- * @throws ParseException
+ * @throws VisitorException
*/
- void visit(LOGenerate g) throws ParseException {
+ void visit(LOGenerate g) throws VisitorException {
// Visit each of generates projection elements.
Iterator<ExpressionOperator> i = g.getProjections().iterator();
while (i.hasNext()) {
@@ -132,9 +134,9 @@
*
* @param s
* the logical sort operator that has to be visited
- * @throws ParseException
+ * @throws VisitorException
*/
- void visit(LOSort s) throws ParseException {
+ void visit(LOSort s) throws VisitorException {
// Visit the sort function
s.getUserFunc().visit(this);
}
@@ -143,9 +145,9 @@
*
* @param filter
* the logical filter operator that has to be visited
- * @throws ParseException
+ * @throws VisitorException
*/
- void visit(LOFilter filter) throws ParseException {
+ void visit(LOFilter filter) throws VisitorException {
// Visit the condition for the filter followed by the input
filter.getCondition().visit(this);
}
@@ -154,9 +156,9 @@
*
* @param split
* the logical split operator that has to be visited
- * @throws ParseException
+ * @throws VisitorException
*/
- void visit(LOSplit split) throws ParseException {
+ void visit(LOSplit split) throws VisitorException {
// Visit each of split's conditions
Iterator<ExpressionOperator> i = split.getConditions().iterator();
while (i.hasNext()) {
@@ -168,9 +170,9 @@
*
* @param forEach
* the logical foreach operator that has to be visited
- * @throws ParseException
+ * @throws VisitorException
*/
- void visit(LOForEach forEach) throws ParseException {
+ void visit(LOForEach forEach) throws VisitorException {
// Visit the operators that are part of the foreach
Iterator<LogicalOperator> i = forEach.getOperators().iterator();
while (i.hasNext()) {
@@ -183,9 +185,9 @@
*
* @param func
* the user defined function
- * @throws ParseException
+ * @throws VisitorException
*/
- void visit(LOUserFunc func) throws ParseException {
+ void visit(LOUserFunc func) throws VisitorException {
// Visit each of the arguments
Iterator<ExpressionOperator> i = func.getArguments().iterator();
while (i.hasNext()) {
@@ -195,9 +197,9 @@
/**
* @param binCond the logical binCond operator that has to be visited
- * @throws ParseException
+ * @throws VisitorException
*/
- void visit(LOBinCond binCond) throws ParseException {
+ void visit(LOBinCond binCond) throws VisitorException {
/**
* Visit the conditional expression followed by the left hand operator
* and the right hand operator respectively
@@ -212,9 +214,9 @@
*
* @param cast
* the logical cast operator that has to be visited
- * @throws ParseException
+ * @throws VisitorException
*/
- void visit(LOCast cast) throws ParseException {
+ void visit(LOCast cast) throws VisitorException {
// Visit the expression to be cast
cast.getExpression().visit(this);
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LogicalOperator.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LogicalOperator.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LogicalOperator.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LogicalOperator.java Fri Apr 18 15:32:08 2008
@@ -22,10 +22,11 @@
import java.util.List;
import java.io.IOException;
+import org.apache.pig.data.DataType;
import org.apache.pig.impl.logicalLayer.parser.ParseException;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.impl.plan.Operator;
-import org.apache.pig.data.DataType;
+import org.apache.pig.impl.plan.VisitorException;
/**
* Parent for all Logical operators.
@@ -177,9 +178,9 @@
*
* @param v
* Visitor to visit with.
- * @throws ParseException
+ * @throws VisitException
* if the visitor has a problem.
*/
- public abstract void visit(LOVisitor v) throws ParseException;
+ public abstract void visit(LOVisitor v) throws VisitorException;
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/UnaryExpressionOperator.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/UnaryExpressionOperator.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/UnaryExpressionOperator.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/UnaryExpressionOperator.java Fri Apr 18 15:32:08 2008
@@ -18,7 +18,7 @@
package org.apache.pig.impl.logicalLayer;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.plan.PlanVisitor;
import org.apache.pig.data.DataType;
@@ -55,7 +55,7 @@
}
@Override
- public void visit(LOVisitor v) throws ParseException {
+ public void visit(LOVisitor v) throws VisitorException {
v.visit(this);
}
@@ -64,4 +64,4 @@
return false;
}
-}
\ No newline at end of file
+}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/plans/ExprPlanVisitor.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/plans/ExprPlanVisitor.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/plans/ExprPlanVisitor.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/plans/ExprPlanVisitor.java Fri Apr 18 15:32:08 2008
@@ -35,6 +35,7 @@
import org.apache.pig.impl.physicalLayer.topLevelOperators.expressionOperators.binaryExprOps.comparators.LTOrEqualToExpr;
import org.apache.pig.impl.physicalLayer.topLevelOperators.expressionOperators.binaryExprOps.comparators.LessThanExpr;
import org.apache.pig.impl.physicalLayer.topLevelOperators.expressionOperators.binaryExprOps.comparators.NotEqualToExpr;
+import org.apache.pig.impl.plan.PlanWalker;
/**
* The visitor to be used for visiting expression plans.
@@ -46,8 +47,9 @@
private final Log log = LogFactory.getLog(getClass());
- public ExprPlanVisitor(ExprPlan plan) {
- super(plan);
+ public ExprPlanVisitor(ExprPlan plan,
+ PlanWalker<ExpressionOperator, ExprPlan> walker) {
+ super(plan, walker);
// TODO Auto-generated constructor stub
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/plans/PhyPlanVisitor.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/plans/PhyPlanVisitor.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/plans/PhyPlanVisitor.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/plans/PhyPlanVisitor.java Fri Apr 18 15:32:08 2008
@@ -17,7 +17,6 @@
*/
package org.apache.pig.impl.physicalLayer.plans;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
import org.apache.pig.impl.physicalLayer.topLevelOperators.POFilter;
import org.apache.pig.impl.physicalLayer.topLevelOperators.POGenerate;
//import org.apache.pig.impl.physicalLayer.topLevelOperators.POGenerate;
@@ -28,9 +27,13 @@
import org.apache.pig.impl.physicalLayer.topLevelOperators.POPackage;
import org.apache.pig.impl.physicalLayer.topLevelOperators.POStore;
import org.apache.pig.impl.physicalLayer.topLevelOperators.PhysicalOperator;
+import org.apache.pig.impl.physicalLayer.topLevelOperators.expressionOperators.ExpressionOperator;
//import org.apache.pig.impl.physicalLayer.topLevelOperators.StartMap;
+import org.apache.pig.impl.plan.DepthFirstWalker;
import org.apache.pig.impl.plan.Operator;
import org.apache.pig.impl.plan.PlanVisitor;
+import org.apache.pig.impl.plan.PlanWalker;
+import org.apache.pig.impl.plan.VisitorException;
/**
* The visitor class for the Physical Plan. To use this,
@@ -48,15 +51,10 @@
*/
public class PhyPlanVisitor<O extends PhysicalOperator, P extends PhysicalPlan<O>> extends PlanVisitor<O,P> {
- public PhyPlanVisitor(P plan) {
- super(plan);
+ public PhyPlanVisitor(P plan, PlanWalker<O, P> walker) {
+ super(plan, walker);
}
- @Override
- public void visit() throws ParseException {
- depthFirst();
- }
-
public void visitLoad(POLoad ld){
//do nothing
}
@@ -65,19 +63,26 @@
//do nothing
}
- public void visitFilter(POFilter fl) throws ParseException{
- ExprPlanVisitor epv = new ExprPlanVisitor(fl.getPlan());
+ public void visitFilter(POFilter fl) throws VisitorException{
+ ExprPlanVisitor epv = new ExprPlanVisitor(fl.getPlan(),
+ new DepthFirstWalker<ExpressionOperator, ExprPlan>(fl.getPlan()));
epv.visit();
}
- public void visitLocalRearrange(POLocalRearrange lr) throws ParseException{
- PhyPlanVisitor<PhysicalOperator, PhysicalPlan<PhysicalOperator>> ppv = new PhyPlanVisitor<PhysicalOperator, PhysicalPlan<PhysicalOperator>>(lr.getPlan());
- ppv.visit();
+ public void visitLocalRearrange(POLocalRearrange lr) throws VisitorException{
+ pushWalker(mCurrentWalker.spawnChildWalker((P)lr.getPlan()));
+ // this causes the current walker (the new one we created)
+ // to walk the nested plan
+ visit();
+ popWalker();
}
- public void visitForEach(POForEach fe) throws ParseException{
- PhyPlanVisitor<PhysicalOperator, PhysicalPlan<PhysicalOperator>> ppv = new PhyPlanVisitor<PhysicalOperator, PhysicalPlan<PhysicalOperator>>(fe.getPlan());
- ppv.visit();
+ public void visitForEach(POForEach fe) throws VisitorException{
+ pushWalker(mCurrentWalker.spawnChildWalker((P)fe.getPlan()));
+ // this causes the current walker (the new one we created)
+ // to walk the nested plan
+ visit();
+ popWalker();
}
// public void visitGlobalRearrange(POGlobalRearrange gr){
@@ -97,3 +102,4 @@
}
}
+
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POFilter.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POFilter.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POFilter.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POFilter.java Fri Apr 18 15:32:08 2008
@@ -25,7 +25,7 @@
import org.apache.pig.data.DataType;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.OperatorKey;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.physicalLayer.POStatus;
import org.apache.pig.impl.physicalLayer.Result;
import org.apache.pig.impl.physicalLayer.plans.ExprPlan;
@@ -154,7 +154,7 @@
}
@Override
- public void visit(PhyPlanVisitor v) throws ParseException {
+ public void visit(PhyPlanVisitor v) throws VisitorException {
v.visitFilter(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POForEach.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POForEach.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POForEach.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POForEach.java Fri Apr 18 15:32:08 2008
@@ -28,11 +28,11 @@
import org.apache.pig.data.IndexedTuple;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.OperatorKey;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
import org.apache.pig.impl.physicalLayer.POStatus;
import org.apache.pig.impl.physicalLayer.Result;
import org.apache.pig.impl.physicalLayer.plans.PhyPlanVisitor;
import org.apache.pig.impl.physicalLayer.plans.PhysicalPlan;
+import org.apache.pig.impl.plan.VisitorException;
/**
* The foreach operator
@@ -69,7 +69,7 @@
}
@Override
- public void visit(PhyPlanVisitor v) throws ParseException {
+ public void visit(PhyPlanVisitor v) throws VisitorException {
v.visitForEach(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POGenerate.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POGenerate.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POGenerate.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POGenerate.java Fri Apr 18 15:32:08 2008
@@ -33,13 +33,13 @@
import org.apache.pig.data.Tuple;
import org.apache.pig.data.TupleFactory;
import org.apache.pig.impl.logicalLayer.OperatorKey;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
import org.apache.pig.impl.physicalLayer.POStatus;
import org.apache.pig.impl.physicalLayer.Result;
import org.apache.pig.impl.physicalLayer.plans.ExprPlan;
import org.apache.pig.impl.physicalLayer.plans.PhyPlanVisitor;
import org.apache.pig.impl.physicalLayer.topLevelOperators.expressionOperators.ExpressionOperator;
import org.apache.pig.impl.plan.PlanVisitor;
+import org.apache.pig.impl.plan.VisitorException;
public class POGenerate extends PhysicalOperator {
@@ -79,7 +79,7 @@
}
@Override
- public void visit(PhyPlanVisitor v) throws ParseException {
+ public void visit(PhyPlanVisitor v) throws VisitorException {
v.visitGenerate(this);
}
@@ -288,7 +288,7 @@
}
@Override
- public void visit(PlanVisitor v) throws ParseException {
+ public void visit(PlanVisitor v) throws VisitorException {
((PhyPlanVisitor)v).visitGenerate(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POLoad.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POLoad.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POLoad.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POLoad.java Fri Apr 18 15:32:08 2008
@@ -31,10 +31,10 @@
import org.apache.pig.impl.io.FileLocalizer;
import org.apache.pig.impl.io.FileSpec;
import org.apache.pig.impl.logicalLayer.OperatorKey;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
import org.apache.pig.impl.physicalLayer.POStatus;
import org.apache.pig.impl.physicalLayer.Result;
import org.apache.pig.impl.physicalLayer.plans.PhyPlanVisitor;
+import org.apache.pig.impl.plan.VisitorException;
/**
* The load operator which is used in two ways:
@@ -150,7 +150,7 @@
}
@Override
- public void visit(PhyPlanVisitor v) throws ParseException {
+ public void visit(PhyPlanVisitor v) throws VisitorException {
v.visitLoad(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POLocalRearrange.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POLocalRearrange.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POLocalRearrange.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POLocalRearrange.java Fri Apr 18 15:32:08 2008
@@ -26,11 +26,11 @@
import org.apache.pig.data.IndexedTuple;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.OperatorKey;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
import org.apache.pig.impl.physicalLayer.POStatus;
import org.apache.pig.impl.physicalLayer.Result;
import org.apache.pig.impl.physicalLayer.plans.PhyPlanVisitor;
import org.apache.pig.impl.physicalLayer.plans.PhysicalPlan;
+import org.apache.pig.impl.plan.VisitorException;
/**
* The local rearrange operator is a part of the co-group
@@ -72,7 +72,7 @@
}
@Override
- public void visit(PhyPlanVisitor v) throws ParseException {
+ public void visit(PhyPlanVisitor v) throws VisitorException {
v.visitLocalRearrange(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POPackage.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POPackage.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POPackage.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POPackage.java Fri Apr 18 15:32:08 2008
@@ -31,10 +31,10 @@
import org.apache.pig.data.Tuple;
import org.apache.pig.data.TupleFactory;
import org.apache.pig.impl.logicalLayer.OperatorKey;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
import org.apache.pig.impl.physicalLayer.POStatus;
import org.apache.pig.impl.physicalLayer.Result;
import org.apache.pig.impl.physicalLayer.plans.PhyPlanVisitor;
+import org.apache.pig.impl.plan.VisitorException;
/**
* The package operator that packages
* the globally rearranged tuples into
@@ -95,7 +95,7 @@
}
@Override
- public void visit(PhyPlanVisitor v) throws ParseException {
+ public void visit(PhyPlanVisitor v) throws VisitorException {
v.visitPackage(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POStore.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POStore.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POStore.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/POStore.java Fri Apr 18 15:32:08 2008
@@ -30,10 +30,10 @@
import org.apache.pig.impl.io.FileLocalizer;
import org.apache.pig.impl.io.FileSpec;
import org.apache.pig.impl.logicalLayer.OperatorKey;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
import org.apache.pig.impl.physicalLayer.POStatus;
import org.apache.pig.impl.physicalLayer.Result;
import org.apache.pig.impl.physicalLayer.plans.PhyPlanVisitor;
+import org.apache.pig.impl.plan.VisitorException;
/**
* The store operator which is used in two ways:
@@ -173,7 +173,7 @@
@Override
- public void visit(PhyPlanVisitor v) throws ParseException {
+ public void visit(PhyPlanVisitor v) throws VisitorException {
v.visitStore(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/PhysicalOperator.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/PhysicalOperator.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/PhysicalOperator.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/PhysicalOperator.java Fri Apr 18 15:32:08 2008
@@ -27,7 +27,7 @@
import org.apache.pig.data.DataType;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.OperatorKey;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.physicalLayer.POStatus;
import org.apache.pig.impl.physicalLayer.Result;
import org.apache.pig.impl.physicalLayer.plans.PhyPlanVisitor;
@@ -213,8 +213,8 @@
return res;
}
}
-
- public abstract void visit(V v) throws ParseException;
+
+ public abstract void visit(V v) throws VisitorException ;
public Result getNext(Integer i) throws ExecException {
return res;
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/ConstantExpression.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/ConstantExpression.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/ConstantExpression.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/ConstantExpression.java Fri Apr 18 15:32:08 2008
@@ -25,7 +25,7 @@
import org.apache.pig.data.DataByteArray;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.OperatorKey;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.physicalLayer.POStatus;
import org.apache.pig.impl.physicalLayer.Result;
import org.apache.pig.impl.physicalLayer.plans.ExprPlanVisitor;
@@ -71,7 +71,7 @@
}
@Override
- public void visit(ExprPlanVisitor v) throws ParseException {
+ public void visit(ExprPlanVisitor v) throws VisitorException {
v.visitConstant(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/ExpressionOperator.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/ExpressionOperator.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/ExpressionOperator.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/ExpressionOperator.java Fri Apr 18 15:32:08 2008
@@ -19,7 +19,7 @@
import org.apache.pig.impl.logicalLayer.OperatorKey;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.physicalLayer.plans.ExprPlanVisitor;
import org.apache.pig.impl.physicalLayer.topLevelOperators.PhysicalOperator;
@@ -44,5 +44,5 @@
return false;
}
- public abstract void visit(ExprPlanVisitor v) throws ParseException;
+ public abstract void visit(ExprPlanVisitor v) throws VisitorException;
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/POProject.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/POProject.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/POProject.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/POProject.java Fri Apr 18 15:32:08 2008
@@ -28,7 +28,7 @@
import org.apache.pig.data.DataByteArray;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.OperatorKey;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.physicalLayer.POStatus;
import org.apache.pig.impl.physicalLayer.Result;
import org.apache.pig.impl.physicalLayer.plans.ExprPlanVisitor;
@@ -89,7 +89,7 @@
}
@Override
- public void visit(ExprPlanVisitor v) throws ParseException {
+ public void visit(ExprPlanVisitor v) throws VisitorException {
v.visitProject(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/arithmeticOperators/Add.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/arithmeticOperators/Add.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/arithmeticOperators/Add.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/arithmeticOperators/Add.java Fri Apr 18 15:32:08 2008
@@ -19,7 +19,7 @@
import org.apache.pig.backend.executionengine.ExecException;
import org.apache.pig.impl.logicalLayer.OperatorKey;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.physicalLayer.POStatus;
import org.apache.pig.impl.physicalLayer.Result;
import org.apache.pig.impl.physicalLayer.plans.ExprPlanVisitor;
@@ -35,7 +35,7 @@
}
@Override
- public void visit(ExprPlanVisitor v) throws ParseException {
+ public void visit(ExprPlanVisitor v) throws VisitorException {
v.visitAdd(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/arithmeticOperators/Divide.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/arithmeticOperators/Divide.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/arithmeticOperators/Divide.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/arithmeticOperators/Divide.java Fri Apr 18 15:32:08 2008
@@ -19,7 +19,7 @@
import org.apache.pig.backend.executionengine.ExecException;
import org.apache.pig.impl.logicalLayer.OperatorKey;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.physicalLayer.POStatus;
import org.apache.pig.impl.physicalLayer.Result;
import org.apache.pig.impl.physicalLayer.plans.ExprPlanVisitor;
@@ -35,7 +35,7 @@
}
@Override
- public void visit(ExprPlanVisitor v) throws ParseException {
+ public void visit(ExprPlanVisitor v) throws VisitorException {
v.visitDivide(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/arithmeticOperators/Mod.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/arithmeticOperators/Mod.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/arithmeticOperators/Mod.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/arithmeticOperators/Mod.java Fri Apr 18 15:32:08 2008
@@ -19,7 +19,7 @@
import org.apache.pig.backend.executionengine.ExecException;
import org.apache.pig.impl.logicalLayer.OperatorKey;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.physicalLayer.POStatus;
import org.apache.pig.impl.physicalLayer.Result;
import org.apache.pig.impl.physicalLayer.plans.ExprPlanVisitor;
@@ -35,7 +35,7 @@
}
@Override
- public void visit(ExprPlanVisitor v) throws ParseException {
+ public void visit(ExprPlanVisitor v) throws VisitorException {
v.visitMod(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/arithmeticOperators/Multiply.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/arithmeticOperators/Multiply.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/arithmeticOperators/Multiply.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/arithmeticOperators/Multiply.java Fri Apr 18 15:32:08 2008
@@ -19,7 +19,7 @@
import org.apache.pig.backend.executionengine.ExecException;
import org.apache.pig.impl.logicalLayer.OperatorKey;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.physicalLayer.POStatus;
import org.apache.pig.impl.physicalLayer.Result;
import org.apache.pig.impl.physicalLayer.plans.ExprPlanVisitor;
@@ -35,7 +35,7 @@
}
@Override
- public void visit(ExprPlanVisitor v) throws ParseException {
+ public void visit(ExprPlanVisitor v) throws VisitorException {
v.visitMultiply(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/arithmeticOperators/Subtract.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/arithmeticOperators/Subtract.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/arithmeticOperators/Subtract.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/arithmeticOperators/Subtract.java Fri Apr 18 15:32:08 2008
@@ -19,7 +19,7 @@
import org.apache.pig.backend.executionengine.ExecException;
import org.apache.pig.impl.logicalLayer.OperatorKey;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.physicalLayer.POStatus;
import org.apache.pig.impl.physicalLayer.Result;
import org.apache.pig.impl.physicalLayer.plans.ExprPlanVisitor;
@@ -35,7 +35,7 @@
}
@Override
- public void visit(ExprPlanVisitor v) throws ParseException {
+ public void visit(ExprPlanVisitor v) throws VisitorException {
v.visitSubtract(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/comparators/EqualToExpr.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/comparators/EqualToExpr.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/comparators/EqualToExpr.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/comparators/EqualToExpr.java Fri Apr 18 15:32:08 2008
@@ -26,11 +26,11 @@
import org.apache.pig.data.DataType;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.OperatorKey;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
import org.apache.pig.backend.executionengine.ExecException;
import org.apache.pig.impl.physicalLayer.POStatus;
import org.apache.pig.impl.physicalLayer.Result;
import org.apache.pig.impl.physicalLayer.plans.ExprPlanVisitor;
+import org.apache.pig.impl.plan.VisitorException;
public class EqualToExpr extends ComparisonOperator {
@@ -45,7 +45,7 @@
}
@Override
- public void visit(ExprPlanVisitor v) throws ParseException {
+ public void visit(ExprPlanVisitor v) throws VisitorException {
v.visitEqualTo(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/comparators/GTOrEqualToExpr.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/comparators/GTOrEqualToExpr.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/comparators/GTOrEqualToExpr.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/comparators/GTOrEqualToExpr.java Fri Apr 18 15:32:08 2008
@@ -21,11 +21,11 @@
import org.apache.commons.logging.LogFactory;
import org.apache.pig.data.DataByteArray;
import org.apache.pig.impl.logicalLayer.OperatorKey;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
import org.apache.pig.impl.physicalLayer.POStatus;
import org.apache.pig.impl.physicalLayer.Result;
import org.apache.pig.impl.physicalLayer.plans.ExprPlanVisitor;
import org.apache.pig.backend.executionengine.ExecException;
+import org.apache.pig.impl.plan.VisitorException;
public class GTOrEqualToExpr extends ComparisonOperator {
@@ -41,7 +41,7 @@
}
@Override
- public void visit(ExprPlanVisitor v) throws ParseException {
+ public void visit(ExprPlanVisitor v) throws VisitorException {
v.visitGTOrEqual(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/comparators/GreaterThanExpr.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/comparators/GreaterThanExpr.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/comparators/GreaterThanExpr.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/comparators/GreaterThanExpr.java Fri Apr 18 15:32:08 2008
@@ -21,7 +21,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.pig.data.DataByteArray;
import org.apache.pig.impl.logicalLayer.OperatorKey;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.physicalLayer.plans.ExprPlanVisitor;
import org.apache.pig.impl.physicalLayer.POStatus;
import org.apache.pig.impl.physicalLayer.Result;
@@ -45,7 +45,7 @@
}
@Override
- public void visit(ExprPlanVisitor v) throws ParseException {
+ public void visit(ExprPlanVisitor v) throws VisitorException {
v.visitGreaterThan(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/comparators/LTOrEqualToExpr.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/comparators/LTOrEqualToExpr.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/comparators/LTOrEqualToExpr.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/comparators/LTOrEqualToExpr.java Fri Apr 18 15:32:08 2008
@@ -21,11 +21,11 @@
import org.apache.commons.logging.LogFactory;
import org.apache.pig.data.DataByteArray;
import org.apache.pig.impl.logicalLayer.OperatorKey;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
import org.apache.pig.impl.physicalLayer.POStatus;
import org.apache.pig.impl.physicalLayer.Result;
import org.apache.pig.impl.physicalLayer.plans.ExprPlanVisitor;
import org.apache.pig.backend.executionengine.ExecException;
+import org.apache.pig.impl.plan.VisitorException;
public class LTOrEqualToExpr extends ComparisonOperator {
private final Log log = LogFactory.getLog(getClass());
@@ -39,7 +39,7 @@
}
@Override
- public void visit(ExprPlanVisitor v) throws ParseException {
+ public void visit(ExprPlanVisitor v) throws VisitorException {
v.visiLTOrEqual(this);
}
Modified: incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/comparators/LessThanExpr.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/comparators/LessThanExpr.java?rev=649715&r1=649714&r2=649715&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/comparators/LessThanExpr.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/topLevelOperators/expressionOperators/binaryExprOps/comparators/LessThanExpr.java Fri Apr 18 15:32:08 2008
@@ -21,11 +21,11 @@
import org.apache.commons.logging.LogFactory;
import org.apache.pig.data.DataByteArray;
import org.apache.pig.impl.logicalLayer.OperatorKey;
-import org.apache.pig.impl.logicalLayer.parser.ParseException;
import org.apache.pig.impl.physicalLayer.POStatus;
import org.apache.pig.impl.physicalLayer.Result;
import org.apache.pig.impl.physicalLayer.plans.ExprPlanVisitor;
import org.apache.pig.backend.executionengine.ExecException;
+import org.apache.pig.impl.plan.VisitorException;
public class LessThanExpr extends ComparisonOperator {
@@ -40,7 +40,7 @@
}
@Override
- public void visit(ExprPlanVisitor v) throws ParseException {
+ public void visit(ExprPlanVisitor v) throws VisitorException {
v.visitLessThan(this);
}