Github user hvanhovell commented on a diff in the pull request:
https://github.com/apache/spark/pull/16168#discussion_r91053897
--- Diff:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
---
@@ -509,32 +509,42 @@ class Analyzer(
* Replaces [[UnresolvedRelation]]s with concrete relations from the
catalog.
*/
object ResolveRelations extends Rule[LogicalPlan] {
- private def lookupTableFromCatalog(u: UnresolvedRelation): LogicalPlan
= {
+ private def lookupTableFromCatalog(
+ u: UnresolvedRelation, db: Option[String] = None): LogicalPlan = {
try {
- catalog.lookupRelation(u.tableIdentifier, u.alias)
+ catalog.lookupRelation(u.tableIdentifier, u.alias, db)
} catch {
case _: NoSuchTableException =>
u.failAnalysis(s"Table or view not found: ${u.tableName}")
}
}
- def apply(plan: LogicalPlan): LogicalPlan = plan resolveOperators {
- case i @ InsertIntoTable(u: UnresolvedRelation, parts, child, _, _)
if child.resolved =>
- i.copy(table = EliminateSubqueryAliases(lookupTableFromCatalog(u)))
- case u: UnresolvedRelation =>
- val table = u.tableIdentifier
- if (table.database.isDefined && conf.runSQLonFile &&
!catalog.isTemporaryTable(table) &&
+ def apply(plan: LogicalPlan): LogicalPlan = {
+ var currentDatabase = catalog.getCurrentDatabase
+ plan resolveOperators {
+ case i@InsertIntoTable(u: UnresolvedRelation, parts, child, _, _)
if child.resolved =>
+ i.copy(table =
EliminateSubqueryAliases(lookupTableFromCatalog(u)))
+ case u: UnresolvedRelation =>
+ val table = u.tableIdentifier
+ if (table.database.isDefined && conf.runSQLonFile &&
!catalog.isTemporaryTable(table) &&
(!catalog.databaseExists(table.database.get) ||
!catalog.tableExists(table))) {
- // If the database part is specified, and we support running SQL
directly on files, and
- // it's not a temporary view, and the table does not exist, then
let's just return the
- // original UnresolvedRelation. It is possible we are matching a
query like "select *
- // from parquet.`/path/to/query`". The plan will get resolved
later.
- // Note that we are testing (!db_exists || !table_exists)
because the catalog throws
- // an exception from tableExists if the database does not exist.
- u
- } else {
- lookupTableFromCatalog(u)
- }
+ // If the database part is specified, and we support running
SQL directly on files, and
+ // it's not a temporary view, and the table does not exist,
then let's just return the
+ // original UnresolvedRelation. It is possible we are matching
a query like "select *
+ // from parquet.`/path/to/query`". The plan will get resolved
later.
+ // Note that we are testing (!db_exists || !table_exists)
because the catalog throws
+ // an exception from tableExists if the database does not
exist.
+ u
+ } else {
+ val logicalPlan = lookupTableFromCatalog(u,
Some(currentDatabase))
+ currentDatabase = logicalPlan.collectFirst {
--- End diff --
This looks scary; for instance it depends on the iteration order for
`collectFirst`.
Why is this needed and why can't we use the current database?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
