Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[Spark] Fix AttributeReference mismatch for readChangeFeed queries coming from Spark Connect #3451

Merged
merged 3 commits into from
Aug 7, 2024
Merged

[Spark] Fix AttributeReference mismatch for readChangeFeed queries coming from Spark Connect #3451

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a3dd90
fix output of the LogicalRelation for readChangeFeed queries coming f…
dillitz Jul 31, 2024
cc0810f
Merge branch 'master' into fix-logical-relation-output-readChangeFeed…
dillitz Aug 6, 2024
67f91b5
copy metadata
dillitz Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion spark/src/main/scala/org/apache/spark/sql/delta/DeltaAnalysis.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1218,7 +1218,15 @@ object DeltaRelation extends DeltaLogging {
val relation = d.withOptions(options.asScala.toMap).toBaseRelation
val output = if (CDCReader.isCDCRead(options)) {
// Handles cdc for the spark.read.options().table() code path
toAttributes(relation.schema)
// Mapping needed for references to the table's columns coming from Spark Connect.
val newOutput = toAttributes(relation.schema)
newOutput.map { a =>
val existingReference = v2Relation.output
.find(e => e.name == a.name && e.dataType == a.dataType && e.nullable == a.nullable)
existingReference.map { e =>
e.copy(metadata = a.metadata)(exprId = e.exprId, qualifier = e.qualifier)
}.getOrElse(a)
}
} else {
v2Relation.output
}
Expand Down
Loading