inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved dangerous helper methods out of AVMService.

Browse Source 
Reworked handling of path lookup failures to not throw exceptions
internally, to improve performance of certain layered directory
operations.  Unfortunately there remains at least one scenario,
handling of bulk loads, and promotions of deeply nested directories in
layered contexts, in which performance is considerably less than
ideal. 

Made AVMService.createBranch() and AVMSyncService.update() perform
implicit snapshots of source tree's stores before proceeding.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3812 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-09-17 20:05:27 +00:00
parent f5e509c18b
commit 90d171b913
11 changed files with 545 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
source/java/org/alfresco/repo/avm/AVMSyncServiceImpl.java
View File

@@ -46,6 +46,11 @@ public class AVMSyncServiceImpl implements AVMSyncService
*/
private AVMService fAVMService;
/**
* The AVMRepository.
*/
private AVMRepository fAVMRepository;
/**
* Do nothing constructor.
*/
@@ -54,10 +59,7 @@ public class AVMSyncServiceImpl implements AVMSyncService
}
/**
* Set the AVM Service. For Spring. For now, at least,
* it's important to wire this using the unintercepted AVMServiceImpl,
* as AVMServiceImpl uses Runtime Exceptions for handling valid states
* that should not cause rollbacks.
* Set the AVM Service. For Spring.
* @param avmService The AVMService reference.
*/
public void setAvmService(AVMService avmService)
@@ -65,6 +67,11 @@ public class AVMSyncServiceImpl implements AVMSyncService
fAVMService = avmService;
}
public void setAvmRepository(AVMRepository avmRepository)
{
fAVMRepository = avmRepository;
}
/**
* Get a difference list between two corresponding node trees.
* @param srcVersion The version id for the source tree.
@@ -280,7 +287,14 @@ public class AVMSyncServiceImpl implements AVMSyncService
{
throw new AVMSyncException("Malformed AVMDifference.");
}
AVMNodeDescriptor srcDesc = fAVMService.lookup(diff.getSourceVersion(),
int colonOff = diff.getSourcePath().indexOf(':');
if (colonOff == -1)
{
throw new AVMBadArgumentException("Invalid path.");
}
String storeName = diff.getSourcePath().substring(0, colonOff);
int version = fAVMService.createSnapshot(storeName);
AVMNodeDescriptor srcDesc = fAVMService.lookup(version,
diff.getSourcePath(), true);
if (srcDesc == null)
{
@@ -385,8 +399,6 @@ public class AVMSyncServiceImpl implements AVMSyncService
fAVMService.link(parentPath, name, toLink);
}
// TODO doesn't handle copies from non head nodes.
/**
* Recursively copy a node into the given position.
* @param parentPath The place to put it.
@@ -417,12 +429,12 @@ public class AVMSyncServiceImpl implements AVMSyncService
// If it's a file or deleted simply link it in.
if (toCopy.isFile() || toCopy.isDeleted() || toCopy.isPlainDirectory())
{
fAVMService.link(parent, name, toCopy);
fAVMRepository.link(parent, name, toCopy);
return;
}
// Otherwise make a directory in the target parent, and recursiveCopy all the source
// children into it.
AVMNodeDescriptor newParentDesc = fAVMService.createDirectory(parent, name);
AVMNodeDescriptor newParentDesc = fAVMRepository.createDirectory(parent, name);
fgLogger.error(newParentDesc);
Map<String, AVMNodeDescriptor> children =
fAVMService.getDirectoryListing(toCopy, true);
@@ -613,14 +625,14 @@ public class AVMSyncServiceImpl implements AVMSyncService
// We've found an identity so flatten it.
if (topNode.getId() == bottomNode.getId())
{
fAVMService.flatten(layer, name);
fAVMRepository.flatten(layer, name);
}
else
{
// Otherwise recursively flatten the children.
if (flatten(topNode, bottomNode))
{
fAVMService.flatten(layer, name);
fAVMRepository.flatten(layer, name);
}
else
{