Skip to content
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

[SPARK-49451][SQL][FOLLOW-UP] Improve duplicate key exception test #48464

Closed
wants to merge 7 commits into from
Closed

[SPARK-49451][SQL][FOLLOW-UP] Improve duplicate key exception test #48464

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
efb2f4a
add support for duplicate keys in from_json(_, 'variant')
harshmotw-db Sep 20, 2024
8672883
Addressed @MaxGekk's comment
harshmotw-db Sep 20, 2024
57a71aa
regenerated golden files
harshmotw-db Sep 20, 2024
e703e34
Merge branch 'master' of https://github.com/harshmotw-db/spark
harshmotw-db Oct 14, 2024
35fc553
test improvement
harshmotw-db Oct 14, 2024
01a5327
improvement
harshmotw-db Oct 14, 2024
4532953
added comment
harshmotw-db Oct 14, 2024
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
28 changes: 18 additions & 10 deletions sql/core/src/test/scala/org/apache/spark/sql/VariantEndToEndSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
package org.apache.spark.sql

import org.apache.spark.SparkThrowable
import org.apache.spark.{SparkException, SparkRuntimeException}
import org.apache.spark.sql.QueryTest.sameRows
import org.apache.spark.sql.catalyst.InternalRow
import org.apache.spark.sql.catalyst.expressions.{Cast, Literal}
Expand Down Expand Up @@ -359,16 +359,24 @@ class VariantEndToEndSuite extends QueryTest with SharedSparkSession {
val expectedMetadata: Array[Byte] = Array(VERSION, 3, 0, 1, 2, 3, 'a', 'b', 'c')
assert(actual === new VariantVal(expectedValue, expectedMetadata))
}
withSQLConf(SQLConf.VARIANT_ALLOW_DUPLICATE_KEYS.key -> "false") {
val df = Seq(json).toDF("j")
.selectExpr("from_json(j,'variant')")
checkError(
exception = intercept[SparkThrowable] {
// Check whether the parse_json and from_json expressions throw the correct exception.
Seq("from_json(j, 'variant')", "parse_json(j)").foreach { expr =>
withSQLConf(SQLConf.VARIANT_ALLOW_DUPLICATE_KEYS.key -> "false") {
val df = Seq(json).toDF("j").selectExpr(expr)
val exception = intercept[SparkException] {
df.collect()
},
condition = "MALFORMED_RECORD_IN_PARSING.WITHOUT_SUGGESTION",
parameters = Map("badRecord" -> json, "failFastMode" -> "FAILFAST")
)
}
checkError(
exception = exception,
condition = "MALFORMED_RECORD_IN_PARSING.WITHOUT_SUGGESTION",
parameters = Map("badRecord" -> json, "failFastMode" -> "FAILFAST")
)
checkError(
exception = exception.getCause.asInstanceOf[SparkRuntimeException],
condition = "VARIANT_DUPLICATE_KEY",
parameters = Map("key" -> "a")
)
}
}
}
}