Hello Omer Frenkel,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/13271
to review the following change.
Change subject: make search for image_type with views
......................................................................
make search for image_type with views
Change-Id: Ie027709a0af08af3cf243d54d63322272e59ddfe
Signed-off-by: Omer Frenkel <[email protected]>
---
M backend/manager/dbscripts/create_views.sql
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ImageType.java
M
backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java
M
backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java
4 files changed, 13 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/71/13271/1
diff --git a/backend/manager/dbscripts/create_views.sql
b/backend/manager/dbscripts/create_views.sql
index d26faa1..49fdbbb 100644
--- a/backend/manager/dbscripts/create_views.sql
+++ b/backend/manager/dbscripts/create_views.sql
@@ -396,10 +396,6 @@
INNER JOIN vm_device vd ON vd.vm_id = vm_templates_view.vmt_guid
INNER JOIN images ON images.image_group_id = vd.device_id AND images.active =
TRUE;
-
-
-
-
CREATE OR REPLACE VIEW vm_templates_storage_domain
AS
SELECT vm_templates.vm_guid AS vmt_guid,
vm_templates.vm_name AS name, vm_templates.mem_size_mb,
@@ -444,6 +440,15 @@
WHERE entity_type = 'TEMPLATE' OR entity_type =
'INSTANCE_TYPE' OR entity_type = 'IMAGE_TYPE';
+CREATE OR REPLACE VIEW image_types_view
+AS
+ SELECT * from vm_templates_view where entity_type = 'IMAGE_TYPE';
+
+CREATE OR REPLACE VIEW image_types_storage_domain
+AS
+ SELECT * from vm_templates_storage_domain where entity_type =
'IMAGE_TYPE';
+
+
CREATE OR REPLACE VIEW vm_pool_map_view
AS
SELECT
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ImageType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ImageType.java
index 8123ec3..1bd229b 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ImageType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ImageType.java
@@ -2,7 +2,7 @@
import org.ovirt.engine.core.compat.Guid;
-public interface ImageType extends BusinessEntity<Guid> {
+public interface ImageType extends BusinessEntity<Guid> {
String getName();
void setName(String value);
diff --git
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java
index 266cf12..ccf550e 100644
---
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java
+++
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java
@@ -197,8 +197,8 @@
"name ASC "));
put(SearchObjects.IMAGE_TYPE_OBJ_NAME, new
EntitySearchInfo(new TemplateCrossRefAutoCompleter(),
new VmTemplateConditionFieldAutoCompleter(),
- "vm_templates_view",
- "vm_templates_storage_domain",
+ "image_types_view",
+ "image_types_storage_domain",
"vmt_guid",
"name ASC "));
put(SearchObjects.VDC_USER_OBJ_NAME, new
EntitySearchInfo(new UserCrossRefAutoCompleter(),
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 92d61f7..6730ce8 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
@@ -811,7 +811,7 @@
if
(SearchObjects.INSTANCE_TYPE_OBJ_NAME.equals(syntax.getObjSingularName(searchObjStr)))
{
specialWhere = "entity_type = 'INSTANCE_TYPE'";
} else if
(SearchObjects.IMAGE_TYPE_OBJ_NAME.equals(syntax.getObjSingularName(searchObjStr)))
{
- specialWhere = "entity_type = 'IMAGE_TYPE'";
+ //specialWhere = "entity_type = 'IMAGE_TYPE'";
}
while (objIter.hasNext()) {
--
To view, visit http://gerrit.ovirt.org/13271
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie027709a0af08af3cf243d54d63322272e59ddfe
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tomas Jelinek <[email protected]>
Gerrit-Reviewer: Omer Frenkel <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
