From b18da4e3cf19d63186543cbfe2f39b267111fd88 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Tue, 15 Nov 2011 16:28:10 +0000
Subject: [PATCH] Batch loading of nodes doesn't pull back deleted nodes;
 search-NodeService interaction fix

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31998 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org.hibernate.dialect.Dialect/node-common-SqlMap.xml | 1 +
 .../alfresco/repo/domain/node/AbstractNodeDAOImpl.java   | 6 +++---
 .../alfresco/repo/domain/node/ibatis/NodeDAOImpl.java    | 9 ++++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

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 767c29da5c..61e583bcdf 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
@@ -722,6 +722,7 @@
             <foreach item="item" index="index" collection="uuids" open="(" separator="," close=")">
                 #{item}
             </foreach>
+            <if test="deleted != null">and node.node_deleted = #{deleted}</if>
     </select>
     
     <select id="select_NodesByIds" parameterType="NodeBatchLoad" resultMap="result_Node">
diff --git a/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java b/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
index aa6db3fac1..2e093392fc 100644
--- a/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
@@ -3819,14 +3819,14 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
             if (batch.size() >= batchSize)
             {
                 // Preload
-                cacheNodesNoBatch(selectNodesByUuids(storeId, batch));
+                cacheNodesNoBatch(selectNodesByUuids(storeId, batch, Boolean.FALSE));
                 batch.clear();
             }
         }
         // Load any remaining nodes
         if (batch.size() > 0)
         {
-            cacheNodesNoBatch(selectNodesByUuids(storeId, batch));
+            cacheNodesNoBatch(selectNodesByUuids(storeId, batch, Boolean.FALSE));
         }
     }
     
@@ -4047,7 +4047,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
     protected abstract int deleteNodesByCommitTime(boolean deletedOnly, long maxTxnCommitTimeMs);
     protected abstract NodeEntity selectNodeById(Long id, Boolean deleted);
     protected abstract NodeEntity selectNodeByNodeRef(NodeRef nodeRef, Boolean deleted);
-    protected abstract List<Node> selectNodesByUuids(Long storeId, SortedSet<String> uuids);
+    protected abstract List<Node> selectNodesByUuids(Long storeId, SortedSet<String> uuids, Boolean deleted);
     protected abstract List<Node> selectNodesByIds(SortedSet<Long> ids, Boolean deleted);
     protected abstract Map<NodeVersionKey, Map<NodePropertyKey, NodePropertyValue>> selectNodeProperties(Set<Long> nodeIds);
     protected abstract Map<NodeVersionKey, Map<NodePropertyKey, NodePropertyValue>> selectNodeProperties(Long nodeId);
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 c0a02c8046..963dd75631 100644
--- a/source/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
@@ -410,11 +410,18 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
 
     @SuppressWarnings("unchecked")
     @Override
-    protected List<Node> selectNodesByUuids(Long storeId, SortedSet<String> uuids)
+    protected List<Node> selectNodesByUuids(Long storeId, SortedSet<String> uuids, Boolean deleted)
     {
         NodeBatchLoadEntity nodeBatchLoadEntity = new NodeBatchLoadEntity();
+        // Store ID
         nodeBatchLoadEntity.setStoreId(storeId);
+        // UUID
         nodeBatchLoadEntity.setUuids(new ArrayList<String>(uuids));
+        // Deleted
+        if (deleted != null)
+        {
+            nodeBatchLoadEntity.setDeleted(deleted);
+        }
         
         return (List<Node>) template.selectList(SELECT_NODES_BY_UUIDS, nodeBatchLoadEntity);
     }