osunix / opengrok-trunk / changeset / 2459459b1540

Up to file-list src/org/opensolaris/opengrok/history/FileHistoryCache.java:

@@ -35,6 +35,10 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
@@ -109,7 +113,7 @@ class FileHistoryCache implements Histor
+        }
+    }
-    public void store(History history, File file, Repository repository)
+    private void storeFile(History history, File file, Repository repository)
             throws HistoryException {
         File cache = getCachedFile(file);
@@ -161,6 +165,41 @@ class FileHistoryCache implements Histor
+        }
+    }
     public void store(History history, Repository repository)
             throws HistoryException {
         if (history.getHistoryEntries() == null) {
             return;
+        }
         HashMap<String, List<HistoryEntry>> map =
                 new HashMap<String, List<HistoryEntry>>();
         for (HistoryEntry e : history.getHistoryEntries()) {
             for (String s : e.getFiles()) {
                 List<HistoryEntry> list = map.get(s);
                 if (list == null) {
                     list = new ArrayList<HistoryEntry>();
                     map.put(s, list);
+                }
                 list.add(e);
+            }
+        }
         File root = RuntimeEnvironment.getInstance().getSourceRootFile();
         for (Map.Entry<String, List<HistoryEntry>> e : map.entrySet()) {
             for (HistoryEntry ent : e.getValue()) {
                 ent.strip();
+            }
             History hist = new History();
             hist.setHistoryEntries(e.getValue());
             File file = new File(root, e.getKey());
             if (!file.isDirectory()) {
                 storeFile(hist, file, repository);
+            }
+        }
+    }
     public History get(File file, Repository repository)
             throws HistoryException {
         File cache = getCachedFile(file);
@@ -205,7 +244,7 @@ class FileHistoryCache implements Histor
                         (cache.exists() ||
                              (time > env.getHistoryReaderTimeLimit()))) {
                 // retrieving the history takes too long, cache it!
-                store(history, file, repository);
+                storeFile(history, file, repository);
+            }
+        }
         return history;

Up to file-list src/org/opensolaris/opengrok/history/HistoryCache.java:

@@ -48,14 +48,13 @@ interface HistoryCache {
     History get(File file, Repository repository) throws HistoryException;
     /**
-     * Store the history for the given file.
+     * Store the history for a repository.
+     *
      * @param history The history to store
      * @param file The file to store information for
      * @param repository The repository the file belongs to
      * @param repository The repository whose history to store
      * @throws HistoryException if the history cannot be stored
      */
-    void store(History history, File file, Repository repository)
+    void store(History history, Repository repository)
             throws HistoryException;
     /**

Up to file-list src/org/opensolaris/opengrok/history/JDBCHistoryCache.java:

@@ -281,6 +281,14 @@ class JDBCHistoryCache implements Histor
     private static PreparedQuery ADD_FILECHANGE = new PreparedQuery(
             "INSERT INTO FILECHANGES(FILE, CHANGESET) VALUES (?,?)");
     public void store(History history, Repository repository)
             throws HistoryException {
         // TODO
         throw new UnsupportedOperationException();
+    }
     // TODO Remove next method as we should use store(History,Repository) now.
     // Assume that this file is never called concurrently from different
     // threads on files in the same repository.
     public void store(History history, File file, Repository repository)

Up to file-list src/org/opensolaris/opengrok/history/Repository.java:

@@ -26,11 +26,6 @@ package org.opensolaris.opengrok.history
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.opensolaris.opengrok.configuration.RuntimeEnvironment;
 /**
  * An interface for an external repository.
@@ -130,33 +125,8 @@ public abstract class Repository extends
         HistoryParser p = pClass.newInstance();
         File directory = new File(getDirectoryName());
         History history = p.parse(directory, this);
         if (history != null && history.getHistoryEntries() != null) {
             HashMap<String, List<HistoryEntry>> map =
                     new HashMap<String, List<HistoryEntry>>();
             for (HistoryEntry e : history.getHistoryEntries()) {
                 for (String s : e.getFiles()) {
                     List<HistoryEntry> list = map.get(s);
                     if (list == null) {
                         list = new ArrayList<HistoryEntry>();
                         map.put(s, list);
+                    }
                     list.add(e);
+                }
+            }
             File root = RuntimeEnvironment.getInstance().getSourceRootFile();
             for (Map.Entry<String, List<HistoryEntry>> e : map.entrySet()) {
                 for (HistoryEntry ent : e.getValue()) {
                     ent.strip();
+                }
                 History hist = new History();
                 hist.setHistoryEntries(e.getValue());
                 File file = new File(root, e.getKey());
                 if (!file.isDirectory()) {
                     cache.store(hist, file, this);
+                }
+            }
+        if (history != null) {
             cache.store(history, this);
+        }
+    }

commit 743:	2459459b1540
parent 742:	36a83c8415f4
branch:	default