Liran Zelkha has uploaded a new change for review. Change subject: core: Fix vm_pools dynamic query ......................................................................
core: Fix vm_pools dynamic query This fix will improve the dynamic query behavior when querying from vm_pool based on primary key query. Change-Id: I1f91cf3986e6f981e66b5ffd11b478fc1e724a4a Bug-Url: https://bugzilla.redhat.com/1064312 Signed-off-by: lzel...@redhat.com <lzel...@redhat.com> --- M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java M backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerTest.java 2 files changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/15/24615/1 diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java index f1f8d34..0e41497 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java @@ -915,7 +915,7 @@ tableNameWithOutTags, primeryKey, syntax.getSearchFrom(), innerQuery); } - } else if (primeryKey.equals("vmt_guid") && wherePhrase.length() == 0) { + } else if ((primeryKey.equals("vmt_guid") || primeryKey.equals("vm_pool_id")) && wherePhrase.length() == 0) { inQuery = StringFormat .format("(SELECT * FROM %1$s ", tableNameWithOutTags); diff --git a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerTest.java b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerTest.java index 4a4cb4c..575ba44 100644 --- a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerTest.java +++ b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerTest.java @@ -123,4 +123,19 @@ "SELECT * FROM ((SELECT * FROM vm_templates_view ) ORDER BY name ASC ) as T1 OFFSET (1 -1) LIMIT 0", query); } + + @Test + public void testVmPools() { + SyntaxChecker chkr = new SyntaxChecker(100); + + ISyntaxChecker curSyntaxChecker = SyntaxCheckerFactory.createBackendSyntaxChecker("foo"); + + SyntaxContainer res = curSyntaxChecker.analyzeSyntaxState("Pools: ", true); + + String query = chkr.generateQueryFromSyntaxContainer(res, true); + + Assert.assertEquals( + "SELECT * FROM ((SELECT * FROM vm_pools_full_view ) ORDER BY vm_pool_name ASC ) as T1 OFFSET (1 -1) LIMIT 0", + query); + } } -- To view, visit http://gerrit.ovirt.org/24615 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1f91cf3986e6f981e66b5ffd11b478fc1e724a4a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Liran Zelkha <lzel...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
