diff --git a/config/alfresco/subsystems/Search/buildonly/common-search.properties b/config/alfresco/subsystems/Search/buildonly/common-search.properties index 26eba8023a..6cae6bddfb 100644 --- a/config/alfresco/subsystems/Search/buildonly/common-search.properties +++ b/config/alfresco/subsystems/Search/buildonly/common-search.properties @@ -1,5 +1,6 @@ search.solrTrackingSupport.enabled=true search.solrTrackingSupport.ignorePathsForSpecificTypes=false +search.solrTrackingSupport.ignorePathsForSpecificAspects=false solr.query.fts.queryConsistency=TRANSACTIONAL_IF_POSSIBLE solr.query.cmis.queryConsistency=TRANSACTIONAL_IF_POSSIBLE diff --git a/config/alfresco/subsystems/Search/common-search-context.xml b/config/alfresco/subsystems/Search/common-search-context.xml index 348fbfe72b..2905ae7765 100644 --- a/config/alfresco/subsystems/Search/common-search-context.xml +++ b/config/alfresco/subsystems/Search/common-search-context.xml @@ -29,6 +29,12 @@ {http://www.alfresco.org/model/application/1.0}configurations + + ${search.solrTrackingSupport.ignorePathsForSpecificAspects} + + + + diff --git a/config/alfresco/subsystems/Search/noindex/common-search.properties b/config/alfresco/subsystems/Search/noindex/common-search.properties index 2731e4a51a..8dfc2bd216 100644 --- a/config/alfresco/subsystems/Search/noindex/common-search.properties +++ b/config/alfresco/subsystems/Search/noindex/common-search.properties @@ -1,5 +1,6 @@ search.solrTrackingSupport.enabled=true search.solrTrackingSupport.ignorePathsForSpecificTypes=false +search.solrTrackingSupport.ignorePathsForSpecificAspects=false solr.query.fts.queryConsistency=TRANSACTIONAL_IF_POSSIBLE solr.query.cmis.queryConsistency=TRANSACTIONAL_IF_POSSIBLE diff --git a/config/alfresco/subsystems/Search/solr/common-search.properties b/config/alfresco/subsystems/Search/solr/common-search.properties index 934e3d939d..cab48f9606 100644 --- a/config/alfresco/subsystems/Search/solr/common-search.properties +++ b/config/alfresco/subsystems/Search/solr/common-search.properties @@ -1,5 +1,6 @@ search.solrTrackingSupport.enabled=true search.solrTrackingSupport.ignorePathsForSpecificTypes=false +search.solrTrackingSupport.ignorePathsForSpecificAspects=false solr.query.fts.queryConsistency=TRANSACTIONAL_IF_POSSIBLE solr.query.cmis.queryConsistency=TRANSACTIONAL_IF_POSSIBLE diff --git a/config/alfresco/subsystems/Search/solr4/common-search.properties b/config/alfresco/subsystems/Search/solr4/common-search.properties index d95716bb0c..aff99a34bc 100644 --- a/config/alfresco/subsystems/Search/solr4/common-search.properties +++ b/config/alfresco/subsystems/Search/solr4/common-search.properties @@ -1,5 +1,6 @@ search.solrTrackingSupport.enabled=true search.solrTrackingSupport.ignorePathsForSpecificTypes=false +search.solrTrackingSupport.ignorePathsForSpecificAspects=false solr.query.fts.queryConsistency=TRANSACTIONAL_IF_POSSIBLE solr.query.cmis.queryConsistency=TRANSACTIONAL_IF_POSSIBLE diff --git a/source/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java b/source/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java index 2cf6c80df7..eaaa301d86 100644 --- a/source/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java +++ b/source/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2014 Alfresco Software Limited. + * Copyright (C) 2005-2015 Alfresco Software Limited. * * This file is part of Alfresco * @@ -85,8 +85,11 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent private boolean enabled = true; private boolean cacheAncestors =true; private boolean ignorePathsForSpecificTypes = false; + private boolean ignorePathsForSpecificAspects = false; private Set typesForIgnoringPaths = new HashSet(); + private Set aspectsForIgnoringPaths = new HashSet(); private List typesForIgnoringPathsString; + private List aspectsForIgnoringPathsString; @Override @@ -106,16 +109,31 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent return ignorePathsForSpecificTypes; } + public boolean isIgnorePathsForSpecificAspects() + { + return ignorePathsForSpecificAspects; + } + public void setIgnorePathsForSpecificTypes(boolean ignorePersonAndConfigurationPaths) { this.ignorePathsForSpecificTypes = ignorePersonAndConfigurationPaths; } + public void setIgnorePathsForSpecificAspects(boolean ignorePathsForSpecificAspects) + { + this.ignorePathsForSpecificAspects = ignorePathsForSpecificAspects; + } + public void setTypesForIgnoringPaths(List typesForIgnoringPaths) { typesForIgnoringPathsString = typesForIgnoringPaths; } + public void setAspectsForIgnoringPaths(List aspectsForIgnoringPaths) + { + this.aspectsForIgnoringPathsString = aspectsForIgnoringPaths; + } + /** * @param cacheAncestors the cacheAncestors to set */ @@ -174,6 +192,36 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent this.dictionaryDAO = dictionaryDAO; } + private interface DefinitionExistChecker + { + boolean isDefinitionExists(QName qName); + } + + private void initIgnoringPathsByCriterion(List initDataInString, Set dataForIgnoringPaths, DefinitionExistChecker dec) + { + if (null != initDataInString) + { + for (String qNameInString : initDataInString) + { + if ((null != qNameInString) && !qNameInString.isEmpty()) + { + try + { + QName qname = QName.resolveToQName(namespaceService, qNameInString); + if (dec.isDefinitionExists(qname)) + { + dataForIgnoringPaths.add(qname); + } + } + catch (InvalidQNameException e) + { + // Just ignore + } + } + } + } + } + /** * Initialize */ @@ -188,29 +236,24 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent PropertyCheck.mandatory(this, "dictionaryService", dictionaryService); PropertyCheck.mandatory(this, "dictionaryDAO", dictionaryDAO); PropertyCheck.mandatory(this, "aclDAO", aclDAO); + PropertyCheck.mandatory(this, "namespaceService", namespaceService); - if ((null != typesForIgnoringPathsString) && (null != namespaceService)) + initIgnoringPathsByCriterion(typesForIgnoringPathsString, typesForIgnoringPaths, new DefinitionExistChecker() { - for (String typeQName : typesForIgnoringPathsString) + @Override + public boolean isDefinitionExists(QName qName) { - if ((null != typeQName) && !typeQName.isEmpty()) - { - try - { - QName type = QName.resolveToQName(namespaceService, typeQName); - - if (null != dictionaryService.getType(type)) - { - this.typesForIgnoringPaths.add(type); - } - } - catch (InvalidQNameException e) - { - // Just ignore - } - } + return (null != dictionaryService.getType(qName)); } - } + }); + initIgnoringPathsByCriterion(aspectsForIgnoringPathsString, aspectsForIgnoringPaths, new DefinitionExistChecker() + { + @Override + public boolean isDefinitionExists(QName qName) + { + return (null != dictionaryService.getAspect(qName)); + } + }); } @Override @@ -766,22 +809,15 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent if(includeAspects || includePaths || includeParentAssociations) { - aspects = new HashSet(); - Set sourceAspects = nodeDAO.getNodeAspects(nodeId); - for(QName aspectQName : sourceAspects) - { - AspectDefinition aspect = dictionaryService.getAspect(aspectQName); - if(aspect != null) - { - aspects.add(aspectQName); - } - } + aspects = getNodeAspects(nodeId); } nodeMetaData.setAspects(aspects); - boolean ignoreLargeMetadata = ignorePathsForSpecificTypes && shouldTypeBeIgnored(getNodeType(nodeId)); - if (!ignoreLargeMetadata && ignorePathsForSpecificTypes) + boolean ignoreLargeMetadata = (ignorePathsForSpecificTypes && shouldBeIgnoredByType(getNodeType(nodeId))) || + (ignorePathsForSpecificAspects && shouldBeIgnoredByAspect(nodeId, aspects)); + if (!ignoreLargeMetadata && (ignorePathsForSpecificTypes || ignorePathsForSpecificAspects)) { + // check if parent should be ignored final List parentIds = new LinkedList(); nodeDAO.getParentAssocs(nodeId, null, null, true, new ChildAssocRefQueryCallback() { @@ -810,8 +846,19 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent } }); - QName parentType = (!parentIds.isEmpty()) ? (getNodeType(parentIds.iterator().next())) : (null); - ignoreLargeMetadata = shouldTypeBeIgnored(parentType); + if (!parentIds.isEmpty()) + { + Long parentId = parentIds.iterator().next(); + if (ignorePathsForSpecificTypes) + { + QName parentType = getNodeType(parentId); + ignoreLargeMetadata = shouldBeIgnoredByType(parentType); + } + if (!ignoreLargeMetadata && ignorePathsForSpecificAspects) + { + ignoreLargeMetadata = shouldBeIgnoredByAspect(parentId); + } + } } CategoryPaths categoryPaths = new CategoryPaths(new ArrayList>(), new ArrayList()); @@ -919,7 +966,11 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent if (ignorePathsForSpecificTypes) { QName nodeType = nodeDAO.getNodeType(childNodePair.getFirst()); - addCurrentChildAssoc = !shouldTypeBeIgnored(nodeType); + addCurrentChildAssoc = !shouldBeIgnoredByType(nodeType); + } + if (!addCurrentChildAssoc && ignorePathsForSpecificAspects) + { + addCurrentChildAssoc = !shouldBeIgnoredByAspect(childNodePair.getFirst()); } if (addCurrentChildAssoc) { @@ -961,7 +1012,11 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent if (ignorePathsForSpecificTypes) { QName nodeType = nodeDAO.getNodeType(childNodePair.getFirst()); - addCurrentId = !shouldTypeBeIgnored(nodeType); + addCurrentId = !shouldBeIgnoredByType(nodeType); + } + if (!addCurrentId) + { + addCurrentId = !shouldBeIgnoredByAspect(childNodePair.getFirst()); } if (addCurrentId) { @@ -1051,7 +1106,7 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent return (null == type) ? (null) : (result); } - private boolean shouldTypeBeIgnored(QName nodeType) + private boolean shouldBeIgnoredByType(QName nodeType) { if (null != nodeType) { @@ -1072,6 +1127,56 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent return false; } + private Set getNodeAspects(Long nodeId) + { + Set aspects = new HashSet(); + Set sourceAspects = nodeDAO.getNodeAspects(nodeId); + for(QName aspectQName : sourceAspects) + { + AspectDefinition aspect = dictionaryService.getAspect(aspectQName); + if(aspect != null) + { + aspects.add(aspectQName); + } + } + return aspects; + } + + private boolean shouldBeIgnoredByAspect(Long nodeId) + { + return shouldBeIgnoredByAspect(nodeId, null); + } + + private boolean shouldBeIgnoredByAspect(Long nodeId, Set aspects) + { + if (null == nodeId) + { + return false; + } + + aspects = (aspects != null) ? aspects : getNodeAspects(nodeId); + + if (!aspects.isEmpty()) + { + for (QName aspectForIgnoringPaths : aspectsForIgnoringPaths) + { + if (aspects.contains(aspectForIgnoringPaths)) + { + return true; + } + for (QName nodeAspect : aspects) + { + if (dictionaryService.isSubClass(nodeAspect, aspectForIgnoringPaths)) + { + return true; + } + } + } + } + + return false; + } + /** * {@inheritDoc} */