Modified: pig/branches/spark/test/org/apache/pig/tez/TestTezLauncher.java URL: http://svn.apache.org/viewvc/pig/branches/spark/test/org/apache/pig/tez/TestTezLauncher.java?rev=1784224&r1=1784223&r2=1784224&view=diff ============================================================================== --- pig/branches/spark/test/org/apache/pig/tez/TestTezLauncher.java (original) +++ pig/branches/spark/test/org/apache/pig/tez/TestTezLauncher.java Fri Feb 24 03:34:37 2017 @@ -23,6 +23,7 @@ import static org.junit.Assert.assertTru import java.util.Arrays; import java.util.Iterator; +import org.apache.hadoop.conf.Configuration; import org.apache.pig.PigServer; import org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhysicalPlan; import org.apache.pig.backend.hadoop.executionengine.tez.TezExecType; @@ -34,7 +35,6 @@ import org.apache.pig.impl.PigContext; import org.apache.pig.test.MiniGenericCluster; import org.apache.pig.test.Util; import org.apache.pig.tools.pigstats.PigStats; -import org.apache.tez.dag.api.TezConfiguration; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -124,11 +124,11 @@ public class TestTezLauncher { @Test public void testQueueName() throws Exception { - TezConfiguration conf = new TezConfiguration(); + Configuration conf = new Configuration(); conf.set("tez.queue.name", "special"); - MRToTezHelper.translateMRSettingsForTezAM(conf); + conf = MRToTezHelper.getDAGAMConfFromMRConf(conf); assertEquals(conf.get("tez.queue.name"), "special"); - + } }
Modified: pig/branches/spark/test/perf/pigmix/bin/generate_data.sh URL: http://svn.apache.org/viewvc/pig/branches/spark/test/perf/pigmix/bin/generate_data.sh?rev=1784224&r1=1784223&r2=1784224&view=diff ============================================================================== --- pig/branches/spark/test/perf/pigmix/bin/generate_data.sh (original) +++ pig/branches/spark/test/perf/pigmix/bin/generate_data.sh Fri Feb 24 03:34:37 2017 @@ -25,11 +25,20 @@ fi source $PIGMIX_HOME/conf/config.sh -echo "Going to run $HADOOP_HOME/bin/hadoop fs -mkdir -p $hdfsroot" -$HADOOP_HOME/bin/hadoop fs -mkdir -p $hdfsroot +if [ $HADOOP_VERSION == "23" ]; then + echo "Going to run $HADOOP_HOME/bin/hadoop fs -mkdir -p $hdfsroot" + $HADOOP_HOME/bin/hadoop fs -mkdir -p $hdfsroot +else + echo "Going to run $HADOOP_HOME/bin/hadoop fs -mkdir $hdfsroot" + $HADOOP_HOME/bin/hadoop fs -mkdir $hdfsroot +fi shopt -s extglob -pigjar=`echo $PIG_HOME/pig*-h2.jar` +if [ $HADOOP_VERSION == "23" ]; then + pigjar=`echo $PIG_HOME/pig*-h2.jar` +else + pigjar=`echo $PIG_HOME/pig*-h1.jar` +fi pigmixjar=$PIGMIX_HOME/pigmix.jar Modified: pig/branches/spark/test/perf/pigmix/build.xml URL: http://svn.apache.org/viewvc/pig/branches/spark/test/perf/pigmix/build.xml?rev=1784224&r1=1784223&r2=1784224&view=diff ============================================================================== --- pig/branches/spark/test/perf/pigmix/build.xml (original) +++ pig/branches/spark/test/perf/pigmix/build.xml Fri Feb 24 03:34:37 2017 @@ -34,8 +34,6 @@ </fileset> </path> - <property name="hadoopversion" value="2" /> - <property name="java.dir" value="${basedir}/src/java"/> <property name="pigmix.build.dir" value="${basedir}/build"/> <property name="pigmix.jar" value="${basedir}/pigmix.jar"/>