Skip to content

[SPARK-32755][SQL][FOLLOWUP] Ensure -- method of AttributeSet have same behavior under Scala 2.12 and 2.13 #29689

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
LuciferYang wants to merge 2 commits into from
Closed

[SPARK-32755][SQL][FOLLOWUP] Ensure -- method of AttributeSet have same behavior under Scala 2.12 and 2.13 #29689

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f9cca9
fix spark-32755-follwup
LuciferYang Sep 9, 2020
a595600
fix SPARK-32755-FOLLOWUP
LuciferYang Sep 9, 2020
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
6 changes: 4 additions & 2 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/AttributeSet.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,12 @@ class AttributeSet private (private val baseSet: mutable.LinkedHashSet[Attribute
*/
def --(other: Iterable[NamedExpression]): AttributeSet = {
other match {
// SPARK-32755: `--` method behave differently under scala 2.12 and 2.13,
// use a Scala 2.12 based code to maintains the insertion order in Scala 2.13
case otherSet: AttributeSet =>
new AttributeSet(baseSet -- otherSet.baseSet)
new AttributeSet(baseSet.clone() --= otherSet.baseSet)

@LuciferYang LuciferYang Sep 9, 2020 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

In Scala 2.12 the implementation of -- is

 override def --(xs: GenTraversableOnce[A]): This = clone() --= xs.seq

@LuciferYang LuciferYang Sep 9, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

diff method is defined as Computes the difference of this set and another set, I haven't tested overall behavior of diff, but I think the current changes don't look complicated either

@hvanhovell hvanhovell Sep 9, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

diff returns a set, so it can potentially mess up the ordering.

@LuciferYang LuciferYang Sep 9, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

image
@hvanhovell Actually, diff returns LinkedHashSet[AttributeEquals] here...

@LuciferYang LuciferYang Sep 9, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

In Scala 2.13

def diff(that: collection.Set[A]): C =
    toIterable.foldLeft(empty)((result, elem) => if (that contains elem) result else result += elem)

In Scala 2.12

def diff(that: GenSet[A]): This = this -- that

It looks like they're maintains ordered, but the input parameter needs to be a Set, so

other.map(a => new AttributeEquals(a.toAttribute))

part need call toSet。。。

@hvanhovell hvanhovell Sep 9, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Ok, then diff looks better.

@hvanhovell hvanhovell Sep 9, 2020 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

If we can avoid the conversion it would be nice. The current thing would be fine in that case.

@LuciferYang LuciferYang Sep 9, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This conversion seems inevitable if use diff :(

@hvanhovell hvanhovell Sep 9, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Let's use the current method then :).

@LuciferYang LuciferYang Sep 9, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

ok ~

case _ =>
new AttributeSet(baseSet -- other.map(a => new AttributeEquals(a.toAttribute)))
new AttributeSet(baseSet.clone() --= other.map(a => new AttributeEquals(a.toAttribute)))
}
}

Expand Down