-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
Prevent Chain
instances being backed by mutable or lazy Seq
#4169
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
de1a9e9
Mutablility fixes in Chain
bplommer b6faa76
`Chain.Wrap` wraps immutable Seq
bplommer bbce5a7
Add access modifier for ChainCompanionCompat
bplommer 8b8c925
Merge remote-tracking branch 'upstream/main' into fix-chain-from-mut-seq
armanbilge 5fdc7cf
Handle Seqs outside the collections hiearchy
armanbilge 267fe58
Remove unnecessary import
armanbilge 4ead5ac
Avoid import aliases
armanbilge 7341d4f
Headers
armanbilge 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
62 changes: 62 additions & 0 deletions
62
core/src/main/scala-2.12/cats/data/ChainCompanionCompat.scala
This file contains 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,62 @@ | ||
/* | ||
* Copyright (c) 2015 Typelevel | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy of | ||
* this software and associated documentation files (the "Software"), to deal in | ||
* the Software without restriction, including without limitation the rights to | ||
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of | ||
* the Software, and to permit persons to whom the Software is furnished to do so, | ||
* subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in all | ||
* copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS | ||
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR | ||
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER | ||
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
*/ | ||
|
||
package cats.data | ||
|
||
import cats.data.Chain.{nil, one, Wrap} | ||
import cats.kernel.compat.scalaVersionSpecific.IterableOnce | ||
|
||
import scala.collection.immutable | ||
|
||
private[data] trait ChainCompanionCompat { | ||
|
||
/** | ||
* Creates a Chain from the specified sequence. | ||
*/ | ||
def fromSeq[A](s: Seq[A]): Chain[A] = | ||
s match { | ||
case imm: immutable.Seq[A] => fromImmutableSeq(imm) | ||
case _ => fromMutableSeq(s) | ||
} | ||
|
||
private def fromImmutableSeq[A](s: immutable.Seq[A]): Chain[A] = { | ||
if (s.isEmpty) nil | ||
else if (s.lengthCompare(1) == 0) one(s.head) | ||
else Wrap(s) | ||
} | ||
|
||
private def fromMutableSeq[A](s: Seq[A]): Chain[A] = { | ||
if (s.isEmpty) nil | ||
else if (s.lengthCompare(1) == 0) one(s.head) | ||
else Wrap(s.toVector) | ||
} | ||
|
||
/** | ||
* Creates a Chain from the specified IterableOnce. | ||
*/ | ||
def fromIterableOnce[A](xs: IterableOnce[A]): Chain[A] = | ||
xs match { | ||
case s: immutable.Seq[A] => fromImmutableSeq(s) // pay O(1) not O(N) cost | ||
case s: Seq[A] => fromMutableSeq(s) | ||
case notSeq => | ||
fromImmutableSeq(notSeq.toVector) // toSeq could return a Stream, creating potential race conditions | ||
} | ||
} |
45 changes: 45 additions & 0 deletions
45
core/src/main/scala-2.13+/cats/data/ChainCompanionCompat.scala
This file contains 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,45 @@ | ||
/* | ||
* Copyright (c) 2015 Typelevel | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy of | ||
* this software and associated documentation files (the "Software"), to deal in | ||
* the Software without restriction, including without limitation the rights to | ||
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of | ||
* the Software, and to permit persons to whom the Software is furnished to do so, | ||
* subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in all | ||
* copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS | ||
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR | ||
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER | ||
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
*/ | ||
|
||
package cats.data | ||
|
||
import cats.data.Chain.{nil, one, Wrap} | ||
|
||
private[data] trait ChainCompanionCompat { | ||
|
||
/** | ||
* Creates a Chain from the specified sequence. | ||
*/ | ||
def fromSeq[A](s: Seq[A]): Chain[A] = | ||
if (s.isEmpty) nil | ||
else if (s.lengthCompare(1) == 0) one(s.head) | ||
else Wrap(s) | ||
|
||
/** | ||
* Creates a Chain from the specified IterableOnce. | ||
*/ | ||
def fromIterableOnce[A](xs: IterableOnce[A]): Chain[A] = Chain.fromSeq( | ||
xs match { | ||
case s: Seq[A] => s // pay O(1) not O(N) cost | ||
case notSeq => notSeq.iterator.to(Vector) // toSeq could return a LazyList, creating potential race conditions | ||
} | ||
) | ||
} |
This file contains 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
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.
let's add a more complete comment here. I don't know the race conditions you are referring to, and future comment readers might also be confused.
I think
toVector
is fine even if there is no race conditions because Vector is very memory efficient (due to internally using Array).