Sahina Bose has uploaded a new change for review. Change subject: gluster: Change sp name for hook content read ......................................................................
gluster: Change sp name for hook content read There's an issue with using same procedure with different row mappers. The procedure name - row mapper is cached and causes exception. So changed code to use different procedure for getting hook content Change-Id: Icd3c74bea322edf636fd166eb93785eceec0ed57 Signed-off-by: Sahina Bose <[email protected]> --- M backend/manager/dbscripts/gluster_hooks_sp.sql M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterHooksDaoDbFacadeImpl.java 2 files changed, 12 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/32/14832/1 diff --git a/backend/manager/dbscripts/gluster_hooks_sp.sql b/backend/manager/dbscripts/gluster_hooks_sp.sql index 251fea9..5b067e5 100644 --- a/backend/manager/dbscripts/gluster_hooks_sp.sql +++ b/backend/manager/dbscripts/gluster_hooks_sp.sql @@ -44,6 +44,15 @@ END; $procedure$ LANGUAGE plpgsql; +Create or replace FUNCTION GetGlusterHookContentById(v_id UUID) +RETURNS SETOF text +AS $procedure$ +BEGIN + RETURN QUERY SELECT content + FROM gluster_hooks + WHERE id = v_id; +END; $procedure$ +LANGUAGE plpgsql; Create or replace FUNCTION GetGlusterHooksByClusterId(v_cluster_id UUID) RETURNS SETOF gluster_hooks diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterHooksDaoDbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterHooksDaoDbFacadeImpl.java index cbb2d49..8d33aec 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterHooksDaoDbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterHooksDaoDbFacadeImpl.java @@ -100,9 +100,8 @@ @Override public String getGlusterHookContent(Guid hookId) { - String content = getCallsHandler().executeRead("GetGlusterHookById", GlusterHookContentRowMapper, - createIdParameterMapper(hookId) - .addValue("includeContent", true)); + String content = getCallsHandler().executeRead("GetGlusterHookContentById", GlusterHookContentRowMapper, + createIdParameterMapper(hookId)); return content; } @@ -255,7 +254,7 @@ @Override public String mapRow(ResultSet rs, int rowNum) throws SQLException { - String content = rs.getString("content"); + String content = rs.getString(1); return content; } } -- To view, visit http://gerrit.ovirt.org/14832 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icd3c74bea322edf636fd166eb93785eceec0ed57 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sahina Bose <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
