Skip to content

[SPARK-23919][SQL] Add array_position function #21037

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
kiszk wants to merge 9 commits into from
Closed

[SPARK-23919][SQL] Add array_position function #21037

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fb04539
initial commit
kiszk Apr 11, 2018
3d8069d
remove unnecessary scalastyle pragma
kiszk Apr 11, 2018
5339a65
address review comment
kiszk Apr 11, 2018
f1238b6
rebase with master
kiszk Apr 11, 2018
07305db
reimplement this for desired behavior
kiszk Apr 12, 2018
3a16231
use long for result instead of BigInt
kiszk Apr 12, 2018
d4cebed
address review comment
kiszk Apr 13, 2018
9a0321d
address review comments
kiszk Apr 16, 2018
7362b1c
address review comments
kiszk Apr 18, 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
address review comments
  • Loading branch information
@kiszk
kiszk committed Apr 18, 2018
commit 9a0321d67cd6e7c65cbf54e22099cc0cfae03463
10 changes: 5 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 @@ -531,7 +531,7 @@ case class ArrayPosition(left: Expression, right: Expression)
Seq(ArrayType, left.dataType.asInstanceOf[ArrayType].elementType)

override def nullable: Boolean = {
left.nullable || right.nullable || left.dataType.asInstanceOf[ArrayType].containsNull
left.nullable || right.nullable
}

override def nullSafeEval(arr: Any, value: Any): Any = {
Expand All @@ -551,15 +551,15 @@ case class ArrayPosition(left: Expression, right: Expression)
val i = ctx.freshName("i")
val getValue = CodeGenerator.getValue(arr, right.dataType, i)
s"""
|int ${pos} = 0;
|int $pos = 0;
|for (int $i = 0; $i < $arr.numElements(); $i ++) {
| if (${ctx.genEqual(right.dataType, value, getValue)}) {
| ${pos} = $i + 1;
| if (!$arr.isNullAt($i) && ${ctx.genEqual(right.dataType, value, getValue)}) {
| $pos = $i + 1;
| break;
| }
|}
|${ev.value} = (long) $pos;
"""
""".stripMargin
})
}
}
3 changes: 2 additions & 1 deletion ...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 @@ -172,11 +172,12 @@ class CollectionExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper
}

test("Array Position") {
val a0 = Literal.create(Seq(1, 2, 3), ArrayType(IntegerType))
val a0 = Literal.create(Seq(1, null, 2, 3), ArrayType(IntegerType))
val a1 = Literal.create(Seq[String](null, ""), ArrayType(StringType))
val a2 = Literal.create(Seq(null), ArrayType(LongType))
val a3 = Literal.create(null, ArrayType(StringType))

checkEvaluation(ArrayPosition(a0, Literal(3)), 4L)
checkEvaluation(ArrayPosition(a0, Literal(1)), 1L)
checkEvaluation(ArrayPosition(a0, Literal(0)), 0L)
checkEvaluation(ArrayPosition(a0, Literal.create(null, IntegerType)), null)
Expand Down