Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix Scope propagation in ZStream#runScoped #9327

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

Merged
merged 1 commit into from
Nov 23, 2024
Merged

Fix Scope propagation in ZStream#runScoped #9327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 3 additions & 9 deletions core/shared/src/main/scala/zio/FiberRef.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,21 +482,15 @@ object FiberRef {
if (newRefs eq oldRefs) zio
else {
fiberState.setFiberRefs(newRefs)
zio.onExit { _ =>
val currentRefs = fiberState.getFiberRefs(false)
if (newRefs eq currentRefs) {
// FiberRefs were not modified, we can just restore the old state
fiberState.setFiberRefs(oldRefs)
} else {
// They were modified, we need to update only the current FiberRef
ZIO.uninterruptibleMask { restore =>
restore(zio).exitWith { exit =>
val oldValue = oldRefs.getOrNull(self)
if (oldValue == null) fiberState.resetFiberRef(self)
else fiberState.setFiberRef(self, oldValue)
exit
}
Exit.unit
}
}

}

override def set(value: Value)(implicit trace: Trace): UIO[Unit] =
Expand Down
33 changes: 33 additions & 0 deletions streams-tests/shared/src/test/scala/zio/stream/ZStreamSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2496,6 +2496,39 @@ object ZStreamSpec extends ZIOBaseSpec {
value <- ref.get
} yield assert(exit)(dies(hasMessage(equalTo("Die")))) &&
assert(value)(equalTo(Chunk("Acquiring A", "Acquiring B", "Acquiring C", "Releasing B", "Releasing A")))
},
test("complex scope propagation (i9316)") {
def resource(ref: Ref[List[String]])(i: Int) =
ZIO.acquireRelease(ref.update(s"acquire $i" :: _).as(i))(_ => ref.update(s"release $i" :: _))
for {
ref <- Ref.make[List[String]](Nil)
_ <- ZIO.scoped(
ZStream
.fromIterable(0 until 3)
.mapZIO(resource(ref))
.mapZIO { i =>
ZIO.scoped {
ZStream
.scoped(ZIO.blocking(ref.update(s"process $i" :: _)))
.runScoped(ZSink.collectAll)
}
}
.runDrain
)
out <- ref.get.map(_.reverse)
} yield assertTrue(
out == List(
"acquire 0",
"process 0",
"acquire 1",
"process 1",
"acquire 2",
"process 2",
"release 2",
"release 1",
"release 0"
)
)
}
),
test("map")(check(pureStreamOfInts, Gen.function(Gen.int)) { (s, f) =>
Expand Down
Loading