From 83387f6f3b86532a79e83e8483c5e4683ff8beac Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Mon, 27 Aug 2018 12:43:17 -0700 Subject: [PATCH] fix --- .../apache/spark/sql/catalyst/analysis/ResolveHints.scala | 6 +----- .../spark/sql/catalyst/analysis/ResolveHintsSuite.scala | 6 ++++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveHints.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveHints.scala index a3e1552168115..a1543e1fd5df9 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveHints.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveHints.scala @@ -62,15 +62,11 @@ object ResolveHints { } } - private def formatDatabaseName(name: String): String = { - if (conf.caseSensitiveAnalysis) name else name.toLowerCase(Locale.ROOT) - } - private def matchedTableIdentifier( nameParts: Seq[String], tableIdent: IdentifierWithDatabase): Boolean = { tableIdent.database match { - case Some(db) if catalog.globalTempViewManager.database == formatDatabaseName(db) => + case Some(db) if resolver(catalog.globalTempViewManager.database, db) => val identifierList = db :: tableIdent.identifier :: Nil namePartsWithDatabase(nameParts, catalog.globalTempViewManager.database) .corresponds(identifierList)(resolver) diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/ResolveHintsSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/ResolveHintsSuite.scala index 245c912c6a5f8..2609d6aa13406 100644 --- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/ResolveHintsSuite.scala +++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/ResolveHintsSuite.scala @@ -163,5 +163,11 @@ class ResolveHintsSuite extends AnalysisTest { Join(ResolvedHint(testRelation, HintInfo(broadcast = true)), ResolvedHint(testRelation2, HintInfo(broadcast = true)), Inner, None), caseSensitive = false) + + checkAnalysis( + UnresolvedHint("MAPJOIN", Seq("default.TaBlE", "default.table2", "DEfault.TaBlE2"), + table("TaBlE").join(table("TaBlE2"))), + Join(ResolvedHint(testRelation, HintInfo(broadcast = true)), testRelation2, Inner, None), + caseSensitive = true) } }