Use Chunk.single rather than Chunk.apply [series/2.x] (#8719)

* Use Chunk.single rather than Chunk.apply # Conflicts: # core/shared/src/main/scala/zio/internal/FiberRuntime.scala * Fix * Improve * Fix NonEmptyChunk.single * Optimize fromIterable * Fix * Revert "Fix" This reverts commit 313a859. * Revert "Optimize fromIterable" This reverts commit 0b4afbe. * Optimize Chunk.apply
zio · Apr 11, 2024 · 53c4d2c · 53c4d2c
1 parent 37b8b6d
commit 53c4d2c
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 16 deletions.
diff --git a/core/shared/src/main/scala/zio/Chunk.scala b/core/shared/src/main/scala/zio/Chunk.scala
@@ -1117,7 +1117,7 @@ object Chunk extends ChunkFactory with ChunkPlatformSpecific {
    * Returns a chunk from a number of values.
    */
   override def apply[A](as: A*): Chunk[A] =
-    fromIterable(as)
+    if (as.size == 1) single(as.head) else fromIterable(as)
 
   /*
    * Performs bitwise operations on boolean chunks returning a Chunk.BitChunk

diff --git a/core/shared/src/main/scala/zio/Hub.scala b/core/shared/src/main/scala/zio/Hub.scala
@@ -140,7 +140,7 @@ object Hub {
             strategy.unsafeCompleteSubscribers(hub, subscribers)
             ZIO.succeed(true)
           } else {
-            strategy.handleSurplus(hub, subscribers, Chunk(a), shutdownFlag)
+            strategy.handleSurplus(hub, subscribers, Chunk.single(a), shutdownFlag)
           }
         }
       def publishAll[A1 <: A](as: Iterable[A1])(implicit trace: Trace): UIO[Chunk[A1]] =

diff --git a/core/shared/src/main/scala/zio/NonEmptyChunk.scala b/core/shared/src/main/scala/zio/NonEmptyChunk.scala
@@ -286,7 +286,7 @@ object NonEmptyChunk {
    * Constructs a `NonEmptyChunk` from one or more values.
    */
   def apply[A](a: A, as: A*): NonEmptyChunk[A] =
-    nonEmpty(Chunk(a) ++ Chunk.fromIterable(as))
+    fromIterable(a, as)
 
   /**
    * Checks if a `chunk` is not empty and constructs a `NonEmptyChunk` from it.
@@ -304,7 +304,15 @@ object NonEmptyChunk {
    * Constructs a `NonEmptyChunk` from an `Iterable`.
    */
   def fromIterable[A](a: A, as: Iterable[A]): NonEmptyChunk[A] =
-    nonEmpty(Chunk.single(a) ++ Chunk.fromIterable(as))
+    if (as.isEmpty) single(a)
+    else
+      nonEmpty {
+        val builder = ChunkBuilder.make[A]()
+        builder.sizeHint(as, 1)
+        builder += a
+        builder ++= as
+        builder.result()
+      }
 
   /**
    * Constructs a `NonEmptyChunk` from an `Iterable` or `None` otherwise.
@@ -316,7 +324,7 @@ object NonEmptyChunk {
    * Constructs a `NonEmptyChunk` from a single value.
    */
   def single[A](a: A): NonEmptyChunk[A] =
-    NonEmptyChunk(a)
+    nonEmpty(Chunk.single(a))
 
   /**
    * Extracts the elements from a `Chunk`.

diff --git a/core/shared/src/main/scala/zio/Queue.scala b/core/shared/src/main/scala/zio/Queue.scala
@@ -165,7 +165,7 @@ object Queue {
             if (succeeded)
               ZIO.succeed(true)
             else
-              strategy.handleSurplus(Chunk(a), queue, takers, shutdownFlag)
+              strategy.handleSurplus(Chunk.single(a), queue, takers, shutdownFlag)
           }
         }
       }

diff --git a/core/shared/src/main/scala/zio/internal/FiberRuntime.scala b/core/shared/src/main/scala/zio/internal/FiberRuntime.scala
@@ -121,7 +121,7 @@ final class FiberRuntime[E, A](fiberId: FiberId.Runtime, fiberRefs0: FiberRefs,
 
   def interruptAsFork(fiberId: FiberId)(implicit trace: Trace): UIO[Unit] =
     ZIO.succeed {
-      val cause = Cause.interrupt(fiberId).traced(StackTrace(self.fiberId, Chunk(trace)))
+      val cause = Cause.interrupt(fiberId).traced(StackTrace(self.fiberId, Chunk.single(trace)))
 
       tell(FiberMessage.InterruptSignal(cause))
     }

diff --git a/streams/shared/src/main/scala/zio/stream/ZPipeline.scala b/streams/shared/src/main/scala/zio/stream/ZPipeline.scala
@@ -2036,10 +2036,10 @@ object ZPipeline extends ZPipelinePlatformSpecificConstructors {
           },
           err =>
             if (stringBuilder.isEmpty) ZChannel.refailCause(err)
-            else ZChannel.write(Chunk(stringBuilder.result)) *> ZChannel.refailCause(err),
+            else ZChannel.write(Chunk.single(stringBuilder.result)) *> ZChannel.refailCause(err),
           done =>
             if (stringBuilder.isEmpty) ZChannel.succeed(done)
-            else ZChannel.write(Chunk(stringBuilder.result)) *> ZChannel.succeed(done)
+            else ZChannel.write(Chunk.single(stringBuilder.result)) *> ZChannel.succeed(done)
         )
 
       new ZPipeline(loop)

diff --git a/streams/shared/src/main/scala/zio/stream/ZStream.scala b/streams/shared/src/main/scala/zio/stream/ZStream.scala
@@ -261,7 +261,7 @@ final class ZStream[-R, +E, +A] private (val channel: ZChannel[R, Any, Any, Any,
                         consumed      <- consumed.get
                         sinkFiber     <- forkSink
                         scheduleFiber <- timeout(Some(b)).forkIn(scope)
-                        toWrite        = c.fold[Chunk[Either[C, B]]](Chunk(Right(b)))(c => Chunk(Right(b), Left(c)))
+                        toWrite        = c.fold[Chunk[Either[C, B]]](Chunk.single(Right(b)))(c => Chunk(Right(b), Left(c)))
                       } yield
                         if (consumed)
                           ZChannel
@@ -271,7 +271,7 @@ final class ZStream[-R, +E, +A] private (val channel: ZChannel[R, Any, Any, Any,
                   case UpstreamEnd =>
                     ZChannel.unwrap {
                       consumed.get.map { p =>
-                        if (p) ZChannel.write(Chunk(Right(b)))
+                        if (p) ZChannel.write(Chunk.single(Right(b)))
                         else ZChannel.unit
                       }
                     }
@@ -2993,7 +2993,7 @@ final class ZStream[-R, +E, +A] private (val channel: ZChannel[R, Any, Any, Any,
                 driver.last.orDie.map { b =>
                   ZChannel.write(Chunk(f(a), g(b))) *> loop(driver, chunkIterator, index + 1)
                 } <* driver.reset,
-              _ => ZIO.succeed(ZChannel.write(Chunk(f(a))) *> loop(driver, chunkIterator, index + 1))
+              _ => ZIO.succeed(ZChannel.write(Chunk.single(f(a))) *> loop(driver, chunkIterator, index + 1))
             )
         }
       else
@@ -4645,7 +4645,7 @@ object ZStream extends ZStreamPlatformSpecificConstructors {
             case Some(e) => ZChannel.fail(e)
             case None    => ZChannel.unit
           },
-          a => ZChannel.write(Chunk(a))
+          a => ZChannel.write(Chunk.single(a))
         )
       )
     )
@@ -5755,7 +5755,7 @@ object ZStream extends ZStreamPlatformSpecificConstructors {
      * terminates with the specified cause if this `Exit` is a `Failure`.
      */
     def done(exit: Exit[E, A])(implicit trace: Trace): B =
-      apply(ZIO.done(exit.mapBothExit(e => Some(e), a => Chunk(a))))
+      apply(ZIO.done(exit.mapBothExit(e => Some(e), a => Chunk.single(a))))
 
     /**
      * Terminates with an end of stream signal.
@@ -5774,7 +5774,7 @@ object ZStream extends ZStreamPlatformSpecificConstructors {
      * with the failure value of this effect.
      */
     def fromEffect(zio: ZIO[R, E, A])(implicit trace: Trace): B =
-      apply(zio.mapBoth(e => Some(e), a => Chunk(a)))
+      apply(zio.mapBoth(e => Some(e), a => Chunk.single(a)))
 
     /**
      * Either emits the success value of this effect or terminates the stream
@@ -5793,7 +5793,7 @@ object ZStream extends ZStreamPlatformSpecificConstructors {
      * Emits a chunk containing the specified value.
      */
     def single(a: A)(implicit trace: Trace): B =
-      apply(ZIO.succeed(Chunk(a)))
+      apply(ZIO.succeed(Chunk.single(a)))
   }
 
   /**