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/03/18 09:27:40 UTC
svn commit: r1302090 - in /pig/branches/branch-0.10/test/e2e/pig: ./
deployers/ tests/
Author: daijy
Date: Sun Mar 18 08:27:40 2012
New Revision: 1302090
URL: http://svn.apache.org/viewvc?rev=1302090&view=rev
Log:
PIG-2585: Enable ignored e2e test cases
Modified:
pig/branches/branch-0.10/test/e2e/pig/build.xml
pig/branches/branch-0.10/test/e2e/pig/deployers/ExistingClusterDeployer.pm
pig/branches/branch-0.10/test/e2e/pig/deployers/LocalDeployer.pm
pig/branches/branch-0.10/test/e2e/pig/tests/cmdline.conf
pig/branches/branch-0.10/test/e2e/pig/tests/negative.conf
pig/branches/branch-0.10/test/e2e/pig/tests/nightly.conf
pig/branches/branch-0.10/test/e2e/pig/tests/streaming.conf
pig/branches/branch-0.10/test/e2e/pig/tests/streaming_local.conf
pig/branches/branch-0.10/test/e2e/pig/tests/turing_jython.conf
Modified: pig/branches/branch-0.10/test/e2e/pig/build.xml
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.10/test/e2e/pig/build.xml?rev=1302090&r1=1302089&r2=1302090&view=diff
==============================================================================
--- pig/branches/branch-0.10/test/e2e/pig/build.xml (original)
+++ pig/branches/branch-0.10/test/e2e/pig/build.xml Sun Mar 18 08:27:40 2012
@@ -246,6 +246,7 @@
<env key="YARN_HOME" value="${YARN_HOME}"/>
<env key="OLD_HADOOP_HOME" value="${OLD_HADOOP_HOME}"/>
<env key="PH_OLD_CLUSTER_CONF" value="${PH_OLD_CLUSTER_CONF}"/>
+ <env key="PERL5LIB" value="./libexec"/>
<arg line="${tests.to.run}"/>
<arg value="${test.location}/tests/cmdline.conf"/>
<arg value="${test.location}/tests/multiquery.conf"/>
Modified: pig/branches/branch-0.10/test/e2e/pig/deployers/ExistingClusterDeployer.pm
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.10/test/e2e/pig/deployers/ExistingClusterDeployer.pm?rev=1302090&r1=1302089&r2=1302090&view=diff
==============================================================================
--- pig/branches/branch-0.10/test/e2e/pig/deployers/ExistingClusterDeployer.pm (original)
+++ pig/branches/branch-0.10/test/e2e/pig/deployers/ExistingClusterDeployer.pm Sun Mar 18 08:27:40 2012
@@ -183,6 +183,11 @@ sub generateData
'filetype' => "studenttab",
'rows' => 1,
'hdfs' => "singlefile/fileexists",
+ },{
+ 'name' => "nameMap",
+ 'filetype' => "studenttab",
+ 'rows' => 1,
+ 'hdfs' => "nameMap/part-00000",
}, {
'name' => "studenttab20m",
'filetype' => "studenttab",
Modified: pig/branches/branch-0.10/test/e2e/pig/deployers/LocalDeployer.pm
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.10/test/e2e/pig/deployers/LocalDeployer.pm?rev=1302090&r1=1302089&r2=1302090&view=diff
==============================================================================
--- pig/branches/branch-0.10/test/e2e/pig/deployers/LocalDeployer.pm (original)
+++ pig/branches/branch-0.10/test/e2e/pig/deployers/LocalDeployer.pm Sun Mar 18 08:27:40 2012
@@ -165,6 +165,11 @@ sub generateData
'rows' => 1,
'outfile' => "singlefile/fileexists",
}, {
+ 'name' => "nameMap",
+ 'filetype' => "studenttab",
+ 'rows' => 1,
+ 'hdfs' => "nameMap/part-00000",
+ },{
'name' => "unicode100",
'filetype' => "unicode",
'rows' => 100,
Modified: pig/branches/branch-0.10/test/e2e/pig/tests/cmdline.conf
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.10/test/e2e/pig/tests/cmdline.conf?rev=1302090&r1=1302089&r2=1302090&view=diff
==============================================================================
--- pig/branches/branch-0.10/test/e2e/pig/tests/cmdline.conf (original)
+++ pig/branches/branch-0.10/test/e2e/pig/tests/cmdline.conf Sun Mar 18 08:27:40 2012
@@ -35,7 +35,6 @@ $cfg = {
'name' => 'Describe_cmdline',
'floatpostprocess' => 0,
'delimiter' => ' ',
- 'ignore' => 1, # Need to investigate failures
'tests' => [
#JIRA[PIG-372]
#JIRA[PIG-374]
@@ -85,7 +84,7 @@ describe A;\,
'pig' => q\
A = load ':INPATH:/singlefile/studenttabcomplex10k' using PigStorage() as (m:map[],x,y);
describe A;\,
- 'expected_out_regex' =>"A: {m: map\\[ \\],x: bytearray,y: bytearray}",
+ 'expected_out_regex' =>"A: {m: map\\[\\],x: bytearray,y: bytearray}",
},
#JIRA[PIG-373]
@@ -100,7 +99,7 @@ describe B;\,
#Expect
# A : { m:map, x:bytearray, y:bytearray }
# B : { m :map }
- 'expected_out_regex' => "A: {m: map\\[ \\],x: bytearray,y: bytearray}\nB: {m: map\\[ \\]}",
+ 'expected_out_regex' => "A: {m: map\\[\\],x: bytearray,y: bytearray}\nB: {m: map\\[\\]}",
},
#JIRA[PIG-373]
#JIRA[PIG-405]
@@ -114,7 +113,7 @@ describe B;\,
#Expect
# A : { m:map, x:bytearray, y:bytearray }
# B : { m :map }
- 'expected_out_regex' => "A: {m: map\\[ \\],x: bytearray,y: bytearray}\nB: {m: map\\[ \\]}",
+ 'expected_out_regex' => "A: {m: map\\[\\],x: bytearray,y: bytearray}\nB: {m: map\\[\\]}",
},
#JIRA[PIG-373]
#JIRA[PIG-405]
@@ -128,7 +127,7 @@ describe A;\,
#Expect
# A : { m:map, x:bytearray, y:bytearray }
# B : { m :map }
- 'expected_out_regex' => "B: {m: map\\[ \\]}\nA: {m: map\\[ \\],x: bytearray,y: bytearray}",
+ 'expected_out_regex' => "B: {m: map\\[\\]}\nA: {m: map\\[\\],x: bytearray,y: bytearray}",
},
#JIRA[PIG-379]
@@ -149,7 +148,7 @@ describe D;\,
# C: {name: chararray,age: integer}
# D: {group: chararray C: {name: chararray,age: integer}}
'expected_out_regex' =>
-"A: {name: chararray,age: int,gpa: float}\nB: {name: chararray,age: int}\nC: {name: chararray,age: int}\nD: {group: chararray,C: {(name: chararray,age: int)}}",
+"A: {name: chararray,age: int,gpa: float}\nB: {name: chararray,age: int}\nC: {name: chararray,age: int}\nD: {group: chararray,C: {\\(name: chararray,age: int\\)}}",
},
{
@@ -169,7 +168,7 @@ describe D;\,
# C: {name: chararray,age: integer}
# D: {group: chararray C: {name: chararray,age: integer}}
'expected_out_regex' =>
-"A: {name: chararray,age: int,gpa: float}\nB: {name: chararray,age: int}\nC: {name: chararray,age: int}\nD: {group: chararray,C: {(name: chararray,age: int)}}\n",
+"A: {name: chararray,age: int,gpa: float}\nB: {name: chararray,age: int}\nC: {name: chararray,age: int}\nD: {group: chararray,C: {\\(name: chararray,age: int\\)}}\n",
},
{
@@ -189,7 +188,7 @@ describe A;\,
# C: {name: chararray,age: integer}
# D: {group: chararray C: {name: chararray,age: integer}}
'expected_out_regex' =>
-"D: {group: chararray,C: {(name: chararray,age: int)}}\nC: {name: chararray,age: int}\nB: {name: chararray,age: int}\nA: {name: chararray,age: int,gpa: float}",
+"D: {group: chararray,C: {\\(name: chararray,age: int\\)}}\nC: {name: chararray,age: int}\nB: {name: chararray,age: int}\nA: {name: chararray,age: int,gpa: float}",
},
{
@@ -209,7 +208,7 @@ describe A;\,
# B: {name: chararray,age: integer}
# C: {name: chararray,age: integer}
# D: {group: chararray C: {name: chararray,age: integer}}
- 'expected_err_regex' => "No alias X to describe"
+ 'expected_err_regex' => "No plan for X to describe"
},
{
@@ -224,8 +223,7 @@ describe D;\,
# D: {group: chararray,A::name: chararray,A::age: int,A::gpa: float,B::name: chararray,B::age: int,B::registration: chararray,B::contributions: float}
'expected_out_regex' => "D: {group: chararray,A::name: chararray,A::age: int,A::gpa: float,B::name: chararray,B::age: int,B::registration: chararray,B::contributions: float}"
- },
-
+ }
],
},
{
Modified: pig/branches/branch-0.10/test/e2e/pig/tests/negative.conf
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.10/test/e2e/pig/tests/negative.conf?rev=1302090&r1=1302089&r2=1302090&view=diff
==============================================================================
--- pig/branches/branch-0.10/test/e2e/pig/tests/negative.conf (original)
+++ pig/branches/branch-0.10/test/e2e/pig/tests/negative.conf Sun Mar 18 08:27:40 2012
@@ -53,9 +53,8 @@ dump c;\,
},
{
'num' => 2,
- 'ignore' => 1, # Need to investigate failures
'pig' => q\register bla.jar\,
- 'expected_err_regex' => "ERROR 101: Local file 'bla.jar' does not exist.",
+ 'expected_err_regex' => "ERROR 101: file 'bla.jar' does not exist.",
}
]
},
@@ -82,10 +81,10 @@ store a into ':INPATH:/singlefile/fileex
},
{
'name' => 'NegForeach',
- 'ignore' => 1, # Need to investigate failures
'tests' => [
{
'num' => 1,
+ 'ignore' => 1, # it is valid now
# testing that nested foreach is not allowed
'pig' => q\a = load ':INPATH:/singlefile/studenttab10k' as (name, age, gpa);
b = group a by name;
@@ -98,7 +97,7 @@ store a into ':INPATH:/singlefile/fileex
'pig' => q\a = load ':INPATH:/singlefile/studenttab10k' as (name, age, gpa);
b = group a by name;
c = foreach b { ba = filter a by age < '25'; g = group ba by gpa; x = foreach g generate group, flatten(g); generate x;}\,
- 'expected_err_regex' => "Encountered \" <IDENTIFIER> \"ba \"\" at line.*\nWas expecting one of:",
+ 'expected_err_regex' => "Syntax error, unexpected symbol at or near 'ba'",
},
{
'num' => 3,
@@ -107,7 +106,7 @@ store a into ':INPATH:/singlefile/fileex
b = load ':INPATH:/singlefile/votertab10k' as (name, age, registration, contributions);
c = cogroup a by (name, age), b by (name, age) ;
d = foreach c { e = cogroup a by (name), b by (name); x= foreach a generate flatten(a), flatten(b); generate x;}\,
- 'expected_err_regex' => "Encountered \" \"cogroup\" \"cogroup \"\" at line .*\nWas expecting one of",
+ 'expected_err_regex' => "mismatched input 'a' expecting LEFT_PAREN",
},
{
'num' => 4,
@@ -116,10 +115,11 @@ store a into ':INPATH:/singlefile/fileex
b = load ':INPATH:/singlefile/votertab10k' as (name, age, registration, contributions);
c = cogroup a by (name), b by (name) ;
d = foreach c { e = join a by (age), b by (age); generate e;}\,
- 'expected_err_regex' => "Encountered \" \"join\" \"join \"\" at .*\nWas expecting one of",
+ 'expected_err_regex' => "mismatched input 'a' expecting LEFT_PAREN",
},
{
'num' => 5,
+ 'ignore' => 1, # it is valid now
# testing that cross within foreach is not allowed
'pig' => q\a = load ':INPATH:/singlefile/studenttab10k' as (name, age, gpa);
b = load ':INPATH:/singlefile/votertab10k' as (name, age, registration, contributions);
@@ -134,7 +134,7 @@ store a into ':INPATH:/singlefile/fileex
b = load ':INPATH:/singlefile/votertab10k' as (name, age, registration, contributions);
c = cogroup a by (name), b by (name) ;
d = foreach c { e = union a,b; generate e;}\,
- 'expected_err_regex' => "Encountered \" \"union\" \"union \"\" at .*\nWas expecting one of",
+ 'expected_err_regex' => "mismatched input 'a' expecting LEFT_PAREN",
},
{
'num' => 7,
@@ -142,7 +142,7 @@ store a into ':INPATH:/singlefile/fileex
'pig' => q\a = load ':INPATH:/singlefile/studenttab10k' as (name, age, gpa);
b = group a by name;
c = foreach b { split a into ba if age < '25', bb if age > '40'; generate group, COUNT(ba), COUNT(bb);}\,
- 'expected_err_regex' => "Encountered \" \"split\" \"split \"\" at line.*\nWas expecting one of:",
+ 'expected_err_regex' => "Syntax error, unexpected symbol at or near 'split'",
},
{
'num' => 8,
@@ -152,7 +152,7 @@ store a into ':INPATH:/singlefile/fileex
c = foreach b {
d = load ':INPATH:/singlefile/votertab10k' as (name, age, registration, contributions);
generate *;}\,
- 'expected_err_regex' => "Encountered \" \"load\" \"load \"\" at line.*\nWas expecting one of:",
+ 'expected_err_regex' => "mismatched input ''/user/pig/tests/data/singlefile/votertab10k'' expecting LEFT_PAREN",
},
{
'num' => 9,
@@ -160,7 +160,7 @@ store a into ':INPATH:/singlefile/fileex
'pig' => q\a = load ':INPATH:/singlefile/studenttab10k' as (name, age, gpa);
b = group a by name;
c = foreach b { store a into ':OUTPATH:'; generate *;}\,
- 'expected_err_regex' => "Encountered \" \"store\" \"store \"\" at line.*\nWas expecting one of:",
+ 'expected_err_regex' => "Syntax error, unexpected symbol at or near 'store'",
},
]
@@ -168,7 +168,6 @@ store a into ':INPATH:/singlefile/fileex
{
# test not allowed operations
'name' => 'NotAllowed',
- 'ignore' => 1, # Need to investigate failures
'tests' => [
{
@@ -177,7 +176,7 @@ store a into ':INPATH:/singlefile/fileex
'num' => 1,
'pig' => q\a = load ':INPATH:/singlefile/studenttab10k' as (name, age, gpa);
b = a;\,
- 'expected_err_regex' => "Currently PIG does not support assigning an existing relation",
+ 'expected_err_regex' => "mismatched input ';' expecting LEFT_PAREN",
},
{
# currently (as of 09/18/2008), the following are not allowed
@@ -185,7 +184,7 @@ store a into ':INPATH:/singlefile/fileex
'num' => 2,
'pig' => q\a = load ':INPATH:/singlefile/studenttab10k' as (name, age, gpa);
b = a as (x,y,z);\,
- 'expected_err_regex' => "Currently PIG does not support assigning an existing relation",
+ 'expected_err_regex' => "mismatched input 'as' expecting LEFT_PAREN",
},
]
},
@@ -247,7 +246,6 @@ store a into ':INPATH:/singlefile/fileex
{
# test for sytax errors
'name' => 'SyntaxErrors',
- 'ignore' => 1, # Need to investigate failures
'tests' => [
{
# missing quotes around command
@@ -257,7 +255,8 @@ A = load ':INPATH:/singlefile/studenttab
B = foreach A generate $2, $1, $0;
C = stream B through awk 'BEGIN {FS = "\t"; OFS = "\t"} {print $3, $2, $1}';
dump C;#,
- 'expected_err_regex' => "Undefined command-alias: awk used as stream operator",
+ #'expected_err_regex' => "mismatched input ''BEGIN {FS = \"\\t\"; OFS = \"\\t\"} {print \$"."3, \$"."2, \$"."1}'' expecting SEMI_COLON",
+ 'expected_err_regex' => "mismatched input ''BEGIN {.*} {.*}'' expecting SEMI_COLON",
},
{
# input spec missing parenthesis
@@ -267,7 +266,7 @@ define CMD `perl PigStreaming.pl foo -`
A = load ':INPATH:/singlefile/studenttab10k';
B = stream A through CMD;
dump B;#,
- 'expected_err_regex' => "Encountered .*foo.* at line 2, column 47.",
+ 'expected_err_regex' => "mismatched input ''foo'' expecting LEFT_PAREN",
},
{
# no serializer name after using
@@ -277,7 +276,7 @@ define CMD `perl PigStreaming.pl foo -`
A = load ':INPATH:/singlefile/studenttab10k';
B = stream A through CMD;
dump B;#,
- 'expected_err_regex' => "Encountered .*\\).* at line 2, column 61.",
+ 'expected_err_regex' => "Syntax error, unexpected symbol at or near '\\)'",
},
{
# alias name missing from define
@@ -287,7 +286,7 @@ define `perl PigStreaming.pl foo -`;
A = load ':INPATH:/singlefile/studenttab10k';
B = stream A through CMD;
dump B;#,
- 'expected_err_regex' => "Encountered .*`perl PigStreaming.pl foo -`.* at line 2, column 8.",
+ 'expected_err_regex' => "mismatched input '`perl PigStreaming.pl foo -`' expecting IDENTIFIER_L",
},
{
# quotes missing from name of the file in ship script
@@ -297,7 +296,7 @@ define CMD `perl PigStreaming.pl foo -`
A = load ':INPATH:/singlefile/studenttab10k';
B = stream A through CMD;
dump B;#,
- 'expected_err_regex' => 'Encountered " "\." "\. "" at line 2, column 46.',
+ 'expected_err_regex' => "mismatched input '.' expecting RIGHT_PAREN",
},
]
},
@@ -362,7 +361,6 @@ dump B;\,
{
# Invalid skip path
'num' => 6,
- 'ignore' => 1, # Need to investigate failures
'pig' => q\
set stream.skippath 'foo';
define CMD `perl PigStreaming.pl`;
@@ -374,24 +372,22 @@ dump B;\,
{
# Invalid command alias in stream operator
'num' => 7,
- 'ignore' => 1, # Need to investigate failures
'pig' => q\
define CMD `perl PigStreaming.pl`;
A = load ':INPATH:/singlefile/studenttab10k';
B = stream A through CMD1;
dump B;\,
- 'expected_err_regex' => "Undefined command-alias: CMD1 used as stream operator",
+ 'expected_err_regex' => "pig script failed to validate: Undefined command-alias \\[CMD1\\]",
},
{
# Invalid operator alias in stream operator
'num' => 8,
- 'ignore' => 1, # Need to investigate failures
'pig' => q\
define CMD `perl PigStreaming.pl`;
A = load ':INPATH:/singlefile/studenttab10k';
B = stream C through CMD;
dump B;\,
- 'expected_err_regex' => "Unrecognized alias C",
+ 'expected_err_regex' => "Undefined alias: C",
},
]
},
@@ -537,20 +533,18 @@ store B into ':OUTPATH:';\,
# Invalid deserializer - throws exception
'num' => 5,
'execonly' => 'local',
- 'ignore' => 1, # need to investigate errors
'pig' => q\
register :FUNCPATH:/testudf.jar;
define CMD `perl :SCRIPTHOMEPATH:/PigStreaming.pl` input(stdin using PigDump) output(stdout using org.apache.pig.test.udf.storefunc.DumpLoaderBad);
A = load ':INPATH:/singlefile/studenttab10k';
B = stream A through CMD;
store B into ':OUTPATH:';\,
- 'expected_err_regex' => "Requested index 0 from tuple ()",
+ 'expected_err_regex' => "Could not resolve PigDump using imports",
},
{
# Invalid serializer - throws exception
'num' => 6,
'execonly' => 'local',
- 'ignore' => 1, # need to investigate errors
'pig' => q\
define CMD `perl :SCRIPTHOMEPATH:/PigStreamingDepend.pl` input(stdin using StringStoreBad);
A = load ':INPATH:/singlefile/studenttab10k';
@@ -558,7 +552,7 @@ B = stream A through `perl PigStreaming.
C = stream B through CMD as (name, age, gpa);
D = foreach C generate name, age;
store D into ':OUTPATH:';\,
- 'expected_err_regex' => "could not instantiate.*StringStoreBad",
+ 'expected_err_regex' => "Could not resolve StringStoreBad using imports",
},
]
},
Modified: pig/branches/branch-0.10/test/e2e/pig/tests/nightly.conf
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.10/test/e2e/pig/tests/nightly.conf?rev=1302090&r1=1302089&r2=1302090&view=diff
==============================================================================
--- pig/branches/branch-0.10/test/e2e/pig/tests/nightly.conf (original)
+++ pig/branches/branch-0.10/test/e2e/pig/tests/nightly.conf Sun Mar 18 08:27:40 2012
@@ -1272,14 +1272,12 @@ store b into ':OUTPATH:';\,
},
{
'num' => 8,
- 'ignore' => 1, # Need to figure out why this fails
'pig' => q\a = load ':INPATH:/glob/star/*good' as (name, age, gpa);
b = filter a by name == 'nick miller';
store b into ':OUTPATH:';\,
},
{
'num' => 9,
- 'ignore' => 1, # Need to figure out why this fails
'pig' => q\a = load ':INPATH:/glob/star/*' as (name, age, gpa);
b = filter a by name == 'nick miller';
store b into ':OUTPATH:';\,
@@ -2973,7 +2971,6 @@ store b into ':OUTPATH:';\,
{
# test reading and writing with .bz extension
'num' => 2,
- 'ignore' => 1, # Need to figure out why this fails
'pig' => q\
a = load ':INPATH:/singlefile/studenttab10k' using PigStorage() as (name, age, gpa);
store a into ':OUTPATH:.intermediate.bz';
@@ -3197,20 +3194,6 @@ store d into ':OUTPATH:';
}, {
-# 'num' => 6,
- 'ignore' => 'FIX: this test is not quite ready',
-
- 'pig' => q?
-
-A = load ':INPATH:/types/numbers.txt' using PigStorage(':') as (intnum1000: int,id: int,intnum5: int,intnum100: int,intnum: int,longnum: long,floatnum: float,doublenum: double);
-B = group A by (intnum5, intnum100, id);
-C = filter B by A.id == 299;
-tuple_scalar = limit C 1;
-D = foreach A generate id, intnum+tuple_scalar.group.$1 as some_sum;
-store ':OUTPATH:';
-?,
- }, {
-
# 4 Test implicit cast
# 10 Cast with a FILTER
#
@@ -3309,7 +3292,7 @@ store f into ':OUTPATH:';\,
},{
'name' => 'udf_TOBAGandTOTUPLE',
- 'ignore' => 1, # Need to investigate failures
+
'sortResults' => 1,
'floatpostprocess' => 1,
'delimiter' => ' ',
@@ -3346,18 +3329,14 @@ describe T4;
describe T5;
describe T6;
?
-# ,'expected_out_regex' => 'B1: {{int}}'
-# ,'expected_out_regex' => 'B3: {{int}}'
-# ,'expected_out_regex' => 'T1: {org.apache.pig.builtin.totuple_id_.*: (intnum1000: int,id: int,intnum5: int)}'
-# ,'expected_out_regex' => 'T2: {org.apache.pig.builtin.totuple_id_.*: (intnum1000: int,id: int,intnum5: int)}'
-# ,'expected_out_regex' => 'T3: {org.apache.pig.builtin.totuple_intnum1000.*: (intnum1000: int,intnum1000: int,intnum1000: int)}'
-# ,'expected_out_regex' => 'T4: {{int},org.apache.pig.builtin.totuple_intnum100.*: (intnum100: int,intnum: int,longnum: long),floatnum: float,doublenum: double}'
-# ,'expected_out_regex' => 'T5: {intnum1000: int,id: int,org.apache.pig.builtin.totuple_intnum100.*: (intnum5: int,intnum100: int,intnum: int).*{NULL}.*doublenum: double}'
- ,'expected_out_regex' => "T6:.*{intnum1000:.*int,org.apache.pig.builtin.totuple_intnum1000_.*:.*(intnum1000:.*int,intnum1000:.*int,intnum1000:.*int).*{int}.*duplicate:.*int}"
-
-
-
-
+ ,'expected_out_regex' => 'B1: {{int}}'
+ ,'expected_out_regex' => 'B3: {{int}}'
+ ,'expected_out_regex' => 'T1: {org.apache.pig.builtin.totuple_id_.*: (intnum1000: int,id: int,intnum5: int)}'
+ ,'expected_out_regex' => 'T2: {org.apache.pig.builtin.totuple_id_.*: (intnum1000: int,id: int,intnum5: int)}'
+ ,'expected_out_regex' => 'T3: {org.apache.pig.builtin.totuple_intnum1000.*: (intnum1000: int,intnum1000: int,intnum1000: int)}'
+ ,'expected_out_regex' => 'T4: {{int},org.apache.pig.builtin.totuple_intnum100.*: (intnum100: int,intnum: int,longnum: long),floatnum: float,doublenum: double}'
+ ,'expected_out_regex' => 'T5: {intnum1000: int,id: int,org.apache.pig.builtin.totuple_intnum100.*: (intnum5: int,intnum100: int,intnum: int).*{NULL}.*doublenum: double}'
+ ,'expected_out_regex' => "T6: {intnum1000: int,org.apache.pig.builtin.totuple_intnum1000.*: \\(intnum1000: int,intnum1000: int,intnum1000: int\\),{\\(int\\)},duplicate: int}"
}, {
# TEST : bag of mixed data types
# TEST : Order
@@ -3586,7 +3565,7 @@ C = foreach B generate $0, $1, TOBAG($5,
},{
'name' => 'MergeOperator',
- #'ignore' => 1, # Need to investigate failures
+
'tests' => [
{
# Test Union using merge where schema is identical | A&B have identical schema
@@ -3652,7 +3631,6 @@ store C into ':OUTPATH:';\,
},{
# Test Union of an intersection
'num' => 5,
- 'ignore' => 1, # Need to figure out why this fails
'pig' => q\
A = load ':INPATH:/singlefile/studenttab10k' using PigStorage() as (name:chararray, age:int, gpa:float);
B = load ':INPATH:/singlefile/votertab10k' as (name:chararray, age:int, registration:chararray, contributions:float);
@@ -3663,15 +3641,14 @@ register :FUNCPATH:/testudf.jar;
define Nil org.apache.pig.test.udf.evalfunc.Nil();
A = load ':INPATH:/singlefile/studenttab10k' using PigStorage() as (name:chararray, age:int, gpa:float);
B = load ':INPATH:/singlefile/votertab10k' as (name:chararray, age:int, registration:chararray, contributions:float);
-C = foreach A generate name, age, gpa, Nil(), Nil();
-D = foreach B generate name, age, Nil(), registration, contributions;
+C = foreach A generate name, age, (chararray)gpa, Nil(), Nil();
+D = foreach B generate name, age, Nil(), registration, (chararray)contributions;
E = union C, D;
store E into ':OUTPATH:';\,
},
{
# Test Union where the intersection is null
'num' => 6,
- 'ignore' => 1, # Need to figure out why this fails
'pig' => q\
A = load ':INPATH:/singlefile/studenttab10k' using PigStorage() as (name:chararray, age:int, gpa:float);
B = load ':INPATH:/singlefile/textdoc' as (line:chararray);
@@ -3682,7 +3659,7 @@ register :FUNCPATH:/testudf.jar;
define Nil org.apache.pig.test.udf.evalfunc.Nil();
A = load ':INPATH:/singlefile/studenttab10k' using PigStorage() as (name:chararray, age:int, gpa:float);
B = load ':INPATH:/singlefile/textdoc' as (line:chararray);
-C = foreach A generate name, age, gpa, Nil(name);
+C = foreach A generate name, (chararray)age, (chararray)gpa, Nil(name);
D = foreach B generate Nil(line), Nil(line), Nil(line), line;
E = union C, D;
store E into ':OUTPATH:';\,
Modified: pig/branches/branch-0.10/test/e2e/pig/tests/streaming.conf
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.10/test/e2e/pig/tests/streaming.conf?rev=1302090&r1=1302089&r2=1302090&view=diff
==============================================================================
--- pig/branches/branch-0.10/test/e2e/pig/tests/streaming.conf (original)
+++ pig/branches/branch-0.10/test/e2e/pig/tests/streaming.conf Sun Mar 18 08:27:40 2012
@@ -247,7 +247,6 @@ store E into ':OUTPATH:';#,
# Section 2.2: script is shipped while the supporting file is cached
'num' => 3,
'execonly' => 'mapred',
- 'ignore' => 1, # Need to investigate failures
'pig' => q@
define CMD `perl PigStreaming.pl - - nameMap` ship(':SCRIPTHOMEPATH:/PigStreaming.pl') cache(':INPATH:/nameMap/part-00000#nameMap');
A = load ':INPATH:/singlefile/studenttab10k';
@@ -373,7 +372,6 @@ store E into ':OUTPATH:';#,
'sortResults' => 1,
'floatpostprocess' => 1,
'delimiter' => ' ',
- 'ignore' => 1, # Need to investigate failures
'tests' => [
{
# Section 5.1: load/store optimization
Modified: pig/branches/branch-0.10/test/e2e/pig/tests/streaming_local.conf
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.10/test/e2e/pig/tests/streaming_local.conf?rev=1302090&r1=1302089&r2=1302090&view=diff
==============================================================================
--- pig/branches/branch-0.10/test/e2e/pig/tests/streaming_local.conf (original)
+++ pig/branches/branch-0.10/test/e2e/pig/tests/streaming_local.conf Sun Mar 18 08:27:40 2012
@@ -90,7 +90,6 @@ store E into ':OUTPATH:';#,
# Section 1.5: multiple streaming operators - adjacent - before local rearrange
'num' => 5,
'execonly' => 'local',
- 'ignore' => 1, # investigate failures
'pig' => q#
register :FUNCPATH:/testudf.jar;
define CMD `perl :SCRIPTHOMEPATH:/PigStreamingDepend.pl` input(stdin using org.apache.pig.test.udf.streaming.StreamingDump);
@@ -105,7 +104,6 @@ store D into ':OUTPATH:';#,
# Section 1.5: multiple streaming operators - not adjacent - before local rearrange
'num' => 6,
'execonly' => 'local',
- 'ignore' => 1, # investigate failures
'pig' => q#
register :FUNCPATH:/testudf.jar;
A = load ':INPATH:/singlefile/studenttab10k';
@@ -122,7 +120,6 @@ store E into ':OUTPATH:';#,
# Section 1.5: multiple streaming operators - adjacent - after local rearrange
'num' => 7,
'execonly' => 'local',
- 'ignore' => 1, # investigate failures
'pig' => q#
register :FUNCPATH:/testudf.jar;
define CMD1 `perl :SCRIPTHOMEPATH:/GroupBy.pl '\t' 0 1`;
@@ -143,7 +140,6 @@ store F into ':OUTPATH:';#,
# same alias name
'num' => 8,
'execonly' => 'local',
- 'ignore' => 1, # investigate failures
'pig' => q#
register :FUNCPATH:/testudf.jar;
define CMD1 `perl :SCRIPTHOMEPATH:/GroupBy.pl '\t' 0`;
@@ -207,7 +203,6 @@ store C into ':OUTPATH:';#,
# Section 3.4: streaming application writes multiple outputs to file
'num' => 13,
'execonly' => 'local',
- 'ignore' => 1, # investigate failures
'pig' => q#
register :FUNCPATH:/testudf.jar;
define CMD `perl :SCRIPTHOMEPATH:/PigStreamingDepend.pl - sio_5_1 sio_5_2` input(stdin using org.apache.pig.test.udf.streaming.StreamingDump) output('sio_5_1', 'sio_5_2');
@@ -220,7 +215,6 @@ store B into ':OUTPATH:';#,
# Section 3.4: streaming application writes multiple outputs: 1 to file and 1 to stdout
'num' => 14,
'execonly' => 'local',
- 'ignore' => 1, # investigate failures
'pig' => q#
register :FUNCPATH:/testudf.jar;
define CMD `perl :SCRIPTHOMEPATH:/PigStreamingDepend.pl - - sio_5_2` input(stdin using org.apache.pig.test.udf.streaming.StreamingDump) output(stdout, 'sio_5_2');
@@ -273,7 +267,6 @@ store D into ':OUTPATH:';#,
# PIG-272: problem with optimization and intermediate store
'num' => 18,
'execonly' => 'local',
- 'ignore' => 1, # investigate failures
'pig' => q#
define CMD1 `perl -ne 'print $_;'`;
define CMD2 `:SCRIPTHOMEPATH:/Split.pl 3` input(stdin using PigStreaming(','));
@@ -284,7 +277,7 @@ C = stream B through CMD1;
D = stream C through CMD2;
E = JOIN B by $0, D by $0;
store E into ':OUTPATH:';#,
-
+ 'notmq' => 1,
'sql' => "select A.name, A.age, A.gpa, B.name, B.age, B.gpa from studenttab10k as A join studenttab10k as B using(name);",
},
]
Modified: pig/branches/branch-0.10/test/e2e/pig/tests/turing_jython.conf
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.10/test/e2e/pig/tests/turing_jython.conf?rev=1302090&r1=1302089&r2=1302090&view=diff
==============================================================================
--- pig/branches/branch-0.10/test/e2e/pig/tests/turing_jython.conf (original)
+++ pig/branches/branch-0.10/test/e2e/pig/tests/turing_jython.conf Sun Mar 18 08:27:40 2012
@@ -80,9 +80,7 @@ else:
'tests' => [
{
'num' => 1,
- 'ignore' => 1, # need a way not to pass --embedded to the verify script
- ,'pig_params' => ['--embedded', 'jython']
- ,'pig' => q\
+ ,'pig' => q\#!/usr/bin/python
# JYTHON COMMENT
from org.apache.pig.scripting import Pig
@@ -481,7 +479,6 @@ else:
{
# 11.23 1 explain() on a complex query
'num' => 1
- ,'ignore' => 'Expected output does not appear to be correct'
,'pig' => q\#!/usr/bin/python
from org.apache.pig.scripting import Pig
@@ -508,7 +505,6 @@ result = P.bind({'in1':input1, 'in2':inp
\
,'rc'=> 0
- ,'expected_out_regex' => "Schema:.*{name:.*bytearray,age:.*bytearray}.*Type:.*Unknown"
}, {
#11.22 1 illustrate() on a complex query
@@ -797,7 +793,6 @@ else:
{
# run a script that returns single negative result
'num' => 1
- ,'ignore' => 1 # figure out why this fails
,'pig' => q\#!/usr/bin/python
from org.apache.pig.scripting import Pig
@@ -823,7 +818,6 @@ else:
{
# run a script that returns single negative result
'num' => 2
- ,'ignore' => 1 # investigate failure
,'pig' => q\#!/usr/bin/python
from org.apache.pig.scripting import Pig
@@ -843,8 +837,8 @@ else:
raise "Pig job FAILED"
\
- ,'rc' => 2
- ,'expected_err_regex' => "INVALID.jar.*does not exist"
+ ,'rc' => 6
+ ,'expected_err_regex' => "name 'bad_output' is not defined"
},{
# bind an undefined input parameter
'num' => 3