Skip to content

[SPARK-29295][SQL][FOLLOWUP] Dynamic partition map parsed from partition path should be case insensitive #28765

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
turboFei wants to merge 2 commits into from
Closed

[SPARK-29295][SQL][FOLLOWUP] Dynamic partition map parsed from partition path should be case insensitive #28765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e076f6a
[SPARK-29295][SQL][FOLLOWUP] Dynamic partition map parsed from partit…
turboFei Jun 9, 2020
d949065
add blank line
turboFei Jun 9, 2020
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
6 changes: 5 additions & 1 deletion sql/hive/src/main/scala/org/apache/spark/sql/hive/execution/InsertIntoHiveTable.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import org.apache.spark.sql.{AnalysisException, Row, SparkSession}
import org.apache.spark.sql.catalyst.catalog._
import org.apache.spark.sql.catalyst.expressions.Attribute
import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
import org.apache.spark.sql.catalyst.util.CaseInsensitiveMap
import org.apache.spark.sql.execution.SparkPlan
import org.apache.spark.sql.execution.command.CommandUtils
import org.apache.spark.sql.hive.HiveExternalCatalog
Expand Down Expand Up @@ -225,9 +226,12 @@ case class InsertIntoHiveTable(
ExternalCatalogUtils.unescapePathName(splitPart(1))
}.toMap

val caseInsensitiveDpMap = CaseInsensitiveMap(dpMap)

val updatedPartitionSpec = partition.map {
case (key, Some(value)) => key -> value
case (key, None) if dpMap.contains(key) => key -> dpMap(key)
case (key, None) if caseInsensitiveDpMap.contains(key) =>
key -> caseInsensitiveDpMap(key)
case (key, _) =>
throw new SparkException(s"Dynamic partition key $key is not among " +
"written partition paths.")
Expand Down
13 changes: 13 additions & 0 deletions sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2544,6 +2544,19 @@ abstract class SQLQuerySuiteBase extends QueryTest with SQLTestUtils with TestHi
assert(e.getMessage.contains("Cannot modify the value of a static config"))
}
}

test("SPARK-29295: dynamic partition map parsed from partition path should be case insensitive") {
withTable("t") {
withSQLConf("hive.exec.dynamic.partition" -> "true",
"hive.exec.dynamic.partition.mode" -> "nonstrict") {
withTempDir { loc =>
sql(s"CREATE TABLE t(c1 INT) PARTITIONED BY(P1 STRING) LOCATION '${loc.getAbsolutePath}'")
sql("INSERT OVERWRITE TABLE t PARTITION(P1) VALUES(1, 'caseSensitive')")
checkAnswer(sql("select * from t"), Row(1, "caseSensitive"))
}
}
}
}
}

class SQLQuerySuite extends SQLQuerySuiteBase with DisableAdaptiveExecutionSuite
Expand Down