Schema changes and ID-based node storage

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2727 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/version/BaseVersionStoreTest.java

@@ -28,7 +28,7 @@ import org.alfresco.repo.dictionary.DictionaryDAO;
 import org.alfresco.repo.dictionary.M2Model;
 import org.alfresco.repo.security.authentication.AuthenticationComponent;
 import org.alfresco.repo.security.authentication.MutableAuthenticationDao;
-import org.alfresco.repo.version.common.counter.VersionCounterDaoService;
+import org.alfresco.repo.version.common.counter.VersionCounterService;
 import org.alfresco.repo.version.common.versionlabel.SerialVersionLabelPolicy;
 import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.cmr.repository.ContentService;
@@ -51,7 +51,7 @@ public abstract class BaseVersionStoreTest extends BaseSpringTest
      */
 	protected NodeService dbNodeService;
     protected VersionService versionService;
-    protected VersionCounterDaoService versionCounterDaoService;
+    protected VersionCounterService versionCounterDaoService;
     protected ContentService contentService;
 	protected DictionaryDAO dictionaryDAO;
     protected AuthenticationService authenticationService;
@@ -133,7 +133,7 @@ public abstract class BaseVersionStoreTest extends BaseSpringTest
         // Get the services by name from the application context
         this.dbNodeService = (NodeService)applicationContext.getBean("dbNodeService");
         this.versionService = (VersionService)applicationContext.getBean("versionService");
-        this.versionCounterDaoService = (VersionCounterDaoService)applicationContext.getBean("versionCounterDaoService");
+        this.versionCounterDaoService = (VersionCounterService)applicationContext.getBean("versionCounterDaoService");
         this.contentService = (ContentService)applicationContext.getBean("contentService");
         this.authenticationService = (AuthenticationService)applicationContext.getBean("authenticationService");
         this.authenticationComponent = (AuthenticationComponent)applicationContext.getBean("authenticationComponent");

source/java/org/alfresco/repo/version/VersionServiceImpl.java

@@ -33,7 +33,7 @@ import org.alfresco.repo.version.common.AbstractVersionServiceImpl;
 import org.alfresco.repo.version.common.VersionHistoryImpl;
 import org.alfresco.repo.version.common.VersionImpl;
 import org.alfresco.repo.version.common.VersionUtil;
-import org.alfresco.repo.version.common.counter.VersionCounterDaoService;
+import org.alfresco.repo.version.common.counter.VersionCounterService;
 import org.alfresco.repo.version.common.versionlabel.SerialVersionLabelPolicy;
 import org.alfresco.service.cmr.repository.AspectMissingException;
 import org.alfresco.service.cmr.repository.AssociationRef;
@@ -73,7 +73,7 @@ public class VersionServiceImpl extends AbstractVersionServiceImpl
     /**
      * The version counter service
      */
-    private VersionCounterDaoService versionCounterService ;
+    private VersionCounterService versionCounterService;
     
     /**
      * The db node service, used as the version store implementation
@@ -91,11 +91,6 @@ public class VersionServiceImpl extends AbstractVersionServiceImpl
     @SuppressWarnings("unused")
     private SearchService searcher;       	
     
-    /**
-     * The version cache
-     */
-    private HashMap<NodeRef, Version> versionCache = new HashMap<NodeRef, Version>(100);
-    
     /**
      * Sets the db node service, used as the version store implementation
      * 
@@ -107,8 +102,6 @@ public class VersionServiceImpl extends AbstractVersionServiceImpl
     }
 
     /**
-     * Sets the searcher
-     * 
      * @param searcher  the searcher
      */
     public void setSearcher(SearchService searcher)
@@ -117,11 +110,9 @@ public class VersionServiceImpl extends AbstractVersionServiceImpl
     }
 	
     /**
-     * Sets the version counter service
-     * 
      * @param versionCounterService  the version counter service
      */
-    public void setVersionCounterDaoService(VersionCounterDaoService versionCounterService)
+    public void setVersionCounterService(VersionCounterService versionCounterService)
     {
         this.versionCounterService = versionCounterService;
     }    
