More for AR-460: System concurrency

There might be a few SDK projects that still use TransactionUtil, but this checkin gets rid of
its use otherwise.
I took a glance over the areas of the code that use UserTransaction directly and didn't see any
transactionally wrapped code that desperately needed to be put into a retry loop (i.e. write
transactions in a concurrent scenario).  If you spot any that you think might qualify, let me know.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6220 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-07-12 04:15:28 +00:00
parent 32054c773c
commit 0d1bd57217
31 changed files with 230 additions and 286 deletions

View File

@@ -37,8 +37,7 @@ import org.alfresco.repo.dictionary.DictionaryDAO;
import org.alfresco.repo.dictionary.M2Model;
import org.alfresco.repo.node.integrity.IntegrityChecker;
import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
import org.alfresco.repo.transaction.TransactionUtil;
import org.alfresco.repo.transaction.TransactionUtil.TransactionWork;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentService;
@@ -109,9 +108,9 @@ public class PerformanceNodeServiceTest extends TestCase
contentService = (ContentService) applicationContext.getBean("contentService");
// create a first store directly
TransactionWork<NodeRef> createStoreWork = new TransactionWork<NodeRef>()
RetryingTransactionCallback<NodeRef> createStoreWork = new RetryingTransactionCallback<NodeRef>()
{
public NodeRef doWork()
public NodeRef execute()
{
StoreRef storeRef = nodeService.createStore(
StoreRef.PROTOCOL_WORKSPACE,
@@ -119,7 +118,7 @@ public class PerformanceNodeServiceTest extends TestCase
return nodeService.getRootNode(storeRef);
}
};
rootNodeRef = TransactionUtil.executeInUserTransaction(txnService, createStoreWork);
rootNodeRef = txnService.getRetryingTransactionHelper().doInTransaction(createStoreWork);
}
@Override
@@ -165,16 +164,16 @@ public class PerformanceNodeServiceTest extends TestCase
startTime = System.currentTimeMillis();
// ensure that we execute the node tree building in a transaction
TransactionWork<Object> buildChildrenWork = new TransactionWork<Object>()
RetryingTransactionCallback<Object> buildChildrenWork = new RetryingTransactionCallback<Object>()
{
public Object doWork()
public Object execute()
{
IntegrityChecker.setWarnInTransaction();
buildNodeChildren(rootNodeRef, 1, testDepth, testChildCount);
return null;
}
};
TransactionUtil.executeInUserTransaction(txnService, buildChildrenWork);
txnService.getRetryingTransactionHelper().doInTransaction(buildChildrenWork);
long endTime = System.currentTimeMillis();