svn commit: r1551297 - in /hive/trunk/hcatalog: src/test/e2e/templeton/tests/jobsubmission.conf webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/JarDelegator.java

[thejas]

Author: thejas
Date: Mon Dec 16 18:22:04 2013
New Revision: 1551297

URL: http://svn.apache.org/r1551297
Log:
HIVE-5975 : [WebHCat] templeton mapreduce job failed if provide "define" 
parameters (Shanyu Zhao via Thejas Nair)

Modified:
    hive/trunk/hcatalog/src/test/e2e/templeton/tests/jobsubmission.conf
    
hive/trunk/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/JarDelegator.java

Modified: hive/trunk/hcatalog/src/test/e2e/templeton/tests/jobsubmission.conf
URL: 
http://svn.apache.org/viewvc/hive/trunk/hcatalog/src/test/e2e/templeton/tests/jobsubmission.conf?rev=1551297&r1=1551296&r2=1551297&view=diff
==============================================================================
--- hive/trunk/hcatalog/src/test/e2e/templeton/tests/jobsubmission.conf 
(original)
+++ hive/trunk/hcatalog/src/test/e2e/templeton/tests/jobsubmission.conf Mon Dec 
16 18:22:04 2013
@@ -67,7 +67,7 @@ $cfg = 
      'method' => 'POST',
      'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/jar',
      'post_options' => ['user.name=:UNAME:','arg=:INPDIR_HDFS:/nums.txt', 
'arg= :OUTDIR:/wc.txt', 
-                        'jar=:INPDIR_HDFS:/hexamples.jar', 'class=wordcount', 
],
+                        'jar=:INPDIR_HDFS:/hexamples.jar', 'class=wordcount', 
'define=MYPROP1=VALUE1', 'define=MYPROP2=VALUE2',],
      'json_field_substr_match' => { 'id' => '\d+'},
                                 #results
      'status_code' => 200,

Modified: 
hive/trunk/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/JarDelegator.java
URL: 
http://svn.apache.org/viewvc/hive/trunk/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/JarDelegator.java?rev=1551297&r1=1551296&r2=1551297&view=diff
==============================================================================
--- 
hive/trunk/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/JarDelegator.java
 (original)
+++ 
hive/trunk/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/JarDelegator.java
 Mon Dec 16 18:22:04 2013
@@ -94,12 +94,13 @@ public class JarDelegator extends Launch
         args.add("-files");
         args.add(TempletonUtils.quoteForWindows(filesListAsString));
       }
-      //the token file location comes after mainClass, as a -Dprop=val
-      args.add("-D" + TempletonControllerJob.TOKEN_FILE_ARG_PLACEHOLDER);
+      //the token file location comes after mainClass, as a -D prop=val
+      args.add("-D");
+      args.add(TempletonControllerJob.TOKEN_FILE_ARG_PLACEHOLDER);
 
       for (String d : defines) {
         args.add("-D");
-        TempletonUtils.quoteForWindows(d);
+        args.add(TempletonUtils.quoteForWindows(d));
       }
       for (String arg : jarArgs) {
         args.add(TempletonUtils.quoteForWindows(arg));