Skip to content

[SPARK-25307][SQL] ArraySort function may return an error in the code generation phase #22314

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
dilipbiswal wants to merge 4 commits into from
Closed

[SPARK-25307][SQL] ArraySort function may return an error in the code generation phase #22314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c07d3c
[SPARK-25307] ArraySort function may return an error in the code gene…
dilipbiswal Aug 31, 2018
1547ac7
Code review
dilipbiswal Sep 3, 2018
3645438
fix
dilipbiswal Sep 3, 2018
d27256e
minor
dilipbiswal Sep 3, 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
5 changes: 3 additions & 2 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 @@ -1046,8 +1046,9 @@ trait ArraySortLike extends ExpectsInputTypes {
} else {
s"int $c = ${ctx.genComp(elementType, s"(($jt) $o1)", s"(($jt) $o2)")};"
}
val nonNullPrimitiveAscendingSort =
if (CodeGenerator.isPrimitiveType(elementType) && !containsNull) {
val canPerformFastSort =
CodeGenerator.isPrimitiveType(elementType) && elementType != BooleanType && !containsNull
val nonNullPrimitiveAscendingSort = if (canPerformFastSort) {
val javaType = CodeGenerator.javaType(elementType)
val primitiveTypeName = CodeGenerator.primitiveTypeName(elementType)
s"""
Expand Down
7 changes: 7 additions & 0 deletions ...src/test/scala/org/apache/spark/sql/catalyst/expressions/CollectionExpressionsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,12 +326,19 @@ class CollectionExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper
val d2 = new Decimal().set(100)
val a4 = Literal.create(Seq(d2, d1), ArrayType(DecimalType(10, 0)))
val a5 = Literal.create(Seq(null, null), ArrayType(NullType))
val a6 = Literal.create(Seq(true, false, true, false),
ArrayType(BooleanType, containsNull = false))
val a7 = Literal.create(Seq(true, false, true, false), ArrayType(BooleanType))
val a8 = Literal.create(Seq(true, false, true, null, false), ArrayType(BooleanType))

checkEvaluation(new SortArray(a0), Seq(1, 2, 3))
checkEvaluation(new SortArray(a1), Seq[Integer]())
checkEvaluation(new SortArray(a2), Seq("a", "b"))
checkEvaluation(new SortArray(a3), Seq(null, "a", "b"))
checkEvaluation(new SortArray(a4), Seq(d1, d2))
checkEvaluation(new SortArray(a6), Seq(false, false, true, true))
checkEvaluation(new SortArray(a7), Seq(false, false, true, true))
checkEvaluation(new SortArray(a8), Seq(null, false, false, true, true))
checkEvaluation(SortArray(a0, Literal(true)), Seq(1, 2, 3))
checkEvaluation(SortArray(a1, Literal(true)), Seq[Integer]())
checkEvaluation(SortArray(a2, Literal(true)), Seq("a", "b"))
Expand Down