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

ACE-1918: Surf-config patch improvements. Made:

Browse Source 
- surfConfigFolder patch to use Cron trigger
          - surf-config SQL query more efficient
	  - changes to comments and formatting


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@73049 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jamal Kaabi-Mofrad
2014-06-04 14:39:31 +00:00
parent 75411310cd
commit ff3d6862ba
8 changed files with 65 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/repo/admin/patch/AsynchronousPatch.java
View File

@@ -127,8 +127,8 @@ public abstract class AsynchronousPatch extends AbstractPatch
if (!appliedPatch.getWasExecuted())
{
// the patch was not executed
logger.debug(I18NUtil.getMessage(MSG_NOT_EXECUTED, appliedPatch.getId(), appliedPatch.getReport()));
// the patch was not executed. E.g. not relevant to the current schema
logger.info(I18NUtil.getMessage(MSG_NOT_EXECUTED, appliedPatch.getId(), appliedPatch.getReport()));
}
else if (appliedPatch.getSucceeded())
{

6
source/java/org/alfresco/repo/admin/patch/impl/SurfConfigFolderPatch.java
View File

@@ -395,8 +395,7 @@ public class SurfConfigFolderPatch extends AsynchronousPatch
int minResults = SITE_BATCH_MAX_QUERY_RANGE / 2;
while (currentId <= maxId && siteNodeIDs.size() < minResults)
{
List<Long> nodeIds = patchDAO.getNodesByTypeQNameId(siteTypeQNameId, currentId, currentId
+ SITE_BATCH_MAX_QUERY_RANGE);
List<Long> nodeIds = patchDAO.getNodesByTypeQNameId(siteTypeQNameId, currentId, currentId + SITE_BATCH_MAX_QUERY_RANGE);
siteNodeIDs.addAll(nodeIds);
// Increment the minimum ID
currentId += SITE_BATCH_MAX_QUERY_RANGE;
@@ -446,8 +445,7 @@ public class SurfConfigFolderPatch extends AsynchronousPatch
while (currentId <= maxId && folderNodes.size() < minResults)
{
List<NodeRef> nodeIds = patchDAO.getChildrenOfTheSharedSurfConfigFolder(currentId, currentId
+ SHARED_SURF_CONFIG_BATCH_MAX_QUERY_RANGE);
List<NodeRef> nodeIds = patchDAO.getChildrenOfTheSharedSurfConfigFolder(currentId, currentId + SHARED_SURF_CONFIG_BATCH_MAX_QUERY_RANGE);
folderNodes.addAll(nodeIds);
// Increment the minimum ID
currentId += SHARED_SURF_CONFIG_BATCH_MAX_QUERY_RANGE;

23
source/java/org/alfresco/repo/domain/patch/ibatis/PatchDAOImpl.java
View File

@@ -30,10 +30,13 @@ import org.alfresco.model.ContentModel;
import org.alfresco.repo.domain.CrcHelper;
import org.alfresco.repo.domain.avm.AVMNodeEntity;
import org.alfresco.repo.domain.locale.LocaleDAO;
import org.alfresco.repo.domain.node.ChildAssocEntity;
import org.alfresco.repo.domain.patch.AbstractPatchDAOImpl;
import org.alfresco.repo.domain.qname.QNameDAO;
import org.alfresco.repo.site.SiteModel;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.Pair;
import org.alfresco.util.ParameterCheck;
@@ -733,7 +736,25 @@ public class PatchDAOImpl extends AbstractPatchDAOImpl
@Override
public List<NodeRef> getChildrenOfTheSharedSurfConfigFolder(Long minNodeId, Long maxNodeId)
{
Map<String, Object> params = new HashMap<String, Object>(2);
Pair<Long, QName> containsAssocQNamePair = qnameDAO.getQName(ContentModel.ASSOC_CONTAINS);
if (containsAssocQNamePair == null)
{
return Collections.emptyList();
}
Map<String, Object> params = new HashMap<String, Object>(7);
// Get qname CRC
Long qnameCrcSites = ChildAssocEntity.getQNameCrc(QName.createQName(SiteModel.SITE_MODEL_URL, "sites"));
Long qnameCrcSurfConfig = ChildAssocEntity.getQNameCrc(QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "surf-config"));
Long qnameCrcPages = ChildAssocEntity.getQNameCrc(QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "pages"));
Long qnameCrcUser = ChildAssocEntity.getQNameCrc(QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "user"));
params.put("qnameCrcSites", qnameCrcSites);
params.put("qnameCrcSurfConfig", qnameCrcSurfConfig);
params.put("qnameCrcPages", qnameCrcPages);
params.put("qnameCrcUser", qnameCrcUser);
params.put("qnameTypeIdContains", containsAssocQNamePair.getFirst());
params.put("minNodeId", minNodeId);
params.put("maxNodeId", maxNodeId);

3
source/java/org/alfresco/service/cmr/model/FileFolderUtil.java
View File

@@ -86,8 +86,7 @@ public class FileFolderUtil
list.add(new PathElementDetails(pathElement, null));
}
FileInfo fileInfo = makeFolders(service, null, parentNodeRef, list, folderTypeQName, behaviourFilter,
parentBehavioursToDisable);
FileInfo fileInfo = makeFolders(service, null, parentNodeRef, list, folderTypeQName, behaviourFilter, parentBehavioursToDisable);
// Should we check the type?
return fileInfo;