filter repositories based on list of directories before invalidating when doing partial reindex

fixes #880

Author: vladak

src/org/opensolaris/opengrok/configuration/RuntimeEnvironment.java

@@ -938,7 +938,15 @@ protected void writeConfiguration() throws IOException {
     public void setConfiguration(Configuration configuration) {
         this.configuration = configuration;
         register();
-        HistoryGuru.getInstance().invalidateRepositories(configuration.getRepositories());
+        HistoryGuru.getInstance().invalidateRepositories(
+            configuration.getRepositories());
+    }
+
+    public void setConfiguration(Configuration configuration, List<String> subFileList) {
+        this.configuration = configuration;
+        register();
+        HistoryGuru.getInstance().invalidateRepositories(
+            configuration.getRepositories(), subFileList);
     }
 
     public Configuration getConfiguration() {

src/org/opensolaris/opengrok/history/HistoryGuru.java

@@ -25,6 +25,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -714,7 +715,32 @@ protected Repository getRepository(File path) {
     }
 
     /**
-     * Invalidate the current list of known repositories!
+     * Invalidate list of known repositories which match the list of directories.
+     *
+     * @param repos the new repositories
+     * @param dirs only process repositories which match the directories
+     */
+    public void invalidateRepositories(Collection<? extends RepositoryInfo> repos, List<String> dirs)
+    {
+        if (repos != null && !repos.isEmpty() && dirs != null && !dirs.isEmpty()) {
+            List<RepositoryInfo> newrepos = new ArrayList<> ();
+            for (RepositoryInfo i : repos) {
+                for (String dir : dirs) {
+                    Path dirPath = new File(dir).toPath();
+                    Path iPath = new File(i.getDirectoryName()).toPath();
+                    if (iPath.startsWith(dirPath)) {
+                        newrepos.add(i);
+                    }
+                }
+            }
+            repos = newrepos;
+        }
+
+        invalidateRepositories(repos);
+    }
+
+    /**
+     * Invalidate list of known repositories.
      *
      * @param repos The new repositories
      */
@@ -723,8 +749,13 @@ public void invalidateRepositories(Collection<? extends RepositoryInfo> repos)
         if (repos == null || repos.isEmpty()) {
             repositories.clear();
         } else {
-            Map<String, Repository> nrep =
+            Map<String, Repository> newrepos =
                 new HashMap<String, Repository>(repos.size());
+            Statistics elapsed = new Statistics();
+            boolean verbose = RuntimeEnvironment.getInstance().isVerbose();
+            if (verbose) {
+                log.log(Level.FINE, "invalidating repositories");
+            }
             for (RepositoryInfo i : repos) {
                 try {
                     Repository r = RepositoryFactory.getRepository(i);
@@ -733,7 +764,7 @@ public void invalidateRepositories(Collection<? extends RepositoryInfo> repos)
                             "Failed to instanciate internal repository data for "
                             + i.getType() + " in " + i.getDirectoryName());
                     } else {
-                        nrep.put(r.getDirectoryName(), r);
+                        newrepos.put(r.getDirectoryName(), r);
                     }
                 } catch (InstantiationException ex) {
                     log.log(Level.WARNING, "Could not create " + i.getType()
@@ -745,7 +776,10 @@ public void invalidateRepositories(Collection<? extends RepositoryInfo> repos)
                         + "', missing access rights.", iae);
                 }
             }
-            repositories = nrep;
+            repositories = newrepos;
+            if (verbose) {
+                elapsed.report(log, "done invalidating repositories");
+            }
         }
     }
 }

src/org/opensolaris/opengrok/index/Indexer.java

@@ -114,6 +114,7 @@ public static void main(String argv[]) {
             Executor.registerErrorHandler();
             boolean searchRepositories = false;
             ArrayList<String> subFiles = new ArrayList<>();
+            ArrayList<String> subFilesList = new ArrayList<>();
             ArrayList<String> repositories = new ArrayList<>();
             HashSet<String> allowedSymlinks = new HashSet<>();
             String configFilename = null;
@@ -530,9 +531,20 @@ public static void main(String argv[]) {
                 allowedSymlinks.addAll(cfg.getAllowedSymlinks());
                 cfg.setAllowedSymlinks(allowedSymlinks);
 
+                // Assemble the unprocessed command line arguments (possibly
+                // a list of paths). This will be used to perform more fine
+                // grained checking in invalidateRepositories().
+                int optind = getopt.getOptind();
+                int orig_optind = optind;
+                if (optind != -1) {
+                    while (optind < argv.length) {
+                        subFilesList.add(cfg.getSourceRoot() + argv[optind++]);
+                    }
+                }
+
                 // Set updated configuration in RuntimeEnvironment.
                 RuntimeEnvironment env = RuntimeEnvironment.getInstance();
-                env.setConfiguration(cfg);
+                env.setConfiguration(cfg, subFilesList);
 
                 /*
                  * Add paths to directories under source root. If projects 
@@ -542,28 +554,24 @@ public static void main(String argv[]) {
                  * directory and not per project data root directory).
                  * For the check we need to have 'env' already set.
                  */
-                int optind = getopt.getOptind();
-                int orig_optind = optind;
-                if (optind != -1) {
-                    while (optind < argv.length) {
-                        if (env.hasProjects()) {
-                            // The paths need to correspond to a project.
-                            if (Project.getProject(argv[optind]) != null) {
-                                subFiles.add(argv[optind]);
-                            } else {
-                                System.err.println("The path " + argv[optind] +
-                                    " does not correspond to a project");
-                            }
+                for (String path : subFilesList) {
+                    path = path.substring(env.getSourceRootPath().length());
+                    if (env.hasProjects()) {
+                        // The paths need to correspond to a project.
+                        if (Project.getProject(path) != null) {
+                            subFiles.add(path);
                         } else {
-                            subFiles.add(argv[optind]);
+                            System.err.println("The path " + path +
+                                " does not correspond to a project");
                         }
-                        ++optind;
+                    } else {
+                        subFiles.add(path);
                     }
+                }
 
-                    if ((orig_optind < argv.length) && subFiles.isEmpty()) {
-                        System.err.println("None of the paths were added, exiting");
-                        System.exit(1);
-                    }
+                if (!subFilesList.isEmpty() && subFiles.isEmpty()) {
+                    System.err.println("None of the paths were added, exiting");
+                    System.exit(1);
                 }
 
                 // Issue a warning when JDBC is used with renamed file handling.