From 65918ed20965b43667b2423bed735d1a80e75aee Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Fri, 11 Mar 2016 17:26:04 +0000
Subject: [PATCH] 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
---
 .../node-common-SqlMap.xml                       | 10 ++++++++++
 .../repo/domain/node/AbstractNodeDAOImpl.java    |  8 ++++++++
 .../org/alfresco/repo/domain/node/NodeDAO.java   |  5 +++++
 .../repo/domain/node/ibatis/NodeDAOImpl.java     | 16 ++++++++++++++++
 .../repo/node/db/DeletedNodeCleanupWorker.java   |  9 ++++++++-
 5 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
index aec197ee1a..b07affa1b1 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
@@ -1355,6 +1355,16 @@
         from
             alf_transaction
     </select>
+    
+    <select id="select_TxnMinCommitTimeForNodeType" parameterType="TransactionQuery" resultType="java.lang.Long">
+        select 
+            min(txn.commit_time_ms)
+        from
+            alf_transaction txn
+            join alf_node node on (node.transaction_id = txn.id)
+        where
+            node.type_qname_id = #{typeQNameId}
+    </select>
 
     <select id="select_OneTxnsByCommitTimeDescending" parameterType="TransactionQuery" resultMap="result_Transaction">
         <include refid="alfresco.node.select_Transaction_Results"/>
diff --git a/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java b/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
index b4afadc377..1ecef48015 100644
--- a/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
@@ -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();
diff --git a/source/java/org/alfresco/repo/domain/node/NodeDAO.java b/source/java/org/alfresco/repo/domain/node/NodeDAO.java
index 1794b3bcd4..d14e74ab01 100644
--- a/source/java/org/alfresco/repo/domain/node/NodeDAO.java
+++ b/source/java/org/alfresco/repo/domain/node/NodeDAO.java
@@ -835,6 +835,11 @@ public interface NodeDAO extends NodeBulkLoader
      */
     public Long getMaxTxnCommitTime();
     
+    /**
+     * @return              Returns the minimum commit time for deleted nodes or <tt>null</tt> if there are no transactions
+     */
+    public Long getMinTxnCommitTimeForDeletedNodes();
+    
     /**
      * @return              Returns the minimum id or <tt>0</tt> if there are no transactions
      */
diff --git a/source/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java b/source/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
index b6f897f45e..5b7fa1f121 100644
--- a/source/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
@@ -148,6 +148,7 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
     private static final String DELETE_TXNS_UNUSED = "alfresco.node.delete_Txns_Unused";
     private static final String SELECT_TXN_MIN_COMMIT_TIME = "alfresco.node.select_TxnMinCommitTime";
     private static final String SELECT_TXN_MAX_COMMIT_TIME = "alfresco.node.select_TxnMaxCommitTime";
+    private static final String SELECT_TXN_MIN_COMMIT_TIME_FOR_NODE_TYPE = "alfresco.node.select_TxnMinCommitTimeForNodeType";
     private static final String SELECT_TXN_MIN_ID = "alfresco.node.select_TxnMinId";
     private static final String SELECT_TXN_MAX_ID = "alfresco.node.select_TxnMaxId";
     private static final String SELECT_TXN_UNUSED_MIN_COMMIT_TIME = "alfresco.node.select_TxnMinUnusedCommitTime";
@@ -1647,6 +1648,21 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
         return template.selectOne(SELECT_TXN_MAX_COMMIT_TIME);
     }
     
+    @Override
+    protected Long selectMinTxnCommitTimeForDeletedNodes()
+    {
+        // Get the deleted nodes
+        Pair<Long, QName> deletedTypePair = qnameDAO.getQName(ContentModel.TYPE_DELETED);
+        if (deletedTypePair == null)
+        {
+            // Nothing to do
+            return 0L;
+        }
+        TransactionQueryEntity txnQuery = new TransactionQueryEntity();
+        txnQuery.setTypeQNameId(deletedTypePair.getFirst());
+        return (Long) template.selectOne(SELECT_TXN_MIN_COMMIT_TIME_FOR_NODE_TYPE, txnQuery);
+    }
+    
     @Override
     protected Long selectMinTxnId()
     {
diff --git a/source/java/org/alfresco/repo/node/db/DeletedNodeCleanupWorker.java b/source/java/org/alfresco/repo/node/db/DeletedNodeCleanupWorker.java
index 7bd1544ed5..c271beb62a 100644
--- a/source/java/org/alfresco/repo/node/db/DeletedNodeCleanupWorker.java
+++ b/source/java/org/alfresco/repo/node/db/DeletedNodeCleanupWorker.java
@@ -102,7 +102,14 @@ public class DeletedNodeCleanupWorker extends AbstractNodeCleanupWorker
         final List<String> results = new ArrayList<String>(100);
 
         final long maxCommitTime = System.currentTimeMillis() - minAge;
-        long fromCommitTime = nodeDAO.getMinUnusedTxnCommitTime().longValue();
+        long fromCommitTime = nodeDAO.getMinTxnCommitTimeForDeletedNodes().longValue();
+        
+        if ( fromCommitTime == 0L )
+        {
+              String msg = "There are no old nodes to purge.";
+              results.add(msg);
+              return results;
+        }
         
         long loopPurgeSize = purgeSize;
         Long purgeCount = new Long(0);