d5399ef · streamly · git.iko.soy

git.iko.soy/streamly

Use StreamK mergeBy instead of StreamD mergeBy

commitd5399efac5d1ce2b0748a896882e72c121d23957 authorHarendra Kumar <harendra@composewell.com> dateSat 25 Sep 2021, 13:39 (5 years ago) parent70fbefe

2 files changed+5−6

unifiedsplit

src/Streamly/Internal/Data/Stream/IsStream/Expand.hs+4−4

@@ -174,6 +174,7 @@ import qualified Streamly.Internal.Data.Stream.IsStream.Type as IsStream

174174import qualified Streamly.Internal.Data.Stream.Parallel as Par

175175import qualified Streamly.Internal.Data.Stream.Serial as Serial

176176import qualified Streamly.Internal.Data.Stream.StreamD as D

177+import qualified Streamly.Internal.Data.Stream.StreamK as K (mergeBy)

177178import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

178179#ifdef USE_STREAMK_ONLY

179180import qualified Streamly.Internal.Data.Stream.StreamK as S

@@ -706,10 +707,9 @@ zipAsyncWith f = zipAsyncWithM (\a b -> return (f a b))

706707-- @

707708--

708709-- @since 0.6.0

709−{-# INLINABLE mergeBy #-}

710−mergeBy ::

711− (IsStream t, Monad m) => (a -> a -> Ordering) -> t m a -> t m a -> t m a

712−mergeBy f m1 m2 = fromStreamS $ S.mergeBy f (toStreamS m1) (toStreamS m2)

710+{-# INLINE mergeBy #-}

711+mergeBy :: IsStream t => (a -> a -> Ordering) -> t m a -> t m a -> t m a

712+mergeBy f m1 m2 = fromStream $ K.mergeBy f (toStream m1) (toStream m2)

713713

714714-- | Like 'mergeBy' but with a monadic comparison function.

715715--

src/Streamly/Internal/Data/Stream/IsStream/Top.hs+1−2

@@ -190,8 +190,7 @@ sampleBurstStart gap =

190190-- /Pre-release/

191191--

192192{-# INLINE sortBy #-}

193−sortBy :: (IsStream t, Monad m) => (a -> a -> Ordering) -> t m a -> t m a

194−-- XXX creating StreamD and using D.mergeBy may be more efficient due to fusion

193+sortBy :: IsStream t => (a -> a -> Ordering) -> t m a -> t m a

195194sortBy f = Stream.concatPairsWith (Stream.mergeBy f) Stream.fromPure

196195

197196------------------------------------------------------------------------------