diff --git hcatalog/webhcat/svr/src/main/config/webhcat-default.xml hcatalog/webhcat/svr/src/main/config/webhcat-default.xml index c9af3b6..f5d3907 100644 --- hcatalog/webhcat/svr/src/main/config/webhcat-default.xml +++ hcatalog/webhcat/svr/src/main/config/webhcat-default.xml @@ -137,7 +137,8 @@ templeton.hive.properties hive.metastore.uris=thrift://localhost:9933,hive.metastore.sasl.enabled=false - Properties to set when running hive. + Properties to set when running hive. This is expected to be a comma-separated prop=value list. + If some value is itself a comma-separated list the escape character is '\' diff --git hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/AppConfig.java hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/AppConfig.java index ee10710..fd8a0d6 100644 --- hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/AppConfig.java +++ hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/AppConfig.java @@ -21,6 +21,8 @@ import java.io.File; import java.net.URL; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.Iterator; @@ -31,8 +33,10 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.VersionInfo; import org.apache.hive.hcatalog.templeton.tool.JobState; +import org.apache.hive.hcatalog.templeton.tool.TempletonUtils; import org.apache.hive.hcatalog.templeton.tool.ZooKeeperCleanup; import org.apache.hive.hcatalog.templeton.tool.ZooKeeperStorage; @@ -104,6 +108,11 @@ * see webhcat-default.xml */ public static final String HCAT_HOME_PATH = "templeton.hcat.home"; + /** + * is a comma separated list of name=value pairs; + * In case some value is itself a comma-separated list, the comma needs to + * be escaped with {@link org.apache.hadoop.util.StringUtils#ESCAPE_CHAR} + */ public static final String HIVE_PROPS_NAME = "templeton.hive.properties"; public static final String LIB_JARS_NAME = "templeton.libjars"; public static final String PIG_ARCHIVE_NAME = "templeton.pig.archive"; @@ -247,8 +256,18 @@ private boolean loadOneClasspathConfig(String fname) { public String controllerMRChildOpts() { return get(TEMPLETON_CONTROLLER_MR_CHILD_OPTS); } - - + /** + * @see #HIVE_PROPS_NAME + */ + public Collection hiveProps() { + String[] props= StringUtils.split(get(HIVE_PROPS_NAME)); + //since raw data was (possibly) escaped to make split work, + //now need to remove escape chars so they don't interfere with downstream processing + for(int i = 0; i < props.length; i++) { + props[i] = TempletonUtils.unEscape(props[i]); + } + return Arrays.asList(props); + } public String[] overrideJars() { if (getBoolean(OVERRIDE_JARS_ENABLED, true)) diff --git hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/HiveDelegator.java hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/HiveDelegator.java index 5190c54..23b1c4f 100644 --- hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/HiveDelegator.java +++ hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/HiveDelegator.java @@ -82,7 +82,7 @@ public EnqueueBean run(String user, Map userArgs, args.add("--hiveconf"); args.add(JobSubmissionConstants.TOKEN_FILE_ARG_PLACEHOLDER_TEZ); - for (String prop : appConf.getStrings(AppConfig.HIVE_PROPS_NAME)) { + for (String prop : appConf.hiveProps()) { args.add("--hiveconf"); args.add(TempletonUtils.quoteForWindows(prop)); } diff --git hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/JobSubmissionConstants.java hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/JobSubmissionConstants.java index 1a0aaac..5f6c18c 100644 --- hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/JobSubmissionConstants.java +++ hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/JobSubmissionConstants.java @@ -45,6 +45,7 @@ "__TEZ_CREDENTIALS_OPTION=WEBHCAT_TOKEN_FILE_LOCATION_TEZ__"; /** * constants needed for Pig job submission + * The string values here are what Pig expects to see in it's environment */ public static interface PigConstants { public static final String HIVE_HOME = "HIVE_HOME"; diff --git hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/LaunchMapper.java hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/LaunchMapper.java index 1616306..3c85dd4 100644 --- hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/LaunchMapper.java +++ hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/LaunchMapper.java @@ -29,6 +29,7 @@ import org.apache.hadoop.mapreduce.JobID; import org.apache.hadoop.mapreduce.Mapper; import org.apache.hadoop.util.Shell; +import org.apache.hadoop.util.StringUtils; import org.apache.hive.hcatalog.templeton.BadParam; import org.apache.hive.hcatalog.templeton.LauncherDelegator; @@ -79,8 +80,8 @@ private static void handlePigEnvVars(Configuration conf, Map env } if(conf.get(PigConstants.PIG_OPTS) != null) { StringBuilder pigOpts = new StringBuilder(); - for(String prop : conf.get(PigConstants.PIG_OPTS).split(",")) { - pigOpts.append("-D").append(prop).append(" "); + for(String prop : StringUtils.split(conf.get(PigConstants.PIG_OPTS))) { + pigOpts.append("-D").append(TempletonUtils.unEscape(prop)).append(" "); } env.put(PigConstants.PIG_OPTS, pigOpts.toString()); } diff --git hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TempletonUtils.java hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TempletonUtils.java index 0725976..6f4c847 100644 --- hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TempletonUtils.java +++ hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TempletonUtils.java @@ -36,6 +36,7 @@ import javax.ws.rs.core.UriBuilder; +import org.apache.commons.lang.StringEscapeUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -346,4 +347,8 @@ public static void addCmdForWindows(ArrayList args) { args.add("call"); } } + + public static String unEscape(String input) { + return StringEscapeUtils.unescapeJava(input); + } } diff --git hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/tool/TestTempletonUtils.java hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/tool/TestTempletonUtils.java index 33e9d42..2f5ec76 100644 --- hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/tool/TestTempletonUtils.java +++ hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/tool/TestTempletonUtils.java @@ -290,5 +290,23 @@ public void testConstructingUserHomeDirectory() throws Exception { } catch (URISyntaxException ex) { } } - + + @Test + public void testPropertiesParsing() throws Exception { + String[] props = {"hive.metastore.uris=thrift://localhost:9933\\,thrift://127.0.0.1:9933", + "hive.metastore.sasl.enabled=false", + "hive.some.fake.path=C:\\foo\\bar.txt\\"}; + StringBuilder input = new StringBuilder(); + for(String prop : props) { + if(input.length() > 0) { + input.append(','); + } + input.append(prop); + } + String[] newProps = StringUtils.split(input.toString()); + for(int i = 0; i < newProps.length; i++) { + Assert.assertEquals("Pre/post split values don't match", + TempletonUtils.unEscape(props[i]), TempletonUtils.unEscape(newProps[i])); + } + } }