Support zio2.x #598

jxnu-liguobin · 2022-05-26T15:51:31Z

closed #462 Initially commit to upgrade zio2.x

Blocking until ZIO 2.0.0

… in some places.

redis/src/main/scala/zio/redis/ByteStream.scala

jxnu-liguobin · 2022-05-26T15:55:09Z

redis/src/main/scala/zio/redis/Output.scala

@@ -152,8 +151,9 @@ object Output {
  final case class OptionalOutput[+A](output: Output[A]) extends Output[Option[A]] {
    protected def tryDecode(respValue: RespValue)(implicit codec: Codec): Option[A] =
      respValue match {
-        case RespValue.NullBulkString | RespValue.NullArray | RespValue.BulkString(Chunk.empty) => None
-        case other                                                                              => Some(output.tryDecode(other))
+        case RespValue.NullBulkString | RespValue.NullArray      => None


Please elaborate.

Compile failed

stable identifier required, but zio.Chunk.empty found. case RespValue.NullBulkString | RespValue.NullArray | RespValue.BulkString(Chunk.empty) => None

because in zio2.x Chunk.empty is def?

redis/src/main/scala/zio/redis/ByteStream.scala

redis/src/main/scala/zio/redis/RespValue.scala

… into series/2.x � Conflicts: � redis/src/main/scala/zio/redis/TestExecutor.scala

mijicd

First of all, thank you for taking care of this. Since it is a huge change we may need to do a few review passes, but it looks good in general.

P.S. It looks like we're going to "forget" about 1.x compatible release (which is not necessary bad considering our timing). That said, please resolve the conflicts.

benchmarks/src/main/scala/zio/redis/benchmarks/lists/BlMoveBenchmarks.scala

mijicd · 2022-08-21T19:10:25Z

benchmarks/src/main/scala/zio/redis/benchmarks/lists/BlMoveBenchmarks.scala


 import java.util.concurrent.TimeUnit

-@State(Scope.Thread)
+@State(org.openjdk.jmh.annotations.Scope.Thread)


Why is this necessary? The import is there.

Scope conflicts with zio.Scope, I have imported zio.Scope to hide

example/src/main/scala/example/ContributorsCache.scala

example/src/main/scala/example/Main.scala

mijicd · 2022-08-21T19:20:32Z

example/src/main/scala/example/config/AppConfig.scala

 import zio.redis.RedisConfig

 final case class AppConfig(redis: RedisConfig, server: ServerConfig)

 object AppConfig {
-  val descriptor: ConfigDescriptor[AppConfig] = DeriveConfigDescriptor.descriptor[AppConfig]
+  val confDescriptor: _root_.zio.config.ConfigDescriptor[AppConfig] = descriptor[AppConfig]


What happened here?

descriptor is now the top-level method instead of DeriveConfigDescriptor's method. And i will delete package prefix

mijicd · 2022-08-21T19:21:15Z

example/src/main/scala/example/package.scala

 package object example {
-  type ContributorsCache = Has[ContributorsCache.Service]
+  type ContributorsCache = ContributorsCache.Service


I think we should get rid of old module pattern encoding as well.

I will use case class

mijicd · 2022-08-21T19:23:14Z

redis/src/main/scala/zio/redis/ByteStream.scala

@@ -28,57 +27,59 @@ import java.nio.channels.{AsynchronousSocketChannel, Channel, CompletionHandler}
 private[redis] object ByteStream {
  trait Service {
    def read: Stream[IOException, Byte]
-    def write(chunk: Chunk[Byte]): IO[IOException, Unit]
+    def write(chunk: Chunk[Byte]): IO[IOException, Option[Unit]]


What's the purpose of option?

Since Option is required for matching here(case State.Start), this is one of the areas I find most confusing.

private[redis] final val Decoder: ZPipeline[Any, RedisError.ProtocolError, Byte, Option[RespValue]] = { val Sinker: ZSink[Any, RedisError.ProtocolError, String, String, Option[RespValue]] = { import internal.State ZSink.fold[String, State](State.Start)(_.inProgress)(_ feed _).mapZIO { case State.Done(value) => ZIO.succeedNow(Some(value)) case State.Failed => ZIO.fail(RedisError.ProtocolError("Invalid data received.")) // ZSink fold will return a State.Start when contFn is false case State.Start => ZIO.succeedNow(None) case other => ZIO.dieMessage(s"Deserialization bug, should not get $other") } }

mijicd · 2022-08-21T19:25:10Z

redis/src/main/scala/zio/redis/Redis.scala

-  lazy val live: URLayer[Has[RedisExecutor] with Has[Codec], Has[Redis]] =
-    ZLayer.identity[Has[Codec]] ++ ZLayer.identity[Has[RedisExecutor]] >>> RedisService
+  lazy val live: URLayer[RedisExecutor with Codec, Redis] =
+    ZLayer.environment[Codec] ++ ZLayer.environment[RedisExecutor] >>> RedisService


I'd get rid of operators.

Do you mean i should use ZLayer.make?

redis/src/main/scala/zio/redis/RedisExecutor.scala

mijicd · 2022-08-21T19:27:48Z

redis/src/main/scala/zio/redis/RespValue.scala

-  private[redis] final val Decoder: Transducer[RedisError.ProtocolError, Byte, RespValue] = {
-    import internal.State
+  private[redis] final val Decoder: ZPipeline[Any, RedisError.ProtocolError, Byte, Option[RespValue]] = {
+    val Sinker: ZSink[Any, RedisError.ProtocolError, String, String, Option[RespValue]] = {


Let's drop the type, and use the lower camel case.

Please don't mark unresolved issues as resolved.

Oh, sorry, I thought it was just the outermost type declaration that should be removed.

…chmarks.scala Co-authored-by: Dejan Mijić <dmijic@acm.org>

mijicd · 2022-08-24T09:56:37Z

example/src/main/scala/example/ContributorsCache.scala

+  case class ServiceLive(r: Redis, s: Sttp) extends Service {
+    override def fetchAll(repository: Repository): IO[ApiError, Contributors] =
+      (read(repository) <> retrieve(repository)).provide(ZLayer.succeed(r), ZLayer.succeed(s))
+  }


Let's abandon the old encoding, e.g.:

trait ContributorsCache { def fetchAll(...) } final case class ContributorsCacheLive(...) extends ContributorsCache { ... }

Also, let's please adhere to the multi-unit files naming convention.

mijicd · 2022-08-24T09:58:29Z

example/src/main/scala/example/ContributorsCache.scala

+      (read(repository) <> retrieve(repository)).provide(ZLayer.succeed(r), ZLayer.succeed(s))
+  }
+
+  object ServiceLive {


Please adjust accordingly.

mijicd · 2022-08-24T09:58:45Z

example/src/main/scala/example/ContributorsCache.scala

+  }
+
+  object ServiceLive {
+    lazy val layer: ZLayer[Redis with Sttp, Nothing, Service] = ZLayer.fromZIO {


You don't need fromZIO, apply works as well. Also, you can use URLayer.

mijicd · 2022-08-24T09:59:54Z

example/src/main/scala/example/ContributorsCache.scala

    get(repository.key)
      .returning[String]
      .someOrFail(ApiError.CacheMiss(repository.key))
      .map(_.fromJson[Contributors])
-      .rightOrFail(ApiError.CorruptedData)
-      .refineToOrDie[ApiError]
+      .foldZIO(_ => ZIO.fail(ApiError.CorruptedData), s => ZIO.succeed(s.getOrElse(Contributors(Chunk.empty))))


What happened here?

I found no rightOrFail method, so I changed it here.

mijicd · 2022-08-24T10:00:50Z

example/src/main/scala/example/Main.scala

@@ -22,41 +22,38 @@ import example.config.{AppConfig, ServerConfig}
 import sttp.client3.asynchttpclient.zio.AsyncHttpClientZioBackend
 import zhttp.service.server.ServerChannelFactory
 import zhttp.service.{EventLoopGroup, Server}
+import zio.Console.printLine


I would not import it. Console.printLine reads nicer.

mijicd · 2022-08-24T10:05:52Z

redis/src/main/scala/zio/redis/TestExecutor.scala

 import zio.redis.RedisError.ProtocolError
 import zio.redis.RespValue.{BulkString, bulkString}
 import zio.redis.TestExecutor.{KeyInfo, KeyType}
-import zio.stm.{random => _, _}
+import zio.stm._
+import zio.{Clock, Random, _}


Suggested change

import zio.{Clock, Random, _}

import zio._

mijicd · 2022-08-24T10:09:28Z

redis/src/main/scala/zio/redis/api/SortedSets.scala

 import zio.redis.Input._
 import zio.redis.Output._
 import zio.redis.ResultBuilder._
 import zio.redis._
 import zio.schema.Schema
-import zio.{Chunk, Has, ZIO}
+import zio.{Chunk, ZIO, _}


Suggested change

import zio.{Chunk, ZIO, _}

import zio._

mijicd · 2022-08-24T10:09:49Z

redis/src/main/scala/zio/redis/api/Streams.scala

 import zio.redis.Input._
 import zio.redis.Output._
 import zio.redis.ResultBuilder._
 import zio.redis._
 import zio.schema.Schema
-import zio.{Chunk, Has, ZIO}
+import zio.{Chunk, ZIO, _}


Suggested change

import zio.{Chunk, ZIO, _}

import zio._

mijicd · 2022-08-24T10:10:25Z

redis/src/main/scala/zio/redis/api/Strings.scala

 import zio.redis.Input._
 import zio.redis.Output._
 import zio.redis.ResultBuilder._
 import zio.redis._
 import zio.schema.Schema
-import zio.{Chunk, Has, ZIO}
+import zio.{Chunk, ZIO, _}


Suggested change

import zio.{Chunk, ZIO, _}

import zio._

@jxnu-liguobin this pattern repeats a lot, please adjust it everywhere according to the suggestion.

mijicd · 2022-08-24T10:11:09Z

redis/src/test/scala/zio/redis/ApiSpec.scala

-  private val TestLayer =
-    RedisExecutor.test ++ ZLayer.succeed(codec) >>> Redis.live
+  private val TestLayer = {
+    val redis = RedisExecutor.test ++ ZLayer.succeed(codec) >>> Redis.live


You should be able to just use make.

closed zio#462 Initially commit to upgrading zio2.x, need to get help…

5c11ed9

… in some places.

jxnu-liguobin changed the title ~~closed #462 Initially commit to upgrading zio2.x, need to get help in…~~ upgrading zio2.x, need to get help in… May 26, 2022

jxnu-liguobin changed the title ~~upgrading zio2.x, need to get help in…~~ Support zio2.x May 26, 2022

jxnu-liguobin commented May 26, 2022

View reviewed changes

redis/src/main/scala/zio/redis/ByteStream.scala Outdated Show resolved Hide resolved

jxnu-liguobin commented May 26, 2022

View reviewed changes

jxnu-liguobin added 6 commits May 27, 2022 00:04

fix

940ea21

up

974b324

fix

0f9ac61

up

d89c193

up

45db14c

up

1cd4da8

jxnu-liguobin commented May 27, 2022

View reviewed changes

redis/src/main/scala/zio/redis/ByteStream.scala Show resolved Hide resolved

jxnu-liguobin commented May 27, 2022

View reviewed changes

redis/src/main/scala/zio/redis/RespValue.scala Outdated Show resolved Hide resolved

jxnu-liguobin added 7 commits May 27, 2022 14:51

fix

a2be43b

fix

1315997

fix

57374db

fix

5dc0858

fix

cdcbc8e

fix

fd4ff78

fix

327656e

jxnu-liguobin force-pushed the series/2.x branch from fd4ff78 to 327656e Compare May 27, 2022 16:02

jxnu-liguobin added 3 commits May 28, 2022 16:38

fix

b34fa8e

fix

bcfe0aa

Merge branch 'series/2.x' of https://github.com/jxnu-liguobin/zio-redis…

bfd5b22

… into series/2.x � Conflicts: � redis/src/main/scala/zio/redis/TestExecutor.scala

jxnu-liguobin force-pushed the series/2.x branch from bfd5b22 to 5c11ed9 Compare June 30, 2022 12:03

jxnu-liguobin added 5 commits June 30, 2022 21:06

revert

eba640e

upgrade 2.0.0

a61242e

revert

1e8fcd2

fix

54fef63

fix

d19887e

jxnu-liguobin added 2 commits August 15, 2022 18:26

Merge branch 'master' into series/2.x

cc28299

fix test

2dea363

jxnu-liguobin marked this pull request as ready for review August 15, 2022 14:00

jxnu-liguobin requested a review from a team as a code owner August 15, 2022 14:00

mijicd reviewed Aug 21, 2022

View reviewed changes

jxnu-liguobin and others added 4 commits August 22, 2022 09:29

Update benchmarks/src/main/scala/zio/redis/benchmarks/lists/BlMoveBen…

c351d85

…chmarks.scala Co-authored-by: Dejan Mijić <dmijic@acm.org>

fix

147053d

Merge remote-tracking branch 'origin/series/2.x' into series/2.x

907c8c7

Merge branch 'master' into series/2.x

98b09de

jxnu-liguobin requested a review from mijicd August 22, 2022 02:19

jxnu-liguobin added 3 commits August 22, 2022 10:34

fix

fe7bf2b

Merge remote-tracking branch 'origin/series/2.x' into series/2.x

1a628f8

Merge branch 'master' into series/2.x

777b38a

mijicd requested changes Aug 24, 2022

View reviewed changes

jxnu-liguobin and others added 7 commits August 24, 2022 18:57

fix pr

24e26da

fix pr

5f97bd2

fix zio2.o syntax

c158c0b

Update redis/src/main/scala/zio/redis/Output.scala

9cc4392

fix example

7706a22

fmt

6fae42e

fix ci

85b27e8

mijicd approved these changes Aug 24, 2022

View reviewed changes

mijicd merged commit 06a2668 into zio:master Aug 24, 2022

mijicd mentioned this pull request Aug 24, 2022

Polish 2.x upgrade #638

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support zio2.x #598

Support zio2.x #598

jxnu-liguobin commented May 26, 2022 •

edited

Loading

jxnu-liguobin May 26, 2022

mijicd May 27, 2022

jxnu-liguobin May 27, 2022 •

edited

Loading

mijicd left a comment •

edited

Loading

mijicd Aug 21, 2022

jxnu-liguobin Aug 22, 2022

mijicd Aug 21, 2022

jxnu-liguobin Aug 22, 2022

mijicd Aug 21, 2022

jxnu-liguobin Aug 22, 2022

mijicd Aug 21, 2022

jxnu-liguobin Aug 22, 2022

mijicd Aug 21, 2022

jxnu-liguobin Aug 22, 2022

mijicd Aug 21, 2022

mijicd Aug 24, 2022

jxnu-liguobin Aug 24, 2022

mijicd Aug 24, 2022

jxnu-liguobin Aug 24, 2022

mijicd Aug 24, 2022

mijicd Aug 24, 2022

mijicd Aug 24, 2022

jxnu-liguobin Aug 24, 2022

mijicd Aug 24, 2022

mijicd Aug 24, 2022

mijicd Aug 24, 2022

mijicd Aug 24, 2022

mijicd Aug 24, 2022

mijicd Aug 24, 2022

Support zio2.x #598

Support zio2.x #598

Conversation

jxnu-liguobin commented May 26, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jxnu-liguobin May 27, 2022 • edited Loading

Choose a reason for hiding this comment

mijicd left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jxnu-liguobin commented May 26, 2022 •

edited

Loading

jxnu-liguobin May 27, 2022 •

edited

Loading

mijicd left a comment •

edited

Loading