Liran Zelkha has uploaded a new change for review. Change subject: core: Remove usage of dynamic queries from the Backend ......................................................................
core: Remove usage of dynamic queries from the Backend Dynamic queries are not optimized, and should only be used for UI search. This patch will remove usage of dynamic queries from the backend. Change-Id: I3df981a958fae36edd6ecf3cb2bb47b94b2c446a Bug-Url: https://bugzilla.redhat.com/1061175 Signed-off-by: [email protected] <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplatesByStoragePoolIdQuery.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java 2 files changed, 10 insertions(+), 18 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/10/24310/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplatesByStoragePoolIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplatesByStoragePoolIdQuery.java index bf40ea3..3dea9bd 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplatesByStoragePoolIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplatesByStoragePoolIdQuery.java @@ -20,23 +20,15 @@ @Override protected void executeQueryCommand() { StoragePool pool = DbFacade.getInstance().getStoragePoolDao().get(getParameters().getId()); - SearchParameters p = new SearchParameters(String.format("Templates: DataCenter = %1$s", pool.getName()), - SearchType.VmTemplate); - p.setMaxCount(Integer.MAX_VALUE); - VdcQueryReturnValue returnValue = Backend.getInstance().runInternalQuery(VdcQueryType.Search, p); - - if (returnValue != null && returnValue.getSucceeded()) { - List<VmTemplate> templateList = returnValue.getReturnValue(); - // Load VmInit - for(VmTemplate template: templateList) { - VmHandler.updateVmInitFromDB(template, true); - } - VmTemplate blank = DbFacade.getInstance().getVmTemplateDao() - .get(VmTemplateHandler.BLANK_VM_TEMPLATE_ID); - if (!templateList.contains(blank)) { - templateList.add(0, blank); - } - getQueryReturnValue().setReturnValue(templateList); + List<VmTemplate> templateList = DbFacade.getInstance().getVmTemplateDao().getAllForStorageDomain(pool.getId()); + for (VmTemplate template : templateList) { + VmHandler.updateVmInitFromDB(template, true); } + VmTemplate blank = DbFacade.getInstance().getVmTemplateDao() + .get(VmTemplateHandler.BLANK_VM_TEMPLATE_ID); + if (!templateList.contains(blank)) { + templateList.add(0, blank); + } + getQueryReturnValue().setReturnValue(templateList); } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java index 3dc50bc..38b48ae 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java @@ -171,7 +171,7 @@ GetAuditLogById, // Search queries - Search, + // Search, // Public services GetDomainList(VdcQueryAuthType.User), -- To view, visit http://gerrit.ovirt.org/24310 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3df981a958fae36edd6ecf3cb2bb47b94b2c446a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liran Zelkha <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
