[SPARK-31312][SQL] Cache Class instance for the UDF instance in HiveFunctionWrapper #28079
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ntext classloader after transformed
HeartSaVioR
commented
Mar 31, 2020
| } | ||
| } | ||
|
|
||
| test("SPARK-26560 Spark should be able to run Hive UDF using jar regardless of " + |
Contributor
Author
There was a problem hiding this comment.
This test is moved to HiveUDFDynamicLoadSuite - now it's being tested with 5 available Hive UDF types.
HeartSaVioR
commented
Mar 31, 2020
| clazz = Utils.getContextOrSparkClassLoader.loadClass(functionClassName) | ||
| .asInstanceOf[Class[_ <: AnyRef]] | ||
| } | ||
| val func = clazz.getConstructor().newInstance().asInstanceOf[UDFType] |
Contributor
Author
There was a problem hiding this comment.
If we add clazz = null below this line, the new UT (SPARK-31312) fails with UDF type (only one of 5 fails, because other cases this cases instance instead).
Contributor
Author
|
cc. @cloud-fan @maropu |
cloud-fan
reviewed
Mar 31, 2020
| val jarUrl = getHiveUDFTestJarUrl | ||
| test("SPARK-26560 Spark should be able to run Hive UDF using jar regardless of " + | ||
| s"current thread context classloader (${udfInfo.identifier}") { | ||
| testHiveUDFUsingJarWithChangingClassloader( |
Contributor
There was a problem hiding this comment.
nit: if the method is only called once, can we inline it?
cloud-fan
reviewed
Mar 31, 2020
|
|
||
| test("SPARK-31312 Transformed Hive UDF using jar expression should not be failed to run " + | ||
| s"regardless of current thread context classloader (${udfInfo.identifier})") { | ||
| testHiveUDFUsingJarWithChangingClassloaderWithCopyUDFExpression( |
cloud-fan
reviewed
Mar 31, 2020
| assert(Thread.currentThread().getContextClassLoader eq | ||
| spark.sqlContext.sharedState.jarClassLoader) | ||
|
|
||
| val udfExpr = fnCreateHiveUDFExpression() |
Contributor
There was a problem hiding this comment.
I think this test should start here. The above test is the same as testHiveUDFUsingJarWithChangingClassloader.
Contributor
Author
|
Thanks for the review comments. I've just consolidated two tests into one, and inlined. Please take a look again. |
|
Test build #120634 has finished for PR 28079 at commit
|
cloud-fan
reviewed
Mar 31, 2020
| ) | ||
|
|
||
| udfTestInfos.foreach { udfInfo => | ||
| val jarUrl = getHiveUDFTestJarUrl |
Contributor
There was a problem hiding this comment.
We can inline it as well
cloud-fan
approved these changes
Mar 31, 2020
|
Test build #120641 has finished for PR 28079 at commit
|
|
Test build #120642 has finished for PR 28079 at commit
|
cloud-fan
pushed a commit
that referenced
this pull request
Mar 31, 2020
…unctionWrapper ### What changes were proposed in this pull request? This patch proposes to cache Class instance for the UDF instance in HiveFunctionWrapper to fix the case where Hive simple UDF is somehow transformed (expression is copied) and evaluated later with another classloader (for the case current thread context classloader is somehow changed). In this case, Spark throws CNFE as of now. It's only occurred for Hive simple UDF, as HiveFunctionWrapper caches the UDF instance whereas it doesn't do for `UDF` type. The comment says Spark has to create instance every time for UDF, so we cannot simply do the same. This patch caches Class instance instead, and switch current thread context classloader to which loads the Class instance. This patch extends the test boundary as well. We only tested with GenericUDTF for SPARK-26560, and this patch actually requires only UDF. But to avoid regression for other types as well, this patch adds all available types (UDF, GenericUDF, AbstractGenericUDAFResolver, UDAF, GenericUDTF) into the boundary of tests. Credit to cloud-fan as he discovered the problem and proposed the solution. ### Why are the changes needed? Above section describes why it's a bug and how it's fixed. ### Does this PR introduce any user-facing change? No. ### How was this patch tested? New UTs added. Closes #28079 from HeartSaVioR/SPARK-31312. Authored-by: Jungtaek Lim (HeartSaVioR) <[email protected]> Signed-off-by: Wenchen Fan <[email protected]> (cherry picked from commit 2a6aa8e) Signed-off-by: Wenchen Fan <[email protected]>
Contributor
|
thanks, merging to master/3.0! |
Contributor
|
@HeartSaVioR can you send a backport PR for 2.4? thanks! |
HeartSaVioR
added a commit
to HeartSaVioR/spark
that referenced
this pull request
Mar 31, 2020
…unctionWrapper This patch proposes to cache Class instance for the UDF instance in HiveFunctionWrapper to fix the case where Hive simple UDF is somehow transformed (expression is copied) and evaluated later with another classloader (for the case current thread context classloader is somehow changed). In this case, Spark throws CNFE as of now. It's only occurred for Hive simple UDF, as HiveFunctionWrapper caches the UDF instance whereas it doesn't do for `UDF` type. The comment says Spark has to create instance every time for UDF, so we cannot simply do the same. This patch caches Class instance instead, and switch current thread context classloader to which loads the Class instance. This patch extends the test boundary as well. We only tested with GenericUDTF for SPARK-26560, and this patch actually requires only UDF. But to avoid regression for other types as well, this patch adds all available types (UDF, GenericUDF, AbstractGenericUDAFResolver, UDAF, GenericUDTF) into the boundary of tests. Credit to cloud-fan as he discovered the problem and proposed the solution. Above section describes why it's a bug and how it's fixed. No. New UTs added. Closes apache#28079 from HeartSaVioR/SPARK-31312. Authored-by: Jungtaek Lim (HeartSaVioR) <[email protected]> Signed-off-by: Wenchen Fan <[email protected]>
Contributor
Author
|
Thanks for the quick review and merge! #28086 is for branch-2.4. |
Member
|
late LGTM, thanks for the work, @HeartSaVioR ! |
Member
|
(very late) LGTM! |
sjincho
pushed a commit
to sjincho/spark
that referenced
this pull request
Apr 15, 2020
…unctionWrapper ### What changes were proposed in this pull request? This patch proposes to cache Class instance for the UDF instance in HiveFunctionWrapper to fix the case where Hive simple UDF is somehow transformed (expression is copied) and evaluated later with another classloader (for the case current thread context classloader is somehow changed). In this case, Spark throws CNFE as of now. It's only occurred for Hive simple UDF, as HiveFunctionWrapper caches the UDF instance whereas it doesn't do for `UDF` type. The comment says Spark has to create instance every time for UDF, so we cannot simply do the same. This patch caches Class instance instead, and switch current thread context classloader to which loads the Class instance. This patch extends the test boundary as well. We only tested with GenericUDTF for SPARK-26560, and this patch actually requires only UDF. But to avoid regression for other types as well, this patch adds all available types (UDF, GenericUDF, AbstractGenericUDAFResolver, UDAF, GenericUDTF) into the boundary of tests. Credit to cloud-fan as he discovered the problem and proposed the solution. ### Why are the changes needed? Above section describes why it's a bug and how it's fixed. ### Does this PR introduce any user-facing change? No. ### How was this patch tested? New UTs added. Closes apache#28079 from HeartSaVioR/SPARK-31312. Authored-by: Jungtaek Lim (HeartSaVioR) <[email protected]> Signed-off-by: Wenchen Fan <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
This patch proposes to cache Class instance for the UDF instance in HiveFunctionWrapper to fix the case where Hive simple UDF is somehow transformed (expression is copied) and evaluated later with another classloader (for the case current thread context classloader is somehow changed). In this case, Spark throws CNFE as of now.
It's only occurred for Hive simple UDF, as HiveFunctionWrapper caches the UDF instance whereas it doesn't do for
UDFtype. The comment says Spark has to create instance every time for UDF, so we cannot simply do the same. This patch caches Class instance instead, and switch current thread context classloader to which loads the Class instance.This patch extends the test boundary as well. We only tested with GenericUDTF for SPARK-26560, and this patch actually requires only UDF. But to avoid regression for other types as well, this patch adds all available types (UDF, GenericUDF, AbstractGenericUDAFResolver, UDAF, GenericUDTF) into the boundary of tests.
Credit to @cloud-fan as he discovered the problem and proposed the solution.
Why are the changes needed?
Above section describes why it's a bug and how it's fixed.
Does this PR introduce any user-facing change?
No.
How was this patch tested?
New UTs added.