mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
More ALF-588: MT - delete tenant requires deleteStore
- Reintroduced testDeleteStore - Added 'protocolsToIgnore' property to index recovery components - Added 'deleted' protocol to all ignorable store settings (ADM indexer, index recovery) - Return 'NodeRef.Status' for transaction changes queries (removes N+1 calls back to NodeService) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22290 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -775,7 +775,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
|
||||
else
|
||||
{
|
||||
Transaction txn = node.getTransaction();
|
||||
return new NodeRef.Status(txn.getChangeTxnId(), txn.getId(), node.getDeleted());
|
||||
return new NodeRef.Status(nodeRef, txn.getChangeTxnId(), txn.getId(), node.getDeleted());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3053,23 +3053,23 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
|
||||
return selectTxnById(txnId);
|
||||
}
|
||||
|
||||
public List<NodeRef> getTxnChanges(Long txnId)
|
||||
public List<NodeRef.Status> getTxnChanges(Long txnId)
|
||||
{
|
||||
return getTxnChangesForStore(null, txnId);
|
||||
}
|
||||
|
||||
public List<NodeRef> getTxnChangesForStore(StoreRef storeRef, Long txnId)
|
||||
public List<NodeRef.Status> getTxnChangesForStore(StoreRef storeRef, Long txnId)
|
||||
{
|
||||
Long storeId = (storeRef == null) ? null : getStoreNotNull(storeRef).getId();
|
||||
List<NodeEntity> nodes = selectTxnChanges(txnId, storeId);
|
||||
// Convert
|
||||
List<NodeRef> nodeRefs = new ArrayList<NodeRef>(nodes.size());
|
||||
List<NodeRef.Status> nodeStatuses = new ArrayList<NodeRef.Status>(nodes.size());
|
||||
for (NodeEntity node : nodes)
|
||||
{
|
||||
nodeRefs.add(node.getNodeRef());
|
||||
nodeStatuses.add(node.getNodeStatus());
|
||||
}
|
||||
// Done
|
||||
return nodeRefs;
|
||||
return nodeStatuses;
|
||||
}
|
||||
|
||||
public int getTxnUpdateCount(Long txnId)
|
||||
|
Reference in New Issue
Block a user