Skip to content

[MINOR] Avoid code duplication for nullable in Higher Order function #22243

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

Closed
mgaido91 wants to merge 2 commits into from
Closed

[MINOR] Avoid code duplication for nullable in Higher Order function #22243

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bf7b29
[MINOR] Avoid code duplication for nullable in Higher Order function
mgaido91 Aug 27, 2018
393379c
address comment
mgaido91 Aug 28, 2018
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: 2 additions & 12 deletions ...alyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/higherOrderFunctions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,8 @@ trait HigherOrderFunction extends Expression with ExpectsInputTypes {
*/
trait SimpleHigherOrderFunction extends HigherOrderFunction {

override def nullable: Boolean = argument.nullable
Copy link
Contributor

@mn-mikke mn-mikke Aug 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we moved the definition of nullable straight to HigherOrderFunction as arguments.exists(_.nullable), we could also avoid the duplicities in ZipWith and MapZipWith. WDYT?

Copy link
Contributor Author

@mgaido91 mgaido91 Aug 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this works too IMO, if others agree I'll update with this suggestion, thanks.

Copy link
Member

@HyukjinKwon HyukjinKwon Aug 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, let's go ahead then if the change is small, straightforward and more deduplciation


def argument: Expression

override def arguments: Seq[Expression] = argument :: Nil
Expand Down Expand Up @@ -217,8 +219,6 @@ case class ArrayTransform(
function: Expression)
extends ArrayBasedSimpleHigherOrderFunction with CodegenFallback {

override def nullable: Boolean = argument.nullable

override def dataType: ArrayType = ArrayType(function.dataType, function.nullable)

override def bind(f: (Expression, Seq[(DataType, Boolean)]) => LambdaFunction): ArrayTransform = {
Expand Down Expand Up @@ -287,8 +287,6 @@ case class MapFilter(
copy(function = f(function, (keyType, false) :: (valueType, valueContainsNull) :: Nil))
}

override def nullable: Boolean = argument.nullable

override def nullSafeEval(inputRow: InternalRow, argumentValue: Any): Any = {
val m = argumentValue.asInstanceOf[MapData]
val f = functionForEval
Expand Down Expand Up @@ -328,8 +326,6 @@ case class ArrayFilter(
function: Expression)
extends ArrayBasedSimpleHigherOrderFunction with CodegenFallback {

override def nullable: Boolean = argument.nullable

override def dataType: DataType = argument.dataType

override def functionType: AbstractDataType = BooleanType
Expand Down Expand Up @@ -375,8 +371,6 @@ case class ArrayExists(
function: Expression)
extends ArrayBasedSimpleHigherOrderFunction with CodegenFallback {

override def nullable: Boolean = argument.nullable

override def dataType: DataType = BooleanType

override def functionType: AbstractDataType = BooleanType
Expand Down Expand Up @@ -516,8 +510,6 @@ case class TransformKeys(
function: Expression)
extends MapBasedSimpleHigherOrderFunction with CodegenFallback {

override def nullable: Boolean = argument.nullable

@transient lazy val MapType(keyType, valueType, valueContainsNull) = argument.dataType

override def dataType: DataType = MapType(function.dataType, valueType, valueContainsNull)
Expand Down Expand Up @@ -568,8 +560,6 @@ case class TransformValues(
function: Expression)
extends MapBasedSimpleHigherOrderFunction with CodegenFallback {

override def nullable: Boolean = argument.nullable

@transient lazy val MapType(keyType, valueType, valueContainsNull) = argument.dataType

override def dataType: DataType = MapType(keyType, function.dataType, function.nullable)
Expand Down