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

AtomicGetOrElseUpdateOnTrieMap::atomicGetOrElseUpdate -> TrieMap::getOrElseUpdate #591

Merged
merged 2 commits into from
Oct 12, 2023

Conversation

dpsoft
Copy link
Contributor

@dpsoft dpsoft commented Jun 17, 2019

  • Remove AtomicGetOrElseUpdateOnTrieMap::atomicGetOrElseUpdate method in favor of TrieMap::getOrElseUpdate

@ivantopo
Copy link
Contributor

Yo @hughsimpson did you explicitly catch an issue from this branch? I see you pushed a commit and I was wondering about it 🤔

As you can see, this PR is quite old and I do remember having a reason not to merge it yet, but I cannot remember it anymore. Probably I discussed it privately with Diego and can't find the conversation anymore 🤷

@hughsimpson
Copy link
Contributor

@ivantopo I actually just messed a couple of lines up during a rebase 😅 the second commit was just to fix that. The only behavioural changes I could spot here was an explicit throw in case the value was null, but it can't be for any of the call-sites. Seemed a reasonable change to me...

@dpsoft
Copy link
Contributor Author

dpsoft commented Oct 11, 2023

Hi, I can't recall the reason why this was never merged—perhaps due to a specific Scala version, but I'm uncertain. The related issue can be found here: scala/bug#7943. I believe it's time to remove the workaround and proceed with the merge. 👍

@hughsimpson hughsimpson merged commit a96a353 into master Oct 12, 2023
1 of 2 checks passed
@hughsimpson hughsimpson deleted the cleanupAtomicGetOrElse branch October 12, 2023 12:35
hughsimpson added a commit to hughsimpson/Kamon that referenced this pull request Nov 7, 2023
…OrElseUpdate (kamon-io#591)

* remove AtomicGetOrElseUpdateOnTrieMap::atomicGetOrElseUpdate method in favor of TrieMap::getOrElseUpdate

* fix rebase bugs

---------

Co-authored-by: Hugh Simpson <hsimpson@rzsoftware.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants