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

Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)

Browse Source 
113290 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      113278 adavis: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
         112985 amorarasu: Merged DEV to V4.1-BUG-FIX (4.1.11)
            111742: MNT-10305: DeletedNodeCleanupWorker should be improved
               - Delete in multiple statements, filtering by transactions with commit time in a time interval.
            112722: Improved the algorithm that sets appropriate time windows for delete, based on the evolution of the purge process.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113397 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-09-30 09:49:37 +00:00
parent 7966debdb6
commit cb1d757f4b
6 changed files with 150 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
View File

@@ -2039,9 +2039,9 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
}
@Override
public int purgeNodes(long maxTxnCommitTimeMs)
public int purgeNodes(long fromTxnCommitTimeMs, long toTxnCommitTimeMs)
{
return deleteNodesByCommitTime(maxTxnCommitTimeMs);
return deleteNodesByCommitTime(fromTxnCommitTimeMs, toTxnCommitTimeMs);
}
/*
@@ -4847,7 +4847,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
Long optionalOldSharedAlcIdInAdditionToNull,
Long newSharedAlcId);
protected abstract int deleteNodeById(Long nodeId);
protected abstract int deleteNodesByCommitTime(long maxTxnCommitTimeMs);
protected abstract int deleteNodesByCommitTime(long fromTxnCommitTimeMs, long toTxnCommitTimeMs);
protected abstract NodeEntity selectNodeById(Long id);
protected abstract NodeEntity selectNodeByNodeRef(NodeRef nodeRef);
protected abstract List<Node> selectNodesByUuids(Long storeId, SortedSet<String> uuids);