Skip to content

[SPARK-47897][SQL][3.5] Fix ExpressionSet performance regression in scala 2.12 #46114

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.

Sign up for GitHub

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

Closed
wForget wants to merge 2 commits into from
Closed

[SPARK-47897][SQL][3.5] Fix ExpressionSet performance regression in scala 2.12 #46114

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88d60ed
Fix ExpressionSet performance regression in scala 2.12
wForget Apr 18, 2024
3f590a3
add comments
wForget Apr 19, 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
21 changes: 20 additions & 1 deletion ...atalyst/src/main/scala-2.12/org/apache/spark/sql/catalyst/expressions/ExpressionSet.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

package org.apache.spark.sql.catalyst.expressions

import scala.collection.mutable
import scala.collection.{mutable, GenTraversableOnce}
import scala.collection.mutable.ArrayBuffer

object ExpressionSet {
Expand Down Expand Up @@ -108,12 +108,31 @@ class ExpressionSet protected(
newSet
}

/**
* SPARK-47897: In Scala 2.12, the `SetLike.++` method iteratively calls `+` method.
* `ExpressionSet.+` is expensive, so we override `++`.
*/
override def ++(elems: GenTraversableOnce[Expression]): ExpressionSet = {
Copy link
Contributor

@minyyy minyyy Apr 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a comment on the method about why we don't use the SetLike.default here? Thanks.

Copy link
Member Author

@wForget wForget Apr 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks, added.

val newSet = clone()
elems.foreach(newSet.add)
newSet
}

override def -(elem: Expression): ExpressionSet = {
val newSet = clone()
newSet.remove(elem)
newSet
}

/**
* SPARK-47897: We need to override `--` like `++`.
*/
override def --(elems: GenTraversableOnce[Expression]): ExpressionSet = {
val newSet = clone()
elems.foreach(newSet.remove)
newSet
}

def map(f: Expression => Expression): ExpressionSet = {
val newSet = new ExpressionSet()
this.iterator.foreach(elem => newSet.add(f(elem)))
Expand Down