-
Notifications
You must be signed in to change notification settings - Fork 29k
[SPARK-23711][SQL] Add fallback generator for UnsafeProjection #21106
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.
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
Closed
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
fe2a1cd
Add the base of fallback logic fo UnsafeProjection.
viirya 36f90cf
Address comment.
viirya 68213fb
Unify with UnsafeProjectionCreator.
viirya 6cdaec4
Add a SQL config to control fallback mode under test.
viirya 32e2766
Merge remote-tracking branch 'upstream/master' into SPARK-23711
viirya aeef468
Add test.
viirya 1f5cc17
Don't access SQLConf on task execution.
viirya 4c04d14
Change SQL conf naming.
viirya 67f8701
Rename CodegenObjectFactory to CodeGeneratorWithInterpreted.
viirya e01fe97
Use public.
viirya de88f88
Change comment.
viirya f883c2b
Change mode name.
viirya 716d88f
Address comments.
viirya 8c56ae4
Simplify test suite.
viirya 5a735af
Don't use hardcoded configs.
viirya 5569646
Merge remote-tracking branch 'upstream/master' into SPARK-23711
viirya ed525f6
Simplify SQL conf getting.
viirya c9ec817
For comment.
viirya 5527595
Task context should not have null properties.
viirya File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next
Next commit
Add the base of fallback logic fo UnsafeProjection.
- Loading branch information
commit fe2a1cdd9002f14422c812d51041ed4f6d361cfc
There are no files selected for viewing
63 changes: 63 additions & 0 deletions
63
...alyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/CodegenObjectFactory.scala
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.spark.sql.catalyst.expressions | ||
|
|
||
| import org.codehaus.commons.compiler.CompileException | ||
| import org.codehaus.janino.InternalCompilerException | ||
|
|
||
| object CodegenObjectFactory { | ||
| def codegenOrInterpreted[T](codegenCreator: () => T, interpretedCreator: () => T): T = { | ||
| try { | ||
| codegenCreator() | ||
| } catch { | ||
| // Catch compile error related exceptions | ||
| case e: InternalCompilerException => interpretedCreator() | ||
| case e: CompileException => interpretedCreator() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| object UnsafeProjectionFactory extends UnsafeProjectionCreator { | ||
| import CodegenObjectFactory._ | ||
|
|
||
| private val codegenCreator = UnsafeProjection | ||
| private lazy val interpretedCreator = InterpretedUnsafeProjection | ||
|
|
||
| /** | ||
| * Returns an [[UnsafeProjection]] for given sequence of bound Expressions. | ||
| */ | ||
| override protected[sql] def createProjection(exprs: Seq[Expression]): UnsafeProjection = { | ||
| codegenOrInterpreted[UnsafeProjection](() => codegenCreator.createProjection(exprs), | ||
| () => interpretedCreator.createProjection(exprs)) | ||
| } | ||
|
|
||
| /** | ||
| * Same as other create()'s but allowing enabling/disabling subexpression elimination. | ||
| * The param `subexpressionEliminationEnabled` doesn't guarantee to work. For example, | ||
| * when fallbacking to interpreted execution, it is not supported. | ||
| */ | ||
| def create( | ||
| exprs: Seq[Expression], | ||
| inputSchema: Seq[Attribute], | ||
| subexpressionEliminationEnabled: Boolean): UnsafeProjection = { | ||
| codegenOrInterpreted[UnsafeProjection]( | ||
| () => codegenCreator.create(exprs, inputSchema, subexpressionEliminationEnabled), | ||
| () => interpretedCreator.create(exprs, inputSchema)) | ||
| } | ||
| } | ||
|
|
||
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
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
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we make this an abstract class in which we just need to implement hooks for the code generated and interpreted versions, i.e.:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks good to me, except that I think
UnsafeProjectionCreatorshould still supportUnsafeProjectionCreator's APIs. So we can replace all usage ofUnsafeProjectionwithUnsafeProjectionCreator.