Skip to content

[SPARK-34556][SQL][3.0] Checking duplicate static partition columns should respect case sensitive conf #31714

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
zsxwing wants to merge 1 commit into from
Closed

[SPARK-34556][SQL][3.0] Checking duplicate static partition columns should respect case sensitive conf #31714

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
[SPARK-34556][SQL] Checking duplicate static partition columns should… 
… respect case sensitive conf

This PR makes partition spec parsing respect case sensitive conf.

When parsing the partition spec, Spark will call `org.apache.spark.sql.catalyst.parser.ParserUtils.checkDuplicateKeys` to check if there are duplicate partition column names in the list. But this method is always case sensitive and doesn't detect duplicate partition column names when using different cases.

Yep. This prevents users from writing incorrect queries such as `INSERT OVERWRITE t PARTITION (c='2', C='3') VALUES (1)` when they don't enable case sensitive conf.

The new added test will fail without this change.

Closes #31669 from zsxwing/SPARK-34556.

Authored-by: Shixiong Zhu <[email protected]>
Signed-off-by: HyukjinKwon <[email protected]>
  • Loading branch information
@zsxwing
zsxwing committed Mar 3, 2021
commit bf244b60169bcf7a75342104a8f2aa822c30087f
6 changes: 5 additions & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,11 @@ class AstBuilder(conf: SQLConf) extends SqlBaseBaseVisitor[AnyRef] with Logging
// Before calling `toMap`, we check duplicated keys to avoid silently ignore partition values
// in partition spec like PARTITION(a='1', b='2', a='3'). The real semantical check for
// partition columns will be done in analyzer.
checkDuplicateKeys(parts, ctx)
if (conf.caseSensitiveAnalysis) {
checkDuplicateKeys(parts, ctx)
} else {
checkDuplicateKeys(parts.map(kv => kv._1.toLowerCase(Locale.ROOT) -> kv._2), ctx)
}
parts.toMap
}

Expand Down
11 changes: 11 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLParserSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,17 @@ class DDLParserSuite extends AnalysisTest with SharedSparkSession {
assert(e.contains("Found duplicate keys 'key1'"))
}

test("SPARK-34556: duplicate keys in partition spec") {
val e = intercept[ParseException] {
parser.parsePlan("INSERT OVERWRITE t PARTITION (c='2', C='3') VALUES (1)")
}.getMessage
assert(e.contains("Found duplicate keys 'c'"))
val conf = new SQLConf()
conf.setConf(SQLConf.CASE_SENSITIVE, true)
val caseSensitiveParser = new SparkSqlParser(conf)
caseSensitiveParser.parsePlan("INSERT OVERWRITE t PARTITION (c='2', C='3') VALUES (1)")
}

test("duplicate columns in partition specs") {
val e = intercept[ParseException] {
parser.parsePlan(
Expand Down