[SPARK-22508][SQL] Fix 64KB JVM bytecode limit problem with GenerateUnsafeRowJoiner.create() #19737
Conversation
This file contains 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
|
Test build #83801 has finished for PR 19737 at commit
|
cloud-fan
reviewed
Nov 20, 2017
|
|
||
| val functions = mutable.ArrayBuffer.empty[String] | ||
| val args = "java.lang.Object obj1, long offset1, java.lang.Object obj2, long offset2" | ||
| val copyBitsets = splitPlatformCode(copyBitset).zipWithIndex.map { case(body, index) => |
There was a problem hiding this comment.
why can't we use splitExpressions here?
There was a problem hiding this comment.
then create one. The benefit is code reuse and the nested class optimization
There was a problem hiding this comment.
Good idea, I forgot that we can create it. I do not want to reinvent wheels :)
cloud-fan
reviewed
Nov 20, 2017
| @@ -166,6 +214,8 @@ object GenerateUnsafeRowJoiner extends CodeGenerator[(StructType, StructType), U | |||
| | private byte[] buf = new byte[64]; | |||
| | private UnsafeRow out = new UnsafeRow(${schema1.size + schema2.size}); | |||
| | | |||
| | ${functions.mkString("\n")} | |||
There was a problem hiding this comment.
this can be ${ctx.declareAddedFunctions()} if we create a codegen context.
|
Test build #84031 has finished for PR 19737 at commit
|
|
Jenkins, retest this please |
cloud-fan
reviewed
Nov 20, 2017
| s"$putLong(buf, ${offset + i * 8}, $bits);\n" | ||
| } | ||
|
|
||
| val functions = mutable.ArrayBuffer.empty[String] |
cloud-fan
reviewed
Nov 20, 2017
| } | ||
|
|
||
| val functions = mutable.ArrayBuffer.empty[String] | ||
| val args = "java.lang.Object obj1, long offset1, java.lang.Object obj2, long offset2" |
cloud-fan
reviewed
Nov 20, 2017
| @@ -154,7 +164,10 @@ object GenerateUnsafeRowJoiner extends CodeGenerator[(StructType, StructType), U | |||
| |$putLong(buf, $cursor, $getLong(buf, $cursor) + ($shift << 32)); | |||
| """.stripMargin | |||
There was a problem hiding this comment.
nit: s"$putLong(buf, $cursor, $getLong(buf, $cursor) + ($shift << 32));\n"
|
Test build #84037 has finished for PR 19737 at commit
|
gatorsmile
reviewed
Nov 21, 2017
| val args = "java.lang.Object obj1, long offset1, java.lang.Object obj2, long offset2" | ||
| val copyBitsets = ctx.splitExpressions(copyBitset, "copyBitsetFunc", | ||
| ("java.lang.Object", "obj1") :: ("long", "offset1") :: | ||
| ("java.lang.Object", "obj2") :: ("long", "offset2") :: Nil) |
There was a problem hiding this comment.
Could you use the named arguments when calling splitExpressions, like what I did in #19790?
gatorsmile
reviewed
Nov 21, 2017
| } | ||
|
|
||
| val updateOffsets = ctx.splitExpressions(updateOffset, "copyBitsetFunc", | ||
| ("long", "numBytesVariableRow1") :: Nil) |
|
LGTM pending jenkins |
|
Test build #84054 has finished for PR 19737 at commit
|
|
retest this please |
|
Test build #84061 has finished for PR 19737 at commit
|
|
thanks, merging to master/2.2! |
asfgit
pushed a commit
that referenced
this pull request
Nov 21, 2017
…nsafeRowJoiner.create() ## What changes were proposed in this pull request? This PR changes `GenerateUnsafeRowJoiner.create()` code generation to place generated code for statements to operate bitmap and offset into separated methods if these size could be large. ## How was this patch tested? Added a new test case into `GenerateUnsafeRowJoinerSuite` Author: Kazuaki Ishizaki <ishizaki@jp.ibm.com> Closes #19737 from kiszk/SPARK-22508. (cherry picked from commit c957714) Signed-off-by: Wenchen Fan <wenchen@databricks.com>
MatthewRBruce
pushed a commit
to Shopify/spark
that referenced
this pull request
Jul 31, 2018
…nsafeRowJoiner.create() ## What changes were proposed in this pull request? This PR changes `GenerateUnsafeRowJoiner.create()` code generation to place generated code for statements to operate bitmap and offset into separated methods if these size could be large. ## How was this patch tested? Added a new test case into `GenerateUnsafeRowJoinerSuite` Author: Kazuaki Ishizaki <ishizaki@jp.ibm.com> Closes apache#19737 from kiszk/SPARK-22508. (cherry picked from commit c957714) Signed-off-by: Wenchen Fan <wenchen@databricks.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 PR changes
GenerateUnsafeRowJoiner.create()code generation to place generated code for statements to operate bitmap and offset into separated methods if these size could be large.How was this patch tested?
Added a new test case into
GenerateUnsafeRowJoinerSuite