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/02/03 01:59:19 UTC
svn commit: r1239961 - in /pig/trunk: CHANGES.txt test/e2e/pig/build.xml
test/e2e/pig/conf/default.conf test/e2e/pig/conf/existing_deployer.conf
test/e2e/pig/drivers/TestDriverPig.pm test/e2e/pig/tests/hcat.conf
Author: daijy
Date: Fri Feb 3 00:59:19 2012
New Revision: 1239961
URL: http://svn.apache.org/viewvc?rev=1239961&view=rev
Log:
PIG-2502: Make "hcat.bin" configurable in e2e test
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/existing_deployer.conf
pig/trunk/test/e2e/pig/drivers/TestDriverPig.pm
pig/trunk/test/e2e/pig/tests/hcat.conf
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1239961&r1=1239960&r2=1239961&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri Feb 3 00:59:19 2012
@@ -88,6 +88,8 @@ OPTIMIZATIONS
BUG FIXES
+PIG-2502: Make "hcat.bin" configurable in e2e test (daijy)
+
PIG-2501: Changes needed to contrib/piggybank/java/build.xml in order to build piggybank.jar with Hadoop 0.23
(ekoontz via daijy)
Modified: pig/trunk/test/e2e/pig/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/build.xml?rev=1239961&r1=1239960&r2=1239961&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/build.xml (original)
+++ pig/trunk/test/e2e/pig/build.xml Fri Feb 3 00:59:19 2012
@@ -96,6 +96,12 @@
</not>
</condition>
+ <condition property="hcat.bin" value="">
+ <not>
+ <isset property="hcat.bin"/>
+ </not>
+ </condition>
+
<!-- Build the UDFs -->
<target name="pig-jar-available">
<available property="pig.jar.available" file="${pig.jar}"/>
@@ -231,7 +237,7 @@
<env key="PH_ROOT" value="."/>
<env key="PH_PIG" value="${pig.dir}"/>
<env key="PH_OLDPIG" value="${harness.old.pig}"/>
- <env key="PH_CLUSTER_CONF" value="${harness.cluster.conf}"/>
+ <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="HARNESS_CONF" value="${harness.conf.file}"/>
@@ -244,6 +250,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="HCAT_BIN" value="${hcat.bin}"/>
<arg line="${tests.to.run}"/>
<arg value="${test.location}/tests/cmdline.conf"/>
<arg value="${test.location}/tests/multiquery.conf"/>
@@ -279,7 +286,7 @@
<env key="PH_ROOT" value="."/>
<env key="PH_PIG" value="${pig.dir}"/>
<env key="PH_OLDPIG" value="${harness.old.pig}"/>
- <env key="PH_CLUSTER_CONF" value="${harness.cluster.conf}"/>
+ <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="HARNESS_CONF" value="${harness.conf.file}"/>
Modified: pig/trunk/test/e2e/pig/conf/default.conf
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/conf/default.conf?rev=1239961&r1=1239960&r2=1239961&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/conf/default.conf (original)
+++ pig/trunk/test/e2e/pig/conf/default.conf Fri Feb 3 00:59:19 2012
@@ -23,7 +23,7 @@ chomp $me;
# PH_LOCAL Root directory for input and output for local mode tests
# PH_OUT Root directory where output data will be stored (on local disk, not HDFS)
# PH_CLUSTER_BIN Conf directory for cluster being used
-# PH_CLUSTER_CONF Binary executable for cluster being used
+# HADOOP_CONF_DIR Binary executable for cluster being used
# PH_PIG Root directory for Pig version being used
$cfg = {
@@ -44,11 +44,12 @@ $cfg = {
, 'jythonjar' => "$ENV{PH_JYTHON_JAR}"
#PIG
- , 'testconfigpath' => "$ENV{PH_CLUSTER_CONF}"
+ , 'testconfigpath' => "$ENV{HADOOP_CONF_DIR}"
, 'funcjarPath' => "$ENV{PH_ROOT}/lib/java"
, 'paramPath' => "$ENV{PH_ROOT}/paramfiles"
, 'pigpath' => "$ENV{PH_PIG}"
, 'oldpigpath' => "$ENV{PH_OLDPIG}"
+ , 'hcatbin' => "$ENV{HCAT_BIN}"
, 'exectype' => 'mapred'
#HADOOP
Modified: pig/trunk/test/e2e/pig/conf/existing_deployer.conf
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/conf/existing_deployer.conf?rev=1239961&r1=1239960&r2=1239961&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/conf/existing_deployer.conf (original)
+++ pig/trunk/test/e2e/pig/conf/existing_deployer.conf Fri Feb 3 00:59:19 2012
@@ -25,7 +25,7 @@ $cfg = {
'deployer' => 'ExistingClusterDeployer',
# hadoop values
- 'hadoopconfdir' => $ENV{'PH_CLUSTER_CONF'},
+ 'hadoopconfdir' => $ENV{'HADOOP_CONF_DIR'},
'hadoopbin' => $ENV{'PH_CLUSTER_BIN'},
# db values
Modified: pig/trunk/test/e2e/pig/drivers/TestDriverPig.pm
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/drivers/TestDriverPig.pm?rev=1239961&r1=1239960&r2=1239961&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/drivers/TestDriverPig.pm (original)
+++ pig/trunk/test/e2e/pig/drivers/TestDriverPig.pm Fri Feb 3 00:59:19 2012
@@ -92,6 +92,11 @@ sub replaceParameters
$cmd =~ s/:REMOTECLUSTER:/$testCmd->{'remoteNotSecureCluster'}/g;
}
+ if ( defined($testCmd->{'hcatbin'}) && $testCmd->{'hcatbin'} ne "" && defined($testCmd->{'java_params'})) {
+ foreach my $param (@{$testCmd->{'java_params'}}) {
+ $param =~ s/:HCATBIN:/$testCmd->{'hcatbin'}/g;
+ }
+ }
return $cmd;
}
Modified: pig/trunk/test/e2e/pig/tests/hcat.conf
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/tests/hcat.conf?rev=1239961&r1=1239960&r2=1239961&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/tests/hcat.conf (original)
+++ pig/trunk/test/e2e/pig/tests/hcat.conf Fri Feb 3 00:59:19 2012
@@ -32,6 +32,7 @@ $cfg = {
'tests' => [
{
'num' => 1,
+ 'java_params' => ['-Dhcat.bin=:HCATBIN:'],
'pig' => q\sql drop table if exists pig_hcat_ddl_1;
sql create table pig_hcat_ddl_1(name string,
age int,
@@ -41,6 +42,7 @@ stored as textfile;\,
},
{
'num' => 2,
+ 'java_params' => ['-Dhcat.bin=:HCATBIN:'],
'pig' => q\a = load ':INPATH:/singlefile/studenttab10k' as (name, age, gpa);
sql drop table if exists pig_hcat_ddl_1;
sql create table pig_hcat_ddl_1(name string,