java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml | 8 --
java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 24 -------
java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml | 18 -----
java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml | 10 ---
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 33
----------
java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 4 -
java/code/src/com/redhat/rhn/common/db/datasource/xml/User_queries.xml | 11 ---
java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml | 31
---------
8 files changed, 3 insertions(+), 136 deletions(-)
New commits:
commit 9e24dd32583426fbf38de6eeb74e57076d80a56b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 26 14:32:01 2010 +0100
comment unused query in Task_queries
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
index e297fa2..603d2f7 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
@@ -299,6 +299,7 @@ SELECT id, channel_label, client, reason, force, bypass_filters,
next_action
</write-mode>
<!-- timings: webdev: 6m (2 records), webqa: 1m 58s (3), prod: 3m 32s (697) -->
+<!--
<mode name="summarypop_awol_server_in_orgs"
class="com.redhat.rhn.frontend.dto.OrgIdWrapper">
<query params="checkin_threshold">
@@ -313,8 +314,9 @@ where sgt.label in ('enterprise_entitled',
'provisioning_entitled')
and (current_timestamp + numtodsinterval(1 + :checkin_threshold, 'day')
</query>
</mode>
-
+-->
<!-- timings: webdev: 3m 36s (2), webqa: 11s (3), prod: 3m 21s(697) -->
+
<mode name="summarypop_awol_server_in_orgs2"
class="com.redhat.rhn.frontend.dto.OrgIdWrapper">
<query params="checkin_threshold">
commit a3cb4dc36fb02425be96f6911b81de63f17e17b5
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 26 14:28:10 2010 +0100
remove dead queries from User_queries
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/User_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/User_queries.xml
index 28a2757..9b69f56 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/User_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/User_queries.xml
@@ -298,17 +298,6 @@ SELECT system_group_id
</callable-mode>
<!-- The Following two procedures are managed by the web team, we simply call them
-->
-<callable-mode name="disable_user">
- <query params="victim_id, admin_id">
- { call web_disable_user_pkg.disable_user(:victim_id, :admin_id) }
- </query>
-</callable-mode>
-
-<callable-mode name="enable_user">
- <query params="victim_id, admin_id">
- { call web_disable_user_pkg.reenable_user(:victim_id, :admin_id) }
- </query>
-</callable-mode>
<mode name="user_count">
<query params="">
commit aa311435f51940de3a9a55cf907d63aec110e43a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 26 14:23:24 2010 +0100
remove dead queries from test_queries
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml
index 542b93f..30b6efb 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml
@@ -175,14 +175,6 @@ update rhnServerGroup set group_type = :type_id where id = :sgid
</query>
</callable-mode>
-<mode name="date_test">
- <query>
-SELECT u.username as USERNAME, u.user_id as USER_ID, u.created as CREATED
- FROM all_users u
- WHERE u.username='SYS'
- </query>
-</mode>
-
<mode name="date_dto_test"
class="com.redhat.rhn.common.db.datasource.test.TestDateDto">
<query>
SELECT u.created as CREATED
@@ -373,22 +365,6 @@ SELECT *
</query>
</mode>
-<write-mode name="insert_into_notifications">
- <query params="id, org_id, contact_email_address">
-INSERT
- INTO web_customer_notification
-VALUES (:id, :org_id, :contact_email_address, sysdate)
- </query>
-</write-mode>
-
-<mode name="get_user_notification">
- <query params="id">
-SELECT *
- FROM web_customer_notification
- WHERE id = :id
- </query>
-</mode>
-
<mode name="get_daily_summary_queue">
<query params="">
SELECT * FROM rhnSummaryQueue
@@ -429,13 +405,6 @@ SELECT * from rhntransactionpackage where
</query>
</mode>
-<mode name="select_virtual_instance">
- <query params="sid">
-SELECT * FROM rhnVirtualInstance WHERE virtual_system_id = :sid OR
- host_system_id = :sid
- </query>
-</mode>
-
<mode name="select_virtual_instance_by_id">
<query params="id">
SELECT * FROM rhnVirtualInstance WHERE id = :id
commit b2e3f9c61943ec76c1269c2a09c07921d0e93b82
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 26 14:01:23 2010 +0100
remove dead queries from System_queries
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index 7661932..370d65c 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -672,13 +672,6 @@ SELECT DISTINCT SP.server_id id,
</elaborator>
</mode>
-<write-mode name="insert_ssm_remove_server_package">
- <query params="user_id, name_id, evr_id, arch_id">
- INSERT INTO rhnSsmSystemPackages (user_id, name_id, evr_id, arch_id)
- VALUES (:user_id, :name_id, :evr_id, :arch_id)
- </query>
-</write-mode>
-
<mode name="out_of_date"
class="com.redhat.rhn.frontend.dto.SystemOverview">
<query params="org_id, user_id">
select * from (
@@ -1527,19 +1520,6 @@ SELECT 1
</query>
</mode>
-<write-mode name="delete_proxy_info">
- <query params="server_id">
-delete from rhnProxyInfo where server_id = :server_id
- </query>
-</write-mode>
-
-<write-mode name="insert_proxy_info">
- <query params="server_id, version">
-INSERT INTO rhnProxyInfo (server_id, proxy_evr_id)
- VALUES (:server_id, lookup_evr(NULL, :version, '1'))
- </query>
-</write-mode>
-
<callable-mode name="entitle_server">
<query params="sid, entitlement">
{call rhn_entitlements.entitle_server(:sid, :entitlement)}
@@ -1558,19 +1538,6 @@ INSERT INTO rhnProxyInfo (server_id, proxy_evr_id)
</query>
</callable-mode>
-<write-mode name="insert_satellite_info">
- <query params="sid, product, owner, issued_string,
expiration_string,version">
-INSERT INTO rhnSatelliteInfo (server_id, cert, product, owner, issued_string,
expiration_string, evr_id)
- VALUES (:sid, EMPTY_BLOB(), :product, :owner, :issued_string, :expiration_string,
lookup_evr(NULL, :version, '1'))
- </query>
-</write-mode>
-
-<write-mode name="delete_satellite_info">
- <query params="sid">
-DELETE FROM rhnSatelliteInfo WHERE server_id = :sid
- </query>
-</write-mode>
-
<callable-mode name="remove_from_action">
<query params="server_id, action_id">
{call rhn_server.remove_action(:server_id, :action_id)}
commit 703ac99a43cfd011b3dc453797e898a6f70fefad
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 26 13:48:57 2010 +0100
remove dead query from Org_queries
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml
index 86ef47e..3789f39 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml
@@ -145,16 +145,6 @@ AND sg.org_id != 1
</query>
</mode>
-<mode name="get_used_org_counts">
- <query params="label">
- SELECT COUNT(sg.org_id) as orgsused
- FROM rhnServerGroup sg, rhnServerGroupMembers sgm, rhnServerGroupType sgt
- WHERE sg.GROUP_TYPE = sgt.id
- AND sgm.SERVER_GROUP_ID = sg.id
- AND sgt.label = :label
- </query>
-</mode>
-
<callable-mode name="delete_organization">
<query params="org_id">
{call rhn_org.delete_org(:org_id)}
commit 62d3bbe5552e59981629a72a6e09f0fc8ffb24d8
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 26 13:48:16 2010 +0100
remove dead queries from General_queries
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
index b73b9b6..6f6be26 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
@@ -275,24 +275,6 @@ ORDER BY KTZ.name
</query>
</mode>
-<write-mode name="insert_set_for_label">
- <query params="user_id, label, element, element_two">
- INSERT
- INTO rhnSet
- (user_id, label, element, element_two)
- VALUES (:user_id, :label, :element, :element_two)
- </query>
-</write-mode>
-
-<write-mode name="delete_set_for_label">
- <query params="user_id, label">
- DELETE
- FROM rhnSet
- WHERE user_id = :user_id
- AND label = :label
- </query>
-</write-mode>
-
<write-mode name="update_current_alerts_date_completed">
<query>
UPDATE rhn_current_alerts
commit 80f65c260da01ee48c52f55d9f922d9d71cb610d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 26 13:42:52 2010 +0100
remove dead queries from Channel_queries
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
index 52ec500..dff7094 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
@@ -862,25 +862,6 @@ ORDER BY UPPER(C.name)
</query>
</callable-mode>
-<write-mode name="flag_server_channels_changed">
- <query params="server_id">
- UPDATE rhnServer SET channels_changed = sysdate WHERE id = :server_id
- </query>
-</write-mode>
-
-<write-mode name="log_channel_history">
- <query params="server_id, channel_id, channel_label, message">
- INSERT INTO rhnServerHistory (id, server_id, summary, details) (
- SELECT rhn_event_id_seq.nextval,
- :server_id,
- :message,
- :channel_label
- FROM rhnChannel c
- WHERE c.id = :channel_id
- )
- </query>
-</write-mode>
-
<callable-mode name="unsubscribe_server_from_channel">
<query params="server_id, channel_id">
{call rhn_channel.unsubscribe_server(:server_id, :channel_id)}
@@ -1185,10 +1166,5 @@ END;
ORDER BY parent, name
</query>
</mode>
-<callable-mode name="can_convert_to_flex">
- <query params="result, sid, cfid">
- {:result = call rhn_channel.convert_to_fve(:sid, :cfid)}
- </query>
-</callable-mode>
</datasource_modes>
commit c4a0d1a18d8a244a64287918eeca0c9ed9f339e8
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 26 13:36:43 2010 +0100
remove dead query from Action_queries
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml
index ee0de64..be03a6d 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml
@@ -263,14 +263,6 @@ UPDATE rhnAction
</query>
</write-mode>
-<write-mode name="cancel_actions">
- <query params="server_id, action_id">
-BEGIN
- rhn_server.remove_action(:server_id, :action_id);
-END;
- </query>
-</write-mode>
-
<write-mode name="schedule_action">
<query params="action_id, name_id, evr_id, arch_id">
INSERT INTO rhnActionPackage (id, action_id, name_id, evr_id, package_arch_id)