Skip to content

fix: Use thread context classloader for Iceberg class loading in CometScanRule #4609

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

Merged
mbutrovich merged 2 commits into from
Jun 9, 2026
+8 −6
Merged

fix: Use thread context classloader for Iceberg class loading in CometScanRule #4609

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfede3e
Use thread context classloader to load Iceberg class in CometScanRule
chern Jun 5, 2026
364d2f7
Merge branch 'main' into classloader-fix
chern Jun 9, 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
14 changes: 8 additions & 6 deletions spark/src/main/scala/org/apache/comet/rules/CometScanRule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,12 +744,14 @@ object CometScanRule extends Logging {
* one iteration for better performance with large tables.
*/
def validateIcebergFileScanTasks(tasks: java.util.List[_]): IcebergTaskValidationResult = {
// scalastyle:off classforname
val contentScanTaskClass = Class.forName(IcebergReflection.ClassNames.CONTENT_SCAN_TASK)
val contentFileClass = Class.forName(IcebergReflection.ClassNames.CONTENT_FILE)
val fileScanTaskClass = Class.forName(IcebergReflection.ClassNames.FILE_SCAN_TASK)
val unboundPredicateClass = Class.forName(IcebergReflection.ClassNames.UNBOUND_PREDICATE)
// scalastyle:on classforname
val contentScanTaskClass =
IcebergReflection.loadClass(IcebergReflection.ClassNames.CONTENT_SCAN_TASK)
val contentFileClass =
IcebergReflection.loadClass(IcebergReflection.ClassNames.CONTENT_FILE)
val fileScanTaskClass =
IcebergReflection.loadClass(IcebergReflection.ClassNames.FILE_SCAN_TASK)
val unboundPredicateClass =
IcebergReflection.loadClass(IcebergReflection.ClassNames.UNBOUND_PREDICATE)

// Cache all method lookups outside the loop
val fileMethod = contentScanTaskClass.getMethod("file")
Expand Down