Skip to content

[SPARK-23916][SQL] Add array_join function #21011

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 9 commits into from
Closed

[SPARK-23916][SQL] Add array_join function #21011

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1408cfc
[SPARK-23916][SQL] Add array_join function
mgaido91 Apr 9, 2018
b9cea24
Merge branch 'master' of github.com:apache/spark into SPARK-23916
mgaido91 Apr 10, 2018
144202f
fix python doctest
mgaido91 Apr 10, 2018
e52ff85
add since + address comment
mgaido91 Apr 10, 2018
dd9482e
review comments
mgaido91 Apr 13, 2018
ad0d4aa
fix indent
mgaido91 Apr 13, 2018
703c09c
Merge branch 'master' of github.com:apache/spark into SPARK-23916
mgaido91 Apr 17, 2018
b1597d7
fix null_replacement
mgaido91 Apr 18, 2018
e9d7baa
Merge branch 'master' of github.com:apache/spark into SPARK-23916
mgaido91 Apr 20, 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
review comments
  • Loading branch information
@mgaido91
mgaido91 committed Apr 13, 2018
commit dd9482e230c9efdab66609639d633a207e47f736
9 changes: 4 additions & 5 deletions ...alyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/collectionOperations.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,6 @@ case class ArrayJoin(
val nullReplacementEval = nullReplacement.map(_.eval(input))
if (nullReplacementEval.contains(null)) return null

Copy link
Member

@ueshin ueshin Apr 13, 2018

Choose a reason for hiding this comment

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

nit: remove an extra line.

Copy link
Contributor Author

@mgaido91 mgaido91 Apr 13, 2018

Choose a reason for hiding this comment

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

I removed the other one.... :)


val buffer = new UTF8StringBuilder()
var firstItem = true
val nullHandling = nullReplacementEval match {
Expand Down Expand Up @@ -380,7 +379,7 @@ case class ArrayJoin(
|}
|$buffer.append(${replacementGen.value});
|$firstItem = false;
""".stripMargin
""".stripMargin
}
val execCode = if (replacement.nullable) {
ctx.nullSafeExec(replacement.nullable, replacementGen.isNull) {
Expand All @@ -392,7 +391,7 @@ case class ArrayJoin(
s"""
|${replacementGen.code}
|$execCode
""".stripMargin
""".stripMargin
case None => genCodeForArrayAndDelimiter(ctx, ev,
(_: String, _: String, _: String) => "// nulls are ignored")
}
Expand All @@ -404,8 +403,8 @@ case class ArrayJoin(
|$code
""".stripMargin)
} else {
ev.copy(s"""
|boolean ${ev.isNull} = false;
ev.copy(
s"""
|UTF8String ${ev.value} = null;
|$code
""".stripMargin, FalseLiteral)
Expand Down