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/08/07 20:25:49 UTC
svn commit: r1370422 - in /pig/branches/branch-0.10: CHANGES.txt
test/e2e/pig/conf/local.conf test/e2e/pig/tests/negative.conf
test/e2e/pig/tests/nightly.conf test/e2e/pig/tests/turing_jython.conf
Author: daijy
Date: Tue Aug 7 18:25:49 2012
New Revision: 1370422
URL: http://svn.apache.org/viewvc?rev=1370422&view=rev
Log:
PIG-2859: Fix few e2e test failures
Modified:
pig/branches/branch-0.10/CHANGES.txt
pig/branches/branch-0.10/test/e2e/pig/conf/local.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/turing_jython.conf
Modified: pig/branches/branch-0.10/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.10/CHANGES.txt?rev=1370422&r1=1370421&r2=1370422&view=diff
==============================================================================
--- pig/branches/branch-0.10/CHANGES.txt (original)
+++ pig/branches/branch-0.10/CHANGES.txt Tue Aug 7 18:25:49 2012
@@ -28,6 +28,8 @@ PIG-2727: PigStorage Source tagging does
BUG FIXES
+PIG-2859: Fix few e2e test failures (rohini via daijy)
+
PIG-2729: Macro expansion does not use pig.import.search.path - UnitTest borked (johannesch via daijy)
PIG-2791: Pig does not work with Namenode Federation (rohini via daijy)
Modified: pig/branches/branch-0.10/test/e2e/pig/conf/local.conf
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.10/test/e2e/pig/conf/local.conf?rev=1370422&r1=1370421&r2=1370422&view=diff
==============================================================================
--- pig/branches/branch-0.10/test/e2e/pig/conf/local.conf (original)
+++ pig/branches/branch-0.10/test/e2e/pig/conf/local.conf Tue Aug 7 18:25:49 2012
@@ -53,6 +53,7 @@ $cfg = {
, 'exectype' => 'local'
#HADOOP
+ , 'mapredjars' => "$ENV{PH_ROOT}/lib"
, 'hadoopHome' => "$ENV{PH_ROOT}/lib"
, 'userhomePath' => "$ENV{HOME}"
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=1370422&r1=1370421&r2=1370422&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 Tue Aug 7 18:25:49 2012
@@ -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' => "mismatched input ''/user/pig/tests/data/singlefile/votertab10k'' expecting LEFT_PAREN",
+ 'expected_err_regex' => "mismatched input ''.*/singlefile/votertab10k'' expecting LEFT_PAREN",
},
{
'num' => 9,
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=1370422&r1=1370421&r2=1370422&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 Tue Aug 7 18:25:49 2012
@@ -2487,7 +2487,7 @@ register :FUNCPATH:/testudf.jar;
a = load ':INPATH:/singlefile/studenttab10k' using PigStorage() as (name:chararray, age:int, gpa: double);
b = foreach a generate CONCAT('(', name), CONCAT((chararray)age, ' )');
store b into ':OUTPATH:.intermediate' using PigStorage(',');
-c = load ':OUTPATH:.intermediate' using DumpLoader();
+c = load ':OUTPATH:.intermediate' using org.apache.pig.test.udf.storefunc.DumpLoader();
store c into ':OUTPATH:';\,
'notmq' => 1,
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=1370422&r1=1370421&r2=1370422&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 Tue Aug 7 18:25:49 2012
@@ -754,13 +754,13 @@ pigfile.close()
#main.pig
P = Pig.compile("""import ':TMP:/module.pig';
-alpha = load ':INPATH:' as (user, age, gpa);
+alpha = load ':INPATH:/singlefile/studenttab10k' as (user, age, gpa);
gamma = group_and_count (alpha, user);
store gamma into ':OUTPATH:';
""")
P.bind().runSingle()
\,
- 'verify_pig_script' => q\A = load ':INPATH:' as (user, age, gpa);
+ 'verify_pig_script' => q\A = load ':INPATH:/singlefile/studenttab10k' as (user, age, gpa);
B = group A by user;
C = foreach B generate group, COUNT(A);
store C into ':OUTPATH:';\