You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ch...@apache.org on 2012/11/14 07:21:24 UTC
svn commit: r1409094 - in /pig/branches/branch-0.11: CHANGES.txt
test/e2e/pig/tests/nightly.conf
Author: cheolsoo
Date: Wed Nov 14 06:21:23 2012
New Revision: 1409094
URL: http://svn.apache.org/viewvc?rev=1409094&view=rev
Log:
PIG-3045: Specifying sorting field(s) at nightly.conf - fix sortArgs (rohini via cheolsoo)
Modified:
pig/branches/branch-0.11/CHANGES.txt
pig/branches/branch-0.11/test/e2e/pig/tests/nightly.conf
Modified: pig/branches/branch-0.11/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.11/CHANGES.txt?rev=1409094&r1=1409093&r2=1409094&view=diff
==============================================================================
--- pig/branches/branch-0.11/CHANGES.txt (original)
+++ pig/branches/branch-0.11/CHANGES.txt Wed Nov 14 06:21:23 2012
@@ -503,6 +503,8 @@ Release 0.10.1 - Unreleased
BUG FIXES
+PIG-3045: Specifying sorting field(s) at nightly.conf - fix sortArgs (rohini via cheolsoo)
+
PIG-2953: "which" utility does not exist on Windows (daijy)
PIG-2960: Increase the timeout for unit test (daijy)
Modified: pig/branches/branch-0.11/test/e2e/pig/tests/nightly.conf
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.11/test/e2e/pig/tests/nightly.conf?rev=1409094&r1=1409093&r2=1409094&view=diff
==============================================================================
--- pig/branches/branch-0.11/test/e2e/pig/tests/nightly.conf (original)
+++ pig/branches/branch-0.11/test/e2e/pig/tests/nightly.conf Wed Nov 14 06:21:23 2012
@@ -1724,7 +1724,7 @@ store d into ':OUTPATH:';\,
'pig' =>q\a = load ':INPATH:/singlefile/studentnulltab10k' as (name:chararray, age:int, gpa:double);
b = order a by name, age, gpa;
store b into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '-k', '1,1', '-k', '2n,2n'],
+ 'sortArgs' => ['-t', ' ', '-k', '1,1', '-k', '2n,3n'],
},
{
# test that sorting descending is based on the type for chararray, int and double
@@ -1732,7 +1732,7 @@ store b into ':OUTPATH:';\,
'pig' =>q\a = load ':INPATH:/singlefile/studentnulltab10k' as (name:chararray, age:int, gpa:double);
b = order a by name desc, age desc, gpa desc;
store b into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '-k', '1r,1r', '-k', '2nr,2nr'],
+ 'sortArgs' => ['-t', ' ', '-k', '1r,1r', '-k', '2nr,3nr'],
},
{
# test that sorting is based on the type for bytearray, long and float
@@ -1740,7 +1740,7 @@ store b into ':OUTPATH:';\,
'pig' =>q\a = load ':INPATH:/singlefile/studentnulltab10k' as (name, age:long, gpa:float);
b = order a by name, age, gpa;
store b into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '-k', '1,1', '-k', '2n,2n'],
+ 'sortArgs' => ['-t', ' ', '-k', '1,1', '-k', '2n,3n'],
},
{
# test that sorting descending is based on the type for chararray, age and float
@@ -1748,7 +1748,7 @@ store b into ':OUTPATH:';\,
'pig' =>q\a = load ':INPATH:/singlefile/studentnulltab10k' as (name, age:long, gpa:float);
b = order a by name desc, age desc, gpa desc;
store b into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '-k', '1r,1r', '-k', '2nr,2nr'],
+ 'sortArgs' => ['-t', ' ', '-k', '1r,1r', '-k', '2nr,3nr'],
},
{
# test precision for doubles is atleast 15 digits
@@ -1843,7 +1843,7 @@ store b into ':OUTPATH:';\,
'pig' => q\a = load ':INPATH:/singlefile/studentnulltab10k' as (name:chararray, age:int, gpa:double);
b = order a by *;
store b into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '-k', '1,1', '-k', '2n,2n'],
+ 'sortArgs' => ['-t', ' ', '-k', '1,1', '-k', '2n,3n'],
},
{
# order by * desc
@@ -1851,7 +1851,7 @@ store b into ':OUTPATH:';\,
'pig' => q\a = load ':INPATH:/singlefile/studentnulltab10k' as (name:chararray, age:int, gpa:double);
b = order a by * desc;
store b into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '-k', '1r,1r', '-k', '2nr,2nr'],
+ 'sortArgs' => ['-t', ' ', '-k', '1r,1r', '-k', '2nr,3nr'],
},
{
'num' => 32,
@@ -1939,7 +1939,7 @@ b = order a by $0, $1;
c = filter b by $0 > 'a'; -- break the sort/limit optimization
d = limit c 100;
store d into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '-k', '1,1'],
+ 'sortArgs' => ['-t', ' ', '-k', '1,2'],
},
{
'num' => 2,
@@ -1948,7 +1948,7 @@ store d into ':OUTPATH:';\,
b = order a by $0, $1;
c = limit b 100;
store c into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '-k', '1,1'],
+ 'sortArgs' => ['-t', ' ', '-k', '1,2'],
},
{
# Make sure that limit higher than number of rows doesn't mess stuff up
@@ -2218,7 +2218,7 @@ B = filter A by age > 50 or extra > 'm';
D = order B by age, extra;
store D into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '-k', '2n,2n'],
+ 'sortArgs' => ['-t', ' ', '-k', '2n,2n', '-k', '4,4'],
},
{
'num' => 2,