fat: rename all batch strategy as single (#347)

Author: pchalamet

src/Terrabuild.Configuration.Tests/TestFiles/Success_WORKSPACE

@@ -19,7 +19,7 @@ target dist {
   depends_on = [ target.build ]
   build = ~auto
   artifacts = ~none
-  batch = ~all
+  batch = ~single
 }
 
 target dummy { }

src/Terrabuild.Configuration.Tests/Workspace.fs

@@ -21,7 +21,7 @@ let parseWorkspace() =
             { TargetBlock.DependsOn = Set [ "build" ] |> Some
               TargetBlock.Build = "auto" |> Expr.Enum |> Some
               TargetBlock.Cache = "none" |> Expr.Enum |> Some
-              TargetBlock.Batch = "all" |> Expr.Enum |> Some
+              TargetBlock.Batch = "single" |> Expr.Enum |> Some
               TargetBlock.Outputs = None }
         let targetDummy =
             { TargetBlock.DependsOn = None

src/Terrabuild.Tests/Core/GraphPipeline/Batch.fs

@@ -4,42 +4,42 @@ open NUnit.Framework
 open GraphDef
 open GraphPipeline.Batch
 
+let buildNode id clusterHash action deps group req =
+    { Node.Id = id
+      Node.ProjectId = id
+      Node.ProjectName = None
+      Node.ProjectDir = $"/src/project{id}"
+      Node.Target = "build"
+      Node.Dependencies = deps
+      Node.Outputs = Set.empty
+      Node.ProjectHash = ""
+      Node.TargetHash = ""
+      Node.ClusterHash = clusterHash
+      Node.Operations = []
+      Node.Artifacts = ArtifactMode.Workspace
+      Node.Action = action
+      Node.Build = BuildMode.Auto
+      Node.Batch = group
+      Node.Required = req }
+
+let addNode (node: Node) nodes = nodes |> Map.add node.Id node
+
 [<Test>]
 let ``check partition computation``() =
-    let buildNode id clusterHash action deps =
-        { Node.Id = id
-          Node.ProjectId = id
-          Node.ProjectName = None
-          Node.ProjectDir = $"/src/project{id}"
-          Node.Target = "build"
-          Node.Dependencies = deps
-          Node.Outputs = Set.empty
-          Node.ProjectHash = ""
-          Node.TargetHash = ""
-          Node.ClusterHash = clusterHash
-          Node.Operations = []
-          Node.Artifacts = ArtifactMode.Workspace
-          Node.Action = action
-          Node.Build = BuildMode.Auto
-          Node.Batch = BatchMode.Partition
-          Node.Required = true }
-
-    let addNode (node: Node) nodes = nodes |> Map.add node.Id node
-
     // Bucket hash-A: connected via A1 -> A2 (in-bucket edge)
-    let nodeA1 = buildNode "A1" (Some "hash-A") RunAction.Exec (Set ["A2"; "B1"])
-    let nodeA2 = buildNode "A2" (Some "hash-A") RunAction.Restore Set.empty
+    let nodeA1 = buildNode "A1" (Some "hash-A") RunAction.Exec (Set ["A2"; "B1"]) BatchMode.Partition true
+    let nodeA2 = buildNode "A2" (Some "hash-A") RunAction.Restore Set.empty BatchMode.Partition true
 
     // Bucket hash-B: connected via B1 -> B2 (in-bucket edge)
-    let nodeB1 = buildNode "B1" (Some "hash-B") RunAction.Exec (Set ["B2"])
-    let nodeB2 = buildNode "B2" (Some "hash-B") RunAction.Exec Set.empty
+    let nodeB1 = buildNode "B1" (Some "hash-B") RunAction.Exec (Set ["B2"]) BatchMode.Partition true
+    let nodeB2 = buildNode "B2" (Some "hash-B") RunAction.Exec Set.empty BatchMode.Partition true
 
     // Bucket hash-C: connected but inactive (no Build) => no batch
-    let nodeC1 = buildNode "C1" (Some "hash-C") RunAction.Restore (Set ["C2"])
-    let nodeC2 = buildNode "C2" (Some "hash-C") RunAction.Restore Set.empty
+    let nodeC1 = buildNode "C1" (Some "hash-C") RunAction.Restore (Set ["C2"]) BatchMode.Partition true
+    let nodeC2 = buildNode "C2" (Some "hash-C") RunAction.Restore Set.empty BatchMode.Partition true
 
     // Not batchable
-    let nodeD1 = buildNode "D1" None RunAction.Exec Set.empty
+    let nodeD1 = buildNode "D1" None RunAction.Exec Set.empty BatchMode.Partition true
 
     let nodes =
         Map.empty
@@ -78,38 +78,18 @@ let ``check partition computation``() =
 
 [<Test>]
 let ``check partition/all computation``() =
-    let buildNode id clusterHash action deps group =
-        { Node.Id = id
-          Node.ProjectId = id
-          Node.ProjectName = None
-          Node.ProjectDir = $"/src/project{id}"
-          Node.Target = "build"
-          Node.Dependencies = deps
-          Node.Outputs = Set.empty
-          Node.ProjectHash = ""
-          Node.TargetHash = ""
-          Node.ClusterHash = clusterHash
-          Node.Operations = []
-          Node.Artifacts = ArtifactMode.Workspace
-          Node.Action = action
-          Node.Build = BuildMode.Auto
-          Node.Batch = group
-          Node.Required = true }
-
-    let addNode (node: Node) nodes = nodes |> Map.add node.Id node
-
     // Bucket hash-A: connected via A1 -> A2 (in-bucket edge)
-    let nodeA1 = buildNode "A1" (Some "hash-A") RunAction.Restore (Set ["A2"; "B1"]) BatchMode.Partition
-    let nodeA2 = buildNode "A2" (Some "hash-A") RunAction.Restore Set.empty BatchMode.Partition
+    let nodeA1 = buildNode "A1" (Some "hash-A") RunAction.Restore (Set ["A2"; "B1"]) BatchMode.Partition true
+    let nodeA2 = buildNode "A2" (Some "hash-A") RunAction.Restore Set.empty BatchMode.Partition true
 
     // Bucket hash-B: connected via B1 -> B2 (in-bucket edge)
-    let nodeB1 = buildNode "B1" (Some "hash-B") RunAction.Exec (Set ["B2"]) BatchMode.All
-    let nodeB2 = buildNode "B2" (Some "hash-B") RunAction.Exec Set.empty BatchMode.All
-    let nodeC1 = buildNode "C1" (Some "hash-B") RunAction.Exec (Set ["C2"]) BatchMode.All
-    let nodeC2 = buildNode "C2" (Some "hash-B") RunAction.Exec Set.empty BatchMode.All
+    let nodeB1 = buildNode "B1" (Some "hash-B") RunAction.Exec (Set ["B2"]) BatchMode.Single true
+    let nodeB2 = buildNode "B2" (Some "hash-B") RunAction.Exec Set.empty BatchMode.Single true
+    let nodeC1 = buildNode "C1" (Some "hash-B") RunAction.Exec (Set ["C2"]) BatchMode.Single true
+    let nodeC2 = buildNode "C2" (Some "hash-B") RunAction.Exec Set.empty BatchMode.Single true
 
     // Not batchable
-    let nodeD1 = buildNode "D1" None RunAction.Exec Set.empty BatchMode.Partition
+    let nodeD1 = buildNode "D1" None RunAction.Exec Set.empty BatchMode.Partition true
 
     let nodes =
         Map.empty

src/Terrabuild/Core/Configuration.fs

@@ -639,10 +639,10 @@ let private finalizeProject workspaceDir projectDir evaluationContext (projectDe
                     match group with
                     | Ok "never" -> BatchMode.Never
                     | Ok "partition" -> BatchMode.Partition
-                    | Ok "all" -> BatchMode.All
+                    | Ok "single" -> BatchMode.Single
                     | Ok x -> raiseParseError $"Invalid group value '{x}'"
                     | Error error -> raiseParseError error
-                | _ -> BatchMode.All
+                | _ -> BatchMode.Single
 
             let target =
                 { Target.Hash = targetHash

src/Terrabuild/Core/GraphDef.fs

@@ -18,7 +18,7 @@ type ContaineredShellOperation = {
 type BatchMode =
     | Never
     | Partition
-    | All
+    | Single
 
 [<RequireQualifiedAccess>]
 type ArtifactMode =

src/Terrabuild/Core/GraphPipeline/Batch.fs

@@ -100,7 +100,7 @@ let computeBatches (graph: Graph) =
                 |> Map.ofSeq
 
             let partitionGroups = batchModes |> Map.tryFind BatchMode.Partition |> Option.defaultValue []  
-            let allGroup = batchModes |> Map.tryFind BatchMode.All |> Option.defaultValue []  
+            let allGroup = batchModes |> Map.tryFind BatchMode.Single |> Option.defaultValue []  
 
             partitionGroups
             |> partitionByDependencies

tests/basic/results/terrabuild-debug.action.json

@@ -24,7 +24,7 @@
       ],
       "artifacts": "none",
       "build": "always",
-      "batch": "all",
+      "batch": "single",
       "action": "exec",
       "required": true
     }

tests/basic/results/terrabuild-debug.batch.json

@@ -24,7 +24,7 @@
       ],
       "artifacts": "none",
       "build": "always",
-      "batch": "all",
+      "batch": "single",
       "action": "exec",
       "required": true
     }

tests/basic/results/terrabuild-debug.cascade.json

@@ -24,7 +24,7 @@
       ],
       "artifacts": "none",
       "build": "always",
-      "batch": "all",
+      "batch": "single",
       "action": "exec",
       "required": true
     }

tests/basic/results/terrabuild-debug.config.json

@@ -35,7 +35,7 @@
       "targets": {
         "build": {
           "hash": "8B56DAA76BB451252D58A9AFF5D2E5A77D0568D8681204549E53A422C9FBDBF0",
-          "batch": "all",
+          "batch": "single",
           "dependsOn": [
             "^build"
           ],