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

Revert "SEARCH-2051 Performance of metadata tracking (#788)"

Browse Source 
This reverts commit 7aadaff450.
This commit is contained in:
Alex Mukha
2020-02-03 13:27:32 +00:00
parent d9579ec621
commit 3bed0a1268
1 changed files with 171 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

281
src/main/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java
View File

@@ -889,22 +889,10 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent
nodeMetaData.setAspects(aspects); nodeMetaData.setAspects(aspects);
boolean ignoreLargeMetadata = (typeIndexFilter.shouldBeIgnored(getNodeType(nodeId)) || aspectIndexFilter.shouldBeIgnored(getNodeAspects(nodeId))); boolean ignoreLargeMetadata = (typeIndexFilter.shouldBeIgnored(getNodeType(nodeId)) || aspectIndexFilter.shouldBeIgnored(getNodeAspects(nodeId)));
if (!ignoreLargeMetadata && (typeIndexFilter.isIgnorePathsForSpecificTypes() || aspectIndexFilter.isIgnorePathsForSpecificAspects()))
CategoryPaths categoryPaths = new CategoryPaths(new ArrayList<Pair<Path, QName>>(), new ArrayList<ChildAssociationRef>());
if(!ignoreLargeMetadata && (includePaths || includeParentAssociations))
{
if(props == null)
{
props = getProperties(nodeId);
}
categoryPaths = getCategoryPaths(status.getNodeRef(), aspects, props);
}
if (!ignoreLargeMetadata && (typeIndexFilter.isIgnorePathsForSpecificTypes() || aspectIndexFilter.isIgnorePathsForSpecificAspects() || includeParentAssociations))
{ {
// check if parent should be ignored // check if parent should be ignored
final List<Long> parentIds = new LinkedList<Long>(); final List<Long> parentIds = new LinkedList<Long>();
final List<ChildAssociationRef> parentAssocs = new ArrayList<ChildAssociationRef>(100);
nodeDAO.getParentAssocs(nodeId, null, null, true, new ChildAssocRefQueryCallback() nodeDAO.getParentAssocs(nodeId, null, null, true, new ChildAssocRefQueryCallback()
{ {
@Override @Override
@@ -923,7 +911,6 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent
public boolean handle(Pair<Long, ChildAssociationRef> childAssocPair, Pair<Long, NodeRef> parentNodePair, Pair<Long, NodeRef> childNodePair) public boolean handle(Pair<Long, ChildAssociationRef> childAssocPair, Pair<Long, NodeRef> parentNodePair, Pair<Long, NodeRef> childNodePair)
{ {
parentIds.add(parentNodePair.getFirst()); parentIds.add(parentNodePair.getFirst());
parentAssocs.add(tenantService.getBaseName(childAssocPair.getSecond(), true));
return false; return false;
} }
@@ -946,105 +933,28 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent
ignoreLargeMetadata = aspectIndexFilter.shouldBeIgnored(getNodeAspects(parentId)); ignoreLargeMetadata = aspectIndexFilter.shouldBeIgnored(getNodeAspects(parentId));
} }
} }
if (includeParentAssociations)
{
for(ChildAssociationRef ref : categoryPaths.getCategoryParents())
{
parentAssocs.add(tenantService.getBaseName(ref, true));
}
CRC32 crc = new CRC32();
for(ChildAssociationRef car : parentAssocs)
{
try
{
crc.update(car.toString().getBytes("UTF-8"));
}
catch (UnsupportedEncodingException e)
{
throw new RuntimeException("UTF-8 encoding is not supported");
}
}
nodeMetaData.setParentAssocs(parentAssocs, crc.getValue());
}
} }
nodeMetaData.setTenantDomain(tenantService.getDomain(nodeRef.getStoreRef().getIdentifier())); CategoryPaths categoryPaths = new CategoryPaths(new ArrayList<Pair<Path, QName>>(), new ArrayList<ChildAssociationRef>());
if(!ignoreLargeMetadata && (includePaths || includeParentAssociations))
if(includeChildAssociations || includeChildIds)
{ {
final List<ChildAssociationRef> childAssocs = new ArrayList<ChildAssociationRef>(100); if(props == null)
final List<Long> childIds = new ArrayList<Long>(100);
nodeDAO.getChildAssocs(nodeId, null, null, null, null, null, new ChildAssocRefQueryCallback()
{ {
@Override props = getProperties(nodeId);
public boolean preLoadNodes() }
{ categoryPaths = getCategoryPaths(status.getNodeRef(), aspects, props);
return false;
}
@Override
public boolean orderResults()
{
return false;
}
@Override
public boolean handle(Pair<Long, ChildAssociationRef> childAssocPair, Pair<Long, NodeRef> parentNodePair,
Pair<Long, NodeRef> childNodePair)
{
QName nodeType = nodeDAO.getNodeType(childNodePair.getFirst());
if (includeChildAssociations)
{
boolean addCurrentChildAssoc = true;
if (typeIndexFilter.isIgnorePathsForSpecificTypes())
{
addCurrentChildAssoc = !typeIndexFilter.shouldBeIgnored(nodeType);
}
if (!addCurrentChildAssoc && aspectIndexFilter.isIgnorePathsForSpecificAspects())
{
addCurrentChildAssoc = !aspectIndexFilter.shouldBeIgnored(getNodeAspects(childNodePair.getFirst()));
}
if (addCurrentChildAssoc)
{
childAssocs.add(tenantService.getBaseName(childAssocPair.getSecond(), true));
}
}
if (includeChildIds)
{
boolean addCurrentId = true;
if (typeIndexFilter.isIgnorePathsForSpecificTypes())
{
addCurrentId = !typeIndexFilter.shouldBeIgnored(nodeType);
}
if (!addCurrentId)
{
addCurrentId = !aspectIndexFilter.shouldBeIgnored(getNodeAspects(childNodePair.getFirst()));
}
if (addCurrentId)
{
childIds.add(childNodePair.getFirst());
}
}
return true;
}
@Override
public void done()
{
}
});
nodeMetaData.setChildAssocs(childAssocs);
nodeMetaData.setChildIds(childIds);
} }
if (includePaths && !ignoreLargeMetadata) if (includePaths && !ignoreLargeMetadata)
{ {
if (props == null)
{
props = getProperties(nodeId);
}
List<Path> directPaths = nodeDAO.getPaths(new Pair<Long, NodeRef>(nodeId, status.getNodeRef()), false); List<Path> directPaths = nodeDAO.getPaths(new Pair<Long, NodeRef>(nodeId, status.getNodeRef()), false);
Collection<Pair<Path, QName>> paths = new ArrayList<Pair<Path, QName>>(directPaths.size() + categoryPaths.getPaths().size()); Collection<Pair<Path, QName>> paths = new ArrayList<Pair<Path, QName>>(directPaths.size() + categoryPaths.getPaths().size());
for (Path path : directPaths) for (Path path : directPaths)
{ {
paths.add(new Pair<Path, QName>(path.getBaseNamePath(tenantService), null)); paths.add(new Pair<Path, QName>(path.getBaseNamePath(tenantService), null));
@@ -1055,22 +965,22 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent
} }
if(unversionedStatus != null) if(unversionedStatus != null)
{ {
List<Path> unversionedPaths = nodeDAO.getPaths(new Pair<Long, NodeRef>(unversionedStatus.getDbId(), unversionedStatus.getNodeRef()), false); List<Path> unversionedPaths = nodeDAO.getPaths(new Pair<Long, NodeRef>(unversionedStatus.getDbId(), unversionedStatus.getNodeRef()), false);
for (Path path : unversionedPaths) for (Path path : unversionedPaths)
{ {
paths.add(new Pair<Path, QName>(path.getBaseNamePath(tenantService), null)); paths.add(new Pair<Path, QName>(path.getBaseNamePath(tenantService), null));
} }
} }
nodeMetaData.setPaths(paths); nodeMetaData.setPaths(paths);
// Calculate name path // Calculate name path
Collection<Collection<String>> namePaths = new ArrayList<Collection<String>>(2); Collection<Collection<String>> namePaths = new ArrayList<Collection<String>>(2);
nodeMetaData.setNamePaths(namePaths); nodeMetaData.setNamePaths(namePaths);
for (Pair<Path, QName> catPair : paths) for (Pair<Path, QName> catPair : paths)
{ {
Path path = catPair.getFirst(); Path path = catPair.getFirst();
boolean added = false; boolean added = false;
List<String> namePath = new ArrayList<String>(path.size()); List<String> namePath = new ArrayList<String>(path.size());
NEXT_ELEMENT: for (Path.Element pathElement : path) NEXT_ELEMENT: for (Path.Element pathElement : path)
@@ -1108,8 +1018,159 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent
} }
} }
} }
} }
nodeMetaData.setTenantDomain(tenantService.getDomain(nodeRef.getStoreRef().getIdentifier()));
if(includeChildAssociations)
{
final List<ChildAssociationRef> childAssocs = new ArrayList<ChildAssociationRef>(100);
nodeDAO.getChildAssocs(nodeId, null, null, null, null, null, new ChildAssocRefQueryCallback()
{
@Override
public boolean preLoadNodes()
{
return false;
}
@Override
public boolean orderResults()
{
return false;
}
@Override
public boolean handle(Pair<Long, ChildAssociationRef> childAssocPair, Pair<Long, NodeRef> parentNodePair,
Pair<Long, NodeRef> childNodePair)
{
boolean addCurrentChildAssoc = true;
if (typeIndexFilter.isIgnorePathsForSpecificTypes())
{
QName nodeType = nodeDAO.getNodeType(childNodePair.getFirst());
addCurrentChildAssoc = !typeIndexFilter.shouldBeIgnored(nodeType);
}
if (!addCurrentChildAssoc && aspectIndexFilter.isIgnorePathsForSpecificAspects())
{
addCurrentChildAssoc = !aspectIndexFilter.shouldBeIgnored(getNodeAspects(childNodePair.getFirst()));
}
if (addCurrentChildAssoc)
{
childAssocs.add(tenantService.getBaseName(childAssocPair.getSecond(), true));
}
return true;
}
@Override
public void done()
{
}
});
nodeMetaData.setChildAssocs(childAssocs);
}
if(includeChildIds)
{
final List<Long> childIds = new ArrayList<Long>(100);
nodeDAO.getChildAssocs(nodeId, null, null, null, null, null, new ChildAssocRefQueryCallback()
{
@Override
public boolean preLoadNodes()
{
return false;
}
@Override
public boolean orderResults()
{
return false;
}
@Override
public boolean handle(Pair<Long, ChildAssociationRef> childAssocPair, Pair<Long, NodeRef> parentNodePair,
Pair<Long, NodeRef> childNodePair)
{
boolean addCurrentId = true;
if (typeIndexFilter.isIgnorePathsForSpecificTypes())
{
QName nodeType = nodeDAO.getNodeType(childNodePair.getFirst());
addCurrentId = !typeIndexFilter.shouldBeIgnored(nodeType);
}
if (!addCurrentId)
{
addCurrentId = !aspectIndexFilter.shouldBeIgnored(getNodeAspects(childNodePair.getFirst()));
}
if (addCurrentId)
{
childIds.add(childNodePair.getFirst());
}
return true;
}
@Override
public void done()
{
}
});
nodeMetaData.setChildIds(childIds);
}
if(includeParentAssociations && !ignoreLargeMetadata)
{
final List<ChildAssociationRef> parentAssocs = new ArrayList<ChildAssociationRef>(100);
nodeDAO.getParentAssocs(nodeId, null, null, null, new ChildAssocRefQueryCallback()
{
@Override
public boolean preLoadNodes()
{
return false;
}
@Override
public boolean orderResults()
{
return false;
}
@Override
public boolean handle(Pair<Long, ChildAssociationRef> childAssocPair,
Pair<Long, NodeRef> parentNodePair, Pair<Long, NodeRef> childNodePair)
{
parentAssocs.add(tenantService.getBaseName(childAssocPair.getSecond(), true));
return true;
}
@Override
public void done()
{
}
});
for(ChildAssociationRef ref : categoryPaths.getCategoryParents())
{
parentAssocs.add(tenantService.getBaseName(ref, true));
}
CRC32 crc = new CRC32();
for(ChildAssociationRef car : parentAssocs)
{
try
{
crc.update(car.toString().getBytes("UTF-8"));
}
catch (UnsupportedEncodingException e)
{
throw new RuntimeException("UTF-8 encoding is not supported");
}
}
nodeMetaData.setParentAssocs(parentAssocs, crc.getValue());
// TODO non-child associations
// Collection<Pair<Long, AssociationRef>> sourceAssocs = nodeDAO.getSourceNodeAssocs(nodeId);
// Collection<Pair<Long, AssociationRef>> targetAssocs = nodeDAO.getTargetNodeAssocs(nodeId);
//
// nodeMetaData.setAssocs();
}
if(includeOwner) if(includeOwner)
{ {
// cached in OwnableService // cached in OwnableService