Skip to content

Commit 2be8cdf

Browse files
committed
Revert "[SPARK-15745][SQL] Use classloader's getResource() for reading resource files in HiveTests" as it was causing Jenkins failures.
This reverts commit f7288e1.
1 parent 3d13c6c commit 2be8cdf

1 file changed

Lines changed: 12 additions & 1 deletion

File tree

sql/hive/src/main/scala/org/apache/spark/sql/hive/test/TestHive.scala

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,19 @@ private[hive] class TestHiveSparkSession(
179179
hiveFilesTemp.mkdir()
180180
ShutdownHookManager.registerShutdownDeleteDir(hiveFilesTemp)
181181

182+
val inRepoTests = if (System.getProperty("user.dir").endsWith("sql" + File.separator + "hive")) {
183+
new File("src" + File.separator + "test" + File.separator + "resources" + File.separator)
184+
} else {
185+
new File("sql" + File.separator + "hive" + File.separator + "src" + File.separator + "test" +
186+
File.separator + "resources")
187+
}
188+
182189
def getHiveFile(path: String): File = {
183-
new File(Thread.currentThread().getContextClassLoader.getResource(path).getFile)
190+
val stripped = path.replaceAll("""\.\.\/""", "").replace('/', File.separatorChar)
191+
hiveDevHome
192+
.map(new File(_, stripped))
193+
.filter(_.exists)
194+
.getOrElse(new File(inRepoTests, stripped))
184195
}
185196

186197
val describedTable = "DESCRIBE (\\w+)".r

0 commit comments

Comments
 (0)