CLOUDSTACK-1179: API searches for names should not be fuzzy. fuzzy

minchen07 · minchen07 · commit e40ebcce8f73 · 2013-03-08T16:43:03.000-08:00
search should be done through keyword.
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -1518,7 +1518,7 @@ private Pair<List<VolumeJoinVO>, Integer> searchForVolumesInternal(ListVolumesCm
         // pagination
         _accountMgr.buildACLViewSearchBuilder(sb, domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria);
 
-        sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE);
+        sb.and("name", sb.entity().getName(), SearchCriteria.Op.EQ);
         sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
         sb.and("volumeType", sb.entity().getVolumeType(), SearchCriteria.Op.LIKE);
         sb.and("instanceId", sb.entity().getVmId(), SearchCriteria.Op.EQ);
@@ -1555,7 +1555,7 @@ private Pair<List<VolumeJoinVO>, Integer> searchForVolumesInternal(ListVolumesCm
         }
 
         if (name != null) {
-            sc.setParameters("name", "%" + name + "%");
+            sc.setParameters("name", name);
         }
 
         sc.setParameters("systemUse", 1);
diff --git a/server/src/com/cloud/user/DomainManagerImpl.java b/server/src/com/cloud/user/DomainManagerImpl.java
@@ -365,7 +365,7 @@ public Pair<List<? extends Domain>, Integer> searchForDomains(ListDomainsCmd cmd
 
         SearchBuilder<DomainVO> sb = _domainDao.createSearchBuilder();
         sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
-        sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE);
+        sb.and("name", sb.entity().getName(), SearchCriteria.Op.EQ);
         sb.and("level", sb.entity().getLevel(), SearchCriteria.Op.EQ);
         sb.and("path", sb.entity().getPath(), SearchCriteria.Op.LIKE);
         sb.and("state", sb.entity().getState(), SearchCriteria.Op.EQ);
@@ -379,7 +379,7 @@ public Pair<List<? extends Domain>, Integer> searchForDomains(ListDomainsCmd cmd
         }
 
         if (domainName != null) {
-            sc.setParameters("name", "%" + domainName + "%");
+            sc.setParameters("name", domainName);
         }
 
         if (level != null) {
@@ -492,7 +492,7 @@ public DomainVO updateDomain(UpdateDomainCmd cmd) {
 
             if (!domains.isEmpty() && !sameDomain) {
                 InvalidParameterValueException ex = new InvalidParameterValueException("Failed to update specified domain id with name '" + domainName + "' since it already exists in the system");
-                ex.addProxyObject(domain, domainId, "domainId");                
+                ex.addProxyObject(domain, domainId, "domainId");
                 throw ex;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1518,7 +1518,7 @@ private Pair<List<VolumeJoinVO>, Integer> searchForVolumesInternal(ListVolumesCm`
`1518`	`1518`	`// pagination`
`1519`	`1519`	`_accountMgr.buildACLViewSearchBuilder(sb, domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria);`
`1520`	`1520`
`1521`		`- sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE);`
	`1521`	`+ sb.and("name", sb.entity().getName(), SearchCriteria.Op.EQ);`
`1522`	`1522`	`sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);`
`1523`	`1523`	`sb.and("volumeType", sb.entity().getVolumeType(), SearchCriteria.Op.LIKE);`
`1524`	`1524`	`sb.and("instanceId", sb.entity().getVmId(), SearchCriteria.Op.EQ);`
`@@ -1555,7 +1555,7 @@ private Pair<List<VolumeJoinVO>, Integer> searchForVolumesInternal(ListVolumesCm`
`1555`	`1555`	`}`
`1556`	`1556`
`1557`	`1557`	`if (name != null) {`
`1558`		`- sc.setParameters("name", "%" + name + "%");`
	`1558`	`+ sc.setParameters("name", name);`
`1559`	`1559`	`}`
`1560`	`1560`
`1561`	`1561`	`sc.setParameters("systemUse", 1);`
Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,7 @@ public Pair<List<? extends Domain>, Integer> searchForDomains(ListDomainsCmd cmd`
`365`	`365`
`366`	`366`	`SearchBuilder<DomainVO> sb = _domainDao.createSearchBuilder();`
`367`	`367`	`sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);`
`368`		`- sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE);`
	`368`	`+ sb.and("name", sb.entity().getName(), SearchCriteria.Op.EQ);`
`369`	`369`	`sb.and("level", sb.entity().getLevel(), SearchCriteria.Op.EQ);`
`370`	`370`	`sb.and("path", sb.entity().getPath(), SearchCriteria.Op.LIKE);`
`371`	`371`	`sb.and("state", sb.entity().getState(), SearchCriteria.Op.EQ);`
`@@ -379,7 +379,7 @@ public Pair<List<? extends Domain>, Integer> searchForDomains(ListDomainsCmd cmd`
`379`	`379`	`}`
`380`	`380`
`381`	`381`	`if (domainName != null) {`
`382`		`- sc.setParameters("name", "%" + domainName + "%");`
	`382`	`+ sc.setParameters("name", domainName);`
`383`	`383`	`}`
`384`	`384`
`385`	`385`	`if (level != null) {`
`@@ -492,7 +492,7 @@ public DomainVO updateDomain(UpdateDomainCmd cmd) {`
`492`	`492`
`493`	`493`	`if (!domains.isEmpty() && !sameDomain) {`
`494`	`494`	`InvalidParameterValueException ex = new InvalidParameterValueException("Failed to update specified domain id with name '" + domainName + "' since it already exists in the system");`
`495`		`- ex.addProxyObject(domain, domainId, "domainId");`
	`495`	`+ ex.addProxyObject(domain, domainId, "domainId");`
`496`	`496`	`throw ex;`
`497`	`497`	`}`
`498`	`498`	`}`