fuwhu commented on a change in pull request #26684: [SPARK-30001][SQL]
ResolveRelations should handle both V1 and V2 tables.
URL: https://github.com/apache/spark/pull/26684#discussion_r358594236
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
##########
@@ -776,47 +792,65 @@ class Analyzer(
case _ => plan
}
- def apply(plan: LogicalPlan): LogicalPlan =
ResolveTables(plan).resolveOperatorsUp {
- case i @ InsertIntoStatement(u @
UnresolvedRelation(AsTableIdentifier(ident)), _, child, _, _)
- if child.resolved =>
- EliminateSubqueryAliases(lookupTableFromCatalog(ident, u)) match {
+ def apply(plan: LogicalPlan): LogicalPlan =
ResolveTempViews(plan).resolveOperatorsUp {
+ case i @ InsertIntoStatement(table, _, _, _, _) if i.query.resolved =>
+ val relation = table match {
+ case u @ UnresolvedRelation(SessionCatalogAndIdentifier(catalog,
ident)) =>
+ lookupRelation(catalog, ident, recurse = false).getOrElse(u)
+ case other => other
+ }
+
+ EliminateSubqueryAliases(relation) match {
case v: View =>
- u.failAnalysis(s"Inserting into a view is not allowed. View:
${v.desc.identifier}.")
+ table.failAnalysis(s"Inserting into a view is not allowed. View:
${v.desc.identifier}.")
case other => i.copy(table = other)
}
+
case u: UnresolvedRelation => resolveRelation(u)
}
- // Look up the table with the given name from catalog. The database we
used is decided by the
- // precedence:
- // 1. Use the database part of the table identifier, if it is defined;
- // 2. Use defaultDatabase, if it is defined(In this case, no temporary
objects can be used,
- // and the default database is only used to look up a view);
- // 3. Use the currentDb of the SessionCatalog.
- private def lookupTableFromCatalog(
- tableIdentifier: TableIdentifier,
- u: UnresolvedRelation,
- defaultDatabase: Option[String] = None): LogicalPlan = {
- val tableIdentWithDb = tableIdentifier.copy(
- database = tableIdentifier.database.orElse(defaultDatabase))
- try {
- v1SessionCatalog.lookupRelation(tableIdentWithDb)
- } catch {
- case _: NoSuchTableException | _: NoSuchDatabaseException =>
- u
+ // Look up a relation from the given session catalog with the following
logic:
+ // 1) If a relation is not found in the catalog, return None.
+ // 2) If a v1 table is found, create a v1 relation. Otherwise, create a v2
relation.
+ // If recurse is set to true, it will call `resolveRelation` recursively
to resolve
+ // relations with the correct database scope.
+ private def lookupRelation(
+ catalog: CatalogPlugin,
+ ident: Identifier,
+ recurse: Boolean): Option[LogicalPlan] = {
+ val newIdent = withNewNamespace(ident)
+ assert(newIdent.namespace.size == 1)
+
+ CatalogV2Util.loadTable(catalog, newIdent) match {
+ case Some(v1Table: V1Table) =>
+ val tableIdent = TableIdentifier(newIdent.name,
newIdent.namespace.headOption)
Review comment:
'tableIdent' is not used at all.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
