-
Notifications
You must be signed in to change notification settings - Fork 313
fix: [Spark 4.1] preserve union output partitioning in CometUnionExec #4207
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
andygrove
wants to merge
5
commits into
apache:main
Choose a base branch
from
andygrove:issue-4122
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 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
d9ec928
fix: [Spark 4.1] preserve union output partitioning in CometUnionExec…
andygrove c688731
ci: register CometSetOpWithGroupBySuite in pr_build workflows
andygrove 308dcb7
fix: [Spark 4.1.1] drop orphaned whitespace hunks on intersect-all go…
andygrove 6d98643
test: address review feedback on CometUnionExec partitioning fix
andygrove 19e5b04
Merge branch 'main' into issue-4122
andygrove 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
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
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
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
43 changes: 43 additions & 0 deletions
43
spark/src/main/spark-3.4/org/apache/spark/sql/comet/shims/ShimCometUnionExec.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,43 @@ | ||
| /* | ||
| * 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.spark.sql.comet.shims | ||
|
|
||
| import scala.reflect.ClassTag | ||
|
|
||
| import org.apache.spark.SparkContext | ||
| import org.apache.spark.rdd.RDD | ||
| import org.apache.spark.sql.catalyst.plans.physical.Partitioning | ||
|
|
||
| object ShimCometUnionExec { | ||
|
|
||
| /** | ||
| * Unions a sequence of RDDs while preserving the declared output partitioning. Before Spark | ||
| * 4.1, [[org.apache.spark.sql.execution.UnionExec]] always reports | ||
| * [[org.apache.spark.sql.catalyst.plans.physical.UnknownPartitioning]], so this shim simply | ||
| * concatenates partitions via `SparkContext.union`. The partitioning-aware path is only needed | ||
| * on Spark 4.1+ (see SPARK-52921). | ||
| */ | ||
| def unionRDDs[T: ClassTag]( | ||
| sc: SparkContext, | ||
| rdds: Seq[RDD[T]], | ||
| @annotation.nowarn("cat=unused") outputPartitioning: Partitioning): RDD[T] = { | ||
| sc.union(rdds) | ||
| } | ||
| } |
43 changes: 43 additions & 0 deletions
43
spark/src/main/spark-3.5/org/apache/spark/sql/comet/shims/ShimCometUnionExec.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,43 @@ | ||
| /* | ||
| * 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.spark.sql.comet.shims | ||
|
|
||
| import scala.reflect.ClassTag | ||
|
|
||
| import org.apache.spark.SparkContext | ||
| import org.apache.spark.rdd.RDD | ||
| import org.apache.spark.sql.catalyst.plans.physical.Partitioning | ||
|
|
||
| object ShimCometUnionExec { | ||
|
|
||
| /** | ||
| * Unions a sequence of RDDs while preserving the declared output partitioning. Before Spark | ||
| * 4.1, [[org.apache.spark.sql.execution.UnionExec]] always reports | ||
| * [[org.apache.spark.sql.catalyst.plans.physical.UnknownPartitioning]], so this shim simply | ||
| * concatenates partitions via `SparkContext.union`. The partitioning-aware path is only needed | ||
| * on Spark 4.1+ (see SPARK-52921). | ||
| */ | ||
| def unionRDDs[T: ClassTag]( | ||
| sc: SparkContext, | ||
| rdds: Seq[RDD[T]], | ||
| @annotation.nowarn("cat=unused") outputPartitioning: Partitioning): RDD[T] = { | ||
| sc.union(rdds) | ||
| } | ||
| } |
43 changes: 43 additions & 0 deletions
43
spark/src/main/spark-4.0/org/apache/spark/sql/comet/shims/ShimCometUnionExec.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,43 @@ | ||
| /* | ||
| * 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.spark.sql.comet.shims | ||
|
|
||
| import scala.reflect.ClassTag | ||
|
|
||
| import org.apache.spark.SparkContext | ||
| import org.apache.spark.rdd.RDD | ||
| import org.apache.spark.sql.catalyst.plans.physical.Partitioning | ||
|
|
||
| object ShimCometUnionExec { | ||
|
|
||
| /** | ||
| * Unions a sequence of RDDs while preserving the declared output partitioning. Before Spark | ||
| * 4.1, [[org.apache.spark.sql.execution.UnionExec]] always reports | ||
| * [[org.apache.spark.sql.catalyst.plans.physical.UnknownPartitioning]], so this shim simply | ||
| * concatenates partitions via `SparkContext.union`. The partitioning-aware path is only needed | ||
| * on Spark 4.1+ (see SPARK-52921). | ||
| */ | ||
| def unionRDDs[T: ClassTag]( | ||
| sc: SparkContext, | ||
| rdds: Seq[RDD[T]], | ||
| @annotation.nowarn("cat=unused") outputPartitioning: Partitioning): RDD[T] = { | ||
| sc.union(rdds) | ||
| } | ||
| } |
60 changes: 60 additions & 0 deletions
60
spark/src/main/spark-4.1/org/apache/spark/sql/comet/shims/ShimCometUnionExec.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,60 @@ | ||
| /* | ||
| * 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.spark.sql.comet.shims | ||
|
|
||
| import scala.reflect.ClassTag | ||
|
|
||
| import org.apache.spark.SparkContext | ||
| import org.apache.spark.rdd.{RDD, SQLPartitioningAwareUnionRDD} | ||
| import org.apache.spark.sql.catalyst.plans.physical.{Partitioning, UnknownPartitioning} | ||
|
|
||
| object ShimCometUnionExec { | ||
|
|
||
| /** | ||
| * Unions a sequence of RDDs while preserving the declared output partitioning. Spark 4.1 | ||
| * introduced [[org.apache.spark.sql.internal.SQLConf.UNION_OUTPUT_PARTITIONING]] (SPARK-52921), | ||
| * which lets [[org.apache.spark.sql.execution.UnionExec]] report a non-trivial output | ||
| * partitioning when all children share the same partitioning. Downstream operators may then | ||
| * skip an otherwise-required shuffle, so the columnar Union path must honor that contract by | ||
| * routing through [[SQLPartitioningAwareUnionRDD]] rather than plain `SparkContext.union`, | ||
| * which concatenates partitions and breaks the partitioning invariant. | ||
| */ | ||
| def unionRDDs[T: ClassTag]( | ||
| sc: SparkContext, | ||
| rdds: Seq[RDD[T]], | ||
| outputPartitioning: Partitioning): RDD[T] = { | ||
| outputPartitioning match { | ||
| case _: UnknownPartitioning => sc.union(rdds) | ||
| case _ => | ||
| val numPartitions = outputPartitioning.numPartitions | ||
| val nonEmpty = rdds.filter(_.partitions.nonEmpty) | ||
| // SQLPartitioningAwareUnionRDD indexes every child at every output partition, so any | ||
| // child whose partition count diverges from the declared numPartitions would raise | ||
| // ArrayIndexOutOfBoundsException. That would only happen if the declared partitioning | ||
| // is stale relative to the RDDs (e.g. children were coalesced by AQE but the reported | ||
| // partitioning was not). Fall back to plain concat in that case. | ||
| if (nonEmpty.isEmpty || nonEmpty.exists(_.partitions.length != numPartitions)) { | ||
| sc.union(rdds) | ||
| } else { | ||
| new SQLPartitioningAwareUnionRDD(sc, nonEmpty, numPartitions) | ||
| } | ||
| } | ||
| } | ||
| } | ||
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.
if
_.partitions.length != numPartitionsfires, then we should probably log a warning message.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.
Added