From 65fa0f6b39a9558c290d3ab9e6a223e65515ea8a Mon Sep 17 00:00:00 2001 From: Sameer Agarwal Date: Thu, 2 Jun 2016 17:29:43 -0700 Subject: [PATCH 1/2] Use classloader's getResource() function for reading resource files in HiveTests --- .../scala/org/apache/spark/sql/hive/test/TestHive.scala | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/test/TestHive.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/test/TestHive.scala index 81964db5477c..8ee2715fa723 100644 --- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/test/TestHive.scala +++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/test/TestHive.scala @@ -179,12 +179,7 @@ private[hive] class TestHiveSparkSession( hiveFilesTemp.mkdir() ShutdownHookManager.registerShutdownDeleteDir(hiveFilesTemp) - val inRepoTests = if (System.getProperty("user.dir").endsWith("sql" + File.separator + "hive")) { - new File("src" + File.separator + "test" + File.separator + "resources" + File.separator) - } else { - new File("sql" + File.separator + "hive" + File.separator + "src" + File.separator + "test" + - File.separator + "resources") - } + val inRepoTests = new File(Thread.currentThread().getContextClassLoader.getResource(".").getFile) def getHiveFile(path: String): File = { val stripped = path.replaceAll("""\.\.\/""", "").replace('/', File.separatorChar) From 165ed519b9d9910adb4bce6ed9a36b5456c8f02d Mon Sep 17 00:00:00 2001 From: Sameer Agarwal Date: Thu, 2 Jun 2016 22:11:33 -0700 Subject: [PATCH 2/2] change getHiveFile --- .../scala/org/apache/spark/sql/hive/test/TestHive.scala | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/test/TestHive.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/test/TestHive.scala index 8ee2715fa723..1d1d5e3f7bd6 100644 --- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/test/TestHive.scala +++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/test/TestHive.scala @@ -179,14 +179,8 @@ private[hive] class TestHiveSparkSession( hiveFilesTemp.mkdir() ShutdownHookManager.registerShutdownDeleteDir(hiveFilesTemp) - val inRepoTests = new File(Thread.currentThread().getContextClassLoader.getResource(".").getFile) - def getHiveFile(path: String): File = { - val stripped = path.replaceAll("""\.\.\/""", "").replace('/', File.separatorChar) - hiveDevHome - .map(new File(_, stripped)) - .filter(_.exists) - .getOrElse(new File(inRepoTests, stripped)) + new File(Thread.currentThread().getContextClassLoader.getResource(path).getFile) } val describedTable = "DESCRIBE (\\w+)".r