store changesets which changed file when it was named differently in extra table

Author: vladak

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

@@ -225,6 +225,10 @@ private void initDB(Statement s) throws SQLException {
             s.execute(getQuery("createTableFilechanges"));
         }
 
+        if (!tableExists(dmd, SCHEMA, "FILEMOVES")) {
+            s.execute(getQuery("createTableFilemoves"));
+        }
+        
         // Derby has some performance problems with auto-generated identity
         // columns when multiple threads insert into the same table
         // concurrently. Therefore, we have our own light-weight id generators
@@ -617,6 +621,9 @@ public void store(History history, Repository repository)
 
     private static final PreparedQuery ADD_FILECHANGE =
             new PreparedQuery(getQuery("addFilechange"));
+    
+    private static final PreparedQuery ADD_FILEMOVE =
+            new PreparedQuery(getQuery("addFilemove"));
 
     /**
      * Get ID value for revision string by querying the DB.
@@ -646,6 +653,7 @@ private void storeHistory(ConnectionResource conn, History history,
         PreparedStatement addChangeset = null;
         PreparedStatement addDirchange = null;
         PreparedStatement addFilechange = null;
+        PreparedStatement addFilemove = null;
         RuntimeEnvironment env = RuntimeEnvironment.getInstance();
 
         // return immediately when there is nothing to do
@@ -687,6 +695,10 @@ private void storeHistory(ConnectionResource conn, History history,
                     addFilechange = conn.getStatement(ADD_FILECHANGE);
                 }
 
+                if (addFilemove == null) {
+                    addFilemove = conn.getStatement(ADD_FILEMOVE);
+                }
+                
                 // Success! Break out of the loop.
                 break;
 
@@ -748,7 +760,6 @@ private void storeHistory(ConnectionResource conn, History history,
                             file.substring(repodir.length() + 1))) {
                                 int fileId = files.get(fullPath);
                                 addFilechange.setInt(2, fileId);
-                                addFilechange.setInt(3, 0);
                                 addFilechange.executeUpdate();
                         }
                         String[] pathElts = splitPath(fullPath);
@@ -801,19 +812,22 @@ private void storeHistory(ConnectionResource conn, History history,
                 for (int i = 0;; i++) {
                     try {
                         int changesetId = getIdForRevision(entry.getRevision());
-                        addFilechange.setInt(1, changesetId);
-                        addFilechange.setInt(2, fileId);
+
                         /*
-                         * If the file exists in the changeset, set its
-                         * moved value to 0 so it can be found when performing
-                         * historyget on directory.
+                         * If the file exists in the changeset, store it in
+                         * the table tracking moves of the file when it had
+                         * one of its precedent names so it can be found
+                         * when performing historyget on directory.
                          */
                         if (entry.getFiles().contains(repo_path)) {
-                            addFilechange.setInt(3, 0);
+                            addFilechange.setInt(1, changesetId);
+                            addFilechange.setInt(2, fileId);
+                            addFilechange.executeUpdate();
                         } else {
-                            addFilechange.setInt(3, 1);
+                            addFilemove.setInt(1, changesetId);
+                            addFilemove.setInt(2, fileId);
+                            addFilemove.executeUpdate();
                         }
-                        addFilechange.executeUpdate();
 
                         conn.commit();
                         break retry;

src/org/opensolaris/opengrok/history/JDBCHistoryCache_queries.properties

@@ -86,6 +86,16 @@ createTableDirchanges=\
           REFERENCES OPENGROK.CHANGESETS ON DELETE CASCADE, \
     CONSTRAINT DIRCHANGES_PK PRIMARY KEY (DIRECTORY, CHANGESET))
 
+createTableFilemoves=\
+  CREATE TABLE OPENGROK.FILEMOVES (\
+    FILE INT NOT NULL \
+        CONSTRAINT FILEMOVES_FK_FILE \
+          REFERENCES OPENGROK.FILES ON DELETE CASCADE, \
+    CHANGESET INT NOT NULL \
+        CONSTRAINT FILEMOVES_FK_CS \
+          REFERENCES OPENGROK.CHANGESETS ON DELETE CASCADE, \
+    CONSTRAINT FILEMOVES_PK PRIMARY KEY (FILE, CHANGESET))
+
 createTableFilechanges=\
   CREATE TABLE OPENGROK.FILECHANGES (\
     FILE INT NOT NULL \
@@ -94,8 +104,7 @@ createTableFilechanges=\
     CHANGESET INT NOT NULL \
         CONSTRAINT FILECHANGES_FK_CS \
           REFERENCES OPENGROK.CHANGESETS ON DELETE CASCADE, \
-    MOVED SMALLINT NOT NULL, \
-    CONSTRAINT FILECHANGES_PK PRIMARY KEY (FILE, CHANGESET, MOVED))
+    CONSTRAINT FILECHANGES_PK PRIMARY KEY (FILE, CHANGESET))
 
 hasCacheForDirectory=\
   SELECT 1 FROM OPENGROK.REPOSITORIES R, OPENGROK.DIRECTORIES D \
@@ -105,7 +114,8 @@ getFileHistory=\
   SELECT CS.REVISION, A.NAME, CS.TIME, CS.MESSAGE, CS.ID \
   FROM \
       OPENGROK.CHANGESETS CS \
-          JOIN OPENGROK.FILECHANGES FC ON CS.ID = FC.CHANGESET \
+          JOIN (SELECT * FROM OPENGROK.FILECHANGES UNION \
+            SELECT * FROM OPENGROK.FILEMOVES) as FC ON CS.ID = FC.CHANGESET \
           JOIN OPENGROK.FILES F ON FC.FILE = F.ID \
           JOIN OPENGROK.DIRECTORIES D ON D.ID = F.DIRECTORY \
           JOIN OPENGROK.AUTHORS A ON A.ID = CS.AUTHOR \
@@ -129,7 +139,7 @@ getDirHistory=\
 getFilesInChangeset=\
   SELECT D.PATH || '/' || F.NAME \
     FROM OPENGROK.DIRECTORIES D, OPENGROK.FILES F, OPENGROK.FILECHANGES FC \
-    WHERE D.ID = F.DIRECTORY AND F.ID = FC.FILE AND FC.MOVED = 0 \
+    WHERE D.ID = F.DIRECTORY AND F.ID = FC.FILE \
     AND FC.CHANGESET = ?
 
 getRepository=SELECT ID FROM OPENGROK.REPOSITORIES WHERE PATH = ?
@@ -143,8 +153,11 @@ addChangeset=\
 
 addDirchange=INSERT INTO OPENGROK.DIRCHANGES(CHANGESET, DIRECTORY) VALUES (?,?)
 
-addFilechange=INSERT INTO OPENGROK.FILECHANGES(CHANGESET, FILE, MOVED) \
-    VALUES (?,?,?)
+addFilechange=INSERT INTO OPENGROK.FILECHANGES(CHANGESET, FILE) \
+    VALUES (?,?)
+
+addFilemove=INSERT INTO OPENGROK.FILEMOVES(CHANGESET, FILE) \
+    VALUES (?,?)
 
 getAuthors=SELECT NAME, ID FROM OPENGROK.AUTHORS WHERE REPOSITORY = ?