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

Fixed ALF-2854: User Usage Queries use read-write methods on QNameDAO

Browse Source 
- Was fixed on 3.3, but problem crept into de-Hibernate porting again for 3.4


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21959 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-08-24 10:17:49 +00:00
parent 96761a1c29
commit 39e25da30c
1 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
source/java/org/alfresco/repo/domain/usage/ibatis/UsageDAOImpl.java
View File

@@ -33,6 +33,7 @@ import org.alfresco.repo.domain.qname.QNameDAO;
import org.alfresco.repo.domain.usage.AbstractUsageDAOImpl; import org.alfresco.repo.domain.usage.AbstractUsageDAOImpl;
import org.alfresco.repo.domain.usage.UsageDeltaEntity; import org.alfresco.repo.domain.usage.UsageDeltaEntity;
import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.util.Pair;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.orm.ibatis.SqlMapClientTemplate; import org.springframework.orm.ibatis.SqlMapClientTemplate;
@@ -108,9 +109,18 @@ public class UsageDAOImpl extends AbstractUsageDAOImpl
@Override @Override
protected void selectUsersWithoutUsage(StoreRef storeRef, MapHandler resultsCallback) protected void selectUsersWithoutUsage(StoreRef storeRef, MapHandler resultsCallback)
{ {
long personTypeQNameEntityId = qnameDAO.getOrCreateQName(ContentModel.TYPE_PERSON).getFirst(); Pair<Long, ? extends Object> personTypeQNamePair = qnameDAO.getQName(ContentModel.TYPE_PERSON);
long usernamePropQNameEntityId = qnameDAO.getOrCreateQName(ContentModel.PROP_USERNAME).getFirst(); Pair<Long, ? extends Object> usernamePropQNamePair = qnameDAO.getQName(ContentModel.PROP_USERNAME);
long sizeCurrentPropQNameEntityId = qnameDAO.getOrCreateQName(ContentModel.PROP_SIZE_CURRENT).getFirst(); Pair<Long, ? extends Object> sizeCurrentPropQNamePair = qnameDAO.getQName(ContentModel.PROP_SIZE_CURRENT);
if (personTypeQNamePair == null || usernamePropQNamePair == null || sizeCurrentPropQNamePair == null)
{
return; // The statics have not been used, so there can be no results
}
Long personTypeQNameEntityId = personTypeQNamePair.getFirst();
Long usernamePropQNameEntityId = usernamePropQNamePair.getFirst();
Long sizeCurrentPropQNameEntityId = sizeCurrentPropQNamePair.getFirst();
Map<String, Object> params = new HashMap<String, Object>(5); Map<String, Object> params = new HashMap<String, Object>(5);
params.put("personTypeQNameID", personTypeQNameEntityId); // cm:person (type) params.put("personTypeQNameID", personTypeQNameEntityId); // cm:person (type)
@@ -132,9 +142,18 @@ public class UsageDAOImpl extends AbstractUsageDAOImpl
@Override @Override
protected void selectUsersWithUsage(StoreRef storeRef, MapHandler resultsCallback) protected void selectUsersWithUsage(StoreRef storeRef, MapHandler resultsCallback)
{ {
long personTypeQNameEntityId = qnameDAO.getOrCreateQName(ContentModel.TYPE_PERSON).getFirst(); Pair<Long, ? extends Object> personTypeQNamePair = qnameDAO.getQName(ContentModel.TYPE_PERSON);
long usernamePropQNameEntityId = qnameDAO.getOrCreateQName(ContentModel.PROP_USERNAME).getFirst(); Pair<Long, ? extends Object> usernamePropQNamePair = qnameDAO.getQName(ContentModel.PROP_USERNAME);
long sizeCurrentPropQNameEntityId = qnameDAO.getOrCreateQName(ContentModel.PROP_SIZE_CURRENT).getFirst(); Pair<Long, ? extends Object> sizeCurrentPropQNamePair = qnameDAO.getQName(ContentModel.PROP_SIZE_CURRENT);
if (personTypeQNamePair == null || usernamePropQNamePair == null || sizeCurrentPropQNamePair == null)
{
return; // The statics have not been used, so there can be no results
}
Long personTypeQNameEntityId = personTypeQNamePair.getFirst();
Long usernamePropQNameEntityId = usernamePropQNamePair.getFirst();
Long sizeCurrentPropQNameEntityId = sizeCurrentPropQNamePair.getFirst();
Map<String, Object> params = new HashMap<String, Object>(5); Map<String, Object> params = new HashMap<String, Object>(5);
params.put("personTypeQNameID", personTypeQNameEntityId); // cm:person (type) params.put("personTypeQNameID", personTypeQNameEntityId); // cm:person (type)
@@ -156,9 +175,18 @@ public class UsageDAOImpl extends AbstractUsageDAOImpl
@Override @Override
protected void selectUserContentSizesForStore(StoreRef storeRef, MapHandler resultsCallback) protected void selectUserContentSizesForStore(StoreRef storeRef, MapHandler resultsCallback)
{ {
long contentTypeQNameEntityId = qnameDAO.getOrCreateQName(ContentModel.TYPE_CONTENT).getFirst(); Pair<Long, ? extends Object> contentTypeQNamePair = qnameDAO.getQName(ContentModel.TYPE_CONTENT);
long ownerPropQNameEntityId = qnameDAO.getOrCreateQName(ContentModel.PROP_OWNER).getFirst(); Pair<Long, ? extends Object> ownerPropQNamePair = qnameDAO.getQName(ContentModel.PROP_OWNER);
long contentPropQNameEntityId = qnameDAO.getOrCreateQName(ContentModel.PROP_CONTENT).getFirst(); Pair<Long, ? extends Object> contentPropQNamePair = qnameDAO.getQName(ContentModel.PROP_CONTENT);
if (contentTypeQNamePair == null || ownerPropQNamePair == null || contentPropQNamePair == null)
{
return; // The statics have not been used, so there can be no results
}
Long contentTypeQNameEntityId = contentTypeQNamePair.getFirst();
Long ownerPropQNameEntityId = ownerPropQNamePair.getFirst();
Long contentPropQNameEntityId = contentPropQNamePair.getFirst();
MapRowHandler rowHandler = new MapRowHandler(resultsCallback); MapRowHandler rowHandler = new MapRowHandler(resultsCallback);