Fixup

Author: vishesh92

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

@@ -3402,7 +3402,7 @@ private Ternary<List<Long>, Integer, String[]> searchForDiskOfferingsIdsAndCount
 
         if (zoneId != null) {
             SearchBuilder<DiskOfferingDetailVO> zoneDetailSearch = _diskOfferingDetailsDao.createSearchBuilder();
-            zoneDetailSearch.and().op("name", zoneDetailSearch.entity().getName(), Op.EQ); // zoneid
+            zoneDetailSearch.and().op("name", zoneDetailSearch.entity().getName(), Op.EQ);
             zoneDetailSearch.or("nameNull", zoneDetailSearch.entity().getName(), Op.NULL);
 
             zoneDetailSearch.and().op("zoneId", zoneDetailSearch.entity().getValue(), Op.EQ);
@@ -3435,7 +3435,7 @@ private Ternary<List<Long>, Integer, String[]> searchForDiskOfferingsIdsAndCount
         if (!Account.Type.ADMIN.equals(account.getType())) {
             SearchBuilder<DiskOfferingDetailVO> domainDetailsSearch = _diskOfferingDetailsDao.createSearchBuilder();
             domainDetailsSearch.and().op("name", domainDetailsSearch.entity().getName(), Op.EQ);
-            domainDetailsSearch.or("nameNull", domainDetailsSearch.entity().getName(), Op.EQ);
+            domainDetailsSearch.or("nameNull", domainDetailsSearch.entity().getName(), Op.NULL);
             domainDetailsSearch.cp();
             domainDetailsSearch.and().op("valueIn", domainDetailsSearch.entity().getValue(), Op.IN);
             domainDetailsSearch.or("valueNull", domainDetailsSearch.entity().getValue(), Op.NULL);
@@ -3760,7 +3760,8 @@ private Pair<List<Long>, Integer> searchForServiceOfferingIdsAndCount(ListServic
         DataCenterJoinVO zone = null;
         if (zoneId != null) {
             SearchBuilder<ServiceOfferingDetailsVO> srvOffrZoneDetailSearch = _srvOfferingDetailsDao.createSearchBuilder();
-            srvOffrZoneDetailSearch.and("name", srvOffrZoneDetailSearch.entity().getName(), Op.EQ);
+            srvOffrZoneDetailSearch.and().op("name", srvOffrZoneDetailSearch.entity().getName(), Op.EQ);
+            srvOffrZoneDetailSearch.or("nameNull", srvOffrZoneDetailSearch.entity().getName(), Op.NULL).cp();
             srvOffrZoneDetailSearch.and().op("value", srvOffrZoneDetailSearch.entity().getValue(), Op.EQ);
             srvOffrZoneDetailSearch.and().or("valueNull", srvOffrZoneDetailSearch.entity().getValue(), Op.NULL);
             srvOffrZoneDetailSearch.cp();
@@ -3777,7 +3778,7 @@ private Pair<List<Long>, Integer> searchForServiceOfferingIdsAndCount(ListServic
                 List<String> storageTags = com.cloud.utils.StringUtils.csvTagsToList(diskOffering.getTags());
                 if (!storageTags.isEmpty() && VolumeApiServiceImpl.MatchStoragePoolTagsWithDiskOffering.value()) {
                     for (String tag : storageTags) {
-                        diskOfferingSearch.and(tag, diskOfferingSearch.entity().getTags(), Op.FIND_IN_SET);
+                        diskOfferingSearch.and(tag, diskOfferingSearch.entity().getTags(), Op.EQ);
                     }
                     diskOfferingSearch.done();
                 }
@@ -3866,7 +3867,8 @@ private Pair<List<Long>, Integer> searchForServiceOfferingIdsAndCount(ListServic
         // Fetch the offering ids from the details table since theres no smart way to filter them in the join ... yet!
         if (owner.getType() != Account.Type.ADMIN) {
             SearchBuilder<ServiceOfferingDetailsVO> srvOffrDomainDetailSearch = _srvOfferingDetailsDao.createSearchBuilder();
-            srvOffrDomainDetailSearch.and("name", srvOffrDomainDetailSearch.entity().getName(), Op.EQ);
+            srvOffrDomainDetailSearch.and().op("name", srvOffrDomainDetailSearch.entity().getName(), Op.EQ);
+            srvOffrDomainDetailSearch.or("nameNull", srvOffrDomainDetailSearch.entity().getName(), Op.NULL).cp();
             srvOffrDomainDetailSearch.and().op("value", srvOffrDomainDetailSearch.entity().getValue(), Op.IN);
             srvOffrDomainDetailSearch.or("value", srvOffrDomainDetailSearch.entity().getValue(), Op.NULL);
             srvOffrDomainDetailSearch.cp().done();
@@ -3881,7 +3883,7 @@ private Pair<List<Long>, Integer> searchForServiceOfferingIdsAndCount(ListServic
                 serviceOfferingSearch.or().op();
 
                 for(String tag : hostTags) {
-                    serviceOfferingSearch.and(tag, serviceOfferingSearch.entity().getHostTag(), Op.FIND_IN_SET);
+                    serviceOfferingSearch.and(tag, serviceOfferingSearch.entity().getHostTag(), Op.EQ);
                 }
                 serviceOfferingSearch.cp().cp().done();
             }