mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
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
This commit is contained in:
@@ -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()
|
||||
{
|
||||
|
Reference in New Issue
Block a user