Skip to content
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

Fix TrieMap#{filterInPlace,mapValuesInPlace} #9727

Merged
merged 1 commit into from
Aug 24, 2021

Conversation

NthPortal
Copy link
Contributor

Fix the behaviour of TrieMap#filterInPlace and
TrieMap#mapValuesInPlace to respect atomic entry changes.

Built on top of #9726

Fixes scala/bug#12443

@NthPortal NthPortal requested a review from a team August 14, 2021 06:37
@scala-jenkins scala-jenkins added this to the 2.13.7 milestone Aug 14, 2021
@NthPortal NthPortal added library:collections PRs involving changes to the standard collection library library:concurrent Changes to the concurrency support in stdlib labels Aug 14, 2021
@NthPortal
Copy link
Contributor Author

currently an inefficient but simpler implementation. i'm working on a faster one, but... I think we should merge the reliable one first, and think about optimisation later

@NthPortal NthPortal marked this pull request as draft August 15, 2021 00:40
@NthPortal
Copy link
Contributor Author

oops I'm going to overengineer a test again 😬

Copy link
Member

@lrytz lrytz left a comment

Choose a reason for hiding this comment

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

LGTM (let's merge #9726 first though)

src/library/scala/collection/concurrent/TrieMap.scala Outdated Show resolved Hide resolved
src/library/scala/collection/concurrent/TrieMap.scala Outdated Show resolved Hide resolved
@NthPortal NthPortal marked this pull request as ready for review August 21, 2021 02:06
@NthPortal
Copy link
Contributor Author

@lrytz I think this has changed enough to need a re-review

Copy link
Member

@lrytz lrytz left a comment

Choose a reason for hiding this comment

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

LGTM, thank you!

Rebased and added MiMa filters.

Fix the behaviour of `concurrent.Map#filterInPlace` and
`concurrent.Map#mapValuesInPlace` to respect atomic entry changes.
@lrytz lrytz merged commit 891e58b into scala:2.13.x Aug 24, 2021
@NthPortal NthPortal deleted the topic/TrieMap-fixes-2/PR branch August 24, 2021 09:34
@SethTisue
Copy link
Member

SethTisue commented Aug 26, 2021

@NthPortal the Scala community build (plus git bisect) found that this is making a twitter-util test hang

the problem is reproducible by cloning https://github.com/twitter/util and running util-logging/testOnly *ThrottledHandler* in sbt. it succeeds with ++2.13.6 but fails with ++2.13.7-bin-891e58b

do you have time to dig into it...?

@NthPortal
Copy link
Contributor Author

that's really bad. but also how??? yeah, I'll look into it

@NthPortal
Copy link
Contributor Author

oh noooooooooooo

@SethTisue
Copy link
Member

followup: #9737

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
library:collections PRs involving changes to the standard collection library library:concurrent Changes to the concurrency support in stdlib
Projects
None yet
5 participants