[ACS-10041] Repository - CPU spikes and OOM errors with SQL Server 2019 (#3588)

repository/src/main/java/org/alfresco/repo/domain/node/ReferenceablePropertiesEntity.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * Copyright (C) 2005 - 2025 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -23,105 +23,102 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package org.alfresco.repo.domain.node;
+package org.alfresco.repo.domain.node;
-
+
-import java.io.Serializable;
+import java.io.Serializable;
-import java.util.HashSet;
+import java.util.HashSet;
-import java.util.Map;
+import java.util.Map;
-import java.util.Set;
+import java.util.Set;
-
+
-import org.alfresco.model.ContentModel;
+import org.alfresco.model.ContentModel;
-import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
+import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
-import org.alfresco.service.namespace.QName;
+import org.alfresco.service.namespace.QName;
-
+
-/**
+/**
- * Class holding properties associated with the <b>sys:referenceable</b> aspect.
+ * Class holding properties associated with the <b>sys:referenceable</b> aspect. This aspect is common enough to warrant direct inclusion on the <b>Node</b> entity.
- * This aspect is common enough to warrant direct inclusion on the <b>Node</b> entity.
+ * 
- * 
+ * @author Derek Hulley
- * @author Derek Hulley
+ * @since 3.4
- * @since 3.4
+ */
- */
+public class ReferenceablePropertiesEntity
-public class ReferenceablePropertiesEntity
+{
-{
+    private static final Set<QName> REFERENCEABLE_PROP_QNAMES;
-    private static final Set<QName> REFERENCEABLE_PROP_QNAMES;
+    static
-    static
+    {
-    {
+        REFERENCEABLE_PROP_QNAMES = new HashSet<QName>(8);
-        REFERENCEABLE_PROP_QNAMES = new HashSet<QName>(8);
+        REFERENCEABLE_PROP_QNAMES.add(ContentModel.PROP_STORE_PROTOCOL);
-        REFERENCEABLE_PROP_QNAMES.add(ContentModel.PROP_STORE_PROTOCOL);
+        REFERENCEABLE_PROP_QNAMES.add(ContentModel.PROP_STORE_IDENTIFIER);
-        REFERENCEABLE_PROP_QNAMES.add(ContentModel.PROP_STORE_IDENTIFIER);
+        REFERENCEABLE_PROP_QNAMES.add(ContentModel.PROP_NODE_UUID);
-        REFERENCEABLE_PROP_QNAMES.add(ContentModel.PROP_NODE_UUID);
+        REFERENCEABLE_PROP_QNAMES.add(ContentModel.PROP_NODE_DBID);
-        REFERENCEABLE_PROP_QNAMES.add(ContentModel.PROP_NODE_DBID);
+    }
-    }
+
-    
+    /**
-    /**
+     * @return Returns <tt>true</tt> if the property belongs to the <b>sys:referenceable</b> aspect
-     * @return          Returns <tt>true</tt> if the property belongs to the <b>sys:referenceable</b> aspect
+     */
-     */
+    public static boolean isReferenceableProperty(QName qname)
-    public static boolean isReferenceableProperty(QName qname)
+    {
-    {
+        return REFERENCEABLE_PROP_QNAMES.contains(qname);
-        return REFERENCEABLE_PROP_QNAMES.contains(qname);
+    }
-    }
+
-    
+    /**
-    /**
+     * Remove all {@link ContentModel#ASPECT_REFERENCEABLE referencable} properties
-     * Remove all {@link ContentModel#ASPECT_REFERENCEABLE referencable} properties
+     */
-     */
+    public static void removeReferenceableProperties(Node node, Map<QName, Serializable> properties)
-    public static void removeReferenceableProperties(Node node, Map<QName, Serializable> properties)
+    {
-    {
+        properties.keySet().removeAll(REFERENCEABLE_PROP_QNAMES);
-        properties.keySet().removeAll(REFERENCEABLE_PROP_QNAMES);
+        String name = DefaultTypeConverter.INSTANCE.convert(String.class, properties.get(ContentModel.PROP_NAME));
-        String name = DefaultTypeConverter.INSTANCE.convert(String.class, properties.get(ContentModel.PROP_NAME));
+        if (name != null && name.equals(node.getUuid()))
-        if (name != null && name.equals(node.getUuid()))
+        {
-        {
+            // The cm:name matches the UUID, so drop it
-            // The cm:name matches the UUID, so drop it
+            properties.remove(ContentModel.PROP_NAME);
-            properties.remove(ContentModel.PROP_NAME);
+        }
-        }
+    }
-    }
+
-    
+    /**
-    /**
+     * Remove all {@link ContentModel#ASPECT_REFERENCEABLE referencable} properties
-     * Remove all {@link ContentModel#ASPECT_REFERENCEABLE referencable} properties
+     */
-     */
+    public static void removeReferenceableProperties(Set<QName> propertyQNames)
-    public static void removeReferenceableProperties(Set<QName> propertyQNames)
+    {
-    {
+        propertyQNames.removeAll(REFERENCEABLE_PROP_QNAMES);
-        propertyQNames.removeAll(REFERENCEABLE_PROP_QNAMES);
+    }
-    }
+
-    
+    /**
-    /**
+     * Adds all {@link ContentModel#ASPECT_REFERENCEABLE referencable} properties.
-     * Adds all {@link ContentModel#ASPECT_REFERENCEABLE referencable} properties.
+     */
-     */
+    public static void addReferenceableProperties(Long nodeId, NodeRef nodeRef, Map<QName, Serializable> properties)
-    public static void addReferenceableProperties(Node node, Map<QName, Serializable> properties)
+    {
-    {
+        properties.put(ContentModel.PROP_STORE_PROTOCOL, nodeRef.getStoreRef().getProtocol());
-        Long nodeId = node.getId();
+        properties.put(ContentModel.PROP_STORE_IDENTIFIER, nodeRef.getStoreRef().getIdentifier());
-        NodeRef nodeRef = node.getNodeRef();
+        properties.put(ContentModel.PROP_NODE_UUID, nodeRef.getId());
-        properties.put(ContentModel.PROP_STORE_PROTOCOL, nodeRef.getStoreRef().getProtocol());
+        properties.put(ContentModel.PROP_NODE_DBID, nodeId);
-        properties.put(ContentModel.PROP_STORE_IDENTIFIER, nodeRef.getStoreRef().getIdentifier());
+        // add the ID as the name, if required
-        properties.put(ContentModel.PROP_NODE_UUID, nodeRef.getId());
+        String name = DefaultTypeConverter.INSTANCE.convert(String.class, properties.get(ContentModel.PROP_NAME));
-        properties.put(ContentModel.PROP_NODE_DBID, nodeId);
+        if (name == null)
-        // add the ID as the name, if required
+        {
-        String name = DefaultTypeConverter.INSTANCE.convert(String.class, properties.get(ContentModel.PROP_NAME));
+            properties.put(ContentModel.PROP_NAME, nodeRef.getId());
-        if (name == null)
+        }
-        {
+    }
-            properties.put(ContentModel.PROP_NAME, nodeRef.getId());
+
-        }
+    public static Serializable getReferenceableProperty(Node node, QName qname)
-    }
+    {
-
+        NodeRef nodeRef = node.getNodeRef();
-    public static Serializable getReferenceableProperty(Node node, QName qname)
+        if (qname.equals(ContentModel.PROP_STORE_PROTOCOL))
-    {
+        {
-        NodeRef nodeRef = node.getNodeRef();
+            return nodeRef.getStoreRef().getProtocol();
-        if (qname.equals(ContentModel.PROP_STORE_PROTOCOL))
+        }
-        {
+        else if (qname.equals(ContentModel.PROP_STORE_IDENTIFIER))
-            return nodeRef.getStoreRef().getProtocol();
+        {
-        }
+            return nodeRef.getStoreRef().getIdentifier();
-        else if (qname.equals(ContentModel.PROP_STORE_IDENTIFIER))
+        }
-        {
+        else if (qname.equals(ContentModel.PROP_NODE_UUID))
-            return nodeRef.getStoreRef().getIdentifier();
+        {
-        }
+            return nodeRef.getId();
-        else if (qname.equals(ContentModel.PROP_NODE_UUID))
+        }
-        {
+        else if (qname.equals(ContentModel.PROP_NODE_DBID))
-            return nodeRef.getId();
+        {
-        }
+            return node.getId();
-        else if (qname.equals(ContentModel.PROP_NODE_DBID))
+        }
-        {
+        throw new IllegalArgumentException("Not sys:referenceable property: " + qname);
-            return node.getId();
+    }
-        }
+}
-        throw new IllegalArgumentException("Not sys:referenceable property: " + qname);
-    }
-}

repository/src/main/java/org/alfresco/repo/node/getchildren/FilterSortNodeEntity.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * Copyright (C) 2005 - 2025 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -23,239 +23,290 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package org.alfresco.repo.node.getchildren;
+package org.alfresco.repo.node.getchildren;
-
+
-import java.util.List;
+import java.util.List;
-import java.util.Set;
+import java.util.Set;
-
+
-import org.alfresco.repo.domain.node.NodeEntity;
+import org.alfresco.repo.domain.node.AuditablePropertiesEntity;
-import org.alfresco.repo.domain.node.NodePropertyEntity;
+import org.alfresco.repo.domain.node.NodePropertyEntity;
-
+import org.alfresco.service.cmr.repository.NodeRef;
-/**
+import org.alfresco.service.cmr.repository.StoreRef;
- * Filterable/Sortable Node Entity
+
- *
+/**
- * Can be optionally filtered/sorted by (up to) three properties - note: sort properties are applied in order
+ * Filterable/Sortable Node Entity
- * 
+ *
- * @author jan
+ * Can be optionally filtered/sorted by (up to) three properties - note: sort properties are applied in order
- * @since 4.0
+ * 
- */
+ * @author jan
-public class FilterSortNodeEntity
+ * @since 4.0
-{
+ */
-    private Long id; // node id
+public class FilterSortNodeEntity
-    
+{
-    private NodeEntity node;
+    private Long id; // node id
-    private NodePropertyEntity prop1;
+    private String nodeUuid;
-    private NodePropertyEntity prop2;
+    private Long typeQNameId;
-    private NodePropertyEntity prop3;
+
-    
+    private AuditablePropertiesEntity auditablePropertiesEntity;
-    // Supplemental query-related parameters
+    private NodePropertyEntity prop1;
-    private Long parentNodeId;
+    private NodePropertyEntity prop2;
-    private Long prop1qnameId;
+    private NodePropertyEntity prop3;
-    private Long prop2qnameId;
+
-    private Long prop3qnameId;
+    private String storeProtocol;
-    private List<Long> childNodeTypeQNameIds;
+    private String storeIdentifier;
-    private Set<Long> assocTypeQNameIds;
+
-    private String pattern;
+    // Supplemental query-related parameters
-    private Long namePropertyQNameId;
+    private Long parentNodeId;
-    private boolean auditableProps;
+    private Long prop1qnameId;
-    private boolean nodeType;
+    private Long prop2qnameId;
-
+    private Long prop3qnameId;
-    private Boolean isPrimary;
+    private List<Long> childNodeTypeQNameIds;
-    
+    private Set<Long> assocTypeQNameIds;
-    /**
+    private String pattern;
-     * Default constructor
+    private Long namePropertyQNameId;
-     */
+    private boolean auditableProps;
-    public FilterSortNodeEntity()
+    private boolean nodeType;
-    {
+
-        auditableProps = false;
+    private Boolean isPrimary;
-    }
+
-    
+    /**
-    public Long getId()
+     * Default constructor
-    {
+     */
-        return id;
+    public FilterSortNodeEntity()
-    }
+    {
-    
+        auditableProps = false;
-    public void setId(Long id)
+    }
-    {
+
-        this.id = id;
+    public Long getId()
-    }
+    {
-    
+        return id;
-    public String getPattern()
+    }
-    {
+
-        return pattern;
+    public void setId(Long id)
-    }
+    {
-
+        this.id = id;
-    protected String escape(String s, char escapeChar)
+    }
-    {
+
-        StringBuilder sb = new StringBuilder();
+    public String getNodeUuid()
-        int idx = -1;
+    {
-        int offset = 0;
+        return nodeUuid;
-        do
+    }
-        {
+
-            idx = s.indexOf(escapeChar, offset);
+    public void setNodeUuid(String nodeUuid)
-            if(idx != -1)
+    {
-            {
+        this.nodeUuid = nodeUuid;
-                sb.append(s.substring(offset, idx));
+    }
-                sb.append("\\");
+
-                sb.append(escapeChar);
+    public Long getTypeQNameId()
-                offset = idx + 1;
+    {
-            }
+        return typeQNameId;
-        }
+    }
-        while(idx != -1);
+
-        sb.append(s.substring(offset));
+    public void setTypeQNameId(Long typeQNameId)
-        return sb.toString();
+    {
-    }
+        this.typeQNameId = typeQNameId;
-    
+    }
-    public void setPattern(String pattern)
+
-    {
+    public String getPattern()
-        if(pattern != null)
+    {
-        {
+        return pattern;
-            // escape the '%' character with '\' (standard SQL escape character)
+    }
-            pattern = escape(pattern, '%');
+
-            // replace the wildcard character '*' with the one used in database queries i.e. '%'
+    protected String escape(String s, char escapeChar)
-            this.pattern = pattern.replace('*', '%');
+    {
-        }
+        StringBuilder sb = new StringBuilder();
-    }
+        int idx = -1;
-
+        int offset = 0;
-    public void setAssocTypeQNameIds(Set<Long> assocTypeQNameIds)
+        do
-    {
+        {
-        this.assocTypeQNameIds = assocTypeQNameIds;
+            idx = s.indexOf(escapeChar, offset);
-    }
+            if (idx != -1)
-    
+            {
-    public Set<Long> getAssocTypeQNameIds()
+                sb.append(s.substring(offset, idx));
-    {
+                sb.append("\\");
-        return assocTypeQNameIds;
+                sb.append(escapeChar);
-    }
+                offset = idx + 1;
-
+            }
-    public Long getNamePropertyQNameId()
+        } while (idx != -1);
-    {
+        sb.append(s.substring(offset));
-        return namePropertyQNameId;
+        return sb.toString();
-    }
+    }
-
+
-    public void setNamePropertyQNameId(Long namePropertyQNameId)
+    public void setPattern(String pattern)
-    {
+    {
-        this.namePropertyQNameId = namePropertyQNameId;
+        if (pattern != null)
-    }
+        {
-
+            // escape the '%' character with '\' (standard SQL escape character)
-    public NodePropertyEntity getProp1()
+            pattern = escape(pattern, '%');
-    {
+            // replace the wildcard character '*' with the one used in database queries i.e. '%'
-        return prop1;
+            this.pattern = pattern.replace('*', '%');
-    }
+        }
-    
+    }
-    public void setProp1(NodePropertyEntity prop1)
+
-    {
+    public void setAssocTypeQNameIds(Set<Long> assocTypeQNameIds)
-        this.prop1 = prop1;
+    {
-    }
+        this.assocTypeQNameIds = assocTypeQNameIds;
-    
+    }
-    public NodePropertyEntity getProp2()
+
-    {
+    public Set<Long> getAssocTypeQNameIds()
-        return prop2;
+    {
-    }
+        return assocTypeQNameIds;
-    
+    }
-    public void setProp2(NodePropertyEntity prop2)
+
-    {
+    public Long getNamePropertyQNameId()
-        this.prop2 = prop2;
+    {
-    }
+        return namePropertyQNameId;
-    
+    }
-    public NodePropertyEntity getProp3()
+
-    {
+    public void setNamePropertyQNameId(Long namePropertyQNameId)
-        return prop3;
+    {
-    }
+        this.namePropertyQNameId = namePropertyQNameId;
-    
+    }
-    public void setProp3(NodePropertyEntity prop3)
+
-    {
+    public AuditablePropertiesEntity getAuditablePropertiesEntity()
-        this.prop3 = prop3;
+    {
-    }
+        return auditablePropertiesEntity;
-    
+    }
-    public NodeEntity getNode()
+
-    {
+    public void setAuditablePropertiesEntity(AuditablePropertiesEntity auditablePropertiesEntity)
-        return node;
+    {
-    }
+        this.auditablePropertiesEntity = auditablePropertiesEntity;
-    
+    }
-    public void setNode(NodeEntity childNode)
+
-    {
+    public NodePropertyEntity getProp1()
-        this.node = childNode;
+    {
-    }
+        return prop1;
-    
+    }
-    // Supplemental query-related parameters
+
-    
+    public void setProp1(NodePropertyEntity prop1)
-    public Long getParentNodeId()
+    {
-    {
+        this.prop1 = prop1;
-        return parentNodeId;
+    }
-    }
+
-    
+    public NodePropertyEntity getProp2()
-    public void setParentNodeId(Long parentNodeId)
+    {
-    {
+        return prop2;
-        this.parentNodeId = parentNodeId;
+    }
-    }
+
-    
+    public void setProp2(NodePropertyEntity prop2)
-    public Long getProp1qnameId()
+    {
-    {
+        this.prop2 = prop2;
-        return prop1qnameId;
+    }
-    }
+
-    
+    public NodePropertyEntity getProp3()
-    public void setProp1qnameId(Long prop1qnameId)
+    {
-    {
+        return prop3;
-        this.prop1qnameId = prop1qnameId;
+    }
-    }
+
-    
+    public void setProp3(NodePropertyEntity prop3)
-    public Long getProp2qnameId()
+    {
-    {
+        this.prop3 = prop3;
-        return prop2qnameId;
+    }
-    }
+
-    
+    public String getStoreProtocol()
-    public void setProp2qnameId(Long prop2qnameId)
+    {
-    {
+        return storeProtocol;
-        this.prop2qnameId = prop2qnameId;
+    }
-    }
+
-    
+    public void setStoreProtocol(String storeProtocol)
-    public Long getProp3qnameId()
+    {
-    {
+        this.storeProtocol = storeProtocol;
-        return prop3qnameId;
+    }
-    }
+
-    
+    public String getStoreIdentifier()
-    public void setProp3qnameId(Long prop3qnameId)
+    {
-    {
+        return storeIdentifier;
-        this.prop3qnameId = prop3qnameId;
+    }
-    }
+
-    
+    public void setStoreIdentifier(String storeIdentifier)
-    public List<Long> getChildNodeTypeQNameIds()
+    {
-    {
+        this.storeIdentifier = storeIdentifier;
-        return childNodeTypeQNameIds;
+    }
-    }
+
-    
+    // Supplemental query-related parameters
-    public void setChildNodeTypeQNameIds(List<Long> childNodeTypeQNameIds)
+
-    {
+    public Long getParentNodeId()
-        this.childNodeTypeQNameIds = childNodeTypeQNameIds;
+    {
-    }
+        return parentNodeId;
-    
+    }
-    public boolean isAuditableProps()
+
-    {
+    public void setParentNodeId(Long parentNodeId)
-        return auditableProps;
+    {
-    }
+        this.parentNodeId = parentNodeId;
-    
+    }
-    public void setAuditableProps(boolean auditableProps)
+
-    {
+    public Long getProp1qnameId()
-        this.auditableProps = auditableProps;
+    {
-    }
+        return prop1qnameId;
-    
+    }
-    public boolean isNodeType()
+
-    {
+    public void setProp1qnameId(Long prop1qnameId)
-        return nodeType;
+    {
-    }
+        this.prop1qnameId = prop1qnameId;
-    
+    }
-    public void setNodeType(boolean nodeType)
+
-    {
+    public Long getProp2qnameId()
-        this.nodeType = nodeType;
+    {
-    }
+        return prop2qnameId;
-
+    }
-    public Boolean isPrimary()
+
-    {
+    public void setProp2qnameId(Long prop2qnameId)
-        return isPrimary;
+    {
-    }
+        this.prop2qnameId = prop2qnameId;
-
+    }
-    public void setIsPrimary(Boolean isPrimary)
+
-    {
+    public Long getProp3qnameId()
-        this.isPrimary = isPrimary;
+    {
-    }
+        return prop3qnameId;
-}
+    }
+
+    public void setProp3qnameId(Long prop3qnameId)
+    {
+        this.prop3qnameId = prop3qnameId;
+    }
+
+    public List<Long> getChildNodeTypeQNameIds()
+    {
+        return childNodeTypeQNameIds;
+    }
+
+    public void setChildNodeTypeQNameIds(List<Long> childNodeTypeQNameIds)
+    {
+        this.childNodeTypeQNameIds = childNodeTypeQNameIds;
+    }
+
+    public boolean isAuditableProps()
+    {
+        return auditableProps;
+    }
+
+    public void setAuditableProps(boolean auditableProps)
+    {
+        this.auditableProps = auditableProps;
+    }
+
+    public boolean isNodeType()
+    {
+        return nodeType;
+    }
+
+    public void setNodeType(boolean nodeType)
+    {
+        this.nodeType = nodeType;
+    }
+
+    public Boolean isPrimary()
+    {
+        return isPrimary;
+    }
+
+    public void setIsPrimary(Boolean isPrimary)
+    {
+        this.isPrimary = isPrimary;
+    }
+
+    public NodeRef createNodeRef()
+    {
+        return new NodeRef(new StoreRef(storeProtocol, storeIdentifier), nodeUuid);
+    }
+}

repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-common-SqlMap.xml

@@ -133,7 +133,15 @@
     <resultMap id="result_FilterSortNode" type="FilterSortNode">
         
         <id property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
-        
+        <result property="nodeUuid" column="uuid" jdbcType="VARCHAR" javaType="java.lang.String"/>
+        <result property="typeQNameId" column="type_qname_id" jdbcType="BIGINT" javaType="java.lang.Long"/>
+
+        <result property="auditablePropertiesEntity.auditCreator" column="audit_creator" jdbcType="VARCHAR" javaType="java.lang.String"/>
+        <result property="auditablePropertiesEntity.auditCreated" column="audit_created" jdbcType="VARCHAR" javaType="java.lang.String"/>
+        <result property="auditablePropertiesEntity.auditModifier" column="audit_modifier" jdbcType="VARCHAR" javaType="java.lang.String"/>
+        <result property="auditablePropertiesEntity.auditModified" column="audit_modified" jdbcType="VARCHAR" javaType="java.lang.String"/>
+        <result property="auditablePropertiesEntity.auditAccessed" column="audit_accessed" jdbcType="VARCHAR" javaType="java.lang.String"/>
+
         <result property="prop1.nodeId" column="prop1_node_id" jdbcType="BIGINT" javaType="java.lang.Long"/>
         <result property="prop1.key.qnameId" column="prop1_qname_id" jdbcType="BIGINT" javaType="java.lang.Long"/>
         <result property="prop1.key.localeId" column="prop1_locale_id" jdbcType="BIGINT" javaType="java.lang.Long"/>
