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 2012/07/09 22:28:05 UTC
svn commit: r1359376 - in /pig/trunk: CHANGES.txt
test/e2e/pig/tests/bigdata.conf test/e2e/pig/tests/nightly.conf
test/e2e/pig/tests/turing_jython.conf
Author: daijy
Date: Mon Jul 9 20:28:04 2012
New Revision: 1359376
URL: http://svn.apache.org/viewvc?rev=1359376&view=rev
Log:
PIG-2782: Specifying sorting field(s) at nightly.conf
Modified:
pig/trunk/CHANGES.txt
pig/trunk/test/e2e/pig/tests/bigdata.conf
pig/trunk/test/e2e/pig/tests/nightly.conf
pig/trunk/test/e2e/pig/tests/turing_jython.conf
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1359376&r1=1359375&r2=1359376&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Mon Jul 9 20:28:04 2012
@@ -186,6 +186,8 @@ OPTIMIZATIONS
BUG FIXES
+PIG-2782: Specifying sorting field(s) at nightly.conf (cheolsoo via daijy)
+
PIG-2790: After Pig-2699 the script schema (LOAD ... USING ... AS {script schema}) is passed after getSchema is called (daijy)
PIG-2777: Docs are broken due to malformed xml after PIG-2673 (dvryaboy)
Modified: pig/trunk/test/e2e/pig/tests/bigdata.conf
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/tests/bigdata.conf?rev=1359376&r1=1359375&r2=1359376&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/tests/bigdata.conf (original)
+++ pig/trunk/test/e2e/pig/tests/bigdata.conf Mon Jul 9 20:28:04 2012
@@ -97,14 +97,14 @@ store c into ':OUTPATH:';\,
'pig' => q\a = load ':INPATH:/singlefile/studenttab20m' as (name, age, gpa);
b = order a by name parallel 20;
store b into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '+0', '-1'],
+ 'sortArgs' => ['-t', ' ', '-k', '1,1'],
},
{
'num' => 8,
'pig' => q\a = load ':INPATH:/singlefile/studenttab20m' as (name:chararray, age:int, gpa:double);
b = order a by name, age desc parallel 20;
store b into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '+0', '-1', '+1rn', '-2'],
+ 'sortArgs' => ['-t', ' ', '-k', '1,1', '-k', '2nr,2nr'],
},
{
'num' => 9,
@@ -115,7 +115,7 @@ D = foreach C generate group, COUNT(B) P
E = order D by $0 PARALLEL 16;
F = limit E 10;
store F into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '+0', '-1'],
+ 'sortArgs' => ['-t', ' ', '-k', '1,1'],
},
]
Modified: pig/trunk/test/e2e/pig/tests/nightly.conf
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/tests/nightly.conf?rev=1359376&r1=1359375&r2=1359376&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/tests/nightly.conf (original)
+++ pig/trunk/test/e2e/pig/tests/nightly.conf Mon Jul 9 20:28:04 2012
@@ -55,7 +55,7 @@ i = order h by $1;
store i into ':OUTPATH:';\,
'floatpostprocess' => 1,
'delimiter' => ' ',
- 'sortArgs' => ['-t', ' ', '+1', '-2'],
+ 'sortArgs' => ['-t', ' ', '-k', '2,2'],
}
]
},
@@ -1106,7 +1106,7 @@ store b into ':OUTPATH:';\,
b = foreach a generate name;
c = order b by name;
store c into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '+0', '-1'],
+ 'sortArgs' => ['-t', ' ', '-k', '1,1'],
},
{
'num' => 2,
@@ -1114,7 +1114,7 @@ store c into ':OUTPATH:';\,
b = foreach a generate $1;
c = order b by $0;
store c into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '+0', '-1'],
+ 'sortArgs' => ['-t', ' ', '-k', '1,1'],
},
{
'num' => 3,
@@ -1122,7 +1122,7 @@ store c into ':OUTPATH:';\,
b = foreach a generate gpa;
c = order b by gpa;
store c into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '+0', '-1'],
+ 'sortArgs' => ['-t', ' ', '-k', '1,1'],
},
{
'num' => 4,
@@ -1137,35 +1137,35 @@ store b into ':OUTPATH:';\,
b = foreach a generate name, age;
c = order b by name, age;
store c into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '+0', '-2'],
+ 'sortArgs' => ['-t', ' ', '-k', '1,2'],
},
{
'num' => 6,
'pig' => q\a = load ':INPATH:/singlefile/studenttab10k';
c = order a by $0;
store c into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '+0', '-1'],
+ 'sortArgs' => ['-t', ' ', '-k', '1,1'],
},
{
'num' => 7,
'pig' => q\a = load ':INPATH:/singlefile/studenttab10k';
c = order a by $1;
store c into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '+1', '-2'],
+ 'sortArgs' => ['-t', ' ', '-k', '2,2'],
},
{
'num' => 8,
'pig' => q\a = load ':INPATH:/singlefile/studenttab10k';
c = order a by $0, $1;
store c into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '+0', '-2'],
+ 'sortArgs' => ['-t', ' ', '-k', '1,2'],
},
{
'num' => 9,
'pig' => q\a = load ':INPATH:/singlefile/studenttab10k';
c = order a by $1, $0;
store c into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '+1', '-2', '+0', '-1'],
+ 'sortArgs' => ['-t', ' ', '-k', '2,2', '-k', '1,1'],
},
{
'num' => 10,
@@ -1183,7 +1183,7 @@ store c into ':OUTPATH:';\,
a = load ':INPATH:/singlefile/studenttab10k';
c = order a by $0 using org.apache.pig.test.udf.orderby.OrdDesc;
store c into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '-r', '+0', '-1'],
+ 'sortArgs' => ['-t', ' ', '-r', '-k', '1,1'],
},
{
'num' => 12,
@@ -1192,7 +1192,7 @@ store c into ':OUTPATH:';\,
a = load ':INPATH:/singlefile/studenttab10k';
c = order a by $0, $1 using org.apache.pig.test.udf.orderby.OrdDesc;
store c into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '-r', '+0', '-2'],
+ 'sortArgs' => ['-t', ' ', '-r', '-k', '1,2'],
},
# ALERT All these tests with inner order bys aren't testing the inner
# ordering. We need to develop a sorting tool to do that.
@@ -1241,7 +1241,7 @@ store c into ':OUTPATH:';\,
'pig' => q\a = load ':INPATH:/singlefile/studenttab10k';
b = order a by $1 parallel 100;
store b into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '+1', '-2'],
+ 'sortArgs' => ['-t', ' ', '-k', '2,2'],
},
{
'num' => 19,
@@ -1253,7 +1253,7 @@ store c into ':OUTPATH:';\,
b = foreach a generate instate;
c = order b by instate;
store c into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '+0', '-1'],
+ 'sortArgs' => ['-t', ' ', '-k', '1,1'],
},
]
},
@@ -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', ' ', '+0', '-1', '+1n', '-2'],
+ 'sortArgs' => ['-t', ' ', '-k', '1,1', '-k', '2n,2n'],
},
{
# 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', ' ', '+0r', '-1', '+1nr', '-2'],
+ 'sortArgs' => ['-t', ' ', '-k', '1r,1r', '-k', '2nr,2nr'],
},
{
# 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', ' ', '+0', '-1', '+1n', '-2'],
+ 'sortArgs' => ['-t', ' ', '-k', '1,1', '-k', '2n,2n'],
},
{
# 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', ' ', '+0r', '-1', '+1nr', '-2'],
+ 'sortArgs' => ['-t', ' ', '-k', '1r,1r', '-k', '2nr,2nr'],
},
{
# test precision for doubles is atleast 15 digits
@@ -1763,7 +1763,7 @@ store b into ':OUTPATH:';\,
'pig' => q\a = load ':INPATH:/singlefile/studentnulltab10k' as (name:chararray, age:int, gpa:double);
b = order a by name;
store b into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '+0', '-1'],
+ 'sortArgs' => ['-t', ' ', '-k', '1,1'],
},
{
# order by string desc
@@ -1771,7 +1771,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;
store b into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '+0r', '-1'],
+ 'sortArgs' => ['-t', ' ', '-k', '1r,1r'],
},
{
# order by int
@@ -1779,7 +1779,7 @@ store b into ':OUTPATH:';\,
'pig' => q\a = load ':INPATH:/singlefile/studentnulltab10k' as (name:chararray, age:int, gpa:double);
b = order a by age;
store b into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '+1n', '-2'],
+ 'sortArgs' => ['-t', ' ', '-k', '2n,2n'],
},
{
# order by int desc
@@ -1787,7 +1787,7 @@ store b into ':OUTPATH:';\,
'pig' => q\a = load ':INPATH:/singlefile/studentnulltab10k' as (name:chararray, age:int, gpa:double);
b = order a by age desc;
store b into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '+1nr', '-2'],
+ 'sortArgs' => ['-t', ' ', '-k', '2nr,2nr'],
},
{
# order by long
@@ -1795,7 +1795,7 @@ store b into ':OUTPATH:';\,
'pig' => q\a = load ':INPATH:/singlefile/studentnulltab10k' as (name:chararray, age:long, gpa:double);
b = order a by age;
store b into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '+1n', '-2'],
+ 'sortArgs' => ['-t', ' ', '-k', '2n,2n'],
},
{
# order by long desc
@@ -1803,7 +1803,7 @@ store b into ':OUTPATH:';\,
'pig' => q\a = load ':INPATH:/singlefile/studentnulltab10k' as (name:chararray, age:long, gpa:double);
b = order a by age desc;
store b into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '+1nr', '-2'],
+ 'sortArgs' => ['-t', ' ', '-k', '2nr,2nr'],
},
{
# order by float
@@ -1811,7 +1811,7 @@ store b into ':OUTPATH:';\,
'pig' => q\a = load ':INPATH:/singlefile/studentnulltab10k' as (name:chararray, age:int, gpa:float);
b = order a by gpa;
store b into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '-k 3n'],
+ 'sortArgs' => ['-t', ' ', '-k', '3n'],
},
{
# order by float desc
@@ -1819,7 +1819,7 @@ store b into ':OUTPATH:';\,
'pig' => q\a = load ':INPATH:/singlefile/studentnulltab10k' as (name:chararray, age:int, gpa:float);
b = order a by gpa desc;
store b into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '-k 3nr'],
+ 'sortArgs' => ['-t', ' ', '-k', '3nr'],
},
{
# order by double
@@ -1827,7 +1827,7 @@ store b into ':OUTPATH:';\,
'pig' => q\a = load ':INPATH:/singlefile/studentnulltab10k' as (name:chararray, age:int, gpa:double);
b = order a by gpa;
store b into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '-k 3n'],
+ 'sortArgs' => ['-t', ' ', '-k', '3n'],
},
{
# order by double desc
@@ -1835,7 +1835,7 @@ store b into ':OUTPATH:';\,
'pig' => q\a = load ':INPATH:/singlefile/studentnulltab10k' as (name:chararray, age:int, gpa:double);
b = order a by gpa desc;
store b into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '-k 3nr'],
+ 'sortArgs' => ['-t', ' ', '-k', '3nr'],
},
{
# order by *
@@ -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', ' ', '+0', '-1', '+1n', '-2'],
+ 'sortArgs' => ['-t', ' ', '-k', '1,1', '-k', '2n,2n'],
},
{
# 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', ' ', '+0r', '-1', '+1nr', '-2'],
+ 'sortArgs' => ['-t', ' ', '-k', '1r,1r', '-k', '2nr,2nr'],
},
{
'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', ' ', '+0', '-1'],
+ 'sortArgs' => ['-t', ' ', '-k', '1,1'],
},
{
'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', ' ', '+0', '-1'],
+ 'sortArgs' => ['-t', ' ', '-k', '1,1'],
},
{
# Make sure that limit higher than number of rows doesn't mess stuff up
@@ -2019,7 +2019,7 @@ b = order a by $0, $1;
c = limit b 100;
store c into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '-k1,2'],
+ 'sortArgs' => ['-t', ' ', '-k', '1,2'],
},
{
'num' => 10,
@@ -2094,7 +2094,7 @@ store b into ':OUTPATH:';\,
split a into a1 if age > 50, a2 if age <= 25;
b = order a2 by name;
store b into ':OUTPATH:';\,
- 'sortArgs' => ['-t', ' ', '+0', '-1'],
+ 'sortArgs' => ['-t', ' ', '-k', '1,1'],
},
{
'num' => 7,
@@ -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', ' ', '+1n', '-2'],
+ 'sortArgs' => ['-t', ' ', '-k', '2n,2n'],
},
{
'num' => 2,
Modified: pig/trunk/test/e2e/pig/tests/turing_jython.conf
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/tests/turing_jython.conf?rev=1359376&r1=1359375&r2=1359376&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/tests/turing_jython.conf (original)
+++ pig/trunk/test/e2e/pig/tests/turing_jython.conf Mon Jul 9 20:28:04 2012
@@ -71,7 +71,7 @@ else:
i = order h by $1;
store i into ':OUTPATH:';
\,
- 'sortArgs' => ['-t', ' ', '+1', '-2'],
+ 'sortArgs' => ['-t', ' ', '-k', '2,2'],
}, {
'num' => 3,
#jython uses 'python.home'/cachedir when python.cachedir is not specified.