Allon Mureinik has uploaded a new change for review.
Change subject: core: Remove GetTagVdsMapByTagNameQuery
......................................................................
core: Remove GetTagVdsMapByTagNameQuery
GetTagVdsMapByTagNameQuery not used anywhere in the code.
This patch removes it, its parameter class
(GetTagVdsByTagNameParameters), the corresponding
VdcQueryType constant, the DAO method only it used to use, the
corresponding test for the DAO and the corresponding stored procedure.
Change-Id: Ib54ee7c2974cc049e326e04893909fc0862a0ab5
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M backend/manager/dbscripts/tags_sp.sql
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagVdsMapByTagNameQuery.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTagVdsMapByTagNameParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAO.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/TagDAOTest.java
7 files changed, 0 insertions(+), 74 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/12600/1
diff --git a/backend/manager/dbscripts/tags_sp.sql
b/backend/manager/dbscripts/tags_sp.sql
index cb546ae..16b71b9 100644
--- a/backend/manager/dbscripts/tags_sp.sql
+++ b/backend/manager/dbscripts/tags_sp.sql
@@ -345,18 +345,6 @@
-Create or replace FUNCTION Gettags_vds_mapByTagName(v_tag_name VARCHAR(50))
RETURNS SETOF tags_vds_map_view
- AS $procedure$
-BEGIN
- RETURN QUERY SELECT tags_vds_map_view.*
- FROM tags_vds_map_view
- WHERE tag_name = v_tag_name;
-END; $procedure$
-LANGUAGE plpgsql;
-
-
-
-
Create or replace FUNCTION GetTagsByVdsId(v_vds_ids VARCHAR(4000)) RETURNS
SETOF tags_vds_map_view
AS $procedure$
BEGIN
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagVdsMapByTagNameQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagVdsMapByTagNameQuery.java
deleted file mode 100644
index 0a8cd8b..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagVdsMapByTagNameQuery.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import org.ovirt.engine.core.common.queries.GetTagVdsMapByTagNameParameters;
-import org.ovirt.engine.core.dal.dbbroker.DbFacade;
-
-// NOT IN USE
-public class GetTagVdsMapByTagNameQuery<P extends
GetTagVdsMapByTagNameParameters> extends QueriesCommandBase<P> {
- public GetTagVdsMapByTagNameQuery(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void executeQueryCommand() {
- getQueryReturnValue().
-
setReturnValue(DbFacade.getInstance().getTagDao().getTagVdsMapByTagName(getParameters().getTagName()));
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTagVdsMapByTagNameParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTagVdsMapByTagNameParameters.java
deleted file mode 100644
index 8adaa25..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTagVdsMapByTagNameParameters.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-public class GetTagVdsMapByTagNameParameters extends
GetTagByTagNameParametersBase {
- private static final long serialVersionUID = -2896819836634242313L;
-
- public GetTagVdsMapByTagNameParameters(String tagName) {
- super(tagName);
- }
-
- public GetTagVdsMapByTagNameParameters() {
- }
-}
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 3fc282a..c95256e 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
@@ -135,7 +135,6 @@
GetTagsByUserId,
GetTagsByVmId,
GetTagsByVdsId,
- GetTagVdsMapByTagName,
GetTagIdsAndChildrenIdsByRegExp,
GetTagIdAndChildrenIds,
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAO.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAO.java
index d9224e9..bc861e5 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAO.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAO.java
@@ -174,8 +174,6 @@
void detachVdsFromTag(Guid tagId, Guid vdsId);
- List<TagsVdsMap> getTagVdsMapByTagName(String tagName);
-
TagsVmMap getTagVmByTagIdAndByVmId(Guid tagId, Guid vmId);
void attachVmToTag(TagsVmMap tagVmMap);
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAODbFacadeImpl.java
index d2515f4..467dc48 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAODbFacadeImpl.java
@@ -332,25 +332,6 @@
.executeModification("Deletetags_vds_map", parameterSource);
}
- @SuppressWarnings("unchecked")
- @Override
- public List<TagsVdsMap> getTagVdsMapByTagName(String tagName) {
- MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("tag_name", tagName);
-
- ParameterizedRowMapper<TagsVdsMap> mapper = new
ParameterizedRowMapper<TagsVdsMap>() {
- @Override
- public TagsVdsMap mapRow(ResultSet rs, int rowNum) throws
SQLException {
- TagsVdsMap entity = new TagsVdsMap();
-
entity.settag_id(Guid.createGuidFromString(rs.getString("tag_id")));
-
entity.setvds_id(Guid.createGuidFromString(rs.getString("vds_id")));
- return entity;
- }
- };
-
- return getCallsHandler()
- .executeReadList("Gettags_vds_mapByTagName", mapper,
parameterSource);
- }
-
@Override
public TagsVmMap getTagVmByTagIdAndByVmId(Guid tagId, Guid vmId) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("tag_id", tagId).addValue(
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/TagDAOTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/TagDAOTest.java
index e041a14..8ce7099 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/TagDAOTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/TagDAOTest.java
@@ -414,17 +414,6 @@
}
@Test
- public void testGetTagVdsMapByTagName() {
- List<TagsVdsMap> result =
dao.getTagVdsMapByTagName(existingTag.gettag_name());
-
- assertNotNull(result);
- assertFalse(result.isEmpty());
- for (TagsVdsMap mapping : result) {
- assertEquals(existingTag.gettag_id(), mapping.gettag_id());
- }
- }
-
- @Test
public void testGetTagVmMapByTag() {
TagsVmMap result =
dao.getTagVmByTagIdAndByVmId(existingVmTag.gettag_id(),
existingVmTag.getvm_id());
--
To view, visit http://gerrit.ovirt.org/12600
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib54ee7c2974cc049e326e04893909fc0862a0ab5
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
