Github user dongjoon-hyun commented on a diff in the pull request:
https://github.com/apache/spark/pull/22198#discussion_r212861282
--- Diff:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveHints.scala
---
@@ -47,20 +49,39 @@ object ResolveHints {
*
* This rule must happen before common table expressions.
*/
- class ResolveBroadcastHints(conf: SQLConf) extends Rule[LogicalPlan] {
+ class ResolveBroadcastHints(conf: SQLConf, catalog: SessionCatalog)
extends Rule[LogicalPlan] {
private val BROADCAST_HINT_NAMES = Set("BROADCAST", "BROADCASTJOIN",
"MAPJOIN")
def resolver: Resolver = conf.resolver
- private def applyBroadcastHint(plan: LogicalPlan, toBroadcast:
Set[String]): LogicalPlan = {
+ private def namePartsWithDatabase(nameParts: Seq[String]): Seq[String]
= {
+ if (nameParts.size == 1) {
+ catalog.getCurrentDatabase +: nameParts
+ } else {
+ nameParts
+ }
+ }
+
+ private def matchedTableIdentifier(
+ nameParts: Seq[String],
+ tableIdent: IdentifierWithDatabase): Boolean = {
+ val identifierList =
+ tableIdent.database.getOrElse(catalog.getCurrentDatabase) ::
tableIdent.identifier :: Nil
+
namePartsWithDatabase(nameParts).corresponds(identifierList)(resolver)
--- End diff --
BTW, @maropu . In addition,
- The current behavior of `master` branch (Spark 2.4) is `Apply a hint into
both`.
- The legacy behavior of Spark 2.3.1 is raising an exception for that query.
So, I think it's a good change to become consistent in Spark 2.4.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
