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 2010/01/20 06:43:49 UTC
svn commit: r901067 - in /hadoop/pig/branches/branch-0.6: CHANGES.txt
src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSort.java
test/org/apache/pig/test/TestEvalPipeline2.java
Author: daijy
Date: Wed Jan 20 05:43:35 2010
New Revision: 901067
URL: http://svn.apache.org/viewvc?rev=901067&view=rev
Log:
PIG-1195: POSort should take care of sort order
Modified:
hadoop/pig/branches/branch-0.6/CHANGES.txt
hadoop/pig/branches/branch-0.6/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSort.java
hadoop/pig/branches/branch-0.6/test/org/apache/pig/test/TestEvalPipeline2.java
Modified: hadoop/pig/branches/branch-0.6/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/branch-0.6/CHANGES.txt?rev=901067&r1=901066&r2=901067&view=diff
==============================================================================
--- hadoop/pig/branches/branch-0.6/CHANGES.txt (original)
+++ hadoop/pig/branches/branch-0.6/CHANGES.txt Wed Jan 20 05:43:35 2010
@@ -272,6 +272,8 @@
PIG-1193: Secondary sort issue on nested desc sort (daijy)
+PIG-1195: POSort should take care of sort order (daijy)
+
Release 0.5.0
INCOMPATIBLE CHANGES
Modified: hadoop/pig/branches/branch-0.6/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSort.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/branch-0.6/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSort.java?rev=901067&r1=901066&r2=901067&view=diff
==============================================================================
--- hadoop/pig/branches/branch-0.6/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSort.java (original)
+++ hadoop/pig/branches/branch-0.6/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSort.java Wed Jan 20 05:43:35 2010
@@ -75,7 +75,7 @@
private List<Boolean> mAscCols;
private POUserComparisonFunc mSortFunc;
transient private final Log log = LogFactory.getLog(getClass());
- transient private Comparator<Tuple> mComparator;
+ private Comparator<Tuple> mComparator;
private boolean inputsAccumulated = false;
private long limit;
Modified: hadoop/pig/branches/branch-0.6/test/org/apache/pig/test/TestEvalPipeline2.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/branch-0.6/test/org/apache/pig/test/TestEvalPipeline2.java?rev=901067&r1=901066&r2=901067&view=diff
==============================================================================
--- hadoop/pig/branches/branch-0.6/test/org/apache/pig/test/TestEvalPipeline2.java (original)
+++ hadoop/pig/branches/branch-0.6/test/org/apache/pig/test/TestEvalPipeline2.java Wed Jan 20 05:43:35 2010
@@ -453,4 +453,22 @@
assertFalse(iter.hasNext());
}
+ // See PIG-1195
+ @Test
+ public void testNestedDescSort() throws Exception{
+ Util.createInputFile(cluster, "table_testNestedDescSort", new String[]{"3","4"});
+ pigServer.registerQuery("A = LOAD 'table_testNestedDescSort' as (a0:int);");
+ pigServer.registerQuery("B = group A ALL;");
+ pigServer.registerQuery("C = foreach B { D = order A by a0 desc;generate D;};");
+ Iterator<Tuple> iter = pigServer.openIterator("C");
+
+ assertTrue(iter.hasNext());
+ Tuple t = iter.next();
+
+ assertTrue(t.toString().equals("({(4),(3)})"));
+ assertFalse(iter.hasNext());
+
+ Util.deleteFile(cluster, "table_testNestedDescSort");
+ }
+
}