etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 12435: Create accountSearch join builder only once. 

status 12435: resolved fixed
reviewed-by: Nitin
This commit is contained in:
kishan 2011-12-08 17:54:57 +05:30
parent 8d677cb7ba
commit ff14d09a8d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
View File

@ -993,11 +993,11 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
sb.and("snapshotTypeEQ", sb.entity().getsnapshotType(), SearchCriteria.Op.IN);
sb.and("snapshotTypeNEQ", sb.entity().getsnapshotType(), SearchCriteria.Op.NEQ);
SearchBuilder<AccountVO> accountSearch = null;
if ((permittedAccounts.isEmpty()) && (domainId != null)) {
// if accountId isn't specified, we can do a domain match for the admin case
SearchBuilder<AccountVO> accountSearch = _accountDao.createSearchBuilder();
accountSearch = _accountDao.createSearchBuilder();
sb.join("accountSearch", accountSearch, sb.entity().getAccountId(), accountSearch.entity().getId(), JoinType.INNER);
SearchBuilder<DomainVO> domainSearch = _domainDao.createSearchBuilder();
if (isRecursive) {
domainSearch.and("path", domainSearch.entity().getPath(), SearchCriteria.Op.LIKE);
@ -1008,9 +1008,11 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
}
if (skipProjectSnapshots) {
SearchBuilder<AccountVO> accountSearch = _accountDao.createSearchBuilder();
accountSearch.and("type", accountSearch.entity().getType(), SearchCriteria.Op.NEQ);
sb.join("accountSearch", accountSearch, sb.entity().getAccountId(), accountSearch.entity().getId(), JoinBuilder.JoinType.INNER);
if(accountSearch == null){
accountSearch = _accountDao.createSearchBuilder();
sb.join("accountSearch", accountSearch, sb.entity().getAccountId(), accountSearch.entity().getId(), JoinBuilder.JoinType.INNER);
}
accountSearch.and("type", accountSearch.entity().getType(), SearchCriteria.Op.NEQ);
}
SearchCriteria<SnapshotVO> sc = sb.create();