aokolnychyi commented on code in PR #55278:
URL: https://github.com/apache/spark/pull/55278#discussion_r3164899319
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala:
##########
@@ -1024,17 +1053,43 @@ class Analyzer(
// Unwrap temp views storing analyzed plans and resolve V2TableReference
nodes in the child.
private def unwrapRelationPlan(plan: LogicalPlan): LogicalPlan = {
EliminateSubqueryAliases(plan) match {
- case v: View if v.isTempViewStoringAnalyzedPlan =>
resolveTableReferences(v.child)
+ case v: View if v.isTempViewStoringAnalyzedPlan =>
resolveTableReferencesInTempView(v.child)
case other => other
}
}
- // Resolve V2TableReference nodes in a plan. V2TableReference is only
created for temp views
- // (via V2TableReference.createForTempView), so we only need to resolve it
when returning
+ // Resolve the write target of a V2 write command (batch or streaming).
+ private def resolveWriteTarget(
+ write: LogicalPlan,
+ table: NamedRelation,
+ withNewTable: NamedRelation => LogicalPlan): LogicalPlan = {
+ table match {
+ case u: UnresolvedRelation if !u.isStreaming =>
+ resolveRelation(u).map(unwrapRelationPlan).map {
+ case v: View => throw
QueryCompilationErrors.writeIntoViewNotAllowedError(
+ v.desc.identifier, write)
+ case u: UnresolvedCatalogRelation =>
+ throw QueryCompilationErrors.writeIntoV1TableNotAllowedError(
+ u.tableMeta.identifier, write)
+ case r: DataSourceV2Relation => withNewTable(r)
+ case _ =>
+ throw QueryCompilationErrors.writeIntoTempViewNotAllowedError(
+ u.multipartIdentifier.quoted)
+ }.getOrElse(write)
+ case _ => write
+ }
+ }
+
+ // Resolve V2TableReference nodes inside temp view plans. These are
created by
+ // V2TableReference.createForTempView. We only need to resolve it when
returning
// the plan of temp views (in resolveViews and unwrapRelationPlan).
- private def resolveTableReferences(plan: LogicalPlan): LogicalPlan = {
+ private def resolveTableReferencesInTempView(plan: LogicalPlan):
LogicalPlan = {
plan.resolveOperatorsUp {
- case r: V2TableReference => relationResolution.resolveReference(r)
+ case r: V2TableReference =>
+ assert(r.context.isInstanceOf[V2TableReference.TemporaryViewContext],
Review Comment:
Not sure I agree with this, it feels risky to enforce this. What about
something like below?
```
private def resolveTableReferencesInTempView(plan: LogicalPlan): LogicalPlan
= {
plan.resolveOperatorsUp {
case r: V2TableReference if r.context.isInstanceOf[TemporaryViewContext]
=>
relationResolution.resolveReference(r)
}
}
```
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
