Merged 5.1.N (5.1.1) to HEAD (5.1)

113586 tvalkevych: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      113508 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
         113395 tvalkevych: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
            113371 amorarasu: Merged DEV to V4.1-BUG-FIX (4.1.11)
               113345: MNT-10305: DeletedNodeCleanupWorker should be improved.
                  - Fixed the starting time for the purge old nodes process.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123579 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-03-11 17:26:04 +00:00
parent 52fbb8090c
commit 65918ed209
5 changed files with 47 additions and 1 deletions

View File

@@ -4861,6 +4861,13 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
Long time = selectMaxTxnCommitTime();
return (time == null ? LONG_ZERO : time);
}
public Long getMinTxnCommitTimeForDeletedNodes()
{
Long time = selectMinTxnCommitTimeForDeletedNodes();
return (time == null ? LONG_ZERO : time);
}
@Override
public Long getMinTxnId()
@@ -5047,6 +5054,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
protected abstract List<Long> selectTxnsUnused(Long minTxnId, Long maxCommitTime, Integer count);
protected abstract Long selectMinTxnCommitTime();
protected abstract Long selectMaxTxnCommitTime();
protected abstract Long selectMinTxnCommitTimeForDeletedNodes();
protected abstract Long selectMinTxnId();
protected abstract Long selectMaxTxnId();
protected abstract Long selectMinUnusedTxnCommitTime();