Tasks no longer need to know the jobUUID

Author: RileyEv

benchmarks/BenchLinearSongAgg/SongAgg.hs

@@ -324,8 +324,8 @@ computeResult inputs jobUUID = do
   aggArtistsEmptyVar <- empty aggATaskUUID jobUUID
   aggSongsEmptyVar <- empty aggSTaskUUID jobUUID
 
-  (Right aggArtists) <- runExceptT (aggArtistsF nilJobUUID inputs aggArtistsEmptyVar)
-  (Right aggSongs  ) <- runExceptT (aggSongsF nilJobUUID inputs aggSongsEmptyVar)
+  (Right aggArtists) <- runExceptT (aggArtistsF inputs aggArtistsEmptyVar)
+  (Right aggSongs  ) <- runExceptT (aggSongsF inputs aggSongsEmptyVar)
 
   let artists = HCons' aggArtistsEmptyVar HNil'
   let songs   = HCons' aggSongsEmptyVar HNil'
@@ -338,8 +338,8 @@ computeResult inputs jobUUID = do
   top10ArtistsEmptyVar <- empty top10ATaskUUID jobUUID
   top10SongsEmptyVar <- empty top10STaskUUID jobUUID
 
-  (Right ac) <- runExceptT (top10ArtistsF nilJobUUID artists top10ArtistsEmptyVar)
-  (Right tc) <- runExceptT (top10SongsF nilJobUUID songs top10SongsEmptyVar)
+  (Right ac) <- runExceptT (top10ArtistsF artists top10ArtistsEmptyVar)
+  (Right tc) <- runExceptT (top10SongsF songs top10SongsEmptyVar)
 
   return (top10ArtistsEmptyVar, top10SongsEmptyVar)
 

src/Pipeline/Internal/Backend/BasicNetwork.hs

@@ -69,7 +69,7 @@ taskExecuter (Task f) taskUUID inPipes outPipes = forever
         (do
           outputStore <- lift (empty taskUUID jobUUID)
           input <- (ExceptT . return) taskInputs
-          catchE (intercept (f jobUUID input outputStore))
+          catchE (intercept (f input outputStore))
                  (throwE . TaskError . ExceptionMessage . displayException)
           return (HCons' outputStore HNil')
         )

src/Pipeline/Internal/Core/CircuitAST.hs

@@ -108,7 +108,7 @@ data Task (iF :: [Type -> Type] -> [Type] -> [Type] -> [Type -> Type] -> [Type]
            outputsS ~ '[g'], outputsT ~ '[b'], outputsA ~ '[g' b'],
            DataStore' inputsS inputsT,
            DataStore g' b', Eq (g' b'))
-       => (JobUUID -> HList' inputsS inputsT -> g' b' -> ExceptT SomeException IO ())
+       => (HList' inputsS inputsT -> g' b' -> ExceptT SomeException IO ())
        -> Task iF inputsS inputsT (Apply inputsS inputsT) outputsS outputsT outputsA (Length inputsS)
 
 

src/Pipeline/Task.hs

@@ -49,7 +49,7 @@ multiInputTask
 multiInputTask f = IIn7
   (inj
     (Task
-      (\uuid sources sink -> do
+      (\sources sink -> do
         input <- lift (fetch' sources)
         let outputValue   = f input
             !outputValue' = outputValue `deepseq` outputValue
@@ -89,6 +89,6 @@ functionTask f = multiInputTask (\(HCons inp HNil) -> f inp)
 -- | Constructor for a task
 task
   :: (DataStore' fs as, DataStore g b, Eq (g b), Show (g b), NFData (g b))
-  => (JobUUID -> HList' fs as -> g b -> ExceptT SomeException IO ())  -- ^ The function a Task will execute.
+  => (HList' fs as -> g b -> ExceptT SomeException IO ())  -- ^ The function a Task will execute.
   -> Circuit fs as (Apply fs as) '[g] '[b] '[g b] (Length fs)
 task f = IIn7 (inj (Task f))