You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by kn...@apache.org on 2017/01/13 21:53:57 UTC
svn commit: r1778666 - in /pig/trunk: CHANGES.txt
test/e2e/pig/drivers/TestDriverPig.pm
test/e2e/pig/lib/hadoop-0.23.0-streaming.jar
test/e2e/pig/lib/hadoop-streaming.jar test/e2e/pig/tests/nightly.conf
Author: knoguchi
Date: Fri Jan 13 21:53:56 2017
New Revision: 1778666
URL: http://svn.apache.org/viewvc?rev=1778666&view=rev
Log:
PIG-5087 e2e Native3 failing after PIG-4923 (knoguchi)
Added:
pig/trunk/test/e2e/pig/lib/hadoop-streaming.jar
- copied unchanged from r1778665, pig/trunk/test/e2e/pig/lib/hadoop-0.23.0-streaming.jar
Removed:
pig/trunk/test/e2e/pig/lib/hadoop-0.23.0-streaming.jar
Modified:
pig/trunk/CHANGES.txt
pig/trunk/test/e2e/pig/drivers/TestDriverPig.pm
pig/trunk/test/e2e/pig/tests/nightly.conf
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1778666&r1=1778665&r2=1778666&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri Jan 13 21:53:56 2017
@@ -71,6 +71,8 @@ OPTIMIZATIONS
BUG FIXES
+PIG-5087 e2e Native3 failing after PIG-4923 (knoguchi)
+
PIG-5073: Skip e2e Limit_5 test for Tez (knoguchi)
PIG-5072: e2e Union_12 fails on typecast when oldpig=0.11 (knoguchi)
Modified: pig/trunk/test/e2e/pig/drivers/TestDriverPig.pm
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/drivers/TestDriverPig.pm?rev=1778666&r1=1778665&r2=1778666&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/drivers/TestDriverPig.pm (original)
+++ pig/trunk/test/e2e/pig/drivers/TestDriverPig.pm Fri Jan 13 21:53:56 2017
@@ -211,13 +211,6 @@ sub runTest
$testCmd->{'pig'} = $testCmd->{'pig_win'};
}
- if ( $testCmd->{'hadoopversion'} == '23' && $testCmd->{'pig23'}) {
- $oldpig = $testCmd->{'pig'};
- $testCmd->{'pig'} = $testCmd->{'pig23'};
- }
- if ( $testCmd->{'hadoopversion'} == '23' && $testCmd->{'expected_err_regex23'}) {
- $testCmd->{'expected_err_regex'} = $testCmd->{'expected_err_regex23'};
- }
my $res = $self->runPigCmdLine( $testCmd, $log, 1, $resources );
if ($oldpig) {
$testCmd->{'pig'} = $oldpig;
@@ -231,10 +224,6 @@ sub runTest
$testCmd->{'pig'} = $testCmd->{'pig_win'};
}
- if ( $testCmd->{'hadoopversion'} == '23' && $testCmd->{'pig23'}) {
- $oldpig = $testCmd->{'pig'};
- $testCmd->{'pig'} = $testCmd->{'pig23'};
- }
my $res = $self->runPig( $testCmd, $log, 1, $resources );
if ($oldpig) {
$testCmd->{'pig'} = $oldpig;
@@ -686,9 +675,6 @@ sub generateBenchmark
if ((Util::isWindows()||Util::isCygwin()) && $testCmd->{'pig_win'}) {
$modifiedTestCmd{'pig'} = $testCmd->{'pig_win'};
}
- if ( $testCmd->{'hadoopversion'} == '23' && $testCmd->{'pig23'}) {
- $modifiedTestCmd{'pig'} = $testCmd->{'pig23'};
- }
# Change so we're looking at the old version of Pig
if (defined $testCmd->{'oldpigpath'} && $testCmd->{'oldpigpath'} ne "") {
$modifiedTestCmd{'pigpath'} = $testCmd->{'oldpigpath'};
@@ -1058,10 +1044,6 @@ sub wrongExecutionMode($$)
}
}
- if (defined $testCmd->{'ignore23'} && $testCmd->{'hadoopversion'}=='23') {
- $wrong = 1;
- }
-
if ($wrong) {
print $log "Skipping test $testCmd->{'group'}" . "_" .
$testCmd->{'num'} . " since it is not suppsed to be run in hadoop 23\n";
Modified: pig/trunk/test/e2e/pig/tests/nightly.conf
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/tests/nightly.conf?rev=1778666&r1=1778665&r2=1778666&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/tests/nightly.conf (original)
+++ pig/trunk/test/e2e/pig/tests/nightly.conf Fri Jan 13 21:53:56 2017
@@ -567,7 +567,6 @@ store c into ':OUTPATH:';\,
{
'num' => 9,
'floatpostprocess' => 1,
- 'ignore23' => 'I cannot get it right due to float precision, temporarily disable',
'pig' => q\a = load ':INPATH:/singlefile/studenttab10k' as (name, age, gpa);
b = group a by name;
c = foreach b generate group, AVG(a.gpa);
@@ -4311,10 +4310,6 @@ store e into ':OUTPATH:';\,
a = load ':INPATH:/singlefile/studenttab10k' using PigStorage() as (name, age, gpa);
b = mapreduce ':MAPREDJARS:/hadoop-streaming.jar' Store a into ':OUTPATH:.intermediate.1' Load ':OUTPATH:.intermediate.2' as (name:chararray, count: int) `-input :OUTPATH:.intermediate.1 -output :OUTPATH:.intermediate.2 -mapper cat -reducer wc`;
store b into ':OUTPATH:';\,
- 'pig23' => q\
-a = load ':INPATH:/singlefile/studenttab10k' using PigStorage() as (name, age, gpa);
-b = mapreduce ':MAPREDJARS:/hadoop-0.23.0-streaming.jar' Store a into ':OUTPATH:.intermediate.1' Load ':OUTPATH:.intermediate.2' as (name:chararray, count: int) `-input :OUTPATH:.intermediate.1 -output :OUTPATH:.intermediate.2 -mapper cat -reducer wc`;
-store b into ':OUTPATH:';\,
'notmq' => 1,
},
]
@@ -4932,7 +4927,6 @@ store C into ':OUTPATH:';\,
'tests' => [
{
'num' => 1,
- 'ignore23' => 'guava version of Pig is higher than hadoop 23',
'pig' => q?register :FUNCPATH:/testudf.jar;
define gm org.apache.pig.test.udf.evalfunc.GoodMonitored();
a = load ':INPATH:/singlefile/studenttab10k' as (name, age, gpa);