Skip to content

[SPARK-19490][SQL] ignore case sensitivity when filtering hive partition columns #16832

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

[SPARK-19490][SQL] ignore case sensitivity when filtering hive partition columns #16832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
efb0b4b
change column names to lower case
cenyuhai Feb 7, 2017
6884ad3
change hive column names to lower case
cenyuhai Feb 10, 2017
7214b8a
add test case
cenyuhai Feb 12, 2017
b734646
fix runtime error
cenyuhai Feb 12, 2017
358769c
fix error in create table syntax
cenyuhai Feb 12, 2017
5e91877
insert data for test case
cenyuhai Feb 12, 2017
f790821
fix bug in test case
cenyuhai Feb 22, 2017
c3f7444
Merge remote-tracking branch 'remotes/apache/master' into SPARK-19490
cenyuhai Feb 22, 2017
c9dd09b
fix bug in test case
cenyuhai Feb 22, 2017
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: 3 additions & 3 deletions sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveExternalCatalog.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1017,9 +1017,9 @@ private[spark] class HiveExternalCatalog(conf: SparkConf, hadoopConf: Configurat
predicates: Seq[Expression]): Seq[CatalogTablePartition] = withClient {
val rawTable = getRawTable(db, table)
val catalogTable = restoreTableMetadata(rawTable)
val partitionColumnNames = catalogTable.partitionColumnNames.toSet
val partitionColumnNames = catalogTable.partitionColumnNames.map(_.toLowerCase).toSet
val nonPartitionPruningPredicates = predicates.filterNot {
_.references.map(_.name).toSet.subsetOf(partitionColumnNames)
_.references.map(_.name.toLowerCase).toSet.subsetOf(partitionColumnNames)
}

if (nonPartitionPruningPredicates.nonEmpty) {
Expand All @@ -1037,7 +1037,7 @@ private[spark] class HiveExternalCatalog(conf: SparkConf, hadoopConf: Configurat
val boundPredicate =
InterpretedPredicate.create(predicates.reduce(And).transform {
case att: AttributeReference =>
val index = partitionSchema.indexWhere(_.name == att.name)
val index = partitionSchema.indexWhere(_.name.toLowerCase == att.name.toLowerCase)
BoundReference(index, partitionSchema(index).dataType, nullable = true)
})
clientPrunedPartitions.filter { p => boundPredicate(p.toRow(partitionSchema)) }
Expand Down
6 changes: 6 additions & 0 deletions sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1236,6 +1236,12 @@ class HiveQuerySuite extends HiveComparisonTest with SQLTestUtils with BeforeAnd
}
}
}

test("SPARK-19490 case sensitivity when filtering hive partition columns") {
sql("CREATE TABLE partition_test (key Int) partitioned by (date string)")
sql("INSERT INTO TABLE partition_test partition(date='20170101') select 1 from src limit 1")
sql("SELECT * FROM partition_test where DATE = '20170101'")
}
}

// for SPARK-2180 test
Expand Down