You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2011/03/27 07:57:27 UTC
svn commit: r1085878 - in /pig/trunk: CHANGES.txt
src/org/apache/pig/newplan/logical/relational/LogicalSchema.java
test/org/apache/pig/test/TestSchema.java
Author: daijy
Date: Sun Mar 27 05:57:27 2011
New Revision: 1085878
URL: http://svn.apache.org/viewvc?rev=1085878&view=rev
Log:
PIG-1868: New logical plan fails when I have complex data types from udf
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/newplan/logical/relational/LogicalSchema.java
pig/trunk/test/org/apache/pig/test/TestSchema.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1085878&r1=1085877&r2=1085878&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Sun Mar 27 05:57:27 2011
@@ -120,6 +120,9 @@ PIG-1696: Performance: Use System.arrayc
BUG FIXES
+PIG-1868: New logical plan fails when I have complex data types from udf
+(daijy)
+
PIG-1927: Dereference partial name failed (daijy)
PIG-1934: Fix zebra test TestCheckin1, TestCheckin4 (daijy)
Modified: pig/trunk/src/org/apache/pig/newplan/logical/relational/LogicalSchema.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/newplan/logical/relational/LogicalSchema.java?rev=1085878&r1=1085877&r2=1085878&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/newplan/logical/relational/LogicalSchema.java (original)
+++ pig/trunk/src/org/apache/pig/newplan/logical/relational/LogicalSchema.java Sun Mar 27 05:57:27 2011
@@ -440,8 +440,7 @@ public class LogicalSchema {
else {
try {
// Only check compatibility
- LogicalSchema.merge(fs1.schema, fs2.schema, MergeMode.LoadForEachInner);
- mergedSubSchema = fs1.schema;
+ mergedSubSchema = LogicalSchema.merge(fs1.schema, fs2.schema, MergeMode.LoadForEachInner);
} catch (FrontendException e) {
throw new FrontendException("Incompatable field schema: left is \"" + fs1.toString(false) + "\", right is \"" + fs2.toString(false) + "\"", 1031);
}
Modified: pig/trunk/test/org/apache/pig/test/TestSchema.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestSchema.java?rev=1085878&r1=1085877&r2=1085878&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestSchema.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestSchema.java Sun Mar 27 05:57:27 2011
@@ -768,7 +768,7 @@ public class TestSchema extends TestCase
mergedSchema = LogicalSchema.merge(b, a, LogicalSchema.MergeMode.LoadForEach);
expected = org.apache.pig.newplan.logical.Util.translateSchema(Util.getSchemaFromString(
- "a2:bytearray, b2:(), c2:int"));
+ "a2:bytearray, b2:(b11:int,b12:float), c2:int"));
Assert.assertTrue(LogicalSchema.equals(mergedSchema, expected, false, false));
}