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

Merged V3.4 to HEAD

Browse Source 
31914: ALF-10619: Not all container deletions were being honoured during indexing due to deletionsSinceFlushed processing
      - If container B is under container A with a secondary association, and A then B were deleted, then not all of Bs containers were getting masked out - only those in a subtree of A!
      - Now that delete events are fired on every affected node in a cascading delete, we can handle the nodes and containers on an individual basis
   31915: ALF-10619: Prevent possible InvalidNodeRefException during reindexing
      - Handle in childRelationshipEvent() when comparing with 'path generation factor'


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31916 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2011-11-12 11:51:50 +00:00
parent ae202a3f24
commit 73e64eed94
1 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneIndexerImpl.java
View File

@@ -42,7 +42,6 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.TreeSet;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.content.MimetypeMap;
@@ -332,20 +331,36 @@ public class ADMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<NodeRef> imp
{ {
throw new LuceneIndexException(event + " failed - node is not in the required store"); throw new LuceneIndexException(event + " failed - node is not in the required store");
} }
NodeRef parentRef = relationshipRef.getParentRef(); final NodeRef parentRef = relationshipRef.getParentRef();
NodeRef childRef = relationshipRef.getChildRef(); final NodeRef childRef = relationshipRef.getChildRef();
if (parentRef != null) if (parentRef != null)
{ {
// If the child has a lot of secondary parents, its cheaper to cascade reindex its parent rather than itself // If the child has a lot of secondary parents, its cheaper to cascade reindex its parent
if (nodeService.getParentAssocs(childRef).size() > PATH_GENERATION_FACTOR) // rather than itself
if (doInReadthroughTransaction(new RetryingTransactionCallback<Boolean>()
{ {
reindex(parentRef, true); @Override
public Boolean execute() throws Throwable
{
try
{
return nodeService.getParentAssocs(childRef).size() > PATH_GENERATION_FACTOR;
}
catch (InvalidNodeRefException e)
{
// The node may have disappeared under our feet!
return false;
}
}
}))
{
reindex(parentRef, true);
reindex(childRef, false); reindex(childRef, false);
} }
// Otherwise, it's cheaper to re-evaluate all the paths to this node // Otherwise, it's cheaper to re-evaluate all the paths to this node
else else
{ {
reindex(childRef, true); reindex(childRef, true);
} }
} }
else else
@@ -947,7 +962,6 @@ public class ADMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<NodeRef> imp
// First, apply deletions and work out a 'flattened' list of reindex actions // First, apply deletions and work out a 'flattened' list of reindex actions
mainReader = getReader(); mainReader = getReader();
IndexReader deltaReader = getDeltaReader(); IndexReader deltaReader = getDeltaReader();
Set<String> deletionsSinceFlush = new TreeSet<String>();
for (Command<NodeRef> command : commandList) for (Command<NodeRef> command : commandList)
{ {
if (s_logger.isDebugEnabled()) if (s_logger.isDebugEnabled())
@@ -978,10 +992,27 @@ public class ADMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<NodeRef> imp
nodeActionMap.put(nodeRef, Action.REINDEX); nodeActionMap.put(nodeRef, Action.REINDEX);
} }
break; break;
case DELETE:
// First ensure leaves with secondary references to the deleted node are reindexed
Set<String> nodeRefSet = Collections.singleton(nodeRef);
deleteReference(nodeRefSet, deltaReader, true);
Set<String> temp = deleteReference(nodeRefSet, mainReader, false);
if (!temp.isEmpty())
{
deletions.addAll(temp);
for (String ref : temp)
{
if (!nodeActionMap.containsKey(ref))
{
nodeActionMap.put(ref, Action.REINDEX);
}
}
}
// Now fall through to cascade reindex case
case CASCADEREINDEX: case CASCADEREINDEX:
deleteContainerAndBelow(nodeRef, deltaReader, true, true); deleteContainerAndBelow(nodeRef, deltaReader, true, true);
// Only mask out the container if it is present in the main index // Only mask out the container if it is present in the main index
Set<String> temp = deleteContainerAndBelow(nodeRef, mainReader, false, true); temp = deleteContainerAndBelow(nodeRef, mainReader, false, true);
if (!temp.isEmpty()) if (!temp.isEmpty())
{ {
containerDeletions.add(nodeRef); containerDeletions.add(nodeRef);
@@ -993,24 +1024,6 @@ public class ADMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<NodeRef> imp
} }
nodeActionMap.put(nodeRef, Action.CASCADEREINDEX); nodeActionMap.put(nodeRef, Action.CASCADEREINDEX);
break; break;
case DELETE:
// if already deleted don't do it again ...
if(!deletionsSinceFlush.contains(nodeRef))
{
Set<String> refs = deleteImpl(nodeRef, deltaReader, mainReader);
// do not delete anything we have deleted before in this flush
// probably OK to cache for the TX as a whole but done per flush => See ALF-8007
deletionsSinceFlush.addAll(refs);
for (String ref : refs)
{
if (!nodeActionMap.containsKey(ref))
{
nodeActionMap.put(ref, Action.REINDEX);
}
}
}
break;
} }
} }
@@ -1065,7 +1078,6 @@ public class ADMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<NodeRef> imp
commandList.clear(); commandList.clear();
this.docs = writer.docCount(); this.docs = writer.docCount();
deletionsSinceFlush.clear();
} }
catch (IOException e) catch (IOException e)
{ {