-
Notifications
You must be signed in to change notification settings - Fork 615
[VL][DELTA] Support Delta CDF scan offload #12218
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
malinjawi
wants to merge
6
commits into
apache:main
Choose a base branch
from
malinjawi:codex/delta-cdf-offload
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
44624fa
[VL][DELTA] Support CDF scan offload
malinjawi 4980906
[VL][DELTA] Allow expected fallback in CDF tests
malinjawi 8a2b90c
[VL][DELTA] Refine CDF test fallback coverage
malinjawi ca8a192
[VL][DELTA] Allow CDF synthetic row branch in tests
malinjawi e62f121
Add Delta CDF deletion vector regression test
malinjawi 2cd31c0
Guard Delta CDF DV remove scans
malinjawi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
gluten-delta/src-delta23/main/scala/org/apache/gluten/extension/DeltaCDFRelationHelper.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.gluten.extension | ||
|
|
||
| import org.apache.spark.sql.{DataFrame, SparkSession} | ||
| import org.apache.spark.sql.delta.BatchCDFSchemaEndVersion | ||
| import org.apache.spark.sql.delta.commands.cdc.CDCReader | ||
|
|
||
| object DeltaCDFRelationHelper { | ||
| def changesToBatchDF( | ||
| relation: CDCReader.DeltaCDFRelation, | ||
| spark: SparkSession): DataFrame = { | ||
| val deltaLog = relation.snapshotWithSchemaMode.snapshot.deltaLog | ||
| val latestVersion = deltaLog.update().version | ||
| val endingVersionForBatchSchema = | ||
| relation.endingVersion.map(v => latestVersion.min(v)).getOrElse(latestVersion) | ||
| val snapshotForBatchSchema = relation.snapshotWithSchemaMode.schemaMode match { | ||
| case BatchCDFSchemaEndVersion => deltaLog.getSnapshotAt(endingVersionForBatchSchema) | ||
| case _ => relation.snapshotWithSchemaMode.snapshot | ||
| } | ||
| val endVersion = relation.endingVersion.getOrElse(latestVersion) | ||
|
|
||
| CDCReader.changesToBatchDF( | ||
| deltaLog, | ||
| relation.startingVersion.get, | ||
| endVersion, | ||
| spark, | ||
| readSchemaSnapshot = Some(snapshotForBatchSchema)) | ||
| } | ||
| } |
44 changes: 44 additions & 0 deletions
44
gluten-delta/src-delta24/main/scala/org/apache/gluten/extension/DeltaCDFRelationHelper.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.gluten.extension | ||
|
|
||
| import org.apache.spark.sql.{DataFrame, SparkSession} | ||
| import org.apache.spark.sql.delta.BatchCDFSchemaEndVersion | ||
| import org.apache.spark.sql.delta.commands.cdc.CDCReader | ||
|
|
||
| object DeltaCDFRelationHelper { | ||
| def changesToBatchDF( | ||
| relation: CDCReader.DeltaCDFRelation, | ||
| spark: SparkSession): DataFrame = { | ||
| val deltaLog = relation.snapshotWithSchemaMode.snapshot.deltaLog | ||
| val latestVersion = deltaLog.update().version | ||
| val endingVersionForBatchSchema = | ||
| relation.endingVersion.map(v => latestVersion.min(v)).getOrElse(latestVersion) | ||
| val snapshotForBatchSchema = relation.snapshotWithSchemaMode.schemaMode match { | ||
| case BatchCDFSchemaEndVersion => deltaLog.getSnapshotAt(endingVersionForBatchSchema) | ||
| case _ => relation.snapshotWithSchemaMode.snapshot | ||
| } | ||
| val endVersion = relation.endingVersion.getOrElse(latestVersion) | ||
|
|
||
| CDCReader.changesToBatchDF( | ||
| deltaLog, | ||
| relation.startingVersion.get, | ||
| endVersion, | ||
| spark, | ||
| readSchemaSnapshot = Some(snapshotForBatchSchema)) | ||
| } | ||
| } |
44 changes: 44 additions & 0 deletions
44
gluten-delta/src-delta33/main/scala/org/apache/gluten/extension/DeltaCDFRelationHelper.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.gluten.extension | ||
|
|
||
| import org.apache.spark.sql.{DataFrame, SparkSession} | ||
| import org.apache.spark.sql.delta.BatchCDFSchemaEndVersion | ||
| import org.apache.spark.sql.delta.commands.cdc.CDCReader | ||
|
|
||
| object DeltaCDFRelationHelper { | ||
| def changesToBatchDF( | ||
| relation: CDCReader.DeltaCDFRelation, | ||
| spark: SparkSession): DataFrame = { | ||
| val deltaLog = relation.snapshotWithSchemaMode.snapshot.deltaLog | ||
| val latestVersion = deltaLog.update().version | ||
| val endingVersionForBatchSchema = | ||
| relation.endingVersion.map(v => latestVersion.min(v)).getOrElse(latestVersion) | ||
| val snapshotForBatchSchema = relation.snapshotWithSchemaMode.schemaMode match { | ||
| case BatchCDFSchemaEndVersion => deltaLog.getSnapshotAt(endingVersionForBatchSchema) | ||
| case _ => relation.snapshotWithSchemaMode.snapshot | ||
| } | ||
| val endVersion = relation.endingVersion.getOrElse(latestVersion) | ||
|
|
||
| CDCReader.changesToBatchDF( | ||
| deltaLog, | ||
| relation.startingVersion.get, | ||
| endVersion, | ||
| spark, | ||
| readSchemaSnapshot = Some(snapshotForBatchSchema)) | ||
| } | ||
| } |
47 changes: 47 additions & 0 deletions
47
gluten-delta/src-delta40/main/scala/org/apache/gluten/extension/DeltaCDFRelationHelper.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.gluten.extension | ||
|
|
||
| import org.apache.spark.sql.{DataFrame, SparkSession} | ||
| import org.apache.spark.sql.delta.BatchCDFSchemaEndVersion | ||
| import org.apache.spark.sql.delta.commands.cdc.CDCReader | ||
|
|
||
| object DeltaCDFRelationHelper { | ||
| def changesToBatchDF( | ||
| relation: CDCReader.DeltaCDFRelation, | ||
| spark: SparkSession): DataFrame = { | ||
| val deltaLog = relation.snapshotWithSchemaMode.snapshot.deltaLog | ||
| val latestVersion = deltaLog.update(catalogTableOpt = relation.catalogTableOpt).version | ||
| val endingVersionForBatchSchema = | ||
| relation.endingVersion.map(v => latestVersion.min(v)).getOrElse(latestVersion) | ||
| val snapshotForBatchSchema = relation.snapshotWithSchemaMode.schemaMode match { | ||
| case BatchCDFSchemaEndVersion => | ||
| deltaLog.getSnapshotAt( | ||
| endingVersionForBatchSchema, | ||
| catalogTableOpt = relation.catalogTableOpt) | ||
| case _ => relation.snapshotWithSchemaMode.snapshot | ||
| } | ||
| val endVersion = relation.endingVersion.getOrElse(latestVersion) | ||
|
|
||
| CDCReader.changesToBatchDF( | ||
| deltaLog, | ||
| relation.startingVersion.get, | ||
| endVersion, | ||
| spark, | ||
| readSchemaSnapshot = Some(snapshotForBatchSchema)) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
98 changes: 98 additions & 0 deletions
98
gluten-delta/src/main/scala/org/apache/gluten/extension/DeltaCDFScanStrategy.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.gluten.extension | ||
|
|
||
| import org.apache.spark.sql.SparkSession | ||
| import org.apache.spark.sql.catalyst.expressions.{Alias, Attribute, AttributeReference, Expression, NamedExpression} | ||
| import org.apache.spark.sql.catalyst.planning.PhysicalOperation | ||
| import org.apache.spark.sql.catalyst.plans.logical.{Filter, LocalRelation, LogicalPlan, Project} | ||
| import org.apache.spark.sql.delta.commands.cdc.CDCReader | ||
| import org.apache.spark.sql.execution.{SparkPlan, SparkStrategy} | ||
| import org.apache.spark.sql.execution.datasources.LogicalRelation | ||
|
|
||
| case class DeltaCDFScanStrategy(spark: SparkSession) extends SparkStrategy { | ||
| override def apply(plan: LogicalPlan): Seq[SparkPlan] = plan match { | ||
| case PhysicalOperation(projects, filters, relation: LogicalRelation) => | ||
| relation.relation match { | ||
| case cdfRelation: CDCReader.DeltaCDFRelation => | ||
| planCDFRelation(relation, cdfRelation, projects, filters).map(planLater).toSeq | ||
| case _ => Nil | ||
| } | ||
| case _ => Nil | ||
| } | ||
|
|
||
| private def planCDFRelation( | ||
| relation: LogicalRelation, | ||
| cdfRelation: CDCReader.DeltaCDFRelation, | ||
| projects: Seq[NamedExpression], | ||
| filters: Seq[Expression]): Option[LogicalPlan] = { | ||
| if (cdfRelation.startingVersion.isEmpty) { | ||
| return Some(projectAndFilter(LocalRelation(relation.output), projects, filters)) | ||
| } | ||
|
|
||
| val cdfPlan = | ||
| DeltaCDFRelationHelper.changesToBatchDF(cdfRelation, spark).queryExecution.analyzed | ||
| val cdfOutput = cdfPlan.output | ||
| val rewrittenFilters = filters.map(rewriteExpression(_, cdfOutput)) | ||
| val rewrittenProjects = projects.map(rewriteProject(_, cdfOutput)) | ||
| Some(projectAndFilter(cdfPlan, rewrittenProjects, rewrittenFilters)) | ||
| } | ||
|
|
||
| private def projectAndFilter( | ||
| child: LogicalPlan, | ||
| projects: Seq[NamedExpression], | ||
| filters: Seq[Expression]): LogicalPlan = { | ||
| val filtered = filters.reduceOption(org.apache.spark.sql.catalyst.expressions.And) match { | ||
| case Some(condition) => Filter(condition, child) | ||
| case None => child | ||
| } | ||
| Project(projects, filtered) | ||
| } | ||
|
|
||
| private def rewriteProject( | ||
| project: NamedExpression, | ||
| cdfOutput: Seq[Attribute]): NamedExpression = { | ||
| project match { | ||
| case attr: AttributeReference => | ||
| Alias( | ||
| resolveCDFAttribute(attr, cdfOutput), | ||
| attr.name)( | ||
| exprId = attr.exprId, | ||
| qualifier = attr.qualifier, | ||
| explicitMetadata = Some(attr.metadata)) | ||
| case other => | ||
| rewriteExpression(other, cdfOutput).asInstanceOf[NamedExpression] | ||
| } | ||
| } | ||
|
|
||
| private def rewriteExpression(expr: Expression, cdfOutput: Seq[Attribute]): Expression = { | ||
| expr.transform { | ||
| case attr: AttributeReference => resolveCDFAttribute(attr, cdfOutput) | ||
| } | ||
| } | ||
|
|
||
| private def resolveCDFAttribute( | ||
| attr: AttributeReference, | ||
| cdfOutput: Seq[Attribute]): Attribute = { | ||
| cdfOutput | ||
| .find(output => spark.sessionState.conf.resolver(output.name, attr.name)) | ||
| .getOrElse( | ||
| throw new IllegalArgumentException( | ||
| s"Unable to resolve CDF attribute ${attr.name} from " + | ||
| s"${cdfOutput.map(_.name).mkString("[", ", ", "]")}")) | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you know what happens in Delta 4.1/4.2/4.3? Would it take the code from 4.0 folder?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes @felipepessoto I checked the current Maven profile/source wiring:
spark-4.0setsdelta.version=4.0.1anddelta.binary.version=40spark-4.1setsdelta.version=4.1.0anddelta.binary.version=40src-delta${delta.binary.version}/main/scalaSo with the current profile setup, both Spark 4.0 / Delta 4.0.x and Spark 4.1 / Delta 4.1.x use
gluten-delta/src-delta40/....For future Delta 4.2 / 4.3 support, it depends on how those profiles are introduced. If they keep
delta.binary.version=40, they will continue to use the samesrc-delta40helper. If Delta changes the relevant CDF APIs and Gluten introduces a new binary bucket, then we should add a new version-specific helper.This also relates to the earlier folder-activation discussion in #11924: supporting family-level folders like
src-spark4/src-delta4would make this cleaner and avoid copying code across Spark/Delta 4.x profiles when the APIs stay compatible. I think that belongs in a separate Maven/source-layout refactor rather than in this CDF PR.