Mailing-List: contact commits-help@ace.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@ace.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1477982 -
 /ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/file/BundleFileStore.java
Date: Wed, 01 May 2013 13:17:19 -0000
To: commits@ace.apache.org
From: bramk@apache.org
Message-Id: <20130501131719.AEAA42388993@eris.apache.org>

Author: bramk
Date: Wed May  1 13:17:19 2013
New Revision: 1477982

URL: http://svn.apache.org/r1477982
Log:
ACE-346 Optimized metadata synchronization

No longer use a map of all files. Just check the highest lastmodified.


Modified:
    ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/file/BundleFileStore.java

Modified: ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/file/BundleFileStore.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/file/BundleFileStore.java?rev=1477982&r1=1477981&r2=1477982&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/file/BundleFileStore.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/file/BundleFileStore.java Wed May  1 13:17:19 2013
@@ -26,13 +26,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.channels.FileChannel;
-import java.util.ArrayList;
 import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.Stack;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.jar.Attributes;
 import java.util.jar.JarInputStream;
 import java.util.jar.Manifest;
@@ -59,25 +54,32 @@ public class BundleFileStore implements 
     private static int BUFFER_SIZE = 8 * 1024;
     private static final String REPOSITORY_XML = "repository.xml";
 
-    private final Object m_dirLock = new Object();
+    // injected by dependencymanager
+    private volatile MetadataGenerator m_metadata;
+    private volatile LogService m_log;
 
-    private volatile MetadataGenerator m_metadata; /* will be injected by dependencymanager */
-    private volatile LogService m_log; /* will be injected by dependencymanager */
+    private volatile long m_dirLastModified;
+    private volatile File m_dir;
 
-    private volatile Map<String, Long> m_foundFiles;;
-
-    /** protected by m_dirLock. */
-    private File m_dir;
-
-    public void generateMetadata() throws IOException {
-        File dir = getWorkingDir();
-        m_metadata.generateMetadata(dir);
-        m_foundFiles = mapDirectory(dir);
+    /**
+     * Checks if the the directory was modified since we last checked. If so, the meta-data generator is called.
+     * 
+     * @throws IOException If there is a problem synchronizing the meta-data.
+     */
+    public void synchronizeMetadata() throws IOException {
+        File dir = m_dir;
+        synchronized (REPOSITORY_XML) {
+            long dirLastmodified = getDirLastModified(dir);
+            if (dirLastmodified > m_dirLastModified) {
+                m_metadata.generateMetadata(dir);
+                m_dirLastModified = getDirLastModified(dir);
+            }
+        }
     }
 
     public InputStream get(String fileName) throws IOException {
-        if (REPOSITORY_XML.equals(fileName) && directoryChanged(getWorkingDir(), m_foundFiles)) {
-            generateMetadata(); // might be called too often
+        if (REPOSITORY_XML.equals(fileName)) {
+            synchronizeMetadata();
         }
         FileInputStream result = null;
         try {
@@ -150,15 +152,13 @@ public class BundleFileStore implements 
                     throw new ConfigurationException(OBRFileStoreConstants.FILE_LOCATION_KEY, "Is not a directory: " + newDir);
                 }
 
-                synchronized (m_dirLock) {
-                    m_dir = newDir;
-                }
-                m_foundFiles = null;
+                m_dir = newDir;
+                m_dirLastModified = 0l;
             }
         }
         else {
             // clean up after getting a null as dictionary, as the service is going to be pulled afterwards
-            m_foundFiles = null;
+            m_dirLastModified = 0l;
         }
     }
 
@@ -167,55 +167,42 @@ public class BundleFileStore implements 
      */
     protected void start() {
         try {
-            generateMetadata();
+            synchronizeMetadata();
         }
         catch (IOException e) {
             m_log.log(LogService.LOG_ERROR, "Could not generate initial meta data for bundle repository");
         }
     }
 
-    private Map<String, Long> mapDirectory(File dir) {
-        Map<String, Long> foundFiles = new HashMap<String, Long>();
+    /**
+     * Returns the highest last-modified for the directory by recursively looking at all directories and files.
+     * 
+     * @param dir
+     *            The directory
+     * @return the Last-modified
+     */
+    private long getDirLastModified(File dir) {
+        long highest = 0l;
         Stack<File> dirs = new Stack<File>();
         dirs.push(dir);
-        while(!dirs.isEmpty()){
+        while (!dirs.isEmpty()) {
             File pwd = dirs.pop();
-            for(File file : pwd.listFiles()){
-                if(file.isDirectory()){
-                    dirs.push(file);
-                } else {
-                    foundFiles.put(file.getAbsolutePath(), file.lastModified() ^ file.length());
-                }
+            long modified = pwd.lastModified();
+            if (modified > highest) {
+                highest = modified;
             }
-        }
-        return foundFiles;
-    }
-
-    private boolean directoryChanged(File dir, Map<String, Long> foundFiles) {
-        if(foundFiles == null){
-            return true;
-        }
-        Stack<File> dirs = new Stack<File>();
-        dirs.push(dir);
-        int fileCount = 0;
-        while(!dirs.isEmpty()){
-            File pwd = dirs.pop();
-            for(File file : pwd.listFiles()){
-                if(file.isDirectory()){
+            for (File file : pwd.listFiles()) {
+                if (file.isDirectory()) {
                     dirs.push(file);
-                } else {
-                    fileCount++;
-                    Long modifiedDateAndLengthXOR = foundFiles.get(file.getAbsolutePath());
-                    if(modifiedDateAndLengthXOR == null || (file.lastModified() ^ file.length()) != modifiedDateAndLengthXOR){
-                        return true;
-                    }
+                    continue;
+                }
+                modified = file.lastModified();
+                if (modified > highest) {
+                    highest = modified;
                 }
             }
         }
-        if(fileCount != foundFiles.size()){
-            return true;
-        }
-        return false;
+        return highest;
     }
 
     /**
@@ -362,11 +349,7 @@ public class BundleFileStore implements 
      * @return the working directory of this file store.
      */
     private File getWorkingDir() {
-        final File dir;
-        synchronized (m_dirLock) {
-            dir = m_dir;
-        }
-        return dir;
+        return m_dir;
     }
 
     /**