[Pig Wiki] Update of "PigTypesBranchIntegration" by OlgaN
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Pig Wiki" for change notification. The following page has been changed by OlgaN: http://wiki.apache.org/pig/PigTypesBranchIntegration -- || [http://issues.apache.org/jira/browse/PIG-156 PIG-156] || unit tests broken under windows can be merged now - depends on streaming and other test cases being merged first|| No || || [http://issues.apache.org/jira/browse/PIG-85 PIG-85] || making PigStorage work with control characters || No || || [http://issues.apache.org/jira/browse/PIG-198 PIG-198] || integration with hadoop 0.17; Files not patched: * src/org/apache/pig/backend/executionengine/PigSlicer.java - not present yet in types * src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java - changes depend on Config properties change * src/org/apache/pig/backend/hadoop/executionengine/mapreduceExec/PigMapReduce.java - this is present in ../impl/mapReduceLayer now and is different in content - depends on some other change going in first which will cause PigMapReduce to "implement" MapRunnable and Reducer (in the types branch it currently does not implement any interface) * src/org/apache/pig/backend/hadoop/executionengine/mapreduceExec/PigCombine.java - not present in types || Yes || - || [http://issues.apache.org/jira/browse/PIG-176 PIG-176] || memory management; depends on PIG-111; || No || + || [http://issues.apache.org/jira/browse/PIG-176 PIG-176] || memory management; depends on PIG-111; || Yes || || [http://issues.apache.org/jira/browse/PIG-151 PIG-151] || problems with bzip files; '''depends on slicer''' || No || || [http://issues.apache.org/jira/browse/PIG-207 PIG-207] || New illustrate command does not work in mapreduce mode. || No || || [http://issues.apache.org/jira/browse/PIG-59 PIG-59] || Illustrate command; I think should be easy to integrate || No || - || [http://issues.apache.org/jira/browse/PIG-170 PIG-170] || memory management || No || + || [http://issues.apache.org/jira/browse/PIG-170 PIG-170] || memory management || Yes || || [http://issues.apache.org/jira/browse/PIG-120 PIG-120] || support hadoop map reduce in loal mode || No || - || [http://issues.apache.org/jira/browse/PIG-235 PIG-235] || Performance issues with memory spills || No || + || [http://issues.apache.org/jira/browse/PIG-235 PIG-235] || Performance issues with memory spills || Yes || || [http://issues.apache.org/jira/browse/PIG-245 PIG-245] || Need wrapper UDFs for all java.lang.Math functions || No || || [https://issues.apache.org/jira/browse/PIG-271 PIG-271] || Add tutorial files and builds to Pig SVN || No || || [http://issues.apache.org/jira/browse/PIG-18 PIG-18] || making Pig work with HOD 0.4; should be doable now - involves backend - HExecutionEngine.java - a little more involved and needs careful merging|| Yes ||
svn commit: r678959 - in /incubator/pig/branches/types/src/org/apache/pig: ./ backend/hadoop/executionengine/mapReduceLayer/ data/ impl/util/
Author: olga
Date: Tue Jul 22 17:50:20 2008
New Revision: 678959
URL: http://svn.apache.org/viewvc?rev=678959&view=rev
Log:
merge of PIG-176-170-235-330
Modified:
incubator/pig/branches/types/src/org/apache/pig/PigServer.java
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/LocalLauncher.java
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduce.java
incubator/pig/branches/types/src/org/apache/pig/data/DefaultTuple.java
incubator/pig/branches/types/src/org/apache/pig/impl/util/ConfigurationValidator.java
incubator/pig/branches/types/src/org/apache/pig/impl/util/SpillableMemoryManager.java
Modified: incubator/pig/branches/types/src/org/apache/pig/PigServer.java
URL:
http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/PigServer.java?rev=678959&r1=678958&r2=678959&view=diff
==
--- incubator/pig/branches/types/src/org/apache/pig/PigServer.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/PigServer.java Tue Jul 22
17:50:20 2008
@@ -114,10 +114,6 @@
this(execType, PropertiesUtil.loadPropertiesFromFile());
}
-public PigServer() throws ExecException {
-this(ExecType.MAPREDUCE);
-}
-
public PigServer(ExecType execType, Properties properties) throws
ExecException {
this.pigContext = new PigContext(execType, properties);
if (this.pigContext.getProperties().getProperty(PigContext.JOB_NAME)
== null) {
Modified:
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/LocalLauncher.java
URL:
http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/LocalLauncher.java?rev=678959&r1=678958&r2=678959&view=diff
==
---
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/LocalLauncher.java
(original)
+++
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/LocalLauncher.java
Tue Jul 22 17:50:20 2008
@@ -3,6 +3,7 @@
import java.io.IOException;
import java.io.PrintStream;
import java.util.List;
+import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -12,12 +13,15 @@
import org.apache.hadoop.mapred.jobcontrol.Job;
import org.apache.hadoop.mapred.jobcontrol.JobControl;
import org.apache.pig.backend.executionengine.ExecException;
+import org.apache.pig.backend.executionengine.ExecutionEngine;
import org.apache.pig.impl.PigContext;
+import org.apache.pig.backend.hadoop.datastorage.ConfigurationUtil;
import
org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.plans.MROperPlan;
import
org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.plans.MRPrinter;
import
org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhysicalPlan;
import org.apache.pig.impl.plan.PlanException;
import org.apache.pig.impl.plan.VisitorException;
+import org.apache.pig.impl.util.ConfigurationValidator;
public class LocalLauncher extends Launcher{
@@ -35,7 +39,9 @@
MRCompiler comp = new MRCompiler(php, pc);
comp.compile();
-Configuration conf = new Configuration();
+ExecutionEngine exe = pc.getExecutionEngine();
+Properties validatedProperties =
ConfigurationValidator.getValidatedProperties(exe.getConfiguration());
+Configuration conf =
ConfigurationUtil.toConfiguration(validatedProperties);
conf.set("mapred.job.tracker", "local");
JobClient jobClient = new JobClient(new JobConf(conf));
Modified:
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java
URL:
http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java?rev=678959&r1=678958&r2=678959&view=diff
==
---
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java
(original)
+++
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java
Tue Jul 22 17:50:20 2008
@@ -22,6 +22,7 @@
import
org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhysicalPlan;
import org.apache.pig.impl.plan.PlanException;
import org.apache.pig.impl.plan.VisitorException;
+import
svn commit: r678958 - in /incubator/pig/trunk: ./ src/org/apache/pig/impl/logicalLayer/parser/ tutorial/scripts/
Author: olga Date: Tue Jul 22 17:49:27 2008 New Revision: 678958 URL: http://svn.apache.org/viewvc?rev=678958&view=rev Log: updates for release Modified: incubator/pig/trunk/README.txt incubator/pig/trunk/build.xml incubator/pig/trunk/src/org/apache/pig/impl/logicalLayer/parser/grammar incubator/pig/trunk/tutorial/scripts/script1-hadoop.pig incubator/pig/trunk/tutorial/scripts/script1-local.pig incubator/pig/trunk/tutorial/scripts/script2-hadoop.pig incubator/pig/trunk/tutorial/scripts/script2-local.pig Modified: incubator/pig/trunk/README.txt URL: http://svn.apache.org/viewvc/incubator/pig/trunk/README.txt?rev=678958&r1=678957&r2=678958&view=diff == --- incubator/pig/trunk/README.txt (original) +++ incubator/pig/trunk/README.txt Tue Jul 22 17:49:27 2008 @@ -5,3 +5,16 @@ and our wiki, at: http://wiki.apache.org/pig/ + +Disclaimer +== + +Apache Sling is an effort undergoing incubation at The Apache Software +Foundation (ASF), sponsored by the Apache Jackrabbit PMC. Incubation is +required of all newly accepted projects until a further review indicates that +the infrastructure, communications, and decision making process have +stabilized in a manner consistent with other successful ASF projects. While +incubation status is not necessarily a reflection of the completeness or +stability of the code, it does indicate that the project has yet to be fully +endorsed by the ASF. + Modified: incubator/pig/trunk/build.xml URL: http://svn.apache.org/viewvc/incubator/pig/trunk/build.xml?rev=678958&r1=678957&r2=678958&view=diff == --- incubator/pig/trunk/build.xml (original) +++ incubator/pig/trunk/build.xml Tue Jul 22 17:49:27 2008 @@ -358,6 +358,10 @@ + + + + @@ -366,7 +370,7 @@ - + Modified: incubator/pig/trunk/src/org/apache/pig/impl/logicalLayer/parser/grammar URL: http://svn.apache.org/viewvc/incubator/pig/trunk/src/org/apache/pig/impl/logicalLayer/parser/grammar?rev=678958&r1=678957&r2=678958&view=diff == --- incubator/pig/trunk/src/org/apache/pig/impl/logicalLayer/parser/grammar (original) +++ incubator/pig/trunk/src/org/apache/pig/impl/logicalLayer/parser/grammar Tue Jul 22 17:49:27 2008 @@ -1,3 +1,21 @@ +/* + * 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. + */ + := ";" := [ "="] ["PARALLEL" ] Modified: incubator/pig/trunk/tutorial/scripts/script1-hadoop.pig URL: http://svn.apache.org/viewvc/incubator/pig/trunk/tutorial/scripts/script1-hadoop.pig?rev=678958&r1=678957&r2=678958&view=diff == --- incubator/pig/trunk/tutorial/scripts/script1-hadoop.pig (original) +++ incubator/pig/trunk/tutorial/scripts/script1-hadoop.pig Tue Jul 22 17:49:27 2008 @@ -1,3 +1,21 @@ +/* + * 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. + */ + -- Query Phrase Popularity (Hadoop cluster) -- This script processes a search query log file from the Excite search engine and finds search phrases that occur with particular high frequency during certain times of the day. Modified: incubator/pig/trunk/tutorial/scripts/scrip
svn commit: r678954 - in /incubator/pig/branches/branch-0.1: ./ src/org/apache/pig/impl/logicalLayer/parser/ tutorial/scripts/
Author: olga Date: Tue Jul 22 17:34:28 2008 New Revision: 678954 URL: http://svn.apache.org/viewvc?rev=678954&view=rev Log: release changes Modified: incubator/pig/branches/branch-0.1/README.txt incubator/pig/branches/branch-0.1/build.xml incubator/pig/branches/branch-0.1/src/org/apache/pig/impl/logicalLayer/parser/grammar incubator/pig/branches/branch-0.1/tutorial/scripts/script1-hadoop.pig incubator/pig/branches/branch-0.1/tutorial/scripts/script1-local.pig incubator/pig/branches/branch-0.1/tutorial/scripts/script2-hadoop.pig incubator/pig/branches/branch-0.1/tutorial/scripts/script2-local.pig Modified: incubator/pig/branches/branch-0.1/README.txt URL: http://svn.apache.org/viewvc/incubator/pig/branches/branch-0.1/README.txt?rev=678954&r1=678953&r2=678954&view=diff == --- incubator/pig/branches/branch-0.1/README.txt (original) +++ incubator/pig/branches/branch-0.1/README.txt Tue Jul 22 17:34:28 2008 @@ -5,3 +5,16 @@ and our wiki, at: http://wiki.apache.org/pig/ + +Disclaimer +== + +Apache Sling is an effort undergoing incubation at The Apache Software +Foundation (ASF), sponsored by the Apache Jackrabbit PMC. Incubation is +required of all newly accepted projects until a further review indicates that +the infrastructure, communications, and decision making process have +stabilized in a manner consistent with other successful ASF projects. While +incubation status is not necessarily a reflection of the completeness or +stability of the code, it does indicate that the project has yet to be fully +endorsed by the ASF. + Modified: incubator/pig/branches/branch-0.1/build.xml URL: http://svn.apache.org/viewvc/incubator/pig/branches/branch-0.1/build.xml?rev=678954&r1=678953&r2=678954&view=diff == --- incubator/pig/branches/branch-0.1/build.xml (original) +++ incubator/pig/branches/branch-0.1/build.xml Tue Jul 22 17:34:28 2008 @@ -358,6 +358,10 @@ + + + + @@ -366,7 +370,7 @@ - + Modified: incubator/pig/branches/branch-0.1/src/org/apache/pig/impl/logicalLayer/parser/grammar URL: http://svn.apache.org/viewvc/incubator/pig/branches/branch-0.1/src/org/apache/pig/impl/logicalLayer/parser/grammar?rev=678954&r1=678953&r2=678954&view=diff == --- incubator/pig/branches/branch-0.1/src/org/apache/pig/impl/logicalLayer/parser/grammar (original) +++ incubator/pig/branches/branch-0.1/src/org/apache/pig/impl/logicalLayer/parser/grammar Tue Jul 22 17:34:28 2008 @@ -1,3 +1,21 @@ +/* + * 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. + */ + := ";" := [ "="] ["PARALLEL" ] Modified: incubator/pig/branches/branch-0.1/tutorial/scripts/script1-hadoop.pig URL: http://svn.apache.org/viewvc/incubator/pig/branches/branch-0.1/tutorial/scripts/script1-hadoop.pig?rev=678954&r1=678953&r2=678954&view=diff == --- incubator/pig/branches/branch-0.1/tutorial/scripts/script1-hadoop.pig (original) +++ incubator/pig/branches/branch-0.1/tutorial/scripts/script1-hadoop.pig Tue Jul 22 17:34:28 2008 @@ -1,3 +1,21 @@ +/* + * 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 + *
svn commit: r678729 - in /incubator/pig/branches/types: src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/ src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOpera
Author: pisong
Date: Tue Jul 22 05:11:17 2008
New Revision: 678729
URL: http://svn.apache.org/viewvc?rev=678729&view=rev
Log:
PIG-319 Modified POUnion to allow injected input
Added:
incubator/pig/branches/types/test/org/apache/pig/test/TestMapReduce2.java
Modified:
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/Result.java
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POUnion.java
Modified:
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/Result.java
URL:
http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/Result.java?rev=678729&r1=678728&r2=678729&view=diff
==
---
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/Result.java
(original)
+++
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/Result.java
Tue Jul 22 05:11:17 2008
@@ -33,6 +33,11 @@
returnStatus = POStatus.STATUS_ERR;
result = null;
}
+
+public Result(byte returnStatus, Object result) {
+this.returnStatus = returnStatus ;
+this.result = result;
+}
@Override
public String toString() {
Modified:
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POUnion.java
URL:
http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POUnion.java?rev=678729&r1=678728&r2=678729&view=diff
==
---
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POUnion.java
(original)
+++
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POUnion.java
Tue Jul 22 05:11:17 2008
@@ -50,6 +50,9 @@
//Used for efficiently shifting between non-drained
//inputs
BitSet done;
+
+boolean nextReturnEOP = false ;
+private static Result eopResult = new Result(POStatus.STATUS_EOP, null) ;
//The index of the last input that was read
int lastInd = 0;
@@ -73,7 +76,12 @@
@Override
public void setInputs(List inputs) {
super.setInputs(inputs);
-done = new BitSet(inputs.size());
+if (inputs != null) {
+done = new BitSet(inputs.size());
+}
+else {
+done = new BitSet(0) ;
+}
}
@Override
@@ -107,37 +115,55 @@
*/
@Override
public Result getNext(Tuple t) throws ExecException {
-while(true){
-if (done.nextClearBit(0) >= inputs.size()) {
-res = new Result();
-res.returnStatus = POStatus.STATUS_EOP;
-clearDone();
-return res;
-}
-if(lastInd >= inputs.size() || done.nextClearBit(lastInd) >=
inputs.size())
-lastInd = 0;
-int ind = done.nextClearBit(lastInd);
-Result res;
-
+
+if (nextReturnEOP) {
+nextReturnEOP = false ;
+return eopResult ;
+}
+
+// Case 1 : Normal connected plan
+if (!isInputAttached()) {
+
while(true){
-if(reporter!=null) reporter.progress();
-res = inputs.get(ind).getNext(t);
-if(res.returnStatus == POStatus.STATUS_NULL)
-continue;
-
-lastInd = ind + 1;
-
-if(res.returnStatus == POStatus.STATUS_ERR)
-return new Result();
-
-if (res.returnStatus == POStatus.STATUS_OK)
-return res;
-
-if (res.returnStatus == POStatus.STATUS_EOP) {
-done.set(ind);
-break;
+if (done.nextClearBit(0) >= inputs.size()) {
+clearDone();
+return eopResult ;
+}
+if(lastInd >= inputs.size() || done.nextClearBit(lastInd) >=
inputs.size())
+lastInd = 0;
+int ind = done.nextClearBit(lastInd);
+Result res;
+
+while(true){
+if(reporter!=null) reporter.progress();
+res = inputs.get(ind).getNext(t);
+if(res.returnStatus == POStatus.STATUS_NULL)
+continue;
+
+lastInd = ind + 1;
+
+if(res.returnStatus == POStatus.STATUS_ERR)
+return new Result();
+
+if
svn commit: r678726 - in /incubator/pig/branches/types: src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt test/org/apache/pig/test/TestTypeChecking.java test/org/apache/pig/test/TypeGraphPri
Author: pisong
Date: Tue Jul 22 05:04:34 2008
New Revision: 678726
URL: http://svn.apache.org/viewvc?rev=678726&view=rev
Log:
PIG-321 Long literal problem in parser
Modified:
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt
incubator/pig/branches/types/test/org/apache/pig/test/TestTypeChecking.java
incubator/pig/branches/types/test/org/apache/pig/test/TypeGraphPrinter.java
Modified:
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt
URL:
http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt?rev=678726&r1=678725&r2=678726&view=diff
==
---
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt
(original)
+++
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt
Tue Jul 22 05:04:34 2008
@@ -2598,7 +2598,7 @@
t = {obj = new Integer(Integer.parseInt(t.image));}
| t =
{
-String num = t.image.substring(0, t.image.length() - 2);
+String num = t.image.substring(0, t.image.length() - 1);
obj = new Long(Long.parseLong(num));
}
| t = {obj = new Float(Float.parseFloat(t.image));}
Modified:
incubator/pig/branches/types/test/org/apache/pig/test/TestTypeChecking.java
URL:
http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/TestTypeChecking.java?rev=678726&r1=678725&r2=678726&view=diff
==
--- incubator/pig/branches/types/test/org/apache/pig/test/TestTypeChecking.java
(original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/TestTypeChecking.java
Tue Jul 22 05:04:34 2008
@@ -258,5 +258,13 @@
}
+public void testGenerate1() throws Throwable {
+TypeCheckingTestUtil.printCurrentMethodName() ;
+planTester.buildPlan("a = load
'/user/pig/tests/data/singlefile/studenttab10k' as (name:chararray, age:int,
gpa:double);") ;
+LogicalPlan plan1 = planTester.buildPlan("b = foreach a generate 1 +
0.2f + 253645L, gpa+1; ") ;
+planTester.typeCheckPlan(plan1);
+}
+
+
}
Modified:
incubator/pig/branches/types/test/org/apache/pig/test/TypeGraphPrinter.java
URL:
http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/TypeGraphPrinter.java?rev=678726&r1=678725&r2=678726&view=diff
==
--- incubator/pig/branches/types/test/org/apache/pig/test/TypeGraphPrinter.java
(original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/TypeGraphPrinter.java
Tue Jul 22 05:04:34 2008
@@ -62,6 +62,76 @@
protected void visit(UnaryExpressionOperator op) {
appendOp(op) ;
}
+
+
+public void visit(LOGreaterThan op) throws VisitorException {
+ appendOp(op) ;
+ }
+
+ public void visit(LOLesserThan op) throws VisitorException {
+ appendOp(op) ;
+ }
+
+ public void visit(LOGreaterThanEqual op) throws VisitorException {
+ appendOp(op) ;
+ }
+
+ public void visit(LOLesserThanEqual op) throws VisitorException {
+ appendOp(op) ;
+ }
+
+ public void visit(LOEqual op) throws VisitorException {
+ appendOp(op) ;
+ }
+
+ public void visit(LONotEqual op) throws VisitorException {
+ appendOp(op) ;
+ }
+
+ public void visit(LOAdd op) throws VisitorException {
+ appendOp(op) ;
+ }
+
+ public void visit(LOSubtract op) throws VisitorException {
+ appendOp(op) ;
+ }
+
+ public void visit(LOMultiply op) throws VisitorException {
+ appendOp(op) ;
+ }
+
+ public void visit(LODivide op) throws VisitorException {
+ appendOp(op) ;
+ }
+
+ public void visit(LOMod op) throws VisitorException {
+ appendOp(op) ;
+ }
+
+
+ public void visit(LONegative op) throws VisitorException {
+ appendOp(op) ;
+ }
+
+ public void visit(LOMapLookup op) throws VisitorException {
+ appendOp(op) ;
+ }
+
+ public void visit(LOAnd op) throws VisitorException {
+ appendOp(op) ;
+ }
+
+ public void visit(LOOr op) throws VisitorException {
+ appendOp(op) ;
+ }
+
+ public void visit(LONot op) throws VisitorException {
+ appendOp(op) ;
+ }
+
+ public void visit(LOIsNull op) throws VisitorException {
+ appendOp(op) ;
+ }
protected void visit(LOCogroup op) throws VisitorException {
appendOp(op) ;
