Author: hashutosh
Date: Fri Dec 20 16:50:21 2013
New Revision: 1552733
URL: http://svn.apache.org/r1552733
Log:
HIVE-6064 : Wincompat: windows path substitutions overridden by
MiniMrShim.getConfiguration() on hadoop-2 (Jason Dere via Ashutosh Chauhan)
Modified:
hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
Modified:
hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
URL:
http://svn.apache.org/viewvc/hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java?rev=1552733&r1=1552732&r2=1552733&view=diff
==============================================================================
---
hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
(original)
+++
hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
Fri Dec 20 16:50:21 2013
@@ -231,10 +231,6 @@ public class QTestUtil {
public void initConf() throws Exception {
- if (Shell.WINDOWS) {
- convertPathsFromWindowsToHdfs();
- }
-
String vectorizationEnabled =
System.getProperty("test.vectorization.enabled");
if(vectorizationEnabled != null &&
vectorizationEnabled.equalsIgnoreCase("true")) {
conf.setBoolVar(ConfVars.HIVE_VECTORIZATION_ENABLED, true);
@@ -258,6 +254,12 @@ public class QTestUtil {
(new Path(dfsUriString,
"/build/ql/test/data/warehouse/")).toString());
}
+
+ // Windows paths should be converted after MiniMrShim.setupConfiguration()
+ // since setupConfiguration may overwrite configuration values.
+ if (Shell.WINDOWS) {
+ convertPathsFromWindowsToHdfs();
+ }
}
private void convertPathsFromWindowsToHdfs() {
