Index version check partial (#2167)

fixes #2166

Author: Vladimir Kotal

OpenGrok

@@ -864,7 +864,8 @@ CheckIndexVersion()
     then
         return
     fi
-    if ! MinimalInvocation --checkIndexVersion -R "${XML_CONFIGURATION}" -d "${DATA_ROOT}"
+    if ! MinimalInvocation --checkIndexVersion \
+        -R "${XML_CONFIGURATION}" -d "${DATA_ROOT}" "$@"
     then
         echo "\nIndex version check failed. You might want to remove all data" \
             "under the data root directory ${DATA_ROOT} and reindex.\n"
@@ -1143,7 +1144,7 @@ case "${1}" in
 	    FatalError "need configuration via OPENGROK_READ_XML_CONFIGURATION"
 	fi
         ValidateConfiguration
-        CheckIndexVersion
+        CheckIndexVersion $@
         CreateRuntimeRequirements
         UpdateDataPartial $@
         ;;

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

@@ -24,6 +24,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.List;
 import org.apache.lucene.index.IndexNotFoundException;
 import org.apache.lucene.index.SegmentInfos;
 import org.apache.lucene.store.Directory;
@@ -52,16 +53,25 @@ public IndexVersionException(String s) {
     /**
      * Check if version of index(es) matches major Lucene version.
      * @param cfg configuration
+     * @param subFilesList list of paths. If non-empty, only projects matching these paths will be checked.
      * @throws Exception otherwise
      */
-    public static void check(Configuration cfg) throws Exception {
+    public static void check(Configuration cfg, List<String> subFilesList) throws Exception {
         File indexRoot = new File(cfg.getDataRoot(), IndexDatabase.INDEX_DIR);
-        if (cfg.isProjectsEnabled()) {
-            for (String projectName : cfg.getProjects().keySet()) {
+        
+        if (!subFilesList.isEmpty()) {
+            // Assumes projects are enabled.
+            for (String projectName : subFilesList) {
                 checkDir(getDirectory(new File(indexRoot, projectName)));
             }
         } else {
-            checkDir(getDirectory(indexRoot));
+            if (cfg.isProjectsEnabled()) {
+                for (String projectName : cfg.getProjects().keySet()) {
+                    checkDir(getDirectory(new File(indexRoot, projectName)));
+                }
+            } else {
+                checkDir(getDirectory(indexRoot));
+            }
         }
     }
 

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

@@ -144,19 +144,6 @@ public static void main(String argv[]) {
                 System.exit(status);
             }
 
-            // Check version of index(es) versus current Lucene version and exit
-            // with return code indicating success or failure.
-            if (checkIndexVersion) {
-                int retval = 0;
-                try {
-                    IndexVersion.check(cfg);
-                } catch (IndexVersionException e) {
-                    System.err.printf("Index version check failed: %s", e);
-                    retval = 1;
-                }
-                System.exit(retval);
-            }
-            
             if (awaitProfiler) pauseToAwaitProfiler();
 
             env = RuntimeEnvironment.getInstance();
@@ -206,11 +193,24 @@ public static void main(String argv[]) {
             // Assemble the unprocessed command line arguments (possibly
             // a list of paths). This will be used to perform more fine
             // grained checking in invalidateRepositories().
-            for (int optind=0; optind< argv.length; optind++) {
+            for (int optind = 0; optind < argv.length; optind++) {
                 String path = Paths.get(cfg.getSourceRoot(), argv[optind]).toString();
                 subFilesList.add(path);
             }
 
+            // Check version of index(es) versus current Lucene version and exit
+            // with return code indicating success or failure.
+            if (checkIndexVersion) {
+                int retval = 0;
+                try {
+                    IndexVersion.check(cfg, subFilesList);
+                } catch (IndexVersionException e) {
+                    System.err.printf("Index version check failed: %s", e);
+                    retval = 1;
+                }
+                System.exit(retval);
+            }
+            
             // If an user used customizations for projects he perhaps just
             // used the key value for project without a name but the code
             // expects a name for the project. Therefore we fill the name

test/org/opensolaris/opengrok/index/IndexVersionTest.java

@@ -28,6 +28,8 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import org.junit.After;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -47,6 +49,7 @@
 
 /**
  * Verify index version check.
+ * 
  * @author Vladimir Kotal
  */
 public class IndexVersionTest {
@@ -85,32 +88,38 @@ public void tearDown() throws IOException {
      * Generate index(es) and check version.
      * @throws Exception 
      */
-    private void testIndexVersion(boolean projectsEnabled) throws Exception {
+    private void testIndexVersion(boolean projectsEnabled, List<String> subFiles) throws Exception {
         env.setVerbose(true);
         env.setHistoryEnabled(false);
         env.setProjectsEnabled(projectsEnabled);
         Indexer.getInstance().prepareIndexer(env, true, true, null,
                 false, false, null, null, new ArrayList<>(), false);
         Indexer.getInstance().doIndexerExecution(true, null, null);
 
-        IndexVersion.check(env.getConfiguration());
+        IndexVersion.check(env.getConfiguration(), subFiles);
     }
 
     @Test
     public void testIndexVersionNoIndex() throws Exception {
-        IndexVersion.check(env.getConfiguration());
+        IndexVersion.check(env.getConfiguration(), new ArrayList<>());
     }
 
     @Test
     @ConditionalRun(CtagsInstalled.class)
-    public void testIndexVersionNoProjects() throws Exception {
-        testIndexVersion(true);
+    public void testIndexVersionProjects() throws Exception {
+        testIndexVersion(true, new ArrayList<>());
     }
 
     @Test
     @ConditionalRun(CtagsInstalled.class)
-    public void testIndexVersionProjects() throws Exception {
-        testIndexVersion(false);
+    public void testIndexVersionSelectedProjects() throws Exception {
+        testIndexVersion(true, Arrays.asList(new String[]{ "mercurial", "git" }));
+    }
+    
+    @Test
+    @ConditionalRun(CtagsInstalled.class)
+    public void testIndexVersionNoProjects() throws Exception {
+        testIndexVersion(false, new ArrayList<>());
     }
 
     @Test(expected = IndexVersion.IndexVersionException.class)
@@ -128,6 +137,6 @@ public void testIndexVersionOldIndex() throws Exception {
         FileUtilities.extractArchive(archive, indexDir);
         cfg.setDataRoot(oldIndexDataDir.toString());
         cfg.setProjectsEnabled(false);
-        IndexVersion.check(cfg);
+        IndexVersion.check(cfg, new ArrayList<>());
     }
 }