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 2014/08/22 05:50:46 UTC
svn commit: r1619656 - in /pig/trunk: CHANGES.txt test/e2e/pig/build.xml
test/e2e/pig/conf/default.conf test/e2e/pig/conf/local.conf
test/e2e/pig/conf/rpm.conf test/e2e/pig/conf/tez.conf
test/e2e/pig/drivers/TestDriverPig.pm test/e2e/pig/drivers/Util.pm
Author: daijy
Date: Fri Aug 22 03:50:45 2014
New Revision: 1619656
URL: http://svn.apache.org/r1619656
Log:
PIG-4136: No special handling jythonjar/jrubyjar in e2e tests after PIG-4047
Modified:
pig/trunk/CHANGES.txt
pig/trunk/test/e2e/pig/build.xml
pig/trunk/test/e2e/pig/conf/default.conf
pig/trunk/test/e2e/pig/conf/local.conf
pig/trunk/test/e2e/pig/conf/rpm.conf
pig/trunk/test/e2e/pig/conf/tez.conf
pig/trunk/test/e2e/pig/drivers/TestDriverPig.pm
pig/trunk/test/e2e/pig/drivers/Util.pm
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1619656&r1=1619655&r2=1619656&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri Aug 22 03:50:45 2014
@@ -66,6 +66,8 @@ OPTIMIZATIONS
BUG FIXES
+PIG-4136: No special handling jythonjar/jrubyjar in e2e tests after PIG-4047 (daijy)
+
PIG-4137: Fix hadoopversion 23 compilation due to TEZ-1469 (daijy)
PIG-4135: Fetch optimization should be disabled if plan contains no limit (cheolsoo)
Modified: pig/trunk/test/e2e/pig/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/build.xml?rev=1619656&r1=1619655&r2=1619656&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/build.xml (original)
+++ pig/trunk/test/e2e/pig/build.xml Fri Aug 22 03:50:45 2014
@@ -279,12 +279,9 @@
<env key="HADOOP_CONF_DIR" value="${harness.cluster.conf}"/>
<env key="PIG_USE_PYTHON" value="${harness.use.python}"/>
<env key="PH_CLUSTER_BIN" value="${harness.cluster.bin}"/>
- <env key="PH_JYTHON_JAR" value="${jython.jar}"/>
- <env key="PH_JRUBY_JAR" value="${jruby.jar}"/>
<env key="PH_HIVE_LIB_DIR" value="${hive.lib.dir}"/>
<env key="PH_HIVE_VERSION" value="${hive.version}"/>
<env key="PH_HIVE_SHIMS_VERSION" value="${hive.hadoop.shims.version}"/>
- <env key="JRUBY_OPTS" value="--1.9"/>
<env key="HARNESS_CONF" value="${harness.conf.file}"/>
<env key="HADOOP_HOME" value="${harness.hadoop.home}"/>
<env key="HADOOP_PREFIX" value="${HADOOP_PREFIX}"/>
@@ -348,9 +345,6 @@
<env key="PH_OLDPIG" value="${harness.old.pig}"/>
<env key="HADOOP_CONF_DIR" value="${harness.cluster.conf}"/>
<env key="PH_CLUSTER_BIN" value="${harness.cluster.bin}"/>
- <env key="PH_JYTHON_JAR" value="${jython.jar}"/>
- <env key="PH_JRUBY_JAR" value="${jruby.jar}"/>
- <env key="JRUBY_OPTS" value="--1.9"/>
<env key="HARNESS_CONF" value="${harness.conf.file}"/>
<env key="HADOOP_HOME" value="${harness.hadoop.home}"/>
Modified: pig/trunk/test/e2e/pig/conf/default.conf
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/conf/default.conf?rev=1619656&r1=1619655&r2=1619656&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/conf/default.conf (original)
+++ pig/trunk/test/e2e/pig/conf/default.conf Fri Aug 22 03:50:45 2014
@@ -44,8 +44,6 @@ $cfg = {
, 'benchmarkPath' => "$ENV{PH_OUT}/benchmarks"
, 'scriptPath' => "$ENV{PH_ROOT}/libexec"
, 'tmpPath' => 'tmp/pigtest'
- , 'jythonjar' => "$ENV{PH_JYTHON_JAR}"
- , 'jrubyjar' => "$ENV{PH_JRUBY_JAR}"
#PIG
, 'testconfigpath' => "$ENV{HADOOP_CONF_DIR}"
Modified: pig/trunk/test/e2e/pig/conf/local.conf
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/conf/local.conf?rev=1619656&r1=1619655&r2=1619656&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/conf/local.conf (original)
+++ pig/trunk/test/e2e/pig/conf/local.conf Fri Aug 22 03:50:45 2014
@@ -41,8 +41,6 @@ $cfg = {
, 'benchmarkPath' => "$ENV{PH_OUT}/benchmarks"
, 'scriptPath' => "$ENV{PH_ROOT}/libexec"
, 'tmpPath' => '/tmp/pigtest'
- , 'jythonjar' => "$ENV{PH_JYTHON_JAR}"
- , 'jrubyjar' => "$ENV{PH_JRUBY_JAR}"
#PIG
, 'testconfigpath' => "$ENV{PH_CLUSTER}/conf/"
Modified: pig/trunk/test/e2e/pig/conf/rpm.conf
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/conf/rpm.conf?rev=1619656&r1=1619655&r2=1619656&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/conf/rpm.conf (original)
+++ pig/trunk/test/e2e/pig/conf/rpm.conf Fri Aug 22 03:50:45 2014
@@ -27,12 +27,6 @@ chomp $me;
# PH_PIG Root directory for Pig version being used
my $hdfsBase = $ENV{PH_HDFS_BASE} || "/user/pig";
-my $jythonjarpath;
-eval {$jythonjarpath = `ls /usr/lib/pig/lib/jython-*.jar`};
-chomp $jythonjarpath;
-my $jrubyjarpath;
-eval {$jrubyjarpath = `ls /usr/lib/pig/lib/jruby-*.jar`};
-chomp $jrubyjarpath;
$cfg = {
#HDFS
@@ -50,8 +44,6 @@ $cfg = {
, 'benchmarkPath' => "$ENV{PH_OUT}/benchmarks"
, 'scriptPath' => "$ENV{PH_ROOT}/libexec"
, 'tmpPath' => '/tmp/pigtest'
- , 'jythonjar' => $jythonjarpath
- , 'jrubyjar' => $jrubyjarpath
#PIG
, 'testconfigpath' => "$ENV{HADOOP_CONF_DIR}"
Modified: pig/trunk/test/e2e/pig/conf/tez.conf
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/conf/tez.conf?rev=1619656&r1=1619655&r2=1619656&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/conf/tez.conf (original)
+++ pig/trunk/test/e2e/pig/conf/tez.conf Fri Aug 22 03:50:45 2014
@@ -44,8 +44,6 @@ $cfg = {
, 'benchmarkPath' => "$ENV{PH_OUT}/benchmarks"
, 'scriptPath' => "$ENV{PH_ROOT}/libexec"
, 'tmpPath' => '/tmp/pigtest'
- , 'jythonjar' => "$ENV{PH_JYTHON_JAR}"
- , 'jrubyjar' => "$ENV{PH_JRUBY_JAR}"
#PIG
, 'testconfigpath' => "$ENV{HADOOP_CONF_DIR}"
Modified: pig/trunk/test/e2e/pig/drivers/TestDriverPig.pm
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/drivers/TestDriverPig.pm?rev=1619656&r1=1619655&r2=1619656&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/drivers/TestDriverPig.pm (original)
+++ pig/trunk/test/e2e/pig/drivers/TestDriverPig.pm Fri Aug 22 03:50:45 2014
@@ -399,9 +399,7 @@ sub getPigCmd($$$)
if(Util::isWindows()||Util::isCygwin()) {
$separator = ";";
}
- my $pcp .= $testCmd->{'jythonjar'} if (defined($testCmd->{'jythonjar'}));
- $pcp .= $separator . $testCmd->{'jrubyjar'} if (defined($testCmd->{'jrubyjar'}));
- $pcp .= $separator . $testCmd->{'classpath'} if (defined($testCmd->{'classpath'}));
+ my $pcp .= $separator . $testCmd->{'classpath'} if (defined($testCmd->{'classpath'}));
# Set it in our current environment. It will get inherited by the IPC::Run
# command.
Modified: pig/trunk/test/e2e/pig/drivers/Util.pm
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/drivers/Util.pm?rev=1619656&r1=1619655&r2=1619656&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/drivers/Util.pm (original)
+++ pig/trunk/test/e2e/pig/drivers/Util.pm Fri Aug 22 03:50:45 2014
@@ -253,12 +253,6 @@ sub getPigCmd
# use user provided jar
my $classpath;
- if (defined $properties->{'jythonjar'}) {
- $classpath = "$classpath:" . $properties->{'jythonjar'};
- }
- if (defined $properties->{'jrubyjar'}) {
- $classpath = "$classpath:" . $properties->{'jrubyjar'};
- }
if( $properties->{'exectype'} eq "local") {
# in local mode, we should not use
# any hadoop-site.xml