Skip to content

[SPARK-56353][BUILD][TESTS][FOLLOWUP] Fix resource loading to work when resources are inside JARs #55299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sarutak wants to merge 2 commits into from
+9 −6
Closed

[SPARK-56353][BUILD][TESTS][FOLLOWUP] Fix resource loading to work when resources are inside JARs #55299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1a4a0a
Fix resource loading to work when resources are inside JARs
sarutak Apr 10, 2026
13b788d
Wrap openStream() with Utils.tryWithResource to ensure InputStream is…
sarutak Apr 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions sql/hive/src/test/scala/org/apache/spark/sql/hive/test/TestHiveUdfsJar.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ package org.apache.spark.sql.hive.test
import java.io.File
import java.lang.management.ManagementFactory
import java.nio.charset.StandardCharsets
import java.nio.file.{Files, Paths}

import org.apache.spark.util.{SparkTestUtils, Utils}

Expand Down Expand Up @@ -64,6 +63,8 @@ object TestHiveUdfsJar {
private def readResource(name: String): String = {
val url = Thread.currentThread().getContextClassLoader.getResource(name)
assert(url != null, s"Resource not found: $name")
new String(Files.readAllBytes(Paths.get(url.toURI)), StandardCharsets.UTF_8)
Utils.tryWithResource(url.openStream()) { is =>
new String(is.readAllBytes(), StandardCharsets.UTF_8)
}
}
}
5 changes: 3 additions & 2 deletions sql/hive/src/test/scala/org/apache/spark/sql/hive/test/TestSpark21101Jar.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ package org.apache.spark.sql.hive.test
import java.io.File
import java.lang.management.ManagementFactory
import java.nio.charset.StandardCharsets
import java.nio.file.{Files, Paths}

import org.apache.spark.util.{SparkTestUtils, Utils}

Expand Down Expand Up @@ -52,6 +51,8 @@ object TestSpark21101Jar {
private def readResource(name: String): String = {
val url = Thread.currentThread().getContextClassLoader.getResource(name)
assert(url != null, s"Resource not found: $name")
new String(Files.readAllBytes(Paths.get(url.toURI)), StandardCharsets.UTF_8)
Utils.tryWithResource(url.openStream()) { is =>
new String(is.readAllBytes(), StandardCharsets.UTF_8)
}
}
}
5 changes: 3 additions & 2 deletions sql/hive/src/test/scala/org/apache/spark/sql/hive/test/TestUDTFJar.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ package org.apache.spark.sql.hive.test
import java.io.File
import java.lang.management.ManagementFactory
import java.nio.charset.StandardCharsets
import java.nio.file.{Files, Paths}

import org.apache.spark.TestUtils
import org.apache.spark.util.Utils
Expand All @@ -34,7 +33,9 @@ object TestUDTFJar {
private def loadResource(name: String): String = {
val url = Thread.currentThread().getContextClassLoader.getResource(name)
assert(url != null, s"Resource not found: $name")
new String(Files.readAllBytes(Paths.get(url.toURI)), StandardCharsets.UTF_8)
Utils.tryWithResource(url.openStream()) { is =>
new String(is.readAllBytes(), StandardCharsets.UTF_8)
}
}

private val source = Map(
Expand Down