vishesh92 commented on code in PR #9547:
URL: https://github.com/apache/cloudstack/pull/9547#discussion_r1768825777
##########
server/src/main/java/com/cloud/api/query/QueryManagerImpl.java:
##########
@@ -1447,13 +1447,18 @@ private Pair<List<Long>, Integer>
searchForUserVMIdsAndCount(ListVMsCmd cmd) {
}
if (keyword != null) {
- userVmSearchBuilder.and().op("keywordDisplayName",
userVmSearchBuilder.entity().getDisplayName(), Op.LIKE);
- userVmSearchBuilder.or("keywordName",
userVmSearchBuilder.entity().getHostName(), Op.LIKE);
- userVmSearchBuilder.or("keywordState",
userVmSearchBuilder.entity().getState(), Op.EQ);
+ SearchBuilder<UserVmJoinVO> userVmJoinSearchBuilder =
_userVmJoinDao.createSearchBuilder();
Review Comment:
I haven't tested this. But the code will look something like this:
```java
if (keyword != null) {
userVmSearchBuilder.and().op("keywordDisplayName",
userVmSearchBuilder.entity().getDisplayName(), Op.LIKE);
userVmSearchBuilder.or("keywordName",
userVmSearchBuilder.entity().getHostName(), Op.LIKE);
userVmSearchBuilder.or("keywordState",
userVmSearchBuilder.entity().getState(), Op.EQ);
if (isRootAdmin) {
userVmSearchBuilder.or("keywordInstanceName",
userVmSearchBuilder.entity().getInstanceName(), Op.LIKE );
}
SearchBuilder<IPAddressVO> ipAddressSearch =
ipAddressDao.createSearchBuilder();
userVmSearchBuilder.join("ipAddressSearch", ipAddressSearch,
ipAddressSearch.entity().getAssociatedWithVmId(),
userVmSearchBuilder.entity().getId(), JoinBuilder.JoinType.LEFT);
SearchBuilder<NicVO> nicSearch = nicDao.createSearchBuilder();
userVmSearchBuilder.join("nicSearch", nicSearch,
JoinBuilder.JoinType.LEFT,
JoinBuilder.JoinCondition.AND,
nicSearch.entity().getInstanceId(),
userVmSearchBuilder.entity().getId(),
nicSearch.entity().getRemoved(),
userVmSearchBuilder.entity().setLong(null));
userVmSearchBuilder.or("ipAddressSearch", "publicIpSearch",
ipAddressSearch.entity().getAddress(), Op.LIKE);
userVmSearchBuilder.or("nicSearch", "ip4Address",
nicSearch.entity().getIPv4Address(), Op.LIKE);
userVmSearchBuilder.or("nicSearch", "ip6Address",
nicSearch.entity().getIPv6Address(), Op.LIKE);
userVmSearchBuilder.cp();
}
```
and for setting the paramerts
```java
if (keyword != null) {
String keywordMatch = "%" + keyword + "%";
userVmSearchCriteria.setParameters("keywordDisplayName",
keywordMatch);
userVmSearchCriteria.setParameters("keywordName", keywordMatch);
userVmSearchCriteria.setParameters("keywordState", keyword);
if (isRootAdmin) {
userVmSearchCriteria.setParameters("keywordInstanceName",
keywordMatch);
}
userVmSearchCriteria.setParameters("publicIpSearch",
keywordMatch);
userVmSearchCriteria.setParameters("ip4Address", keywordMatch);
userVmSearchCriteria.setParameters("ip6Address", keywordMatch);
}
```
These `or` & `join` methods were added recently to allow more complex
queries during a join.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
