use filter on VO and cleanup

Author: DaanHoogland

engine/schema/src/main/java/com/cloud/storage/dao/VolumeDao.java

@@ -18,7 +18,6 @@
 
 import java.util.Date;
 import java.util.List;
-import java.util.Set;
 
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.storage.ScopeType;
@@ -113,7 +112,8 @@ public interface VolumeDao extends GenericDao<VolumeVO, Long>, StateDao<Volume.S
     /**
      * Gets the Total Primary Storage space allocated for an account
      *
-     * @param list of ids of virtual router VMs under this account
+     * @param accountId
+     * @param virtualRouters list of ids of virtual router VMs under this account
      * @return total Primary Storage space (in bytes) used
      */
     long primaryStorageUsedForAccount(long accountId, List<Long> virtualRouters);
@@ -157,7 +157,5 @@ public interface VolumeDao extends GenericDao<VolumeVO, Long>, StateDao<Volume.S
 
     List<VolumeVO> listByIds(List<Long> ids);
 
-    Set<Long> listEncryptedVolumeIds();
-
     List<VolumeVO> listAllocatedVolumesForAccountDiskOfferingIdsAndNotForVms(long accountId, List<Long> diskOfferingIds, List<Long> vmIds);
 }

engine/schema/src/main/java/com/cloud/storage/dao/VolumeDaoImpl.java

@@ -16,16 +16,14 @@
 // under the License.
 package com.cloud.storage.dao;
 
-import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
+import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
@@ -73,7 +71,6 @@ public class VolumeDaoImpl extends GenericDaoBase<VolumeVO, Long> implements Vol
     protected final SearchBuilder<VolumeVO> RootDiskStateSearch;
     private final SearchBuilder<VolumeVO> storeAndInstallPathSearch;
     private final SearchBuilder<VolumeVO> volumeIdSearch;
-    private final SearchBuilder<VolumeVO> encryptedIdSearch;
     protected GenericSearchBuilder<VolumeVO, Long> CountByAccount;
     protected GenericSearchBuilder<VolumeVO, SumCount> primaryStorageSearch;
     protected GenericSearchBuilder<VolumeVO, SumCount> primaryStorageSearch2;
@@ -84,7 +81,6 @@ public class VolumeDaoImpl extends GenericDaoBase<VolumeVO, Long> implements Vol
     @Inject
     ResourceTagDao _tagsDao;
 
-    protected static final String SELECT_VM_SQL = "SELECT DISTINCT instance_id from volumes v where v.host_id = ? and v.mirror_state = ?";
     // need to account for zone-wide primary storage where storage_pool has
     // null-value pod and cluster, where hypervisor information is stored in
     // storage_pool
@@ -501,10 +497,6 @@ public VolumeDaoImpl() {
         volumeIdSearch.and("idIN", volumeIdSearch.entity().getId(), Op.IN);
         volumeIdSearch.done();
 
-        encryptedIdSearch = createSearchBuilder();
-        encryptedIdSearch.and("encryptionMethod", encryptedIdSearch.entity().getId(), Op.NNULL);
-        encryptedIdSearch.done();
-
         poolAndPathSearch = createSearchBuilder();
         poolAndPathSearch.and("poolId", poolAndPathSearch.entity().getPoolId(), Op.EQ);
         poolAndPathSearch.and("path", poolAndPathSearch.entity().getPath(), Op.EQ);
@@ -870,23 +862,6 @@ public List<VolumeVO> listByIds(List<Long> ids) {
         return listBy(sc, null);
     }
 
-    @Override
-    public Set<Long> listEncryptedVolumeIds() {
-        String selectSql = "SELECT id FROM volumes WHERE encrypt_format IS NOT NULL";
-        Set<Long> ids = new HashSet<>();
-        Connection conn = TransactionLegacy.getStandaloneConnection();
-        try {
-            PreparedStatement stmt = conn.prepareStatement(selectSql);
-            ResultSet rs = stmt.executeQuery();
-            while (rs != null && rs.next()) {
-                ids.add(rs.getLong(1));
-            }
-        } catch (SQLException ex) {
-            throw new CloudRuntimeException("Error while trying to find ids for encrypted volumes", ex);
-        }
-        return ids;
-    }
-
     @Override
     public List<VolumeVO> listAllocatedVolumesForAccountDiskOfferingIdsAndNotForVms(long accountId, List<Long> diskOfferingIds, List<Long> vmIds) {
         SearchBuilder<VolumeVO> sb = createSearchBuilder();

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

@@ -2416,7 +2416,6 @@ private Pair<List<Long>, Integer> searchForVolumeIdsAndCount(ListVolumesCmd cmd)
         Long podId = cmd.getPodId();
 
         List<Long> ids = getIdsListFromCmd(cmd.getId(), cmd.getIds());
-        checkEncrypted(cmd, ids);
 
         Ternary<Long, Boolean, ListProjectResourcesCriteria> domainIdRecursiveListProject = new Ternary<>(cmd.getDomainId(), cmd.isRecursive(), null);
         accountMgr.buildACLSearchParameters(caller, id, cmd.getAccountName(), cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, cmd.listAll(), false);
@@ -2438,6 +2437,13 @@ private Pair<List<Long>, Integer> searchForVolumeIdsAndCount(ListVolumesCmd cmd)
         volumeSearchBuilder.and("uuid", volumeSearchBuilder.entity().getUuid(), SearchCriteria.Op.NNULL);
         volumeSearchBuilder.and("instanceId", volumeSearchBuilder.entity().getInstanceId(), SearchCriteria.Op.EQ);
         volumeSearchBuilder.and("dataCenterId", volumeSearchBuilder.entity().getDataCenterId(), SearchCriteria.Op.EQ);
+        if (cmd.isEncrypted() != null) {
+            if (cmd.isEncrypted()) {
+                volumeSearchBuilder.and("encryptFormat", volumeSearchBuilder.entity().getEncryptFormat(), SearchCriteria.Op.NNULL);
+            } else {
+                volumeSearchBuilder.and("encryptFormat", volumeSearchBuilder.entity().getEncryptFormat(), SearchCriteria.Op.NULL);
+            }
+        }
 
         if (keyword != null) {
             volumeSearchBuilder.and().op("keywordName", volumeSearchBuilder.entity().getName(), SearchCriteria.Op.LIKE);
@@ -2588,20 +2594,6 @@ private Pair<List<Long>, Integer> searchForVolumeIdsAndCount(ListVolumesCmd cmd)
         return new Pair<>(vmIds, count);
     }
 
-    private void checkEncrypted(ListVolumesCmd cmd, List<Long> ids) {
-        if (Boolean.TRUE.equals(cmd.isEncrypted())) {
-            Set<Long> encs = volumeDao.listEncryptedVolumeIds();
-            if (encs.contains(cmd.getId())) {
-                return;
-            }
-            for (Long id: ids) {
-                if (! encs.contains(id)) {
-                    ids.remove(id);
-                }
-            }
-        }
-    }
-
     private boolean shouldListSystemVms(ListVolumesCmd cmd, Long callerId) {
         return Boolean.TRUE.equals(cmd.getListSystemVms()) && accountMgr.isRootAdmin(callerId);
     }