java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml | 54 ++++------ schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2 | 1 schema/spacewalk/upgrade/spacewalk-schema-0.2-to-spacewalk-schema-0.3 | 1 schema/spacewalk/upgrade/spacewalk-schema-0.3-to-spacewalk-schema-0.4 | 1 schema/spacewalk/upgrade/spacewalk-schema-0.4-to-spacewalk-schema-0.5 | 1 5 files changed, 24 insertions(+), 34 deletions(-)
New commits: commit e72832547859dd98564e6cedaf27db43b8d5d730 Author: Justin Sherrill jsherril@redhat.com Date: Wed Sep 30 12:23:40 2009 -0400
525575 - imporoving performance of system group overview query (michaels fix)
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml index 39d7ecf..b087976 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml @@ -20,36 +20,30 @@ AND SGM.server_id = CP.host_id(+) AND SGM.group_id = UMSG.server_group_id GROUP BY SGM.group_id) MONITORING_STATUS, - - - ( SELECT 1 from dual where exists - (select 1 FROM rhnErrata E, - rhnServerNeededPackageCache SNPC, - rhnServerGroupMembers SGM - WHERE E.advisory_type = 'Security Advisory' - and snpc.errata_id = e.id - and snpc.server_id = sgm.server_id - and sgm.server_group_id = G.id)) AS SECURITY_ERRATA, - - (SELECT 1 from dual where exists - (select 1 FROM rhnErrata E, - rhnServerNeededPackageCache SNPC, - rhnServerGroupMembers SGM - WHERE E.advisory_type = 'Bug Fix Advisory' - and snpc.errata_id = e.id - and snpc.server_id = sgm.server_id - and sgm.server_group_id = G.id)) AS BUG_ERRATA, - - (SELECT 1 from dual where exists - (select 1 FROM rhnErrata E, - rhnServerNeededPackageCache SNPC, - rhnServerGroupMembers SGM - WHERE E.advisory_type = 'Product Enhancement Advisory' - and snpc.errata_id = e.id - and snpc.server_id = sgm.server_id - and sgm.server_group_id = G.id)) AS ENHANCEMENT_ERRATA - - + ( select /*+first_rows*/ 1 + FROM rhnErrata E + WHERE E.advisory_type = 'Security Advisory' + and exists (select 1 from rhnServerNeededErrataCache SNPC, rhnServerGroupMembers SGM + where snpc.errata_id = e.id + and snpc.server_id = sgm.server_id + and sgm.server_group_id = 5) + and rownum = 1) AS SECURITY_ERRATA, + ( select /*+first_rows*/ 1 + FROM rhnErrata E + WHERE E.advisory_type = 'Bug Fix Advisory' + and exists (select 1 from rhnServerNeededErrataCache SNPC, rhnServerGroupMembers SGM + where snpc.errata_id = e.id + and snpc.server_id = sgm.server_id + and sgm.server_group_id = 5) + and rownum = 1) AS BUG_ERRATA, + ( select /*+first_rows*/ 1 + FROM rhnErrata E + WHERE E.advisory_type = 'Product Enhancement Advisory' + and exists (select 1 from rhnServerNeededErrataCache SNPC, rhnServerGroupMembers SGM + where snpc.errata_id = e.id + and snpc.server_id = sgm.server_id + and sgm.server_group_id = 5) + and rownum = 1) AS ENHANCEMENT_ERRATA FROM rhnServerGroup G, rhnUserManagedServerGroups UMSG WHERE G.ORG_ID = :org_id AND UMSG.user_id = :user_id diff --git a/schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2 b/schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2 deleted file mode 120000 index f612f22..0000000 --- a/schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2 +++ /dev/null @@ -1 +0,0 @@ -satellite-5.1-spacewalk-0.2 \ No newline at end of file diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.2-to-spacewalk-schema-0.3 b/schema/spacewalk/upgrade/spacewalk-schema-0.2-to-spacewalk-schema-0.3 deleted file mode 120000 index b48bb8a..0000000 --- a/schema/spacewalk/upgrade/spacewalk-schema-0.2-to-spacewalk-schema-0.3 +++ /dev/null @@ -1 +0,0 @@ -spacewalk-0.2-spacewalk-0.3 \ No newline at end of file diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.3-to-spacewalk-schema-0.4 b/schema/spacewalk/upgrade/spacewalk-schema-0.3-to-spacewalk-schema-0.4 deleted file mode 120000 index 64b32f3..0000000 --- a/schema/spacewalk/upgrade/spacewalk-schema-0.3-to-spacewalk-schema-0.4 +++ /dev/null @@ -1 +0,0 @@ -spacewalk-0.3-spacewalk-0.4 \ No newline at end of file diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.4-to-spacewalk-schema-0.5 b/schema/spacewalk/upgrade/spacewalk-schema-0.4-to-spacewalk-schema-0.5 deleted file mode 120000 index a9f7adb..0000000 --- a/schema/spacewalk/upgrade/spacewalk-schema-0.4-to-spacewalk-schema-0.5 +++ /dev/null @@ -1 +0,0 @@ -spacewalk-0.4-spacewalk-0.5 \ No newline at end of file
spacewalk-commits@lists.fedorahosted.org