Author: yanz
Date: Fri Oct 1 20:29:09 2010
New Revision: 1003636
URL: http://svn.apache.org/viewvc?rev=1003636&view=rev
Log:
PIG-1658: ORDER BY does not work properly on integer/short keys that are -1
(yanz)
Modified:
hadoop/pig/trunk/CHANGES.txt
hadoop/pig/trunk/contrib/zebra/build.xml
hadoop/pig/trunk/src/org/apache/pig/data/BinInterSedes.java
Modified: hadoop/pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/CHANGES.txt?rev=1003636&r1=1003635&r2=1003636&view=diff
==============================================================================
--- hadoop/pig/trunk/CHANGES.txt (original)
+++ hadoop/pig/trunk/CHANGES.txt Fri Oct 1 20:29:09 2010
@@ -207,6 +207,8 @@ PIG-1309: Map-side Cogroup (ashutoshc)
BUG FIXES
+PIG-1658: ORDER BY does not work properly on integer/short keys that are -1
(yanz)
+
PIG-1638: sh output gets mixed up with the grunt prompt (nrai via daijy)
PIG-1607: pig should have separate javadoc.jar in the maven
Modified: hadoop/pig/trunk/contrib/zebra/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/build.xml?rev=1003636&r1=1003635&r2=1003636&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/build.xml (original)
+++ hadoop/pig/trunk/contrib/zebra/build.xml Fri Oct 1 20:29:09 2010
@@ -352,9 +352,6 @@ to call at top-level: ant deploy-contrib
<filename name="**/pig/TestMergeJoinEmpty.java"/>
</not>
<not>
- <filename name="**/pig/TestMergeJoinPartial.java"/>
- </not>
- <not>
<filename name="**/pig/TestSimpleType.java"/>
</not>
<not>
Modified: hadoop/pig/trunk/src/org/apache/pig/data/BinInterSedes.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/data/BinInterSedes.java?rev=1003636&r1=1003635&r2=1003636&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/data/BinInterSedes.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/data/BinInterSedes.java Fri Oct 1
20:29:09 2010
@@ -1082,9 +1082,9 @@ public class BinInterSedes implements In
case BinInterSedes.INTEGER_1:
return 1;
case BinInterSedes.INTEGER_INBYTE:
- return bb.get() & 0xff;
+ return bb.get();
case BinInterSedes.INTEGER_INSHORT:
- return bb.getShort() & 0xffff;
+ return bb.getShort();
case BinInterSedes.INTEGER:
return bb.getInt();
default:
