Skip to content

[SPARK-23939][SQL] Add transform_keys function #22013

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
codeatri wants to merge 15 commits into from
Closed

[SPARK-23939][SQL] Add transform_keys function #22013

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0a19cc4
Added Support for transform_keys function
codeatri Aug 6, 2018
12e0259
Merge branch 'master' into SPARK-23939
codeatri Aug 7, 2018
5806ac4
Addressed Review Commenst
codeatri Aug 8, 2018
150a6a5
Additional Tests containing nulls
codeatri Aug 8, 2018
9f6a8ab
nit: style
codeatri Aug 8, 2018
6526630
added additional unit test
codeatri Aug 8, 2018
f7fd231
nit:space
codeatri Aug 8, 2018
1cbaf0c
addressed review comments
codeatri Aug 9, 2018
bb52630
Merge branch 'master' into SPARK-23939
codeatri Aug 14, 2018
621213d
fix style
codeatri Aug 14, 2018
5db526b
Merge master Refactoring changes
codeatri Aug 14, 2018
e5d9b05
review comments
codeatri Aug 15, 2018
fb885f4
review comments
codeatri Aug 15, 2018
58b60b2
fix unit test
codeatri Aug 15, 2018
2f4943f
review
codeatri Aug 15, 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
Prev Previous commit
Next Next commit
Merge master Refactoring changes
  • Loading branch information
@codeatri
codeatri committed Aug 14, 2018
commit 5db526be7bad0fa38dc9743c919014b475cf8aeb
15 changes: 6 additions & 9 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 @@ -512,21 +512,18 @@ case class ArrayAggregate(
""",
since = "2.4.0")
case class TransformKeys(
input: Expression,
argument: Expression,
function: Expression)
extends MapBasedSimpleHigherOrderFunction with CodegenFallback {

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

@mgaido91 mgaido91 Aug 16, 2018

Choose a reason for hiding this comment

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

I think this can be moved to SimpleHigherOrderFunction

Copy link
Member

@ueshin ueshin Aug 16, 2018

Choose a reason for hiding this comment

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

makes sense.
Let's have wrap-up prs for higher-order functions after the remaining 2 prs are merged.


override def dataType: DataType = {
val map = input.dataType.asInstanceOf[MapType]
val map = argument.dataType.asInstanceOf[MapType]
MapType(function.dataType, map.valueType, map.valueContainsNull)
Copy link
Member

@ueshin ueshin Aug 15, 2018

Choose a reason for hiding this comment

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

We can use valueType and valueContainsNull from the following val?

Copy link
Member

@ueshin ueshin Aug 15, 2018

Choose a reason for hiding this comment

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

What about this?

}

override def inputTypes: Seq[AbstractDataType] = Seq(MapType, expectingFunctionType)

@transient val (keyType, valueType, valueContainsNull) =
HigherOrderFunction.mapKeyValueArgumentType(input.dataType)
@transient val MapType(keyType, valueType, valueContainsNull) = argument.dataType
Copy link
Member

@ueshin ueshin Aug 15, 2018

Choose a reason for hiding this comment

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

lazy val?
Could you add a test when argument is not a map in invalid cases of DataFrameFunctionsSuite?


override def bind(f: (Expression, Seq[(DataType, Boolean)]) => LambdaFunction): TransformKeys = {
copy(function = f(function, (keyType, false) :: (valueType, valueContainsNull) :: Nil))
Expand All @@ -538,8 +535,8 @@ case class TransformKeys(
(keyVar, valueVar)
}
Copy link
Member

@ueshin ueshin Aug 15, 2018

Choose a reason for hiding this comment

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

nit: how about:

@transient lazy val LambdaFunction(_,
  (keyVar: NamedLambdaVariable) :: (valueVar: NamedLambdaVariable) :: Nil, _) = function

Copy link
Member

@ueshin ueshin Aug 15, 2018

Choose a reason for hiding this comment

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

Sorry, I meant we don't need to surround by:

@transient lazy val (keyVar, valueVar) = {
  ...
  (keyVar, valueVar)
}

just

@transient lazy val LambdaFunction(_,
  (keyVar: NamedLambdaVariable) :: (valueVar: NamedLambdaVariable) :: Nil, _) = function

should work.


override def nullSafeEval(inputRow: InternalRow, value: Any): Any = {
val map = value.asInstanceOf[MapData]
override def nullSafeEval(inputRow: InternalRow, argumentValue: Any): Any = {
val map = argumentValue.asInstanceOf[MapData]
val f = functionForEval
Copy link
Contributor

@mn-mikke mn-mikke Aug 15, 2018

Choose a reason for hiding this comment

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

Can't we use functionForEval directly?

val resultKeys = new GenericArrayData(new Array[Any](map.numElements))
var i = 0
Expand Down