Skip to content

Commit 83387f6

Browse files
committed
fix
1 parent bd3f502 commit 83387f6

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveHints.scala

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,11 @@ object ResolveHints {
6262
}
6363
}
6464

65-
private def formatDatabaseName(name: String): String = {
66-
if (conf.caseSensitiveAnalysis) name else name.toLowerCase(Locale.ROOT)
67-
}
68-
6965
private def matchedTableIdentifier(
7066
nameParts: Seq[String],
7167
tableIdent: IdentifierWithDatabase): Boolean = {
7268
tableIdent.database match {
73-
case Some(db) if catalog.globalTempViewManager.database == formatDatabaseName(db) =>
69+
case Some(db) if resolver(catalog.globalTempViewManager.database, db) =>
7470
val identifierList = db :: tableIdent.identifier :: Nil
7571
namePartsWithDatabase(nameParts, catalog.globalTempViewManager.database)
7672
.corresponds(identifierList)(resolver)

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/ResolveHintsSuite.scala

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,5 +163,11 @@ class ResolveHintsSuite extends AnalysisTest {
163163
Join(ResolvedHint(testRelation, HintInfo(broadcast = true)),
164164
ResolvedHint(testRelation2, HintInfo(broadcast = true)), Inner, None),
165165
caseSensitive = false)
166+
167+
checkAnalysis(
168+
UnresolvedHint("MAPJOIN", Seq("default.TaBlE", "default.table2", "DEfault.TaBlE2"),
169+
table("TaBlE").join(table("TaBlE2"))),
170+
Join(ResolvedHint(testRelation, HintInfo(broadcast = true)), testRelation2, Inner, None),
171+
caseSensitive = true)
166172
}
167173
}

0 commit comments

Comments
 (0)