Merge pull request #64 from ghostdogpr/master

Update ZIO to 1.0.0-RC21

Author: ghostdogpr

build.sbt

@@ -22,14 +22,15 @@ inThisBuild(
     pgpSecretRing := file("/tmp/secret.asc"),
     scmInfo := Some(
       ScmInfo(url("https://github.com/zio/zio-query/"), "scm:git:[email protected]:zio/zio-query.git")
-    )
+    ),
+    resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
   )
 )
 
 addCommandAlias("fmt", "all scalafmtSbt scalafmt test:scalafmt")
 addCommandAlias("check", "all scalafmtSbtCheck scalafmtCheck test:scalafmtCheck")
 
-val zioVersion = "1.0.0-RC20"
+val zioVersion = "1.0.0-RC21-1"
 
 lazy val root = project
   .in(file("."))

zio-query/shared/src/main/scala/zio/query/Cache.scala

@@ -48,7 +48,7 @@ object Cache {
   private final class Impl(private val state: Ref[Map[Any, Any]]) extends Cache {
 
     def get[E, A](request: Request[E, A]): IO[Unit, Ref[Option[Either[E, A]]]] =
-      state.get.map(_.get(request).asInstanceOf[Option[Ref[Option[Either[E, A]]]]]).get
+      state.get.map(_.get(request).asInstanceOf[Option[Ref[Option[Either[E, A]]]]]).get.orElseFail(())
 
     def put[E, A](request: Request[E, A], result: Ref[Option[Either[E, A]]]): UIO[Unit] =
       state.update(_ + (request -> result)).unit

zio-query/shared/src/test/scala/zio/query/ZQuerySpec.scala

@@ -308,31 +308,21 @@ object ZQuerySpec extends ZIOBaseSpec {
 
     val totalCount = 15000
 
+    val paymentData: Map[Int, Payment] = List.tabulate(totalCount)(i => i -> Payment(i, "payment name")).toMap
     case class GetPayment(id: Int) extends Request[Nothing, Payment]
     val paymentSource: DataSource[Any, GetPayment] =
       DataSource.fromFunctionBatchedOptionM("PaymentSource") { requests: Chunk[GetPayment] =>
-        ZIO
-          .succeed(
-            List.tabulate(totalCount)(Payment(_, "payment name"))
-          )
-          .map { payments =>
-            requests.map(req => payments.find(_.id == req.id))
-          }
+        ZIO.effectTotal(requests.map(req => paymentData.get(req.id)))
       }
 
     def getPayment(id: Int): UQuery[Payment] =
       ZQuery.fromRequest(GetPayment(id))(paymentSource)
 
+    val addressData: Map[Int, Address] = List.tabulate(totalCount)(i => i -> Address(i, "street")).toMap
     case class GetAddress(id: Int) extends Request[Nothing, Address]
     val addressSource: DataSource[Any, GetAddress] =
       DataSource.fromFunctionBatchedOptionM("AddressSource") { requests: Chunk[GetAddress] =>
-        ZIO
-          .succeed(
-            List.tabulate(totalCount)(Address(_, "street"))
-          )
-          .map { addresses =>
-            requests.map(req => addresses.find(_.id == req.id))
-          }
+        ZIO.effectTotal(requests.map(req => addressData.get(req.id)))
       }
 
     def getAddress(id: Int): UQuery[Address] =