diff --git itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java index 275e3d7..4b32076 100644 --- itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java +++ itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java @@ -231,10 +231,6 @@ private String getHadoopMainVersion(String input) { 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 void initConf() throws Exception { (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() {