diff --git cli/src/test/org/apache/hadoop/hive/cli/TestRCFileCat.java cli/src/test/org/apache/hadoop/hive/cli/TestRCFileCat.java index 7ee02e8..33b2428 100644 --- cli/src/test/org/apache/hadoop/hive/cli/TestRCFileCat.java +++ cli/src/test/org/apache/hadoop/hive/cli/TestRCFileCat.java @@ -25,6 +25,7 @@ import java.io.File; import java.io.IOException; import java.io.PrintStream; +import java.net.URI; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; @@ -89,19 +90,19 @@ public void testRCFileCat() throws Exception { try { - String[] params = {"--verbose","file://" + template.getAbsolutePath() }; + String[] params = {"--verbose","file://" + template.toURI().getPath() }; assertEquals(0, fileCat.run(params)); assertTrue(dataOut.toString().contains("123\t456\t789\t1000\t5.3\thive and hadoop\t\tNULL")); assertTrue(dataOut.toString().contains("100\t200\t123\t1000\t5.3\thive and hadoop\t\tNULL")); assertTrue(dataOut.toString().contains("200\t400\t678\t1000\t4.8\thive and hadoop\t\tTEST")); dataOut.reset(); - params = new String[] { "--start=-10","--file-sizes","file://" + template.getAbsolutePath() }; + params = new String[] { "--start=-10","--file-sizes", "file://" + template.toURI().getPath() }; assertEquals(0, fileCat.run(params)); assertTrue(dataOut.toString().contains("File size (uncompressed): 105. File size (compressed): 134. Number of rows: 3.")); dataOut.reset(); - params = new String[] {"--start=0", "--column-sizes","file://" + template.getAbsolutePath() }; + params = new String[] {"--start=0", "--column-sizes","file://" + template.toURI().getPath() }; assertEquals(0, fileCat.run(params)); assertTrue(dataOut.toString().contains("0\t9\t17")); assertTrue(dataOut.toString().contains("1\t9\t17")); @@ -112,7 +113,8 @@ public void testRCFileCat() throws Exception { dataOut.reset(); - params = new String[] {"--start=0", "--column-sizes-pretty","file://" + template.getAbsolutePath() }; + params = new String[] {"--start=0", "--column-sizes-pretty", + "file://" + template.toURI().getPath() }; assertEquals(0, fileCat.run(params)); assertTrue(dataOut.toString().contains("Column 0: Uncompressed size: 9 Compressed size: 17")); assertTrue(dataOut.toString().contains("Column 1: Uncompressed size: 9 Compressed size: 17")); @@ -127,7 +129,8 @@ public void testRCFileCat() throws Exception { "[--column-sizes | --column-sizes-pretty] [--file-sizes] fileName")); dataErr.reset(); - params = new String[] { "--fakeParameter","file://" + template.getAbsolutePath()}; + params = new String[] { "--fakeParameter", + "file://" + template.toURI().getPath()}; assertEquals(-1, fileCat.run(params)); assertTrue(dataErr.toString().contains("RCFileCat [--start=start_offet] [--length=len] [--verbose] " + "[--column-sizes | --column-sizes-pretty] [--file-sizes] fileName")); diff --git hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestStreaming.java hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestStreaming.java index ec99728..6d332be 100644 --- hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestStreaming.java +++ hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestStreaming.java @@ -731,7 +731,7 @@ public void createDbAndTable(IMetaStoreClient client, String databaseName, throws Exception { Database db = new Database(); db.setName(databaseName); - String dbLocation = "raw://" + dbFolder.newFolder(databaseName + ".db").getCanonicalPath(); + String dbLocation = "raw://" + dbFolder.newFolder(databaseName + ".db").toURI().getPath(); db.setLocationUri(dbLocation); client.createDatabase(db); diff --git hcatalog/webhcat/java-client/src/test/java/org/apache/hive/hcatalog/api/TestHCatClient.java hcatalog/webhcat/java-client/src/test/java/org/apache/hive/hcatalog/api/TestHCatClient.java index f9f7b04..5ed66ed 100644 --- hcatalog/webhcat/java-client/src/test/java/org/apache/hive/hcatalog/api/TestHCatClient.java +++ hcatalog/webhcat/java-client/src/test/java/org/apache/hive/hcatalog/api/TestHCatClient.java @@ -157,7 +157,7 @@ public void testBasicDDLCommands() throws Exception { assertTrue(testDb.getProperties().size() == 0); String warehouseDir = System .getProperty("test.warehouse.dir", "/user/hive/warehouse"); - String expectedDir = fixPath(warehouseDir).replaceFirst("pfile:///", "pfile:/"); + String expectedDir = warehouseDir.replaceFirst("pfile:///", "pfile:/"); assertEquals(expectedDir + "/" + db + ".db", testDb.getLocation()); ArrayList cols = new ArrayList(); cols.add(new HCatFieldSchema("id", Type.INT, "id comment")); diff --git itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/ql/security/TestStorageBasedMetastoreAuthorizationProviderWithACL.java itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/ql/security/TestStorageBasedMetastoreAuthorizationProviderWithACL.java index a0d1023..ee81385 100644 --- itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/ql/security/TestStorageBasedMetastoreAuthorizationProviderWithACL.java +++ itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/ql/security/TestStorageBasedMetastoreAuthorizationProviderWithACL.java @@ -67,6 +67,10 @@ protected HiveConf createHiveConf() throws Exception { fs.mkdirs(warehouseDir); conf.setVar(HiveConf.ConfVars.METASTOREWAREHOUSE, warehouseDir.toString()); conf.setBoolVar(HiveConf.ConfVars.HIVE_WAREHOUSE_SUBDIR_INHERIT_PERMS, true); + + // Set up scratch directory + Path scratchDir = new Path(new Path(fs.getUri()), "/scratchdir"); + conf.setVar(HiveConf.ConfVars.SCRATCHDIR, scratchDir.toString()); return conf; } diff --git itests/hive-unit/src/main/java/org/apache/hive/jdbc/miniHS2/MiniHS2.java itests/hive-unit/src/main/java/org/apache/hive/jdbc/miniHS2/MiniHS2.java index ffad413..32b971c 100644 --- itests/hive-unit/src/main/java/org/apache/hive/jdbc/miniHS2/MiniHS2.java +++ itests/hive-unit/src/main/java/org/apache/hive/jdbc/miniHS2/MiniHS2.java @@ -176,7 +176,7 @@ private MiniHS2(HiveConf hiveConf, boolean useMiniMR, boolean useMiniKdc, baseDfsDir = new Path(new Path(fs.getUri()), "/base"); } else { fs = FileSystem.getLocal(hiveConf); - baseDfsDir = new Path("file://"+ baseDir.getPath()); + baseDfsDir = new Path("file://"+ baseDir.toURI().getPath()); } if (useMiniKdc) { hiveConf.setVar(ConfVars.HIVE_SERVER2_KERBEROS_PRINCIPAL, serverPrincipal); diff --git itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/FolderPermissionBase.java itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/FolderPermissionBase.java index 7f8ca87..724f03d 100644 --- itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/FolderPermissionBase.java +++ itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/FolderPermissionBase.java @@ -82,11 +82,16 @@ public static void baseSetup() throws Exception { warehouseDir = new Path(baseDfsDir, "warehouse"); fs.mkdirs(warehouseDir); conf.setVar(ConfVars.METASTOREWAREHOUSE, warehouseDir.toString()); - + + // Assuming the tests are run either in C or D drive in Windows OS! dataFileDir = conf.get("test.data.files").replace('\\', '/') - .replace("c:", ""); + .replace("c:", "").replace("C:", "").replace("D:", "").replace("d:", ""); dataFilePath = new Path(dataFileDir, "kv1.txt"); - + + // Set up scratch directory + Path scratchDir = new Path(baseDfsDir, "scratchdir"); + conf.setVar(HiveConf.ConfVars.SCRATCHDIR, scratchDir.toString()); + //set hive conf vars conf.setBoolVar(HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY, false); conf.setBoolVar(HiveConf.ConfVars.HIVE_WAREHOUSE_SUBDIR_INHERIT_PERMS, true); diff --git itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestSSL.java itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestSSL.java index 0058cd3..2bc8d73 100644 --- itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestSSL.java +++ itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestSSL.java @@ -21,6 +21,7 @@ import static org.junit.Assert.fail; import java.io.File; +import java.net.URLEncoder; import java.sql.Connection; import java.sql.DriverManager; import java.sql.ResultSet; @@ -55,8 +56,8 @@ private Connection hs2Conn = null; private String dataFileDir = conf.get("test.data.files"); private Map confOverlay; - private final String SSL_CONN_PARAMS = ";ssl=true;sslTrustStore=" + dataFileDir + File.separator + - TRUST_STORE_NAME + ";trustStorePassword=" + KEY_STORE_PASSWORD; + private final String SSL_CONN_PARAMS = ";ssl=true;sslTrustStore=" + URLEncoder.encode(dataFileDir + File.separator + + TRUST_STORE_NAME) + ";trustStorePassword=" + KEY_STORE_PASSWORD; @BeforeClass public static void beforeTest() throws Exception { 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 a035ff1..ccaec46 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 @@ -305,7 +305,7 @@ public QTestUtil(String outDir, String logDir, MiniClusterType clusterType, this.outDir = outDir; this.logDir = logDir; if (confDir != null && !confDir.isEmpty()) { - HiveConf.setHiveSiteLocation(new URL("file://"+confDir+"/hive-site.xml")); + HiveConf.setHiveSiteLocation(new URL("file://"+ new File(confDir).toURI().getPath() + "/hive-site.xml")); System.out.println("Setting hive-site: "+HiveConf.getHiveSiteLocation()); } conf = new HiveConf(Driver.class);