Author: daijy
Date: Tue May 12 07:02:41 2015
New Revision: 1678879
URL: http://svn.apache.org/r1678879
Log:
PIG-4481: e2e tests ComputeSpec_1, ComputeSpec_2 and StreamingPerformance_3
produce different result on Windows
Modified:
pig/branches/branch-0.15/CHANGES.txt
pig/branches/branch-0.15/test/e2e/pig/tests/streaming.conf
Modified: pig/branches/branch-0.15/CHANGES.txt
URL:
http://svn.apache.org/viewvc/pig/branches/branch-0.15/CHANGES.txt?rev=1678879&r1=1678878&r2=1678879&view=diff
==============================================================================
--- pig/branches/branch-0.15/CHANGES.txt (original)
+++ pig/branches/branch-0.15/CHANGES.txt Tue May 12 07:02:41 2015
@@ -66,6 +66,8 @@ PIG-4333: Split BigData tests into multi
BUG FIXES
+PIG-4481: e2e tests ComputeSpec_1, ComputeSpec_2 and StreamingPerformance_3
produce different result on Windows (daijy)
+
PIG-4496: Fix CBZip2InputStream to close underlying stream (petersla via daijy)
PIG-4528: Fix a typo in src/docs/src/documentation/content/xdocs/basic.xml
(namusyaka via daijy)
Modified: pig/branches/branch-0.15/test/e2e/pig/tests/streaming.conf
URL:
http://svn.apache.org/viewvc/pig/branches/branch-0.15/test/e2e/pig/tests/streaming.conf?rev=1678879&r1=1678878&r2=1678879&view=diff
==============================================================================
--- pig/branches/branch-0.15/test/e2e/pig/tests/streaming.conf (original)
+++ pig/branches/branch-0.15/test/e2e/pig/tests/streaming.conf Tue May 12
07:02:41 2015
@@ -39,13 +39,14 @@ $cfg = {
'num' => 1,
'pig' => q#
A = load ':INPATH:/singlefile/studenttab10k';
-B = foreach A generate $2, $1, $0;
-C = stream B through `awk 'BEGIN {FS = "\t"; OFS = "\t"} {print $3, $2, $1}'`;
+B = foreach A generate $2, $1;
+C = stream B through `awk 'BEGIN {FS = "\t"; OFS = "\t"} {print $2, $1}'`;
store C into ':OUTPATH:';#,
'pig_win' => q#
+DEFINE CMD `awk -F "\\\t" "{print $2, $1}"` output(stdout using PigStreaming('
'));
A = load ':INPATH:/singlefile/studenttab10k';
-B = foreach A generate $2, $1, $0;
-C = stream B through `awk "BEGIN {FS = \\\\"\t\\\\"; OFS = \\\\"\t\\\\"}
{print $3, $2, $1}"`;
+B = foreach A generate $2, $1;
+C = stream B through CMD;
store C into ':OUTPATH:';#,
'sql' => "select name, age, gpa from studenttab10k;",
},
@@ -54,16 +55,15 @@ store C into ':OUTPATH:';#,
'num' => 2,
'pig' => q#
A = load ':INPATH:/singlefile/studenttab10k';
-B = foreach A generate $2, $1, $0;
-C = stream B through `awk 'BEGIN {FS = "\t"; OFS = "\t"} {print $3, $2, $1}'`
as (name, age, gpa);
-D = foreach C generate name, age;
-store D into ':OUTPATH:';#,
+B = foreach A generate $2, $1;
+C = stream B through `awk 'BEGIN {FS = "\t"; OFS = "\t"} {print $2, $1}'` as
(age, gpa);
+store C into ':OUTPATH:';#,
'pig_win' => q#
+DEFINE CMD `awk -F "\\\t" "{print $2, $1}"` output(stdout using PigStreaming('
'));
A = load ':INPATH:/singlefile/studenttab10k';
-B = foreach A generate $2, $1, $0;
-C = stream B through `awk "BEGIN {FS = \\\\"\t\\\\"; OFS = \\\\"\t\\\\"}
{print $3, $2, $1}"` as (name, age, gpa);
-D = foreach C generate name, age;
-store D into ':OUTPATH:';#,
+B = foreach A generate $2, $1;
+C = stream B through CMD as (age, gpa);
+store C into ':OUTPATH:';#,
'sql' => "select name, age from studenttab10k;",
},
{
@@ -432,7 +432,7 @@ C = stream B through CMD1;
D = stream C through CMD2;
store D into ':OUTPATH:';#,
'pig_win' => q#
-define CMD1 `perl -ne "print $_;print STDERR "stderr $_";"`;
+define CMD1 `perl -ne "print $_;print STDERR 'stderr $_';"`;
define CMD2 `Split.pl 3` input(stdin using PigStreaming(','))
ship(':SCRIPTHOMEPATH:/Split.pl');
A = load ':INPATH:/singlefile//studenttab10k';
B = stream A through CMD1;
