Skip to content

Commit af8832f

Browse files
author
Alex Huang
committed
Unified both the SearchBuilder and SearchCriteriaService
1 parent 58f287c commit af8832f

34 files changed

Lines changed: 157 additions & 438 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
import com.cloud.utils.db.EntityManager;
100100
import com.cloud.utils.db.SearchCriteria.Op;
101101
import com.cloud.utils.db.SearchCriteria2;
102-
import com.cloud.utils.db.SearchCriteriaService;
102+
import com.cloud.utils.db.SearchCriteria2;
103103
import com.cloud.utils.db.Transaction;
104104
import com.cloud.utils.exception.CloudRuntimeException;
105105
import com.cloud.utils.exception.HypervisorVersionChangedException;
@@ -1448,7 +1448,7 @@ public void run() {
14481448
try {
14491449
List<Long> behindAgents = findAgentsBehindOnPing();
14501450
for (Long agentId : behindAgents) {
1451-
SearchCriteriaService<HostVO, HostVO> sc = SearchCriteria2.create(HostVO.class);
1451+
SearchCriteria2<HostVO, HostVO> sc = SearchCriteria2.create(HostVO.class);
14521452
sc.addAnd(sc.getEntity().getId(), Op.EQ, agentId);
14531453
HostVO h = sc.find();
14541454
if (h != null) {
@@ -1470,7 +1470,7 @@ public void run() {
14701470
}
14711471
}
14721472

1473-
SearchCriteriaService<HostVO, HostVO> sc = SearchCriteria2.create(HostVO.class);
1473+
SearchCriteria2<HostVO, HostVO> sc = SearchCriteria2.create(HostVO.class);
14741474
sc.addAnd(sc.getEntity().getResourceState(), Op.IN, ResourceState.PrepareForMaintenance, ResourceState.ErrorInMaintenance);
14751475
List<HostVO> hosts = sc.list();
14761476

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
import com.cloud.utils.concurrency.NamedThreadFactory;
9090
import com.cloud.utils.db.SearchCriteria.Op;
9191
import com.cloud.utils.db.SearchCriteria2;
92-
import com.cloud.utils.db.SearchCriteriaService;
92+
import com.cloud.utils.db.SearchCriteria2;
9393
import com.cloud.utils.db.Transaction;
9494
import com.cloud.utils.exception.CloudRuntimeException;
9595
import com.cloud.utils.nio.Link;
@@ -783,7 +783,7 @@ public synchronized void run() {
783783
public void startRebalanceAgents() {
784784
s_logger.debug("Management server " + _nodeId + " is asking other peers to rebalance their agents");
785785
List<ManagementServerHostVO> allMS = _mshostDao.listBy(ManagementServerHost.State.Up);
786-
SearchCriteriaService<HostVO, HostVO> sc = SearchCriteria2.create(HostVO.class);
786+
SearchCriteria2<HostVO, HostVO> sc = SearchCriteria2.create(HostVO.class);
787787
sc.addAnd(sc.getEntity().getManagementServerId(), Op.NNULL);
788788
sc.addAnd(sc.getEntity().getType(), Op.EQ, Host.Type.Routing);
789789
List<HostVO> allManagedAgents = sc.list();
@@ -1369,7 +1369,7 @@ public void agentrebalance() {
13691369
profilerAgentLB.start();
13701370
//initiate agent lb task will be scheduled and executed only once, and only when number of agents loaded exceeds _connectedAgentsThreshold
13711371
if (EnableLB.value() && !_agentLbHappened) {
1372-
SearchCriteriaService<HostVO, HostVO> sc = SearchCriteria2.create(HostVO.class);
1372+
SearchCriteria2<HostVO, HostVO> sc = SearchCriteria2.create(HostVO.class);
13731373
sc.addAnd(sc.getEntity().getManagementServerId(), Op.NNULL);
13741374
sc.addAnd(sc.getEntity().getType(), Op.EQ, Host.Type.Routing);
13751375
List<HostVO> allManagedRoutingAgents = sc.list();

‎engine/orchestration/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import com.cloud.utils.component.AdapterBase;
3939
import com.cloud.utils.db.SearchCriteria2;
4040
import com.cloud.utils.db.SearchCriteria.Op;
41-
import com.cloud.utils.db.SearchCriteriaService;
41+
import com.cloud.utils.db.SearchCriteria2;
4242

4343
@Component
4444
@Local(value=AgentLoadBalancerPlanner.class)
@@ -49,7 +49,7 @@ public class ClusterBasedAgentLoadBalancerPlanner extends AdapterBase implements
4949

5050
@Override
5151
public List<HostVO> getHostsToRebalance(long msId, int avLoad) {
52-
SearchCriteriaService<HostVO, HostVO> sc = SearchCriteria2.create(HostVO.class);
52+
SearchCriteria2<HostVO, HostVO> sc = SearchCriteria2.create(HostVO.class);
5353
sc.addAnd(sc.getEntity().getType(), Op.EQ, Host.Type.Routing);
5454
sc.addAnd(sc.getEntity().getManagementServerId(), Op.EQ, msId);
5555
List<HostVO> allHosts = sc.list();

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import com.cloud.utils.db.SearchBuilder;
3333
import com.cloud.utils.db.SearchCriteria;
3434
import com.cloud.utils.db.SearchCriteria2;
35-
import com.cloud.utils.db.SearchCriteriaService;
35+
import com.cloud.utils.db.SearchCriteria2;
3636
import com.cloud.utils.db.SearchCriteria.Func;
3737
import com.cloud.utils.db.SearchCriteria.Op;
3838

@@ -50,21 +50,21 @@ protected StorageNetworkIpRangeDaoImpl() {
5050

5151
@Override
5252
public List<StorageNetworkIpRangeVO> listByPodId(long podId) {
53-
SearchCriteriaService<StorageNetworkIpRangeVO, StorageNetworkIpRangeVO> sc = SearchCriteria2.create(StorageNetworkIpRangeVO.class);
53+
SearchCriteria2<StorageNetworkIpRangeVO, StorageNetworkIpRangeVO> sc = SearchCriteria2.create(StorageNetworkIpRangeVO.class);
5454
sc.addAnd(sc.getEntity().getPodId(), Op.EQ, podId);
5555
return sc.list();
5656
}
5757

5858
@Override
5959
public List<StorageNetworkIpRangeVO> listByRangeId(long rangeId) {
60-
SearchCriteriaService<StorageNetworkIpRangeVO, StorageNetworkIpRangeVO> sc = SearchCriteria2.create(StorageNetworkIpRangeVO.class);
60+
SearchCriteria2<StorageNetworkIpRangeVO, StorageNetworkIpRangeVO> sc = SearchCriteria2.create(StorageNetworkIpRangeVO.class);
6161
sc.addAnd(sc.getEntity().getId(), Op.EQ, rangeId);
6262
return sc.list();
6363
}
6464

6565
@Override
6666
public List<StorageNetworkIpRangeVO> listByDataCenterId(long dcId) {
67-
SearchCriteriaService<StorageNetworkIpRangeVO, StorageNetworkIpRangeVO> sc = SearchCriteria2.create(StorageNetworkIpRangeVO.class);
67+
SearchCriteria2<StorageNetworkIpRangeVO, StorageNetworkIpRangeVO> sc = SearchCriteria2.create(StorageNetworkIpRangeVO.class);
6868
sc.addAnd(sc.getEntity().getDataCenterId(), Op.EQ, dcId);
6969
return sc.list();
7070
}

‎engine/schema/src/com/cloud/user/AccountDetailsDaoImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import com.cloud.utils.db.SearchCriteria;
3232
import com.cloud.utils.db.SearchCriteria.Op;
3333
import com.cloud.utils.db.SearchCriteria2;
34-
import com.cloud.utils.db.SearchCriteriaService;
34+
import com.cloud.utils.db.SearchCriteria2;
3535
import com.cloud.utils.db.Transaction;
3636

3737
@Local(value = {AccountDetailsDao.class})
@@ -46,7 +46,7 @@ protected AccountDetailsDaoImpl() {
4646

4747
@Override
4848
public Map<String, String> findDetails(long accountId) {
49-
SearchCriteriaService<AccountDetailVO, AccountDetailVO> sc = SearchCriteria2.create(AccountDetailVO.class);
49+
SearchCriteria2<AccountDetailVO, AccountDetailVO> sc = SearchCriteria2.create(AccountDetailVO.class);
5050
sc.addAnd(sc.getEntity().getAccountId(), Op.EQ, accountId);
5151
List<AccountDetailVO> results = sc.list();
5252
Map<String, String> details = new HashMap<String, String>(results.size());
@@ -72,7 +72,7 @@ public void persist(long accountId, Map<String, String> details) {
7272

7373
@Override
7474
public AccountDetailVO findDetail(long accountId, String name) {
75-
SearchCriteriaService<AccountDetailVO, AccountDetailVO> sc = SearchCriteria2.create(AccountDetailVO.class);
75+
SearchCriteria2<AccountDetailVO, AccountDetailVO> sc = SearchCriteria2.create(AccountDetailVO.class);
7676
sc.addAnd(sc.getEntity().getAccountId(), Op.EQ, accountId);
7777
sc.addAnd(sc.getEntity().getName(), Op.EQ, name);
7878
return sc.find();

‎engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import com.cloud.utils.db.SearchCriteria.Func;
4141
import com.cloud.utils.db.SearchCriteria.Op;
4242
import com.cloud.utils.db.SearchCriteria2;
43-
import com.cloud.utils.db.SearchCriteriaService;
43+
import com.cloud.utils.db.SearchCriteria2;
4444
import com.cloud.utils.db.Transaction;
4545
import com.cloud.utils.exception.CloudRuntimeException;
4646

@@ -316,7 +316,7 @@ public List<StoragePoolVO> findLocalStoragePoolsByTags(long dcId, long podId, Lo
316316
public List<StoragePoolVO> findZoneWideStoragePoolsByTags(long dcId, String[] tags) {
317317
List<StoragePoolVO> storagePools = null;
318318
if (tags == null || tags.length == 0) {
319-
SearchCriteriaService<StoragePoolVO, StoragePoolVO> sc = SearchCriteria2.create(StoragePoolVO.class);
319+
SearchCriteria2<StoragePoolVO, StoragePoolVO> sc = SearchCriteria2.create(StoragePoolVO.class);
320320
sc.addAnd(sc.getEntity().getDataCenterId(), Op.EQ, dcId);
321321
sc.addAnd(sc.getEntity().getStatus(), Op.EQ, Status.Up);
322322
sc.addAnd(sc.getEntity().getScope(), Op.EQ, ScopeType.ZONE);
@@ -421,7 +421,7 @@ public List<StoragePoolVO> listPoolsByCluster(long clusterId) {
421421

422422
@Override
423423
public List<StoragePoolVO> findZoneWideStoragePoolsByHypervisor(long dataCenterId, HypervisorType hypervisorType) {
424-
SearchCriteriaService<StoragePoolVO, StoragePoolVO> sc = SearchCriteria2.create(StoragePoolVO.class);
424+
SearchCriteria2<StoragePoolVO, StoragePoolVO> sc = SearchCriteria2.create(StoragePoolVO.class);
425425
sc.addAnd(sc.getEntity().getDataCenterId(), Op.EQ, dataCenterId);
426426
sc.addAnd(sc.getEntity().getStatus(), Op.EQ, Status.Up);
427427
sc.addAnd(sc.getEntity().getScope(), Op.EQ, ScopeType.ZONE);

‎engine/storage/cache/src/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import com.cloud.utils.db.GlobalLock;
2727
import com.cloud.utils.db.SearchCriteria;
2828
import com.cloud.utils.db.SearchCriteria2;
29-
import com.cloud.utils.db.SearchCriteriaService;
29+
import com.cloud.utils.db.SearchCriteria2;
3030
import com.cloud.utils.exception.CloudRuntimeException;
3131

3232
import org.apache.cloudstack.engine.subsystem.api.storage.*;
@@ -79,7 +79,7 @@ public DataStore getCacheStorage(Scope scope) {
7979
}
8080

8181
protected List<DataStore> getCacheStores() {
82-
SearchCriteriaService<ImageStoreVO, ImageStoreVO> sc = SearchCriteria2.create(ImageStoreVO.class);
82+
SearchCriteria2<ImageStoreVO, ImageStoreVO> sc = SearchCriteria2.create(ImageStoreVO.class);
8383
sc.addAnd(sc.getEntity().getRole(), SearchCriteria.Op.EQ, DataStoreRole.ImageCache);
8484
List<ImageStoreVO> imageStoreVOs = sc.list();
8585
List<DataStore> stores = new ArrayList<DataStore>();

‎engine/storage/cache/src/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithmLRU.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.cloud.utils.NumbersUtil;
2323
import com.cloud.utils.db.SearchCriteria;
2424
import com.cloud.utils.db.SearchCriteria2;
25-
import com.cloud.utils.db.SearchCriteriaService;
25+
import com.cloud.utils.db.SearchCriteria2;
2626

2727
import org.apache.cloudstack.engine.subsystem.api.storage.*;
2828
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
@@ -72,7 +72,7 @@ public DataObject chooseOneToBeReplaced(DataStore store) {
7272
cal.add(Calendar.DAY_OF_MONTH, -unusedTimeInterval.intValue());
7373
Date bef = cal.getTime();
7474

75-
SearchCriteriaService<TemplateDataStoreVO, TemplateDataStoreVO> sc = SearchCriteria2.create(TemplateDataStoreVO.class);
75+
SearchCriteria2<TemplateDataStoreVO, TemplateDataStoreVO> sc = SearchCriteria2.create(TemplateDataStoreVO.class);
7676
sc.addAnd(sc.getEntity().getLastUpdated(), SearchCriteria.Op.LT, bef);
7777
sc.addAnd(sc.getEntity().getState(), SearchCriteria.Op.EQ, ObjectInDataStoreStateMachine.State.Ready);
7878
sc.addAnd(sc.getEntity().getDataStoreId(), SearchCriteria.Op.EQ, store.getId());
@@ -83,7 +83,7 @@ public DataObject chooseOneToBeReplaced(DataStore store) {
8383
return templateFactory.getTemplate(template.getTemplateId(), store);
8484
}
8585

86-
SearchCriteriaService<VolumeDataStoreVO, VolumeDataStoreVO> volSc = SearchCriteria2.create(VolumeDataStoreVO.class);
86+
SearchCriteria2<VolumeDataStoreVO, VolumeDataStoreVO> volSc = SearchCriteria2.create(VolumeDataStoreVO.class);
8787
volSc.addAnd(volSc.getEntity().getLastUpdated(), SearchCriteria.Op.LT, bef);
8888
volSc.addAnd(volSc.getEntity().getState(), SearchCriteria.Op.EQ, ObjectInDataStoreStateMachine.State.Ready);
8989
volSc.addAnd(volSc.getEntity().getDataStoreId(), SearchCriteria.Op.EQ, store.getId());
@@ -93,7 +93,7 @@ public DataObject chooseOneToBeReplaced(DataStore store) {
9393
return volumeFactory.getVolume(volume.getVolumeId(), store);
9494
}
9595

96-
SearchCriteriaService<SnapshotDataStoreVO, SnapshotDataStoreVO> snapshotSc = SearchCriteria2.create(SnapshotDataStoreVO.class);
96+
SearchCriteria2<SnapshotDataStoreVO, SnapshotDataStoreVO> snapshotSc = SearchCriteria2.create(SnapshotDataStoreVO.class);
9797
snapshotSc.addAnd(snapshotSc.getEntity().getLastUpdated(), SearchCriteria.Op.LT, bef);
9898
snapshotSc.addAnd(snapshotSc.getEntity().getState(), SearchCriteria.Op.EQ, ObjectInDataStoreStateMachine.State.Ready);
9999
snapshotSc.addAnd(snapshotSc.getEntity().getDataStoreId(), SearchCriteria.Op.EQ, store.getId());

‎engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import com.cloud.utils.component.ComponentContext;
4545
import com.cloud.utils.db.SearchCriteria.Op;
4646
import com.cloud.utils.db.SearchCriteria2;
47-
import com.cloud.utils.db.SearchCriteriaService;
47+
import com.cloud.utils.db.SearchCriteria2;
4848
import com.cloud.utils.exception.CloudRuntimeException;
4949
import com.cloud.utils.fsm.NoTransitionException;
5050

@@ -104,7 +104,7 @@ public SnapshotInfo getParent() {
104104

105105
@Override
106106
public SnapshotInfo getChild() {
107-
SearchCriteriaService<SnapshotDataStoreVO, SnapshotDataStoreVO> sc = SearchCriteria2
107+
SearchCriteria2<SnapshotDataStoreVO, SnapshotDataStoreVO> sc = SearchCriteria2
108108
.create(SnapshotDataStoreVO.class);
109109
sc.addAnd(sc.getEntity().getDataStoreId(), Op.EQ, this.store.getId());
110110
sc.addAnd(sc.getEntity().getRole(), Op.EQ, this.store.getRole());

‎engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import com.cloud.storage.ScopeType;
4646
import com.cloud.utils.db.DB;
4747
import com.cloud.utils.db.SearchCriteria2;
48-
import com.cloud.utils.db.SearchCriteriaService;
48+
import com.cloud.utils.db.SearchCriteria2;
4949
import com.cloud.utils.db.Transaction;
5050
import com.cloud.utils.db.SearchCriteria.Op;
5151
import com.cloud.utils.exception.CloudRuntimeException;
@@ -220,7 +220,7 @@ protected EndPoint findEndpointForImageStorage(DataStore store) {
220220
}
221221

222222
private List<HostVO> listUpAndConnectingSecondaryStorageVmHost(Long dcId) {
223-
SearchCriteriaService<HostVO, HostVO> sc = SearchCriteria2.create(HostVO.class);
223+
SearchCriteria2<HostVO, HostVO> sc = SearchCriteria2.create(HostVO.class);
224224
if (dcId != null) {
225225
sc.addAnd(sc.getEntity().getDataCenterId(), Op.EQ, dcId);
226226
}
@@ -258,7 +258,7 @@ public List<EndPoint> selectAll(DataStore store) {
258258
endPoints.add(RemoteHostEndPoint.getHypervisorHostEndPoint(host.getId(), host.getPrivateIpAddress(),
259259
host.getPublicIpAddress()));
260260
} else if (store.getScope().getScopeType() == ScopeType.CLUSTER) {
261-
SearchCriteriaService<HostVO, HostVO> sc = SearchCriteria2.create(HostVO.class);
261+
SearchCriteria2<HostVO, HostVO> sc = SearchCriteria2.create(HostVO.class);
262262
sc.addAnd(sc.getEntity().getClusterId(), Op.EQ, store.getScope().getScopeId());
263263
sc.addAnd(sc.getEntity().getStatus(), Op.EQ, Status.Up);
264264
List<HostVO> hosts = sc.find();

0 commit comments

Comments
 (0)