svn commit: r1671361 - in /pig/trunk: CHANGES.txt src/org/apache/pig/backend/hadoop/executionengine/tez/util/MRToTezHelper.java test/org/apache/pig/tez/TestTezLauncher.java

[daijy]

Author: daijy
Date: Sun Apr  5 00:55:36 2015
New Revision: 1671361

URL: http://svn.apache.org/r1671361
Log:
PIG-4488: Pig on tez mask tez.queue.name

Modified:
    pig/trunk/CHANGES.txt
    
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/util/MRToTezHelper.java
    pig/trunk/test/org/apache/pig/tez/TestTezLauncher.java

Modified: pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1671361&r1=1671360&r2=1671361&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Sun Apr  5 00:55:36 2015
@@ -58,6 +58,8 @@ PIG-4333: Split BigData tests into multi
  
 BUG FIXES
 
+PIG-4488: Pig on tez mask tez.queue.name (daijy)
+
 PIG-4497: [Pig on Tez] NPE for null scalar (rohini)
 
 PIG-4493: Pig on Tez gives wrong results if Union is followed by Split (rohini)

Modified: 
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/util/MRToTezHelper.java
URL: 
http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/util/MRToTezHelper.java?rev=1671361&r1=1671360&r2=1671361&view=diff
==============================================================================
--- 
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/util/MRToTezHelper.java
 (original)
+++ 
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/util/MRToTezHelper.java
 Sun Apr  5 00:55:36 2015
@@ -123,7 +123,7 @@ public class MRToTezHelper {
 
         for (Entry<String, String> entry : mrParamToDAGParamMap.entrySet()) {
             if (dagAMConf.get(entry.getKey()) != null) {
-                dagAMConf.set(entry.getValue(), dagAMConf.get(entry.getKey()));
+                dagAMConf.setIfUnset(entry.getValue(), 
dagAMConf.get(entry.getKey()));
                 dagAMConf.unset(entry.getKey());
                 if (LOG.isDebugEnabled()) {
                     LOG.debug("MR->DAG Translating MR key: " + entry.getKey()

Modified: pig/trunk/test/org/apache/pig/tez/TestTezLauncher.java
URL: 
http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/tez/TestTezLauncher.java?rev=1671361&r1=1671360&r2=1671361&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/tez/TestTezLauncher.java (original)
+++ pig/trunk/test/org/apache/pig/tez/TestTezLauncher.java Sun Apr  5 00:55:36 
2015
@@ -20,10 +20,12 @@ package org.apache.pig.tez;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+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;
 import org.apache.pig.backend.hadoop.executionengine.tez.TezLauncher;
+import org.apache.pig.backend.hadoop.executionengine.tez.util.MRToTezHelper;
 import org.apache.pig.impl.PigContext;
 import org.apache.pig.test.MiniGenericCluster;
 import org.apache.pig.test.Util;
@@ -105,5 +107,14 @@ public class TestTezLauncher {
         assertEquals(1, pigStats.getOutputStats().size());
         assertEquals(OUTPUT_FILE, pigStats.getOutputStats().get(0).getName());
     }
+
+    @Test
+    public void testQueueName() throws Exception {
+        Configuration conf = new Configuration();
+        conf.set("tez.queue.name", "special");
+        conf = MRToTezHelper.getDAGAMConfFromMRConf(conf);
+        assertEquals(conf.get("tez.queue.name"), "special");
+        
+    }
 }