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

- 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

config/alfresco/node-services-context.xml

@@ -97,9 +97,6 @@
       <property name="nodeService">
          <ref bean="NodeService"/>
       </property>
-      <property name="searchService">
-         <ref bean="SearchService"/>
-      </property>
       <property name="transactionService">
          <ref bean="transactionService"/>
       </property>

source/java/org/alfresco/repo/node/archive/NodeArchiveServiceImpl.java

@@ -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();
+        List<ChildAssociationRef> archivedAssocs = nodeService.getChildAssocs(archiveParentNodeRef);
-        // build the query
+        ResultSet rs = new ChildAssocRefResultSet(nodeService, archivedAssocs);
-        String query = String.format("PARENT:\"%s\" AND ASPECT:\"%s\"", archiveParentNodeRef, ContentModel.ASPECT_ARCHIVED);
+        // Done
-        // 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
         return rs;
     }
     
@@ -146,29 +134,9 @@ public class NodeArchiveServiceImpl implements NodeArchiveService
         return new BatchProcessWorkProvider<NodeRef>()
         {
             private VmShutdownListener vmShutdownLister = new VmShutdownListener("getArchivedNodesWorkProvider");
-            private Integer workSize;
+            public int getTotalEstimatedWorkSize()
-            private int skipResults = 0;
-            public synchronized int getTotalEstimatedWorkSize()
             {
-                if (workSize == null)
+                return 0;
-                {
-                    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;
             }
             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);
         }