Author: zly
Date: Wed Apr 26 21:31:44 2017
New Revision: 1792822
URL: http://svn.apache.org/viewvc?rev=1792822&view=rev
Log:
PIG-5166:GroupAggFunc_9 is failing with spark exec type(Adam via Liyun)
Modified:
pig/branches/spark/test/e2e/pig/drivers/TestDriverPig.pm
pig/branches/spark/test/e2e/pig/tests/nightly.conf
pig/branches/spark/test/e2e/pig/tools/test/floatpostprocessor.pl
Modified: pig/branches/spark/test/e2e/pig/drivers/TestDriverPig.pm
URL:
http://svn.apache.org/viewvc/pig/branches/spark/test/e2e/pig/drivers/TestDriverPig.pm?rev=1792822&r1=1792821&r2=1792822&view=diff
==============================================================================
--- pig/branches/spark/test/e2e/pig/drivers/TestDriverPig.pm (original)
+++ pig/branches/spark/test/e2e/pig/drivers/TestDriverPig.pm Wed Apr 26
21:31:44 2017
@@ -603,7 +603,7 @@ sub postProcessSingleOutputFile
if (defined $testCmd->{'floatpostprocess'} &&
defined $testCmd->{'delimiter'}) {
$fppCmd .= " | perl $toolpath/floatpostprocessor.pl \"" .
- $testCmd->{'delimiter'} . "\"";
+ $testCmd->{'delimiter'} . "\" " . $testCmd->{'decimals'};
}
$fppCmd .= " > $localdir/out_original";
Modified: pig/branches/spark/test/e2e/pig/tests/nightly.conf
URL:
http://svn.apache.org/viewvc/pig/branches/spark/test/e2e/pig/tests/nightly.conf?rev=1792822&r1=1792821&r2=1792822&view=diff
==============================================================================
--- pig/branches/spark/test/e2e/pig/tests/nightly.conf (original)
+++ pig/branches/spark/test/e2e/pig/tests/nightly.conf Wed Apr 26 21:31:44 2017
@@ -573,6 +573,7 @@ c = foreach b generate group, AVG(a.gpa)
store c into ':OUTPATH:';\,
'floatpostprocess' => 1,
'delimiter' => ' ',
+ 'decimals' => 6,
},
{
'num' => 10,
Modified: pig/branches/spark/test/e2e/pig/tools/test/floatpostprocessor.pl
URL:
http://svn.apache.org/viewvc/pig/branches/spark/test/e2e/pig/tools/test/floatpostprocessor.pl?rev=1792822&r1=1792821&r2=1792822&view=diff
==============================================================================
--- pig/branches/spark/test/e2e/pig/tools/test/floatpostprocessor.pl (original)
+++ pig/branches/spark/test/e2e/pig/tools/test/floatpostprocessor.pl Wed Apr 26
21:31:44 2017
@@ -26,6 +26,7 @@ use strict;
our @floats;
our $delim;
+our $decimals;
sub parseLine($)
{
@@ -41,7 +42,7 @@ sub postprocess($)
for (my $i = 0; $i < @fields; $i++) {
if ($i != 0) { print($delim); }
if ($floats[$i]) {
- printf("%.3f", $fields[$i]);
+ printf("%." . $decimals . "f", $fields[$i]);
} else {
print($fields[$i]);
}
@@ -72,6 +73,10 @@ sub is_float {
if (!defined($delim)) {
die "Usage: $0 delimiter\n";
}
+ $decimals = shift;
+ if (!defined($decimals)) {
+ $decimals = 3;
+ }
my @sampled;
my $line;
