Skip to content

Commit b60eef3

Browse files
author
Alex Huang
committed
Added comments and finished off the work
1 parent 5fd47cc commit b60eef3

22 files changed

Lines changed: 561 additions & 526 deletions

File tree

‎engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,8 @@
9797
import com.cloud.utils.concurrency.NamedThreadFactory;
9898
import com.cloud.utils.db.DB;
9999
import com.cloud.utils.db.EntityManager;
100+
import com.cloud.utils.db.QueryBuilder;
100101
import com.cloud.utils.db.SearchCriteria.Op;
101-
import com.cloud.utils.db.GenericQueryBuilder;
102-
import com.cloud.utils.db.GenericQueryBuilder;
103102
import com.cloud.utils.db.Transaction;
104103
import com.cloud.utils.exception.CloudRuntimeException;
105104
import com.cloud.utils.exception.HypervisorVersionChangedException;
@@ -1448,7 +1447,7 @@ public void run() {
14481447
try {
14491448
List<Long> behindAgents = findAgentsBehindOnPing();
14501449
for (Long agentId : behindAgents) {
1451-
GenericQueryBuilder<HostVO, HostVO> sc = GenericQueryBuilder.create(HostVO.class);
1450+
QueryBuilder<HostVO> sc = QueryBuilder.create(HostVO.class);
14521451
sc.and(sc.entity().getId(), Op.EQ, agentId);
14531452
HostVO h = sc.find();
14541453
if (h != null) {
@@ -1470,7 +1469,7 @@ public void run() {
14701469
}
14711470
}
14721471

1473-
GenericQueryBuilder<HostVO, HostVO> sc = GenericQueryBuilder.create(HostVO.class);
1472+
QueryBuilder<HostVO> sc = QueryBuilder.create(HostVO.class);
14741473
sc.and(sc.entity().getResourceState(), Op.IN, ResourceState.PrepareForMaintenance, ResourceState.ErrorInMaintenance);
14751474
List<HostVO> hosts = sc.list();
14761475

‎engine/schema/src/com/cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,17 @@
1717
package com.cloud.dc.dao;
1818

1919
import java.util.List;
20-
import java.util.Map;
2120

2221
import javax.ejb.Local;
23-
import javax.naming.ConfigurationException;
2422

2523
import org.springframework.stereotype.Component;
2624

2725
import com.cloud.dc.StorageNetworkIpRangeVO;
2826
import com.cloud.utils.db.DB;
29-
import com.cloud.utils.db.Filter;
3027
import com.cloud.utils.db.GenericDaoBase;
3128
import com.cloud.utils.db.GenericSearchBuilder;
32-
import com.cloud.utils.db.SearchBuilder;
29+
import com.cloud.utils.db.QueryBuilder;
3330
import com.cloud.utils.db.SearchCriteria;
34-
import com.cloud.utils.db.GenericQueryBuilder;
35-
import com.cloud.utils.db.GenericQueryBuilder;
3631
import com.cloud.utils.db.SearchCriteria.Func;
3732
import com.cloud.utils.db.SearchCriteria.Op;
3833

@@ -50,21 +45,21 @@ protected StorageNetworkIpRangeDaoImpl() {
5045

5146
@Override
5247
public List<StorageNetworkIpRangeVO> listByPodId(long podId) {
53-
GenericQueryBuilder<StorageNetworkIpRangeVO, StorageNetworkIpRangeVO> sc = GenericQueryBuilder.create(StorageNetworkIpRangeVO.class);
48+
QueryBuilder<StorageNetworkIpRangeVO> sc = QueryBuilder.create(StorageNetworkIpRangeVO.class);
5449
sc.and(sc.entity().getPodId(), Op.EQ, podId);
5550
return sc.list();
5651
}
5752

5853
@Override
5954
public List<StorageNetworkIpRangeVO> listByRangeId(long rangeId) {
60-
GenericQueryBuilder<StorageNetworkIpRangeVO, StorageNetworkIpRangeVO> sc = GenericQueryBuilder.create(StorageNetworkIpRangeVO.class);
55+
QueryBuilder<StorageNetworkIpRangeVO> sc = QueryBuilder.create(StorageNetworkIpRangeVO.class);
6156
sc.and(sc.entity().getId(), Op.EQ, rangeId);
6257
return sc.list();
6358
}
6459

6560
@Override
6661
public List<StorageNetworkIpRangeVO> listByDataCenterId(long dcId) {
67-
GenericQueryBuilder<StorageNetworkIpRangeVO, StorageNetworkIpRangeVO> sc = GenericQueryBuilder.create(StorageNetworkIpRangeVO.class);
62+
QueryBuilder<StorageNetworkIpRangeVO> sc = QueryBuilder.create(StorageNetworkIpRangeVO.class);
6863
sc.and(sc.entity().getDataCenterId(), Op.EQ, dcId);
6964
return sc.list();
7065
}

‎engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public UsageEventDaoImpl () {
6666
IpeventsSearch.and("networktype", IpeventsSearch.entity().getResourceType(), SearchCriteria.Op.EQ);
6767
IpeventsSearch.and().op("assignEvent", IpeventsSearch.entity().getType(), SearchCriteria.Op.EQ);
6868
IpeventsSearch.or("releaseEvent", IpeventsSearch.entity().getType(), SearchCriteria.Op.EQ);
69-
IpeventsSearch.closeParen();
69+
IpeventsSearch.cp();
7070
IpeventsSearch.done();
7171
}
7272

0 commit comments

Comments
 (0)