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

Fix ALF-1990: Use NodeService to find nodes to purge

Browse Source 
- Ensures that results are consistent with underlying background deletes
 - Needs separate read transactions for the getNextWork calls


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@23267 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-10-26 08:12:09 +00:00
parent 7ac35ae7fd
commit b0a43c462d
2 changed files with 10 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
source/java/org/alfresco/repo/node/archive/NodeArchiveServiceImpl.java
View File

@@ -31,6 +31,7 @@ import org.alfresco.repo.batch.BatchProcessor.BatchProcessWorker;
import org.alfresco.repo.lock.JobLockService;
import org.alfresco.repo.lock.LockAcquisitionException;
import org.alfresco.repo.node.archive.RestoreNodeReport.RestoreStatus;
import org.alfresco.repo.search.results.ChildAssocRefResultSet;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.permissions.AccessDeniedException;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
@@ -42,7 +43,6 @@ import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.search.ResultSet;
import org.alfresco.service.cmr.search.ResultSetRow;
import org.alfresco.service.cmr.search.SearchParameters;
import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
@@ -67,7 +67,6 @@ public class NodeArchiveServiceImpl implements NodeArchiveService
private static Log logger = LogFactory.getLog(NodeArchiveServiceImpl.class);
private NodeService nodeService;
private SearchService searchService;
private TransactionService transactionService;
private JobLockService jobLockService;
@@ -83,7 +82,7 @@ public class NodeArchiveServiceImpl implements NodeArchiveService
public void setSearchService(SearchService searchService)
{
this.searchService = searchService;
logger.warn("Property 'searchService' has been deprecated as of 3.4.0b");
}
public NodeRef getStoreArchiveNode(StoreRef originalStoreRef)
@@ -118,21 +117,10 @@ public class NodeArchiveServiceImpl implements NodeArchiveService
*/
private ResultSet getArchivedNodes(StoreRef originalStoreRef, int skipCount, int limit)
{
// Get the archive location
NodeRef archiveParentNodeRef = nodeService.getStoreArchiveNode(originalStoreRef);
StoreRef archiveStoreRef = archiveParentNodeRef.getStoreRef();
// build the query
String query = String.format("PARENT:\"%s\" AND ASPECT:\"%s\"", archiveParentNodeRef, ContentModel.ASPECT_ARCHIVED);
// search parameters
SearchParameters params = new SearchParameters();
params.addStore(archiveStoreRef);
params.setLanguage(SearchService.LANGUAGE_LUCENE);
params.setQuery(query);
params.setSkipCount(skipCount);
params.setMaxItems(limit);
// get all archived children using a search
ResultSet rs = searchService.query(params);
// done
List<ChildAssociationRef> archivedAssocs = nodeService.getChildAssocs(archiveParentNodeRef);
ResultSet rs = new ChildAssocRefResultSet(nodeService, archivedAssocs);
// Done
return rs;
}
@@ -146,29 +134,9 @@ public class NodeArchiveServiceImpl implements NodeArchiveService
return new BatchProcessWorkProvider<NodeRef>()
{
private VmShutdownListener vmShutdownLister = new VmShutdownListener("getArchivedNodesWorkProvider");
private Integer workSize;
private int skipResults = 0;
public synchronized int getTotalEstimatedWorkSize()
public int getTotalEstimatedWorkSize()
{
if (workSize == null)
{
workSize = Integer.valueOf(0);
ResultSet rs = null;
try
{
rs = getArchivedNodes(originalStoreRef, 0, -1);
workSize = rs.length();
}
catch (Throwable e)
{
logger.error("Failed to get archive size", e);
}
finally
{
if (rs != null) { rs.close(); }
}
}
return workSize;
return 0;
}
public synchronized Collection<NodeRef> getNextWork()
{
@@ -192,12 +160,12 @@ public class NodeArchiveServiceImpl implements NodeArchiveService
ResultSet rs = null;
try
{
rs = getArchivedNodes(originalStoreRef, skipResults, 100);
// The results may be limited by permissions, but 0 results really means 0 results
rs = getArchivedNodes(originalStoreRef, 0, 100);
for (ResultSetRow row : rs)
{
results.add(row.getNodeRef());
}
skipResults += results.size();
}
finally
{
@@ -493,7 +461,7 @@ public class NodeArchiveServiceImpl implements NodeArchiveService
"ArchiveBulkPurgeOrRestore",
transactionService.getRetryingTransactionHelper(),
getArchivedNodesWorkProvider(originalStoreRef, lockToken),
2, 20,
2, 100,
null, null, 1000);
batchProcessor.process(worker, true);
}