add progress reporting for file collection

Author: vladak

opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexDatabase.java

@@ -868,7 +868,10 @@ boolean getIndexDownArgs(String dir, File sourceRoot, IndexDownArgs args) throws
         if (historyBased) {
             indexDownUsingHistory(env.getSourceRootFile(), args);
         } else {
-            indexDown(sourceRoot, dir, args);
+            String logSuffix = project != null ? " for project " + project : String.format(" for directory '%s'", dir);
+            try (Progress progress = new Progress(LOGGER, String.format("file collection%s", logSuffix))) {
+                indexDown(sourceRoot, dir, args, progress);
+            }
         }
 
         elapsed.report(LOGGER, String.format("Done file collection for directory '%s'", dir),
@@ -890,9 +893,13 @@ void indexDownUsingHistory(File sourceRoot, IndexDownArgs args) throws IOExcepti
 
         FileCollector fileCollector = RuntimeEnvironment.getInstance().getFileCollector(project.getName());
 
-        for (String path : fileCollector.getFiles()) {
-            File file = new File(sourceRoot, path);
-            processFileIncremental(args, file, path);
+        try (Progress progress = new Progress(LOGGER, String.format("collecting files for %s", project),
+                fileCollector.getFiles().size())) {
+            for (String path : fileCollector.getFiles()) {
+                File file = new File(sourceRoot, path);
+                processFileIncremental(args, file, path);
+                progress.increment();
+            }
         }
     }
 
@@ -1561,10 +1568,11 @@ private void handleSymlink(String path, AcceptSymlinkRet ret) {
      * @param dir the root indexDirectory to generate indexes for
      * @param parent path to parent directory
      * @param args arguments to control execution and for collecting a list of
+     * @param progress {@link Progress} instance
      * files for indexing
      */
     @VisibleForTesting
-    void indexDown(File dir, String parent, IndexDownArgs args) throws IOException {
+    void indexDown(File dir, String parent, IndexDownArgs args, Progress progress) throws IOException {
 
         if (isInterrupted()) {
             return;
@@ -1590,9 +1598,10 @@ void indexDown(File dir, String parent, IndexDownArgs args) throws IOException {
                 handleSymlink(path, ret);
             } else {
                 if (file.isDirectory()) {
-                    indexDown(file, path, args);
+                    indexDown(file, path, args, progress);
                 } else {
                     processFile(args, file, path);
+                    progress.increment();
                 }
             }
         }

opengrok-indexer/src/test/java/org/opengrok/indexer/index/IndexDatabaseTest.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.index;
@@ -555,11 +555,11 @@ private void checkIndexDown(boolean historyBased, IndexDatabase idb) throws IOEx
         // hence it should be called just once.
         if (historyBased) {
             verify(idb, times(1)).indexDownUsingHistory(any(), any());
-            verify(idb, times(0)).indexDown(any(), any(), any());
+            verify(idb, times(0)).indexDown(any(), any(), any(), any());
         } else {
             // indexDown() is recursive, so it will be called more than once.
             verify(idb, times(0)).indexDownUsingHistory(any(), any());
-            verify(idb, atLeast(1)).indexDown(any(), any(), any());
+            verify(idb, atLeast(1)).indexDown(any(), any(), any(), any());
         }
     }