Merged V3.2 to HEAD

17163: org.alfresco.repo.domain.hibernate.AclDaoComponentImpl.updateAuthority() needs to flush/dirty the session in order to work
   17160: Fix HeartBeat
      - Lazy initialization in scheduled job needed its own transaction
   17146: Fix failing unit tests
      - HibernateNodeDaoServiceImpl.moveNodeToStore() must invalidate parentAssocsCache now that it contains NodeRefs
   17145: Fixes to patches for new CRC schema changes
      - Sequenced patch.fixNameCrcValues-2 before all other patches
      - Fixed typos in schema upgrade script and added CRCs for the repository descriptor nodes, so that the descriptor service and patch service can boot up
      - HeartBeat initializes lazily so that it doesn't try to load information before the patch service has bootstrapped
      - Made FixNameCrcValuesPatch industrial strength by using BatchProcessor to handle multi threading, progress reporting and transaction delineation
   17097: Removal of spurious logs directory accidentally introduced in 17096
   17096: Performance tuning for improved throughput during high volume import from LDAP directory
      - Lucene indexer will now no longer index and then reindex the same node in the same transaction
      - lucene.indexer.mergerTargetOverlaysBlockingFactor reduced to 1 (improves indexing performance and no excessive throttling observed during 10 hour test)
      - HomeFolderManager fixed so that it pays attention to the eager home folder creation flag
      - HibernateNodeDaoServiceImpl.parentAssocsCache 'upgraded' to hold information about root nodes and node refs so that recursive methods such as prependPaths can run entirely out of the cache
      - Boolean argument added to getChildAssocs() so that preloading of all child nodes is optional
      - qname_crc column added to alf_child_assoc to allow efficient lookup and indexing of child associations by QName. CRC of (qname_namespace, qname_localname).
      - idx_alf_cass_qnln on qname_localname replaced with idx_alf_cass_qncrc (qname_crc, type_qname_id, parent_node_id)
      - All node service lookup queries involving qname_localname modified to include qname_crc in WHERE clause
      - schema patch provided
      - existing org.alfresco.repo.admin.patch.impl.FixNameCrcValuesPatch extended to also fill in qname_crc column and forced to run on newer schemas
      - Optimized ChainingUserRegistrySynchronizer so that it doesn't have to look up the entire set of authorities during  an 'empty' incremental sync
      - ChainingUserRegistrySynchronizer no longer starts an outer transaction around all its smaller transactions (used to die due to timeout)
      - rule service disabled for LDAP batch processing threads
      - org.alfresco.cache.parentAssocsCache and org.alfresco.cache.storeAndNodeIdCache size increased to 80,000
      - Fixed case sensitivity issue with person caching in PersonServiceImpl
      - Cache the people container in PersonServiceImpl for faster person lookups
      - PersonDAO removed and replaced with now more efficient node service child assoc lookup methods


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

source/java/org/alfresco/repo/domain/hibernate/ChildAssocImpl.java

@@ -25,9 +25,11 @@
 package org.alfresco.repo.domain.hibernate;
 
 import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
+import java.util.zip.CRC32;
 
 import org.alfresco.repo.domain.ChildAssoc;
 import org.alfresco.repo.domain.Node;
@@ -50,6 +52,7 @@ public class ChildAssocImpl implements ChildAssoc, Serializable
     private Long typeQNameId;
     private Long qnameNamespaceId;
     private String qnameLocalName;
+    private long qnameCrc;
     private String childNodeName;
     private long childNodeNameCrc;
     private boolean isPrimary;
@@ -230,18 +233,36 @@ public class ChildAssocImpl implements ChildAssoc, Serializable
         String assocQNameNamespace = qname.getNamespaceURI();
         String assocQNameLocalName = qname.getLocalName();
         Long assocQNameNamespaceId = qnameDAO.getOrCreateNamespace(assocQNameNamespace).getFirst();
+        Long assocQNameCrc = getCrc(qname);
         // get write lock
         refWriteLock.lock();
         try
         {
             setQnameNamespaceId(assocQNameNamespaceId);
             setQnameLocalName(assocQNameLocalName);
+            setQnameCrc(assocQNameCrc);
         }
         finally
         {
             refWriteLock.unlock();
         }
     }
