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

OpenCMIS server: significant query performance improvements

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29606 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Florian Mü
2011-08-08 13:14:42 +00:00
parent 18bd553b68
commit 26f647d5fd
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/opencmis/CMISChangeLogDataExtractor.java
View File

@@ -22,6 +22,7 @@ import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import org.alfresco.opencmis.dictionary.CMISDictionaryService; import org.alfresco.opencmis.dictionary.CMISDictionaryService;
import org.alfresco.opencmis.dictionary.CMISPropertyAccessor;
import org.alfresco.opencmis.dictionary.TypeDefinitionWrapper; import org.alfresco.opencmis.dictionary.TypeDefinitionWrapper;
import org.alfresco.repo.audit.extractor.AbstractDataExtractor; import org.alfresco.repo.audit.extractor.AbstractDataExtractor;
import org.alfresco.service.cmr.model.FileInfo; import org.alfresco.service.cmr.model.FileInfo;
@@ -61,7 +62,8 @@ public class CMISChangeLogDataExtractor extends AbstractDataExtractor
HashMap<String, Serializable> result = new HashMap<String, Serializable>(5); HashMap<String, Serializable> result = new HashMap<String, Serializable>(5);
result.put(KEY_NODE_REF, nodeRef); result.put(KEY_NODE_REF, nodeRef);
// Support version nodes by recording the object ID // Support version nodes by recording the object ID
result.put(KEY_OBJECT_ID, type.getPropertyById(PropertyIds.OBJECT_ID).getPropertyAccessor().getValue(nodeRef)); CMISPropertyAccessor accessor = type.getPropertyById(PropertyIds.OBJECT_ID).getPropertyAccessor();
result.put(KEY_OBJECT_ID, accessor.getValue(accessor.createNodeInfo(nodeRef)));
return result; return result;
} }

4
source/java/org/alfresco/opencmis/mapping/AbstractProperty.java
View File

@@ -107,12 +107,12 @@ public abstract class AbstractProperty implements CMISPropertyAccessor
protected abstract Serializable getValueInternal(CMISNodeInfo nodeInfo); protected abstract Serializable getValueInternal(CMISNodeInfo nodeInfo);
protected CMISNodeInfo createNodeInfo(NodeRef nodeRef) public CMISNodeInfo createNodeInfo(NodeRef nodeRef)
{ {
return connector.createNodeInfo(nodeRef); return connector.createNodeInfo(nodeRef);
} }
protected CMISNodeInfo createNodeInfo(AssociationRef assocRef) public CMISNodeInfo createNodeInfo(AssociationRef assocRef)
{ {
return connector.createNodeInfo(assocRef); return connector.createNodeInfo(assocRef);
} }

6
source/java/org/alfresco/opencmis/search/CMISResultSet.java
View File

@@ -29,6 +29,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import org.alfresco.opencmis.dictionary.CMISDictionaryService; import org.alfresco.opencmis.dictionary.CMISDictionaryService;
import org.alfresco.opencmis.dictionary.CMISNodeInfo;
import org.alfresco.repo.search.impl.querymodel.Query; import org.alfresco.repo.search.impl.querymodel.Query;
import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef;
@@ -48,6 +49,8 @@ public class CMISResultSet implements ResultSetSPI<CMISResultSetRow, CMISResultS
private static final long serialVersionUID = 2014688399588268994L; private static final long serialVersionUID = 2014688399588268994L;
private Map<String, ResultSet> wrapped; private Map<String, ResultSet> wrapped;
private Map<NodeRef, CMISNodeInfo> nodeInfos;
private LimitBy limitBy; private LimitBy limitBy;
@@ -72,6 +75,7 @@ public class CMISResultSet implements ResultSetSPI<CMISResultSetRow, CMISResultS
this.query = query; this.query = query;
this.cmisDictionaryService = cmisDictionaryService; this.cmisDictionaryService = cmisDictionaryService;
this.alfrescoDictionaryService = alfrescoDictionaryService; this.alfrescoDictionaryService = alfrescoDictionaryService;
this.nodeInfos = new HashMap<NodeRef, CMISNodeInfo>();
} }
/* /*
@@ -111,7 +115,7 @@ public class CMISResultSet implements ResultSetSPI<CMISResultSetRow, CMISResultS
*/ */
public CMISResultSetRow getRow(int i) public CMISResultSetRow getRow(int i)
{ {
return new CMISResultSetRow(this, i, getScores(i), nodeService, getNodeRefs(i), query, cmisDictionaryService); return new CMISResultSetRow(this, i, getScores(i), nodeService, getNodeRefs(i), nodeInfos, query, cmisDictionaryService);
} }
/* /*

8
source/java/org/alfresco/opencmis/search/CMISResultSetRow.java
View File

@@ -23,6 +23,7 @@ import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import org.alfresco.opencmis.dictionary.CMISDictionaryService; import org.alfresco.opencmis.dictionary.CMISDictionaryService;
import org.alfresco.opencmis.dictionary.CMISNodeInfo;
import org.alfresco.repo.search.impl.querymodel.Column; import org.alfresco.repo.search.impl.querymodel.Column;
import org.alfresco.repo.search.impl.querymodel.PropertyArgument; import org.alfresco.repo.search.impl.querymodel.PropertyArgument;
import org.alfresco.repo.search.impl.querymodel.Query; import org.alfresco.repo.search.impl.querymodel.Query;
@@ -55,13 +56,16 @@ public class CMISResultSetRow implements ResultSetRow
private NodeService nodeService; private NodeService nodeService;
private Map<String, NodeRef> nodeRefs; private Map<String, NodeRef> nodeRefs;
private Map<NodeRef, CMISNodeInfo> nodeInfos;
private Query query; private Query query;
private CMISDictionaryService cmisDictionaryService; private CMISDictionaryService cmisDictionaryService;
public CMISResultSetRow(CMISResultSet resultSet, int index, Map<String, Float> scores, NodeService nodeService, public CMISResultSetRow(CMISResultSet resultSet, int index, Map<String, Float> scores, NodeService nodeService,
Map<String, NodeRef> nodeRefs, Query query, CMISDictionaryService cmisDictionaryService) Map<String, NodeRef> nodeRefs, Map<NodeRef, CMISNodeInfo> nodeInfos, Query query,
CMISDictionaryService cmisDictionaryService)
{ {
this.resultSet = resultSet; this.resultSet = resultSet;
this.index = index; this.index = index;
@@ -70,6 +74,7 @@ public class CMISResultSetRow implements ResultSetRow
this.nodeRefs = nodeRefs; this.nodeRefs = nodeRefs;
this.query = query; this.query = query;
this.cmisDictionaryService = cmisDictionaryService; this.cmisDictionaryService = cmisDictionaryService;
this.nodeInfos = nodeInfos;
} }
/* /*
@@ -158,6 +163,7 @@ public class CMISResultSetRow implements ResultSetRow
CmisFunctionEvaluationContext context = new CmisFunctionEvaluationContext(); CmisFunctionEvaluationContext context = new CmisFunctionEvaluationContext();
context.setCmisDictionaryService(cmisDictionaryService); context.setCmisDictionaryService(cmisDictionaryService);
context.setNodeRefs(nodeRefs); context.setNodeRefs(nodeRefs);
context.setNodeInfos(nodeInfos);
context.setNodeService(nodeService); context.setNodeService(nodeService);
context.setScores(scores); context.setScores(scores);
context.setScore(getScore()); context.setScore(getScore());