apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 11354: enabled cache for listBy Dao calls and specifically for listBySecurityGroup

Browse Source
This commit is contained in:
Abhinandan Prateek 2011-10-24 10:48:39 +05:30 committed by root
parent 83b4d2f7f9
commit ed2816051a
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java
View File

@ -116,7 +116,7 @@ public class SecurityGroupVMMapDaoImpl extends GenericDaoBase<SecurityGroupVMMap
SearchCriteria<SecurityGroupVMMapVO> sc = ListBySecurityGroupAndStates.create();
sc.setParameters("securityGroupId", securityGroupId);
sc.setParameters("states", (Object[])vmStates);
return listBy(sc);
return listBy(sc, null, true);
}
@Override

15
utils/src/com/cloud/utils/db/GenericDaoBase.java
View File

@ -859,7 +859,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> implements Gene
}
return findOneIncludingRemovedBy(sc);
}
@DB(txn=false)
protected List<T> listBy(final SearchCriteria<T> sc, final Filter filter) {
if (_removed != null) {
@ -868,11 +868,24 @@ public abstract class GenericDaoBase<T, ID extends Serializable> implements Gene
return listIncludingRemovedBy(sc, filter);
}
@DB(txn=false)
protected List<T> listBy(final SearchCriteria<T> sc, final Filter filter, final boolean enable_query_cache) {
if (_removed != null) {
sc.addAnd(_removed.second().field.getName(), SearchCriteria.Op.NULL);
}
return listIncludingRemovedBy(sc, filter, enable_query_cache);
}
@DB(txn=false)
protected List<T> listBy(final SearchCriteria<T> sc) {
return listBy(sc, null);
}
@DB(txn=false)
protected List<T> listIncludingRemovedBy(final SearchCriteria<T> sc, final Filter filter, final boolean enable_query_cache) {
return searchIncludingRemoved(sc, filter, null, false, enable_query_cache);
}
@DB(txn=false)
protected List<T> listIncludingRemovedBy(final SearchCriteria<T> sc, final Filter filter) {
return searchIncludingRemoved(sc, filter, null, false);