@@ -164,7 +155,7 @@ public class VersionServiceImpl extends AbstractVersionServiceImpl
     }
 	
     /**
-     * @see VersionCounterDaoService#nextVersionNumber(StoreRef)
+     * @see VersionCounterService#nextVersionNumber(StoreRef)
      */
     public Version createVersion(
             NodeRef nodeRef, 
@@ -727,45 +718,37 @@ public class VersionServiceImpl extends AbstractVersionServiceImpl
      */
     private Version getVersion(NodeRef versionRef)
     {
-        Version result = null;
-		
-		if (versionRef != null)
-		{
-            // check to see if this version is already in the cache
-            result = this.versionCache.get(versionRef);
-            
-            if (result == null)
-            {
-    	        Map<String, Serializable> versionProperties = new HashMap<String, Serializable>();
-    	        
-    	        // Get the standard node details
-    	        Map<QName, Serializable> nodeProperties = this.dbNodeService.getProperties(versionRef);
-    	        for (QName key : nodeProperties.keySet())
-    	        {                 
-	                Serializable value = nodeProperties.get(key);
-	                versionProperties.put(key.getLocalName(), value);
-    	        }
-                
-                // Get the meta data
-                List<ChildAssociationRef> metaData = 
-                    this.dbNodeService.getChildAssocs(versionRef, RegexQNamePattern.MATCH_ALL, CHILD_QNAME_VERSION_META_DATA);
-                for (ChildAssociationRef ref : metaData)
-                {
-                    NodeRef metaDataValue = (NodeRef)ref.getChildRef();
-                    String name = (String)this.dbNodeService.getProperty(metaDataValue, PROP_QNAME_META_DATA_NAME);
-                    Serializable value = this.dbNodeService.getProperty(metaDataValue, PROP_QNAME_META_DATA_VALUE);
-                    versionProperties.put(name, value);
-                }
-    	        
-    	        // Create and return the version object
-                NodeRef newNodeRef = new NodeRef(new StoreRef(STORE_PROTOCOL, STORE_ID), versionRef.getId());
-    	        result = new VersionImpl(versionProperties, newNodeRef);
-                
-                // Add the version to the cache
-                this.versionCache.put(versionRef, result);
-            }
-		}
-		
+        if (versionRef == null)
+        {
+            return null;
+        }
+        Map<String, Serializable> versionProperties = new HashMap<String, Serializable>();
+        
+        // Get the standard node details
+        Map<QName, Serializable> nodeProperties = this.dbNodeService.getProperties(versionRef);
+        for (QName key : nodeProperties.keySet())
+        {                 
+            Serializable value = nodeProperties.get(key);
+            versionProperties.put(key.getLocalName(), value);
+        }
+        
+        // Get the meta data
+        List<ChildAssociationRef> metaData = this.dbNodeService.getChildAssocs(
+                versionRef,
+                RegexQNamePattern.MATCH_ALL,
+                CHILD_QNAME_VERSION_META_DATA);
+        for (ChildAssociationRef ref : metaData)
+        {
+            NodeRef metaDataValue = (NodeRef)ref.getChildRef();
+            String name = (String)this.dbNodeService.getProperty(metaDataValue, PROP_QNAME_META_DATA_NAME);
+            Serializable value = this.dbNodeService.getProperty(metaDataValue, PROP_QNAME_META_DATA_VALUE);
+            versionProperties.put(name, value);
+        }
+        
+        // Create and return the version object
+        NodeRef newNodeRef = new NodeRef(new StoreRef(STORE_PROTOCOL, STORE_ID), versionRef.getId());
+        Version result = new VersionImpl(versionProperties, newNodeRef);
+		// done
 		return result;
     }
     

source/java/org/alfresco/repo/version/VersionTestSuite.java

@@ -21,7 +21,7 @@ import junit.framework.TestSuite;
 
 import org.alfresco.repo.version.common.VersionHistoryImplTest;
 import org.alfresco.repo.version.common.VersionImplTest;
-import org.alfresco.repo.version.common.counter.VersionCounterDaoServiceTest;
+import org.alfresco.repo.version.common.counter.VersionCounterServiceTest;
 import org.alfresco.repo.version.common.versionlabel.SerialVersionLabelPolicyTest;
 
 /**
@@ -42,7 +42,7 @@ public class VersionTestSuite extends TestSuite
         suite.addTestSuite(VersionImplTest.class);
         suite.addTestSuite(VersionHistoryImplTest.class);
         suite.addTestSuite(SerialVersionLabelPolicyTest.class);
-        suite.addTestSuite(VersionCounterDaoServiceTest.class);
+        suite.addTestSuite(VersionCounterServiceTest.class);
         suite.addTestSuite(VersionServiceImplTest.class);
         suite.addTestSuite(NodeServiceImplTest.class);
         suite.addTestSuite(ContentServiceImplTest.class);

source/java/org/alfresco/repo/version/common/counter/VersionCounterService.java

@@ -20,11 +20,11 @@ import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.namespace.QName;
 
 /**
- * Version counter DAO service interface.
+ * Version counter service interface.
  * 
  * @author Roy Wetherall
  */
-public interface VersionCounterDaoService
+public interface VersionCounterService
 {
     /**
      * Helper method for simple patching

source/java/org/alfresco/repo/version/common/counter/VersionCounterServiceTest.java

@@ -35,7 +35,7 @@ import org.springframework.context.ApplicationContext;
 /**
  * @author Roy Wetherall
  */
-public class VersionCounterDaoServiceTest extends TestCase
+public class VersionCounterServiceTest extends TestCase
 {
     private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
     
@@ -44,7 +44,7 @@ public class VersionCounterDaoServiceTest extends TestCase
 
     private TransactionService transactionService;
     private NodeService nodeService;
-    private VersionCounterDaoService counter;
+    private VersionCounterService counter;
     
     @Override
     public void setUp() throws Exception
@@ -52,7 +52,7 @@ public class VersionCounterDaoServiceTest extends TestCase
         ServiceRegistry serviceRegistry = (ServiceRegistry) ctx.getBean("ServiceRegistry");
         transactionService = serviceRegistry.getTransactionService();
         nodeService = serviceRegistry.getNodeService();
-        counter = (VersionCounterDaoService) ctx.getBean("versionCounterDaoService");
+        counter = (VersionCounterService) ctx.getBean("versionCounterService");
         
         storeRef1 = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, "test1_" + System.currentTimeMillis());
         storeRef2 = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, "test2_" + System.currentTimeMillis());

source/java/org/alfresco/repo/version/common/counter/hibernate/HibernateVersionCounterDaoServiceImpl.java

@@ -1,183 +0,0 @@
-/*
- * Copyright (C) 2005 Alfresco, Inc.
- *
- * Licensed under the Mozilla Public License version 1.1 
- * with a permitted attribution clause. You may obtain a
- * copy of the License at
- *
- *   http://www.alfresco.org/legal/license.txt
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific
- * language governing permissions and limitations under the
- * License.
- */
-package org.alfresco.repo.version.common.counter.hibernate;
-
-import org.alfresco.repo.domain.StoreKey;
-import org.alfresco.repo.domain.VersionCount;
-import org.alfresco.repo.domain.hibernate.VersionCountImpl;
-import org.alfresco.repo.node.NodeServicePolicies;
-import org.alfresco.repo.policy.JavaBehaviour;
-import org.alfresco.repo.policy.PolicyComponent;
-import org.alfresco.repo.version.common.counter.VersionCounterDaoService;
-import org.alfresco.service.cmr.repository.StoreRef;
-import org.alfresco.service.namespace.NamespaceService;
-import org.alfresco.service.namespace.QName;
-import org.hibernate.LockMode;
-import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
-
-/**
- * Version counter DAO service implemtation using Hibernate.
- * <p>
- * The object should execute within its own transaction, and is limited to single-thread
- * entry.  If it becomes a bottleneck, the transaction synchronization should be moved
- * over to reentrant locks and/or the hibernate mappings should be optimized for better
- * read-write access. 
- * 
- * @author Derek Hulley
- */
-public class HibernateVersionCounterDaoServiceImpl
-        extends HibernateDaoSupport
-        implements VersionCounterDaoService, NodeServicePolicies.BeforeCreateStorePolicy
-{
-    private PolicyComponent policyComponent;
-
-    /**
-     * @param policyComponent the component to register behaviour
-     */
-    public void setPolicyComponent(PolicyComponent policyComponent)
-    {
-        this.policyComponent = policyComponent;
-    }
-    
-    /**
-     * Bind to receive notifications of store creations
-     */
-    public void init()
-    {
-        policyComponent.bindClassBehaviour(
-                QName.createQName(NamespaceService.ALFRESCO_URI, "beforeCreateStore"),
-                this,
-                new JavaBehaviour(this, "beforeCreateStore"));
-    }
-
-    /**
-     * Create a version counter for the store
-     * @param nodeTypeQName
-     * @param storeRef
-     */
-    public void beforeCreateStore(QName nodeTypeQName, StoreRef storeRef)
-    {
-        final StoreKey storeKey = new StoreKey(storeRef.getProtocol(), storeRef.getIdentifier());
-        VersionCount versionCount = (VersionCount) getHibernateTemplate().get(VersionCountImpl.class, storeKey);
-        if (versionCount != null)
-        {
-            // already exists
-            return;
-        }
-        versionCount = new VersionCountImpl();
-        versionCount.setKey(storeKey);
-        getHibernateTemplate().save(versionCount);
-    }
-
-    /**
-     * Retrieves or creates a version counter.  This locks the counter against updates for the
-     * current transaction.
-     * 
-     * @param storeKey the primary key of the counter
-     * @return Returns a current or new version counter
-     */
-    private VersionCount getVersionCounter(StoreRef storeRef)
-    {
-        final StoreKey storeKey = new StoreKey(storeRef.getProtocol(), storeRef.getIdentifier());
-        
-        // check if it exists
-        VersionCount versionCount = (VersionCount) getHibernateTemplate().get(
-                VersionCountImpl.class,
-                storeKey,
-                LockMode.UPGRADE);
-        if (versionCount == null)
-        {
-            // This could fail on some databases with concurrent adds.  But it is only those databases
-            // that don't lock the index against an addition of the row, and then it will only fail once.
-            versionCount = new VersionCountImpl();
-            versionCount.setKey(storeKey);
-            getHibernateTemplate().save(versionCount);
-            // debug
-            if (logger.isDebugEnabled())
-            {
-                logger.debug("Created version counter: \n" +
-                        "   Thread: " + Thread.currentThread().getName() + "\n" +
-                        "   Version count: " + versionCount.getVersionCount());
-            }
-        }
-        else
-        {
-            // debug
-            if (logger.isDebugEnabled())
-            {
-                logger.debug("Got version counter: \n" +
-                        "   Thread: " + Thread.currentThread().getName() + "\n" +
-                        "   Version count: " + versionCount.getVersionCount());
-            }
-        }
-        // done
-        return versionCount;
-    }
-    
-    /**
-     * Get the next available version number for the specified store.
-     * 
-     * @param storeRef  the version store id
-     * @return          the next version number
-     */
-    public int nextVersionNumber(StoreRef storeRef)
-    {
-        // get the version counter
-        VersionCount versionCount = getVersionCounter(storeRef);
-        // get an incremented count
-        int nextCount = versionCount.incrementVersionCount();
-        
-        // done
-        if (logger.isDebugEnabled())
-        {
-            logger.debug("Incremented version count: \n" +
-                    "   Thread: " + Thread.currentThread().getName() + "\n" +
-                    "   New version count: " + versionCount.getVersionCount());
-        }
-        return nextCount;
-    }
-    
-    /**
-     * Gets the current version number for the specified store.
-     * 
-     * @param storeRef  the store reference
-     * @return          the current version number, zero if no version yet allocated.
-     */
-    public int currentVersionNumber(StoreRef storeRef)
-    {
-        // get the version counter
-        VersionCount versionCounter = getVersionCounter(storeRef);
-        // get an incremented count
-        return versionCounter.getVersionCount();
-    }
-    
-    /**
-     * Resets the version number for a the specified store.
-     * 
-     * WARNING: calling this method will completely reset the current 
-     * version count for the specified store and cannot be undone.  
-     *
-     * @param storeRef  the store reference
-     */
-    public synchronized void resetVersionNumber(StoreRef storeRef)
-    {
-        // get the version counter
-        VersionCount versionCounter = getVersionCounter(storeRef);
-        // get an incremented count
-        versionCounter.resetVersionCount();
-    }
-}