@@ -169,8 +177,9 @@
         <result property="prop3.value.floatValue" column="prop3_float_value" jdbcType="FLOAT" javaType="java.lang.Float"/>
         <result property="prop3.value.doubleValue" column="prop3_double_value" jdbcType="FLOAT" javaType="java.lang.Double"/>
         <result property="prop3.value.stringValue" column="prop3_string_value" jdbcType="VARCHAR" javaType="java.lang.String"/>
-        
+
-        <association property="node" resultMap="alfresco.node.result_Node"/>
+        <result property="storeProtocol" column="protocol" jdbcType="VARCHAR" javaType="java.lang.String"/>
+        <result property="storeIdentifier" column="identifier" jdbcType="VARCHAR" javaType="java.lang.String"/>
         
     </resultMap>
     
@@ -972,8 +981,8 @@
     </select>
 
     <!-- GetChildren - with explicit prop filtering and/or sorting -->
-    <select id="select_GetChildrenCannedQueryWithProps" parameterType="FilterSortNode" resultMap="result_FilterSortNode">
+    <select id="select_GetChildrenCannedQueryWithProps" parameterType="FilterSortNode" resultMap="result_FilterSortNode" flushCache="true">
-       select
+       select distinct
             childNode.id             as id,
             childNode.version        as version,
             childStore.id            as store_id,
@@ -989,7 +998,7 @@
             childNode.audit_created  as audit_created,
             childNode.audit_modifier as audit_modifier,
             childNode.audit_modified as audit_modified,
-            childNode.audit_accessed  as audit_accessed
+            childNode.audit_accessed as audit_accessed
             <if test="prop1qnameId != null">
           , prop1.node_id            as prop1_node_id,
             prop1.qname_id           as prop1_qname_id,
@@ -1067,9 +1076,6 @@
                     #{item}
                 </foreach>
             </if>
-        <if test="prop1qnameId == null and auditableProps == false">
-            <include refid="alfresco.node.select_ChildAssoc_OrderBy"/>
-        </if>
     </select>
     
     <!-- GetChildren - with no explicit sorting (or prop filtering) - note: still filtered by child type (and optionally primary or secondary) -->