Merge pull request #784 from vladak/removed_tunable_flip

change the renamed file handling tunable to be false by default

Author: Vladimir Kotal

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

@@ -64,8 +64,8 @@ public final class RuntimeEnvironment {
     private static RuntimeEnvironment instance = new RuntimeEnvironment();
     private static ExecutorService historyExecutor = null;
     private static ExecutorService historyRenamedExecutor = null;
-    private static boolean RenamedEnabled = true;
- 
+    private static boolean RenamedEnabled = false;
+
     /* Get thread pool used for top-level repository history generation. */
     public static synchronized ExecutorService getHistoryExecutor() {
         if (historyExecutor == null) {
@@ -137,11 +137,11 @@ public static synchronized void destroyRenamedHistoryExecutor() throws Interrupt
     /*
      * Is handling of renamed files turned on ?
      */
-    public static boolean RenamedFilesEnabled() {
-        String disabled =
-            System.getProperty("org.opensolaris.opengrok.history.RenamedHandlingDisabled");
-        if (disabled != null) {
-            RenamedEnabled = false;
+    public static boolean isRenamedFilesEnabled() {
+        String enabled =
+            System.getProperty("org.opensolaris.opengrok.history.RenamedHandlingEnabled");
+        if (enabled != null) {
+            RenamedEnabled = true;
         }
 
         return (RenamedEnabled);

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

@@ -354,7 +354,7 @@ public void store(History history, Repository repository)
         final File root = RuntimeEnvironment.getInstance().getSourceRootFile();
         for (Map.Entry<String, List<HistoryEntry>> map_entry : map.entrySet()) {
             try {
-                if (RuntimeEnvironment.RenamedFilesEnabled() &&
+                if (RuntimeEnvironment.isRenamedFilesEnabled() &&
                     isRenamedFile(map_entry, env, repository, history)) {
                         continue;
                 }
@@ -366,7 +366,7 @@ public void store(History history, Repository repository)
             doFileHistory(map_entry, env, repository, null, root, false);
         }
 
-        if (!RuntimeEnvironment.RenamedFilesEnabled()) {
+        if (!RuntimeEnvironment.isRenamedFilesEnabled()) {
             return;
         }
 

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

@@ -601,7 +601,7 @@ private History getHistory(
                 ps.setString(2, filePath);
             } else {
                 // Fetch history for a single file only.
-                ps = conn.getStatement(env.RenamedFilesEnabled() && (getFilemovesCount() > 0) ?
+                ps = conn.getStatement(RuntimeEnvironment.isRenamedFilesEnabled() && (getFilemovesCount() > 0) ?
                     GET_FILE_HISTORY : GET_FILE_HISTORY_FOLDED);
                 ps.setString(2, getParentPath(filePath));
                 ps.setString(3, getBaseName(filePath));
@@ -828,7 +828,7 @@ private void storeHistory(final ConnectionResource conn, History history,
                         String fullPath = toUnixPath(file);
                         if (!history.isRenamed(
                             file.substring(repodir.length() + 1)) ||
-                            !RuntimeEnvironment.RenamedFilesEnabled()) {
+                            !RuntimeEnvironment.isRenamedFilesEnabled()) {
                                 int fileId = files.get(fullPath);
                                 addFilechange.setInt(2, fileId);
                                 addFilechange.executeUpdate();
@@ -858,7 +858,7 @@ private void storeHistory(final ConnectionResource conn, History history,
             }
         }
 
-        if (!RuntimeEnvironment.RenamedFilesEnabled()) {
+        if (!RuntimeEnvironment.isRenamedFilesEnabled()) {
             return;
         }
 

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

@@ -18,8 +18,7 @@
  */
 
 /*
- * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opensolaris.opengrok.history;
 

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

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opensolaris.opengrok.history;
 
@@ -89,9 +89,12 @@ public class MercurialRepository extends Repository {
         + FILE_LIST + END_OF_ENTRY + "\\n";
 
     /** Template for formatting hg log output for directories. */
-    private static final String DIR_TEMPLATE =
+    private static final String DIR_TEMPLATE_RENAMED =
         TEMPLATE_STUB + FILE_LIST
         + FILE_COPIES + "{file_copies}\\n" + END_OF_ENTRY + "\\n";
+    private static final String DIR_TEMPLATE =
+        TEMPLATE_STUB + FILE_LIST
+        + END_OF_ENTRY + "\\n";
 
     /** Pattern used to extract author/revision from hg annotate. */
     private static final Pattern ANNOTATION_PATTERN =
@@ -151,9 +154,9 @@ Executor getHistoryLogExecutor(File file, String changeset)
 
         cmd.add("--template");
         if (file.isDirectory()) {
-            cmd.add(DIR_TEMPLATE);
+            cmd.add(RuntimeEnvironment.isRenamedFilesEnabled() ? DIR_TEMPLATE_RENAMED : DIR_TEMPLATE);
         } else {
-            /* JDBC requires to have complete list of files. */
+            /* JDBC requires complete list of files. */
             cmd.add(env.storeHistoryCacheInDB() ? FILE_TEMPLATE_LIST : FILE_TEMPLATE);
         }
         if (!filename.isEmpty()) {

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

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
  *
  * Portions Copyright 2011 Jens Elkner.
  */
@@ -99,7 +99,7 @@ private static void A_usage() {
      */
     @SuppressWarnings("PMD.UseStringBufferForStringAppends")
     public static void main(String argv[]) {
-        Statistics stats=new Statistics();//this won't count JVM creation though
+        Statistics stats = new Statistics(); //this won't count JVM creation though
         boolean runIndex = true;
         boolean update = true;
         boolean optimizedChanged = false;
@@ -538,10 +538,16 @@ public static void main(String argv[]) {
                 allowedSymlinks.addAll(cfg.getAllowedSymlinks());
                 cfg.setAllowedSymlinks(allowedSymlinks);
 
-                //Set updated configuration in RuntimeEnvironment
+                // Set updated configuration in RuntimeEnvironment.
                 RuntimeEnvironment env = RuntimeEnvironment.getInstance();
                 env.setConfiguration(cfg);
 
+                // Issue a warning when JDBC is used with renamed file handling.
+                // This causes heavy slowdown when used with JavaDB (issue #774).
+                if (RuntimeEnvironment.isRenamedFilesEnabled() && cfg.isHistoryCacheInDB()) {
+                    System.out.println("History stored in DB and renamed file handling is on - possible performance degradation");
+                }
+
                 getInstance().prepareIndexer(env, searchRepositories, addProjects,
                         defaultProject, configFilename, refreshHistory,
                         listFiles, createDict, subFiles, repositories,

test/org/opensolaris/opengrok/history/FileHistoryCacheTest.java

@@ -50,6 +50,9 @@ public class FileHistoryCacheTest extends TestCase {
 
         cache = new FileHistoryCache();
         cache.initialize();
+
+        // The tests expect support for renamed files.
+        System.setProperty("org.opensolaris.opengrok.history.RenamedHandlingEnabled", "1");
     }
 
     /**

test/org/opensolaris/opengrok/history/JDBCHistoryCacheTest.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
  */
 
 package org.opensolaris.opengrok.history;
@@ -85,6 +85,9 @@ public static Test suite() {
 
         // Mercurial parser needs to know if the history is stored in DB.
         RuntimeEnvironment.getInstance().setStoreHistoryCacheInDB(true);
+
+        // The tests expect support for renamed files.
+        System.setProperty("org.opensolaris.opengrok.history.RenamedHandlingEnabled", "1");
     }
 
     /**