Merge branch 'master' into file-channel

Author: fa93hws

README.md

@@ -139,6 +139,8 @@ workspace.
   -V, --version           Print version information and exit.
   -w, --workspacePath=<workspacePath>
                           Path to Bazel workspace directory.
+  --displayElapsedTime    This flag controls whether to print out elapsed time
+                          for bazel query and content hashing
 ```
 
 ## Installing

src/main/java/com/bazel_diff/BazelClient.java

@@ -9,6 +9,8 @@
 import java.nio.file.Path;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.time.Duration;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -26,6 +28,7 @@ class BazelClientImpl implements BazelClient {
     private Path bazelPath;
     private Boolean verbose;
     private Boolean keepGoing;
+    private Boolean displayElapsedTime;
     private List<String> startupOptions;
     private List<String> commandOptions;
 
@@ -35,25 +38,44 @@ class BazelClientImpl implements BazelClient {
             String startupOptions,
             String commandOptions,
             Boolean verbose,
-            Boolean keepGoing
+            Boolean keepGoing,
+            Boolean displayElapsedTime
     ) {
         this.workingDirectory = workingDirectory.normalize();
         this.bazelPath = bazelPath;
         this.startupOptions = startupOptions != null ? Arrays.asList(startupOptions.split(" ")): new ArrayList<String>();
         this.commandOptions = commandOptions != null ? Arrays.asList(commandOptions.split(" ")): new ArrayList<String>();
         this.verbose = verbose;
         this.keepGoing = keepGoing;
+        this.displayElapsedTime = displayElapsedTime;
     }
 
     @Override
     public List<BazelTarget> queryAllTargets() throws IOException {
+        Instant queryStartTime = Instant.now();
         List<Build.Target> targets = performBazelQuery("'//external:all-targets' + '//...:all-targets'");
+        Instant queryEndTime = Instant.now();
+        if (displayElapsedTime) {
+            long querySeconds = Duration.between(queryStartTime, queryEndTime).getSeconds();
+            System.out.printf("BazelDiff: All targets queried in %d seconds%n", querySeconds);
+        }
         return targets.stream().map( target -> new BazelTargetImpl(target)).collect(Collectors.toList());
     }
 
     @Override
     public Map<String, BazelSourceFileTarget> queryAllSourcefileTargets() throws IOException, NoSuchAlgorithmException {
-        return processBazelSourcefileTargets(performBazelQuery("kind('source file', //...:all-targets)"), true);
+        Instant queryStartTime = Instant.now();
+        List<Build.Target> targets = performBazelQuery("kind('source file', //...:all-targets)");
+        Instant queryEndTime = Instant.now();
+        Map<String, BazelSourceFileTarget> sourceFileTargets = processBazelSourcefileTargets(targets, true);
+        Instant contentHashEndTime = Instant.now();
+        if (displayElapsedTime) {
+            long querySeconds = Duration.between(queryStartTime, queryEndTime).getSeconds();
+            long contentHashSeconds = Duration.between(queryEndTime, contentHashEndTime).getSeconds();
+            System.out.printf("BazelDiff: All source files queried in %d seconds%n", querySeconds);
+            System.out.printf("BazelDiff: Content hash calculated in %d seconds%n", contentHashSeconds);
+        }
+        return sourceFileTargets;
     }
 
     private Map<String, BazelSourceFileTarget> processBazelSourcefileTargets(List<Build.Target> targets, Boolean readSourcefileTargets) throws IOException, NoSuchAlgorithmException {

src/main/java/com/bazel_diff/main.java

@@ -10,6 +10,8 @@
 import java.io.*;
 import java.nio.file.Path;
 import java.security.NoSuchAlgorithmException;
+import java.time.Duration;
+import java.time.Instant;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -33,6 +35,9 @@ class GenerateHashes implements Callable<Integer> {
     @Option(names = {"-s", "--seed-filepaths"}, description = "A text file containing a newline separated list of filepaths, each of these filepaths will be read and used as a seed for all targets.")
     File seedFilepaths;
 
+    @Option(names = {"--displayElapsedTime"}, description = "This flag controls whether to print out elapsed time for bazel query and content hashing")
+    boolean displayElapsedTime;
+
     @Parameters(index = "0", description = "The filepath to write the resulting JSON of dictionary target => SHA-256 values")
     File outputPath;
 
@@ -44,9 +49,11 @@ public Integer call() {
                 parent.bazelStartupOptions,
                 parent.bazelCommandOptions,
                 BazelDiff.isVerbose(),
-                parent.keepGoing);
+                parent.keepGoing,
+                displayElapsedTime);
         TargetHashingClient hashingClient = new TargetHashingClientImpl(bazelClient, new FilesClientImp());
         try {
+            Instant generateHashStartTime = Instant.now();
             Set<Path> seedFilepathsSet = new HashSet<>();
             if (seedFilepaths != null) {
                 FileReader fileReader = new FileReader(seedFilepaths);
@@ -60,6 +67,11 @@ public Integer call() {
             FileWriter myWriter = new FileWriter(outputPath);
             myWriter.write(gson.toJson(hashes));
             myWriter.close();
+            Instant generateHashEndTime = Instant.now();
+            if (displayElapsedTime) {
+                long generateHashSeconds = Duration.between(generateHashStartTime, generateHashEndTime).getSeconds();
+                System.out.printf("BazelDiff: Generate-hashes command finishes in %d seconds%n", generateHashSeconds);
+            }
             return ExitCode.OK;
         } catch (IOException | NoSuchAlgorithmException e) {
             e.printStackTrace();
@@ -121,7 +133,8 @@ public Integer call() throws IOException {
                 bazelStartupOptions,
                 bazelCommandOptions,
                 BazelDiff.isVerbose(),
-                keepGoing
+                keepGoing,
+                false
         );
         TargetHashingClient hashingClient = new TargetHashingClientImpl(bazelClient, new FilesClientImp());
         Gson gson = new Gson();