remove individual history files

fixes oracle#767
vladak · Jul 19, 2017 · e31a033 · e31a033
1 parent 3f6755e
commit e31a033
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 4 deletions.
diff --git a/src/org/opensolaris/opengrok/history/FileHistoryCache.java b/src/org/opensolaris/opengrok/history/FileHistoryCache.java
@@ -715,6 +715,25 @@ public void clear(Repository repository) {
         }
     }
 
+    @Override
+    public void clearFile(String path) {
+        RuntimeEnvironment env = RuntimeEnvironment.getInstance();
+        File historyFile = new File(env.getDataRootFile(),
+            historyDirName + File.separator + path);
+        File parent = historyFile.getParentFile();
+
+        if (!historyFile.delete() && historyFile.exists()) {
+            LOGGER.log(Level.WARNING,
+                "Failed to remove obsolete history cache-file: {0}",
+                historyFile.getAbsolutePath());
+        }
+
+        if (parent.delete()) {
+            LOGGER.log(Level.FINE, "Removed empty history cache dir:{0}",
+                parent.getAbsolutePath());
+        }
+    }
+
     @Override
     public String getInfo() {
         return getClass().getSimpleName();

diff --git a/src/org/opensolaris/opengrok/history/HistoryCache.java b/src/org/opensolaris/opengrok/history/HistoryCache.java
@@ -125,6 +125,12 @@ Map<String, Date> getLastModifiedTimes(
      */
     void clear(Repository repository) throws HistoryException;
 
+    /**
+     * Clear entry for single file from history cache.
+     * @param file path to the file
+     */
+    void clearFile(String file);
+
     /**
      * Get a string with information about the history cache.
      *

diff --git a/src/org/opensolaris/opengrok/history/HistoryGuru.java b/src/org/opensolaris/opengrok/history/HistoryGuru.java
@@ -620,6 +620,15 @@ public void createCache(Collection<String> repositories) {
         createCacheReal(getReposFromString(repositories));
     }
 
+    private HistoryCache getHistoryCache() {
+        HistoryCache cache = historyCache;
+        if (cache == null) {
+            cache = new FileHistoryCache();
+        }
+
+        return cache;
+    }
+
     /**
      * Remove history data for a list of repositories
      * @param repositories list of repository paths
@@ -628,10 +637,8 @@ public void createCache(Collection<String> repositories) {
      */
     public List<Repository> clearCache(Collection<String> repositories) throws HistoryException {
         List<Repository> repos = getReposFromString(repositories);
-        HistoryCache cache = historyCache;
-        if (cache == null) {
-            cache = new FileHistoryCache();
-        }
+        HistoryCache cache = getHistoryCache();
+
         for (Repository r : repos) {
             try {
                 cache.clear(r);
@@ -647,6 +654,11 @@ public List<Repository> clearCache(Collection<String> repositories) throws Histo
         return repos;
     }
 
+    public void clearCacheFile(String path) {
+        HistoryCache cache = getHistoryCache();
+        cache.clearFile(path);
+    }
+
     /**
      * Remove history data for a list of repositories and invalidate the list
      * of repositories accordingly.

diff --git a/src/org/opensolaris/opengrok/index/IndexDatabase.java b/src/org/opensolaris/opengrok/index/IndexDatabase.java
@@ -592,6 +592,10 @@ private void removeXrefFile(String path) {
         }
     }
 
+    private void removeHistoryFile(String path) {
+        HistoryGuru.getInstance().clearCacheFile(path);
+    }
+
     /**
      * Remove a stale file (uidIter.term().text()) from the index database (and
      * the xref file)
@@ -610,6 +614,7 @@ private void removeFile() throws IOException {
         writer.commit();
 
         removeXrefFile(path);
+        removeHistoryFile(path);
 
         setDirty();
         for (IndexChangedListener listener : listeners) {