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:
@@ -171,15 +171,7 @@ public class ChainingUserRegistrySynchronizerTest extends TestCase
|
||||
{
|
||||
newGroup("G2", "U1", "U3", "U4"), newGroup("G6", "U3", "U4", "G7"), newGroup("G7", "U5")
|
||||
}));
|
||||
this.retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Object>()
|
||||
{
|
||||
|
||||
public Object execute() throws Throwable
|
||||
{
|
||||
ChainingUserRegistrySynchronizerTest.this.synchronizer.synchronize(true, true);
|
||||
return null;
|
||||
}
|
||||
});
|
||||
this.synchronizer.synchronize(true, true);
|
||||
this.retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Object>()
|
||||
{
|
||||
|
||||
@@ -200,7 +192,7 @@ public class ChainingUserRegistrySynchronizerTest extends TestCase
|
||||
assertExists("Z2", "G7", "U5");
|
||||
return null;
|
||||
}
|
||||
});
|
||||
}, false, true);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -209,22 +201,14 @@ public class ChainingUserRegistrySynchronizerTest extends TestCase
|
||||
* @throws Exception
|
||||
* the exception
|
||||
*/
|
||||
private void tearDownTestUsersAndGroups() throws Exception
|
||||
public void tearDownTestUsersAndGroups() throws Exception
|
||||
{
|
||||
// Wipe out everything that was in Z1 and Z2
|
||||
this.applicationContextManager.setUserRegistries(new MockUserRegistry("Z0", new NodeDescription[] {},
|
||||
new NodeDescription[] {}), new MockUserRegistry("Z1", new NodeDescription[] {},
|
||||
new NodeDescription[] {}), new MockUserRegistry("Z2", new NodeDescription[] {},
|
||||
new NodeDescription[] {}));
|
||||
this.retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Object>()
|
||||
{
|
||||
|
||||
public Object execute() throws Throwable
|
||||
{
|
||||
ChainingUserRegistrySynchronizerTest.this.synchronizer.synchronize(true, true);
|
||||
return null;
|
||||
}
|
||||
});
|
||||
this.synchronizer.synchronize(true, true);
|
||||
this.retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Object>()
|
||||
{
|
||||
|
||||
@@ -245,7 +229,7 @@ public class ChainingUserRegistrySynchronizerTest extends TestCase
|
||||
assertNotExists("G7");
|
||||
return null;
|
||||
}
|
||||
});
|
||||
}, false, true);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -348,15 +332,7 @@ public class ChainingUserRegistrySynchronizerTest extends TestCase
|
||||
{
|
||||
newGroup("G2", "U1", "U3", "U4", "U6"), newGroup("G6", "U3", "U4", "G7"), newGroup("G7", "U4", "U5")
|
||||
}));
|
||||
this.retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Object>()
|
||||
{
|
||||
|
||||
public Object execute() throws Throwable
|
||||
{
|
||||
ChainingUserRegistrySynchronizerTest.this.synchronizer.synchronize(true, true);
|
||||
return null;
|
||||
}
|
||||
});
|
||||
this.synchronizer.synchronize(true, true);
|
||||
this.retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Object>()
|
||||
{
|
||||
|
||||
@@ -378,7 +354,7 @@ public class ChainingUserRegistrySynchronizerTest extends TestCase
|
||||
assertExists("Z2", "G7");
|
||||
return null;
|
||||
}
|
||||
});
|
||||
}, false, true);
|
||||
tearDownTestUsersAndGroups();
|
||||
}
|
||||
|
||||
@@ -393,15 +369,7 @@ public class ChainingUserRegistrySynchronizerTest extends TestCase
|
||||
List<NodeDescription> persons = new ArrayList<NodeDescription>(new RandomPersonCollection(100));
|
||||
List<NodeDescription> groups = new ArrayList<NodeDescription>(new RandomGroupCollection(100, persons));
|
||||
this.applicationContextManager.setUserRegistries(new MockUserRegistry("Z0", persons, groups));
|
||||
this.retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Object>()
|
||||
{
|
||||
|
||||
public Object execute() throws Throwable
|
||||
{
|
||||
ChainingUserRegistrySynchronizerTest.this.synchronizer.synchronize(true, true);
|
||||
return null;
|
||||
}
|
||||
});
|
||||
this.synchronizer.synchronize(true, true);
|
||||
tearDownTestUsersAndGroups();
|
||||
}
|
||||
|
||||
@@ -413,20 +381,20 @@ public class ChainingUserRegistrySynchronizerTest extends TestCase
|
||||
*/
|
||||
public void dontTestAssocs() throws Exception
|
||||
{
|
||||
this.retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Object>()
|
||||
{
|
||||
public Object execute() throws Throwable
|
||||
{
|
||||
List<NodeDescription> groups = new ArrayList<NodeDescription>(new RandomGroupCollection(1000,
|
||||
ChainingUserRegistrySynchronizerTest.this.authorityService.getAllAuthoritiesInZone(
|
||||
AuthorityService.ZONE_AUTH_EXT_PREFIX + "Z0", null)));
|
||||
ChainingUserRegistrySynchronizerTest.this.applicationContextManager
|
||||
.setUserRegistries(new MockUserRegistry("Z0", Collections.<NodeDescription> emptyList(), groups));
|
||||
;
|
||||
ChainingUserRegistrySynchronizerTest.this.synchronizer.synchronize(true, true);
|
||||
return null;
|
||||
}
|
||||
});
|
||||
List<NodeDescription> groups = this.retryingTransactionHelper.doInTransaction(
|
||||
new RetryingTransactionCallback<List<NodeDescription>>()
|
||||
{
|
||||
|
||||
public List<NodeDescription> execute() throws Throwable
|
||||
{
|
||||
return new ArrayList<NodeDescription>(new RandomGroupCollection(1000,
|
||||
ChainingUserRegistrySynchronizerTest.this.authorityService.getAllAuthoritiesInZone(
|
||||
AuthorityService.ZONE_AUTH_EXT_PREFIX + "Z0", null)));
|
||||
}
|
||||
}, true, true);
|
||||
ChainingUserRegistrySynchronizerTest.this.applicationContextManager.setUserRegistries(new MockUserRegistry(
|
||||
"Z0", Collections.<NodeDescription> emptyList(), groups));
|
||||
ChainingUserRegistrySynchronizerTest.this.synchronizer.synchronize(true, true);
|
||||
tearDownTestUsersAndGroups();
|
||||
}
|
||||
|
||||
@@ -631,10 +599,9 @@ public class ChainingUserRegistrySynchronizerTest extends TestCase
|
||||
{
|
||||
return this.zoneId;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* (non-Javadoc)
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
* @see org.alfresco.repo.security.sync.UserRegistry#processDeletions(java.util.Set)
|
||||
*/
|
||||
public void processDeletions(Set<String> candidateAuthoritiesForDeletion)
|
||||
@@ -649,7 +616,8 @@ public class ChainingUserRegistrySynchronizerTest extends TestCase
|
||||
}
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
* @see org.alfresco.repo.security.sync.UserRegistry#getGroups(java.util.Date)
|
||||
*/
|
||||
public Collection<NodeDescription> getGroups(Date modifiedSince)
|
||||
|
Reference in New Issue
Block a user