svn commit: r689177 - in /incubator/pig/branches/types: src/org/apache/pig/PigServer.java src/org/apache/pig/impl/logicalLayer/LOSplitOutput.java test/org/apache/pig/test/TestFilterUDF.java test/org/a
Author: olga
Date: Tue Aug 26 12:30:22 2008
New Revision: 689177
URL: http://svn.apache.org/viewvc?rev=689177view=rev
Log:
PIG-370: split followed by dump is broken
Added:
incubator/pig/branches/types/test/org/apache/pig/test/TestSplitStore.java
Modified:
incubator/pig/branches/types/src/org/apache/pig/PigServer.java
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOSplitOutput.java
incubator/pig/branches/types/test/org/apache/pig/test/TestFilterUDF.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=689177r1=689176r2=689177view=diff
==
--- incubator/pig/branches/types/src/org/apache/pig/PigServer.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/PigServer.java Tue Aug 26
12:30:22 2008
@@ -41,6 +41,7 @@
import org.apache.pig.backend.executionengine.ExecPhysicalPlan;
import org.apache.pig.backend.executionengine.ExecJob.JOB_STATUS;
import org.apache.pig.backend.executionengine.ExecutionEngine;
+import org.apache.pig.builtin.BinStorage;
import org.apache.pig.builtin.PigStorage;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.PigContext;
@@ -307,7 +308,8 @@
if(null == op) {
throw new IOException(Unable to find an operator for alias
+ id);
}
-ExecJob job = execute(getPlanFromAlias(id,
op.getClass().getName()));
+//ExecJob job = execute(getPlanFromAlias(id,
op.getClass().getName()));
+ExecJob job = store(id, FileLocalizer.getTemporaryPath(null,
pigContext).toString(), BinStorage.class.getName() + ());
// invocation of execute is synchronous!
if (job.getStatus() == JOB_STATUS.COMPLETED) {
return job.getResults();
@@ -328,14 +330,14 @@
* @throws IOException
*/
-public void store(String id, String filename) throws IOException {
-store(id, filename, PigStorage.class.getName() + ()); // SFPig is
the default store function
+public ExecJob store(String id, String filename) throws IOException {
+return store(id, filename, PigStorage.class.getName() + ()); //
SFPig is the default store function
}
/**
* forces execution of query (and all queries from which it reads), in
order to store result in file
*/
-public void store(
+public ExecJob store(
String id,
String filename,
String func) throws IOException{
@@ -344,13 +346,13 @@
try {
LogicalPlan readFrom = getPlanFromAlias(id, store);
-store(id, readFrom, filename, func);
+return store(id, readFrom, filename, func);
} catch (FrontendException fe) {
throw WrappedIOException.wrap(Unable to store alias + id, fe);
}
}
-public void store(
+public ExecJob store(
String id,
LogicalPlan readFrom,
String filename,
@@ -358,7 +360,7 @@
try {
LogicalPlan storePlan = QueryParser.generateStorePlan(opTable,
scope, readFrom, filename, func, aliasOp.get(id), aliases);
-execute(storePlan);
+return execute(storePlan);
} catch (Exception e) {
throw WrappedIOException.wrap(Unable to store for alias: +
id, e);
Modified:
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOSplitOutput.java
URL:
http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOSplitOutput.java?rev=689177r1=689176r2=689177view=diff
==
---
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOSplitOutput.java
(original)
+++
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/LOSplitOutput.java
Tue Aug 26 12:30:22 2008
@@ -70,6 +70,7 @@
if (!mIsSchemaComputed) {
// get our parent's schema
CollectionLogicalOperator s = mPlan.getPredecessors(this);
+if(s==null) return null;
try {
LogicalOperator op = s.iterator().next();
if (null == op) {
Modified:
incubator/pig/branches/types/test/org/apache/pig/test/TestFilterUDF.java
URL:
http://svn.apache.org/viewvc/incubator/pig/branches/types/test/org/apache/pig/test/TestFilterUDF.java?rev=689177r1=689176r2=689177view=diff
==
--- incubator/pig/branches/types/test/org/apache/pig/test/TestFilterUDF.java
(original)
+++ incubator/pig/branches/types/test/org/apache/pig/test/TestFilterUDF.java
Tue Aug 26 12:30:22 2008
@@ -24,10 +24,23 @@
public class TestFilterUDF extends TestCase
svn commit: r689221 - /incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/validators/TypeCheckingVisitor.java
Author: olga
Date: Tue Aug 26 13:55:01 2008
New Revision: 689221
URL: http://svn.apache.org/viewvc?rev=689221view=rev
Log:
improved error message
Modified:
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/validators/TypeCheckingVisitor.java
Modified:
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/validators/TypeCheckingVisitor.java
URL:
http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/validators/TypeCheckingVisitor.java?rev=689221r1=689220r2=689221view=diff
==
---
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/validators/TypeCheckingVisitor.java
(original)
+++
incubator/pig/branches/types/src/org/apache/pig/impl/logicalLayer/validators/TypeCheckingVisitor.java
Tue Aug 26 13:55:01 2008
@@ -1481,7 +1481,7 @@
binCond.setType(lhsType);
}
else {
-String msg = Unsupported input type for BinCond ;
+String msg = Unsupported input type for BinCond: lhs = +
lhsType + ; rhs = + rhsType;
msgCollector.collect(msg, MessageType.Error) ;
throw new VisitorException(msg) ;
}
svn commit: r689289 - /incubator/pig/branches/types/src/org/apache/pig/PigServer.java
Author: gates
Date: Tue Aug 26 17:00:29 2008
New Revision: 689289
URL: http://svn.apache.org/viewvc?rev=689289view=rev
Log:
PIG-379 Changed describe to not call the optimizer.
Modified:
incubator/pig/branches/types/src/org/apache/pig/PigServer.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=689289r1=689288r2=689289view=diff
==
--- incubator/pig/branches/types/src/org/apache/pig/PigServer.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/PigServer.java Tue Aug 26
17:00:29 2008
@@ -282,7 +282,7 @@
try {
LogicalPlan lp = getPlanFromAlias(alias, describe);
try {
-lp = compileLp(lp, describe);
+lp = compileLp(lp, describe, false);
} catch (ExecException e) {
throw new FrontendException(e.getMessage());
}
@@ -529,6 +529,13 @@
private LogicalPlan compileLp(
LogicalPlan lp,
String operation) throws ExecException, FrontendException {
+return compileLp(lp, operation, true);
+}
+
+private LogicalPlan compileLp(
+LogicalPlan lp,
+String operation,
+boolean optimize) throws ExecException, FrontendException {
// Look up the logical plan in the aliases map. That plan will be
// properly connected to all the others.
@@ -585,8 +592,10 @@
}
// optimize
-LogicalOptimizer optimizer = new LogicalOptimizer(lp);
-optimizer.optimize();
+if (optimize) {
+LogicalOptimizer optimizer = new LogicalOptimizer(lp);
+optimizer.optimize();
+}
return lp;
}
svn commit: r689292 - /incubator/pig/branches/types/src/org/apache/pig/PigServer.java
Author: gates
Date: Tue Aug 26 17:10:08 2008
New Revision: 689292
URL: http://svn.apache.org/viewvc?rev=689292view=rev
Log:
PIG-372 Fix NPE in dump schema when there is no known schema.
Modified:
incubator/pig/branches/types/src/org/apache/pig/PigServer.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=689292r1=689291r2=689292view=diff
==
--- incubator/pig/branches/types/src/org/apache/pig/PigServer.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/PigServer.java Tue Aug 26
17:10:08 2008
@@ -287,7 +287,8 @@
throw new FrontendException(e.getMessage());
}
Schema schema = lp.getLeaves().get(0).getSchema();
-System.out.println(schema.toString());
+if (schema != null) System.out.println(schema.toString());
+else System.out.println(Schema for + alias + unknown.);
} catch (FrontendException fe) {
throw WrappedIOException.wrap(
Unable to describe schema for alias + alias, fe);
svn commit: r689293 - /incubator/pig/branches/types/src/org/apache/pig/PigServer.java
Author: gates
Date: Tue Aug 26 17:15:45 2008
New Revision: 689293
URL: http://svn.apache.org/viewvc?rev=689293view=rev
Log:
PIG-383 Added relation name to describe output.
Modified:
incubator/pig/branches/types/src/org/apache/pig/PigServer.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=689293r1=689292r2=689293view=diff
==
--- incubator/pig/branches/types/src/org/apache/pig/PigServer.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/PigServer.java Tue Aug 26
17:15:45 2008
@@ -287,7 +287,7 @@
throw new FrontendException(e.getMessage());
}
Schema schema = lp.getLeaves().get(0).getSchema();
-if (schema != null) System.out.println(schema.toString());
+if (schema != null) System.out.println(alias + : +
schema.toString());
else System.out.println(Schema for + alias + unknown.);
} catch (FrontendException fe) {
throw WrappedIOException.wrap(
