From 8c30a3c366ed66dcb92bdd6c0129851ccffe6de7 Mon Sep 17 00:00:00 2001
From: Chris Llanwarne <cjllanwarne@gmail.com>
Date: Mon, 7 Jan 2019 16:24:42 -0500
Subject: [PATCH] PR feedback

---
 .../main/resources/standardTestCases/afters/afters.wdl   | 2 +-
 .../standardTestCases/afters/afters_and_scatters.wdl     | 9 ++-------
 .../lifecycle/execution/stores/ExecutionStore.scala      | 1 -
 .../biscayne/ast2wdlom/WdlFileToWdlomSpec.scala          | 1 -
 .../biscayne/valid/afters_and_ifs/afters_and_ifs.wdl     | 2 +-
 .../valid/afters_and_scatters/afters_and_scatters.wdl    | 2 +-
 6 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/centaur/src/main/resources/standardTestCases/afters/afters.wdl b/centaur/src/main/resources/standardTestCases/afters/afters.wdl
index 80e4811b0c2..d65d5af139c 100644
--- a/centaur/src/main/resources/standardTestCases/afters/afters.wdl
+++ b/centaur/src/main/resources/standardTestCases/afters/afters.wdl
@@ -5,7 +5,7 @@ workflow afters {
     String where = "/tmp/helloFile"
   }
 
-  # Should not impact 'read' because it happens before the second read:
+  # Should not impact 'read' because the second write overwrites it:
   call write_to_shared as foo1 { input: i = 5, where = where }
 
   # This value should always be the value we get from the read:
diff --git a/centaur/src/main/resources/standardTestCases/afters/afters_and_scatters.wdl b/centaur/src/main/resources/standardTestCases/afters/afters_and_scatters.wdl
index a1b467434ed..cf5fb54d962 100644
--- a/centaur/src/main/resources/standardTestCases/afters/afters_and_scatters.wdl
+++ b/centaur/src/main/resources/standardTestCases/afters/afters_and_scatters.wdl
@@ -5,7 +5,7 @@ workflow afters {
     String where = "/tmp/helloFile"
   }
 
-  # Should not impact 'read' because it happens before the second read:
+  # Should not impact 'read' because the second write overwrites it:
   call write_to_shared as foo1 { input: i = 5, where = where }
 
   # Scatter once to replace the contents with something else:
@@ -14,12 +14,7 @@ workflow afters {
   }
 
   # The call to 'read':
-  call read_from_shared
-    after foo2
-    { input:
-      where = where
-#      , ready = foo2.done[0]
-    }
+  call read_from_shared after foo2 { input: where = where }
 
   # Should not impact 'read' because it happens afterwards:
   call write_to_shared as foo3 after read_from_shared { input: i = 77, where = where }
diff --git a/engine/src/main/scala/cromwell/engine/workflow/lifecycle/execution/stores/ExecutionStore.scala b/engine/src/main/scala/cromwell/engine/workflow/lifecycle/execution/stores/ExecutionStore.scala
index f946835c77e..f046e4b4d41 100644
--- a/engine/src/main/scala/cromwell/engine/workflow/lifecycle/execution/stores/ExecutionStore.scala
+++ b/engine/src/main/scala/cromwell/engine/workflow/lifecycle/execution/stores/ExecutionStore.scala
@@ -38,7 +38,6 @@ object ExecutionStore {
 
       key match {
         case scatteredCallCompletion: ScatteredCallCompletionKey =>
-          println(s"${statusTable.row(scatteredCallCompletion.node).size} == ${scatteredCallCompletion.totalIndices}?")
           statusTable.row(scatteredCallCompletion.node).size == scatteredCallCompletion.totalIndices
         case scatterCollector: ScatterCollectorKey =>
           // The outputToGather is the PortBasedGraphOutputNode of the inner graph that we're collecting. Go one step upstream and then
diff --git a/wdl/transforms/biscayne/src/test/scala/wdl/transforms/biscayne/ast2wdlom/WdlFileToWdlomSpec.scala b/wdl/transforms/biscayne/src/test/scala/wdl/transforms/biscayne/ast2wdlom/WdlFileToWdlomSpec.scala
index 54534476389..ca430469ecc 100644
--- a/wdl/transforms/biscayne/src/test/scala/wdl/transforms/biscayne/ast2wdlom/WdlFileToWdlomSpec.scala
+++ b/wdl/transforms/biscayne/src/test/scala/wdl/transforms/biscayne/ast2wdlom/WdlFileToWdlomSpec.scala
@@ -2,7 +2,6 @@ package wdl.transforms.biscayne.ast2wdlom
 
 import better.files.File
 import org.scalatest.{FlatSpec, Matchers}
-import wdl.model.draft3.elements.{ExpressionElement, _}
 import wdl.transforms.biscayne.ast2wdlom.WdlFileToWdlomSpec._
 import wom.types._
 import wdl.model.draft3.elements.CommandPartElement.{PlaceholderCommandPartElement, StringCommandPartElement}
diff --git a/womtool/src/test/resources/validate/biscayne/valid/afters_and_ifs/afters_and_ifs.wdl b/womtool/src/test/resources/validate/biscayne/valid/afters_and_ifs/afters_and_ifs.wdl
index 23a7d3dfae8..2bd89d8180d 100644
--- a/womtool/src/test/resources/validate/biscayne/valid/afters_and_ifs/afters_and_ifs.wdl
+++ b/womtool/src/test/resources/validate/biscayne/valid/afters_and_ifs/afters_and_ifs.wdl
@@ -5,7 +5,7 @@ workflow afters {
     String where = "/tmp/helloFile"
   }
 
-  # Should not impact 'read' because it happens before the second read:
+  # Should not impact 'read' because the second write overwrites it:
   call write_to_shared as foo1 { input: i = 5, where = where }
 
   # Conditionally do (and don't) call a write:
diff --git a/womtool/src/test/resources/validate/biscayne/valid/afters_and_scatters/afters_and_scatters.wdl b/womtool/src/test/resources/validate/biscayne/valid/afters_and_scatters/afters_and_scatters.wdl
index 72cfe9f943c..8cb07333b79 100644
--- a/womtool/src/test/resources/validate/biscayne/valid/afters_and_scatters/afters_and_scatters.wdl
+++ b/womtool/src/test/resources/validate/biscayne/valid/afters_and_scatters/afters_and_scatters.wdl
@@ -5,7 +5,7 @@ workflow afters {
     String where = "/tmp/helloFile"
   }
 
-  # Should not impact 'read' because it happens before the second read:
+  # Should not impact 'read' because the second write overwrites it:
   call write_to_shared as foo1 { input: i = 5, where = where }
 
   # Scatter once to replace the contents with something else: