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 2009/10/08 20:20:10 UTC
svn commit: r823254 - in /hadoop/pig/trunk: CHANGES.txt
src/org/apache/pig/impl/logicalLayer/LOCogroup.java
src/org/apache/pig/impl/logicalLayer/LOJoin.java
Author: daijy
Date: Thu Oct 8 18:20:10 2009
New Revision: 823254
URL: http://svn.apache.org/viewvc?rev=823254&view=rev
Log:
PIG-989: Allow type merge between numerical type and non-numerical type
Modified:
hadoop/pig/trunk/CHANGES.txt
hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOCogroup.java
hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOJoin.java
Modified: hadoop/pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/CHANGES.txt?rev=823254&r1=823253&r2=823254&view=diff
==============================================================================
--- hadoop/pig/trunk/CHANGES.txt (original)
+++ hadoop/pig/trunk/CHANGES.txt Thu Oct 8 18:20:10 2009
@@ -56,6 +56,8 @@
PIG-592: schema inferred incorrectly (daijy)
+PIG-989: Allow type merge between numerical type and non-numerical type (daijy)
+
Release 0.5.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOCogroup.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOCogroup.java?rev=823254&r1=823253&r2=823254&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOCogroup.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOCogroup.java Thu Oct 8 18:20:10 2009
@@ -391,6 +391,12 @@
}
byte innerType = innerPlans.get(0).getSingleLeafPlanOutputType() ;
groupType = DataType.mergeType(groupType, innerType) ;
+ if (groupType==-1)
+ {
+ int errCode = 1107;
+ String msg = "Cannot merge cogroup keys, incompatible types";
+ throw new FrontendException(msg, errCode, PigException.INPUT) ;
+ }
}
return groupType ;
Modified: hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOJoin.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOJoin.java?rev=823254&r1=823253&r2=823254&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOJoin.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/impl/logicalLayer/LOJoin.java Thu Oct 8 18:20:10 2009
@@ -262,6 +262,12 @@
}
byte innerType = innerPlans.get(0).getSingleLeafPlanOutputType() ;
groupType = DataType.mergeType(groupType, innerType) ;
+ if (groupType==-1)
+ {
+ int errCode = 1107;
+ String msg = "Cannot merge join keys, incompatible types";
+ throw new FrontendException(msg, errCode, PigException.INPUT) ;
+ }
}
return groupType ;