Skip to content

[SPARK-xxxxx][SQL] Make variant path functions raise INVALID_VARIANT_PATH consistently in interpreted and codegen execution #57682

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

Open
bojana-db wants to merge 1 commit into
base: master
Choose a base branch
from
+45 −0
Open

[SPARK-xxxxx][SQL] Make variant path functions raise INVALID_VARIANT_PATH consistently in interpreted and codegen execution #57682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 15 additions & 0 deletions ...src/main/scala/org/apache/spark/sql/catalyst/expressions/variant/variantExpressions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,11 @@ case class VariantGet(
timeZoneId,
zoneId)

override def eval(input: InternalRow): Any = {
val _ = parsedPath
super.eval(input)
}

protected override def nullSafeEval(input: Any, path: Any): Any = parsedPath match {
case Some(pp) =>
VariantGet.variantGet(input.asInstanceOf[VariantVal], pp, dataType, castArgs)
Expand Down Expand Up @@ -873,6 +878,11 @@ case class VariantInsert(
}
}

override def eval(input: InternalRow): Any = {
val _ = foldablePath
super.eval(input)
}

override protected def nullSafeEval(v: Any, p: Any, valValue: Any): Any = {
val inputVariant = v.asInstanceOf[VariantVal]
foldablePath match {
Expand Down Expand Up @@ -1308,6 +1318,11 @@ case class VariantArrayAppend(
}
}

override def eval(input: InternalRow): Any = {
val _ = foldablePath
super.eval(input)
}

override protected def nullSafeEval(v: Any, p: Any, valValue: Any): Any = {
val inputVariant = v.asInstanceOf[VariantVal]
foldablePath match {
Expand Down
30 changes: 30 additions & 0 deletions ...test/scala/org/apache/spark/sql/catalyst/expressions/variant/VariantExpressionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,6 +686,16 @@ class VariantExpressionSuite extends SparkFunSuite with ExpressionEvalHelper {
// scalastyle:on nonascii
testVariantGet("[1, 2, 3]", "$[2147483647]", IntegerType, null)

Seq("variant_get" -> true, "try_variant_get" -> false).foreach {
case (name, failOnError) =>
checkErrorInExpression[SparkRuntimeException](
VariantGet(BoundReference(0, VariantType, nullable = true), Literal(".a"),
IntegerType, failOnError),
InternalRow(null),
"INVALID_VARIANT_GET_PATH",
Map("path" -> ".a", "functionName" -> s"`$name`"))
}

checkInvalidPath("")
checkInvalidPath(".a")
checkInvalidPath("$1")
Expand Down Expand Up @@ -1487,6 +1497,16 @@ class VariantExpressionSuite extends SparkFunSuite with ExpressionEvalHelper {
"INVALID_VARIANT_PATH",
name => Map("path" -> "abc", "functionName" -> s"`$name`"))

Seq("variant_insert" -> true, "try_variant_insert" -> false).foreach {
case (name, failOnError) =>
checkErrorInExpression[SparkRuntimeException](
VariantInsert(BoundReference(0, VariantType, nullable = true),
Literal.create("abc", StringType), Literal(1), failOnError),
InternalRow(null),
"INVALID_VARIANT_PATH",
Map("path" -> "abc", "functionName" -> s"`$name`"))
}

val tooBig = "x".repeat(16 * 1024 * 1024)
checkInsertUnrecoverableError("{}", "$.a[2000000000]", Literal(1),
"VARIANT_SIZE_LIMIT",
Expand Down Expand Up @@ -1840,6 +1860,16 @@ class VariantExpressionSuite extends SparkFunSuite with ExpressionEvalHelper {
checkAppendUnrecoverableError("[]", "abc", Literal(1),
"INVALID_VARIANT_PATH",
name => Map("path" -> "abc", "functionName" -> s"`$name`"))

Seq("variant_array_append" -> true, "try_variant_array_append" -> false).foreach {
case (name, failOnError) =>
checkErrorInExpression[SparkRuntimeException](
VariantArrayAppend(BoundReference(0, VariantType, nullable = true),
Literal.create("abc", StringType), Literal(1), failOnError),
InternalRow(null),
"INVALID_VARIANT_PATH",
Map("path" -> "abc", "functionName" -> s"`$name`"))
}
checkErrorInExpression[SparkRuntimeException](
VariantArrayAppend(Literal(parseJson("[]")), Literal(""), Literal(1)),
"INVALID_VARIANT_PATH",
Expand Down