cloud-fan commented on a change in pull request #27265: [SPARK-30555][SQL] MERGE INTO insert action should only access columns from source table URL: https://github.com/apache/spark/pull/27265#discussion_r368029518
########## File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala ########## @@ -1347,20 +1350,27 @@ class Analyzer( def resolveAssignments( assignments: Seq[Assignment], - mergeInto: MergeIntoTable): Seq[Assignment] = { + mergeInto: MergeIntoTable, + resolveValueWithBothTables: Boolean): Seq[Assignment] = { if (assignments.isEmpty) { val expandedColumns = mergeInto.targetTable.output val expandedValues = mergeInto.sourceTable.output expandedColumns.zip(expandedValues).map(kv => Assignment(kv._1, kv._2)) } else { assignments.map { assign => val resolvedKey = assign.key match { - case c if !c.resolved => resolveExpressionTopDown(c, mergeInto.targetTable) Review comment: This is a mistake. `resolveExpressionTopDown` resolves attributes with the output of the input plan's children, not input. We should wrap target table with a `Project` when calling this method. ---------------------------------------------------------------- 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: us...@infra.apache.org With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org