Skip to content
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

Jump to bottom

Fix regression from 21.12 where udfs defined in repl no longer worked #5030

Merged
merged 4 commits into from
Mar 25, 2022
Merged

Fix regression from 21.12 where udfs defined in repl no longer worked #5030

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d6fb013
Fix regression from 21.12 where udfs defined in repl no longer worked
abellina Mar 23, 2022
9d46c92
Update copyrights
abellina Mar 23, 2022
1020f54
Add a comment explaining the use of Class.forName
abellina Mar 25, 2022
514c7a2
Update udf-compiler/src/main/scala/com/nvidia/spark/udf/LambdaReflect…
abellina Mar 25, 2022
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
15 changes: 12 additions & 3 deletions udf-compiler/src/main/scala/com/nvidia/spark/udf/LambdaReflection.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2021, NVIDIA CORPORATION.
* Copyright (c) 2019-2022, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -18,7 +18,6 @@ package com.nvidia.spark.udf

import java.lang.invoke.SerializedLambda

import com.nvidia.spark.rapids.ShimLoader
import javassist.{ClassClassPath, ClassPool, CtBehavior, CtClass, CtField, CtMethod}
import javassist.bytecode.{CodeIterator, ConstPool, Descriptor}

Expand Down Expand Up @@ -152,7 +151,17 @@ object LambdaReflection {
}

def getClass(name: String): Class[_] = {
ShimLoader.loadClass(name)
// Don't use ShimLoader.loadClass because in the REPL use case the classes
// compiled by REPL are accessible via the thread's context classloader,
// but not by the parent classloader detected by the plugin.
//
// This code is executed after the Plugin and ShimLoader has already been initialized.
// REPL classes are able to interact with the Plugin classes because the REPL
// Thread context classloader is a descendant of the Plugin classloader.

// scalastyle:off classforname
Class.forName(name, true, Thread.currentThread().getContextClassLoader)
abellina marked this conversation as resolved.
Show resolved Hide resolved
// scalastyle:on classforname
}

def parseTypeSig(sig: String): Option[DataType] = {
Expand Down