+    
+    public static long getCrc(QName qname)
+    {
+        CRC32 crc = new CRC32();
+        try
+        {
+            crc.update(qname.getNamespaceURI().getBytes("UTF-8"));
+            crc.update(qname.getLocalName().getBytes("UTF-8"));
+        }
+        catch (UnsupportedEncodingException e)
+        {
+            throw new RuntimeException("UTF-8 encoding is not supported");
+        }
+        return crc.getValue();
+        
+    }
 
     public boolean equals(Object obj)
     {
@@ -290,6 +311,7 @@ public class ChildAssocImpl implements ChildAssoc, Serializable
           .append(", assoc type=").append(typeQNameId)
           .append(", assoc qname ns=").append(qnameNamespaceId)
           .append(", assoc qname localname=").append(qnameLocalName)
+          .append(", assoc qname crc=").append(qnameCrc)
           .append(", isPrimary=").append(isPrimary)
           .append("]");
         return sb.toString();
@@ -461,6 +483,16 @@ public class ChildAssocImpl implements ChildAssoc, Serializable
             refWriteLock.unlock();
         }
     }
+    
+    public long getQnameCrc()
+    {
+        return qnameCrc;
+    }
+
+    public void setQnameCrc(long crc)
+    {
+        this.qnameCrc = crc;
+    }
 
     public String getChildNodeName()
     {

source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml

@@ -185,7 +185,8 @@
          <column name="child_node_id" not-null="true"/>
       </many-to-one>
       <property name="qnameNamespaceId" column="qname_ns_id" type="long" not-null="true" />  <!-- fk_alf_cass_qnns -->
-      <property name="qnameLocalName" column="qname_localname" type="string" length="255" not-null="true" index="idx_alf_cass_qnln" />
+      <property name="qnameLocalName" column="qname_localname" type="string" length="255" not-null="true" />
+      <property name="qnameCrc" column="qname_crc" type="long" not-null="true"/>
       <property name="isPrimary" column="is_primary" />
       <property name="index" column="assoc_index" />
    </class>
@@ -260,14 +261,12 @@
    <query name="node.GetParentAssocs">
       select
          assoc,
-         parent,
-         child
+         parent
       from
          org.alfresco.repo.domain.hibernate.ChildAssocImpl as assoc
          join assoc.parent as parent
-         join assoc.child as child
       where
-         child.id = :childId
+         assoc.child.id = :childId
    </query>
    
    <query name="node.DeleteParentAssocs">
@@ -317,7 +316,8 @@
          assoc.child.id = :childId and
          assoc.typeQNameId = :typeQNameId and
          assoc.qnameNamespaceId = :qnameNamespaceId and
-         assoc.qnameLocalName = :qnameLocalName
+         assoc.qnameLocalName = :qnameLocalName and
+         assoc.qnameCrc = :qnameCrc
       order by
          assoc.index,
          assoc.id
@@ -356,6 +356,7 @@
          assoc.typeQNameId,
          assoc.qnameNamespaceId,
          assoc.qnameLocalName,
+         assoc.qnameCrc,
          assoc.childNodeName,
          assoc.childNodeNameCrc,
          assoc.isPrimary,
@@ -366,11 +367,10 @@
          child.uuid
       from
          org.alfresco.repo.domain.hibernate.ChildAssocImpl as assoc
-         join assoc.parent as parent
          join assoc.child as child
          join child.store as store
       where
-         parent.id = :parentId and
+         assoc.parent.id = :parentId and
          assoc.typeQNameId = :typeQNameId and
          assoc.childNodeName in (:childNodeNames)
       order by
@@ -384,6 +384,7 @@
          assoc.typeQNameId,
          assoc.qnameNamespaceId,
          assoc.qnameLocalName,
+         assoc.qnameCrc,
          assoc.childNodeName,
          assoc.childNodeNameCrc,
          assoc.isPrimary,
@@ -394,11 +395,10 @@
          child.uuid
       from
          org.alfresco.repo.domain.hibernate.ChildAssocImpl as assoc
-         join assoc.parent as parent
          join assoc.child as child
          join child.store as store
       where
-         parent.id = :parentId
+         assoc.parent.id = :parentId
       order by
          assoc.index,
          assoc.id
@@ -410,6 +410,7 @@
          assoc.typeQNameId,
          assoc.qnameNamespaceId,
          assoc.qnameLocalName,
+         assoc.qnameCrc,
          assoc.childNodeName,
          assoc.childNodeNameCrc,
          assoc.isPrimary,
@@ -420,13 +421,13 @@
          child.uuid
       from
          org.alfresco.repo.domain.hibernate.ChildAssocImpl as assoc
-         join assoc.parent as parent
          join assoc.child as child
          join child.store as store
       where
-         parent.id = :parentId and
+         assoc.parent.id = :parentId and
          assoc.qnameNamespaceId = :qnameNamespaceId and
-         assoc.qnameLocalName = :qnameLocalName
+         assoc.qnameLocalName = :qnameLocalName and
+         assoc.qnameCrc = :qnameCrc
       order by
          assoc.index,
          assoc.id
@@ -437,6 +438,7 @@
       <return-scalar column="type_qname_id" type="long"/>
       <return-scalar column="qname_ns_id" type="long"/>
       <return-scalar column="qname_localname" type="string"/>
+      <return-scalar column="qname_crc" type="long"/>
       <return-scalar column="child_node_name" type="string"/>
       <return-scalar column="child_node_name_crc" type="long"/>
       <return-scalar column="is_primary" type="boolean"/>
@@ -450,6 +452,7 @@
          a.type_qname_id,
          a.qname_ns_id,
          a.qname_localname,
+         a.qname_crc,
          a.child_node_name,
          a.child_node_name_crc,
          a.is_primary,
@@ -471,6 +474,7 @@
          assoc.typeQNameId,
          assoc.qnameNamespaceId,
          assoc.qnameLocalName,
+         assoc.qnameCrc,
          assoc.childNodeName,
          assoc.childNodeNameCrc,
          assoc.isPrimary,
@@ -481,14 +485,14 @@
          child.uuid
       from
          org.alfresco.repo.domain.hibernate.ChildAssocImpl as assoc
-         join assoc.parent as parent
          join assoc.child as child
          join child.store as store
       where
-         parent.id = :parentId and
+         assoc.parent.id = :parentId and
          assoc.typeQNameId = :typeQNameId and
          assoc.qnameNamespaceId = :qnameNamespaceId and
-         assoc.qnameLocalName = :qnameLocalName
+         assoc.qnameLocalName = :qnameLocalName and
+         assoc.qnameCrc = :qnameCrc
       order by
          assoc.index,
          assoc.id
@@ -500,6 +504,7 @@
          assoc.typeQNameId,
          assoc.qnameNamespaceId,
          assoc.qnameLocalName,
+         assoc.qnameCrc,
          assoc.childNodeName,
          assoc.childNodeNameCrc,
          assoc.isPrimary,
@@ -510,11 +515,10 @@
          child.uuid
       from
          org.alfresco.repo.domain.hibernate.ChildAssocImpl as assoc
-         join assoc.parent as parent
          join assoc.child as child
          join child.store as store
       where
-         parent.id = :parentId and
+         assoc.parent.id = :parentId and
          child.typeQNameId in (:childTypeQNameIds)
       order by
          assoc.index,
@@ -527,6 +531,7 @@
          assoc.typeQNameId,
          assoc.qnameNamespaceId,
          assoc.qnameLocalName,
+         assoc.qnameCrc,
          assoc.childNodeName,
          assoc.childNodeNameCrc,
          assoc.isPrimary,
@@ -537,7 +542,6 @@
          child.uuid
       from
          org.alfresco.repo.domain.hibernate.ChildAssocImpl as assoc
-         join assoc.parent as parent
          join assoc.child as child
          join child.store as store
       where
@@ -554,6 +558,7 @@
          assoc.typeQNameId,
          assoc.qnameNamespaceId,
          assoc.qnameLocalName,
+         assoc.qnameCrc,
          assoc.childNodeName,
          assoc.childNodeNameCrc,
          assoc.isPrimary,
@@ -834,6 +839,7 @@
       <return-scalar column="type_qname_id" type="long"/>
       <return-scalar column="qname_ns_id" type="long"/>
       <return-scalar column="qname_localname" type="string"/>
+      <return-scalar column="qname_crc" type="long"/>
       <return-scalar column="child_node_name" type="string"/>
       <return-scalar column="child_node_name_crc" type="long"/>
       <return-scalar column="is_primary" type="boolean"/>
@@ -847,6 +853,7 @@
          z1.type_qname_id,
          z1.qname_ns_id,
          z1.qname_localname,
+         z1.qname_crc,
          z1.child_node_name,
          z1.child_node_name_crc,
          z1.is_primary,