2 commits - schema/spacewalk
by Jan Pazdziora
schema/spacewalk/postgres/triggers/rhnKickstartableTree.sql | 21 ++++++------
1 file changed, 11 insertions(+), 10 deletions(-)
New commits:
commit 6746cbdb36e75b36ac05ab02eba9eb60330c30ee
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Oct 22 16:57:15 2010 +0200
We cannot touch old if tg_op is INSERT.
Addressing
record "old" is not assigned yet
DETAIL: The tuple structure of a not-yet-assigned record is indeterminate.
CONTEXT: PL/pgSQL function "rhn_kstree_mod_trig_fun" line 2 at IF
diff --git a/schema/spacewalk/postgres/triggers/rhnKickstartableTree.sql b/schema/spacewalk/postgres/triggers/rhnKickstartableTree.sql
index 7ba6c08..42c3fd3 100644
--- a/schema/spacewalk/postgres/triggers/rhnKickstartableTree.sql
+++ b/schema/spacewalk/postgres/triggers/rhnKickstartableTree.sql
@@ -18,13 +18,14 @@
create or replace function rhn_kstree_mod_trig_fun() returns trigger as
$$
begin
- if tg_op='UPDATE' and (
- new.cobbler_id = old.cobbler_id and
- new.cobbler_xen_id = old.cobbler_xen_id and
- new.last_modified = old.last_modified or
- new.last_modified is null
- ) then
- new.last_modified := current_timestamp;
+ if tg_op='UPDATE' then
+ if new.cobbler_id = old.cobbler_id
+ and new.cobbler_xen_id = old.cobbler_xen_id
+ and new.last_modified = old.last_modified
+ or new.last_modified is null
+ then
+ new.last_modified := current_timestamp;
+ end if;
elseif tg_op='INSERT' and new.last_modified is null then
new.last_modified := current_timestamp;
end if;
commit 41cd07357dbda4828f2880315939633ef751133e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Oct 22 16:56:23 2010 +0200
Use uniform eight character indents; clean trailing blanks.
diff --git a/schema/spacewalk/postgres/triggers/rhnKickstartableTree.sql b/schema/spacewalk/postgres/triggers/rhnKickstartableTree.sql
index dbeca40..7ba6c08 100644
--- a/schema/spacewalk/postgres/triggers/rhnKickstartableTree.sql
+++ b/schema/spacewalk/postgres/triggers/rhnKickstartableTree.sql
@@ -9,24 +9,24 @@
-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-- along with this software; if not, see
-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
---
+--
-- Red Hat trademarks are not licensed under GPLv2. No permission is
-- granted to use or replicate Red Hat trademarks that are incorporated
--- in this software or its documentation.
+-- in this software or its documentation.
--
create or replace function rhn_kstree_mod_trig_fun() returns trigger as
$$
begin
if tg_op='UPDATE' and (
- new.cobbler_id = old.cobbler_id and
- new.cobbler_xen_id = old.cobbler_xen_id and
- new.last_modified = old.last_modified or
- new.last_modified is null
- ) then
- new.last_modified := current_timestamp;
+ new.cobbler_id = old.cobbler_id and
+ new.cobbler_xen_id = old.cobbler_xen_id and
+ new.last_modified = old.last_modified or
+ new.last_modified is null
+ ) then
+ new.last_modified := current_timestamp;
elseif tg_op='INSERT' and new.last_modified is null then
- new.last_modified := current_timestamp;
+ new.last_modified := current_timestamp;
end if;
new.modified := current_timestamp;
13 years, 7 months
Changes to 'refs/tags/spacewalk-schema-1.2.50-1'
by Michael Mraka
Tag 'spacewalk-schema-1.2.50-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-10-22 12:26 +0000
Tagging package [spacewalk-schema] version [1.2.50-1] in directory [schema/spacewalk/].
Changes since spacewalk-setup-1.2.12-1:
Michael Mraka (28):
reviewed rhnErrataNotificationQueue indexes
reviewed rhnErrataPackage indexes
reviewed rhnErrataPackageTmp indexes
reviewed rhnKickstartPreserveFileList indexes
reviewed rhnPackageArch indexes
reviewed rhnPackageFile indexes
reviewed rhnPrivateChannelFamily indexes
reviewed rhnSGTypeVirtSubLevel indexes
reviewed rhnSatelliteChannelFamily indexes
reviewed rhnServerAction indexes
reviewed rhnServerArch indexes
reviewed rhnServerChannel indexes
reviewed rhnServerChannelArchCompat indexes
reviewed rhnServerCustomDataValue indexes
reviewed rhnServerGroup indexes
reviewed rhnServerGroupMembers indexes
reviewed rhnServerNeededCache indexes
rhnPrivateErrataMail is unused; dropping
reviewed rhnServerPackageArchCompat indexes
reviewed rhnServerPreserveFileList indexes
reviewed rhnServerServerGroupArchCompat indexes
reviewed rhnServerTokenRegs indexes
reviewed rhnSnapshotConfigChannel indexes
reviewed rhnSnapshotConfigRevision indexes
reviewed rhnSnapshotTag indexes
reviewed rhnSolarisPatchPackages indexes
reviewed rhnSolarisPatchSetMembers indexes
Automatic commit of package [spacewalk-schema] release [1.2.50-1].
---
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/common/tables/rhnErrataNotificationQueue.sql | 8
schema/spacewalk/common/tables/rhnErrataPackage.sql | 4
schema/spacewalk/common/tables/rhnErrataPackageTmp.sql | 4
schema/spacewalk/common/tables/rhnKickstartPreserveFileList.sql | 4
schema/spacewalk/common/tables/rhnPackageArch.sql | 4
schema/spacewalk/common/tables/rhnPackageFile.sql | 4
schema/spacewalk/common/tables/rhnPrivateChannelFamily.sql | 4
schema/spacewalk/common/tables/rhnSGTypeVirtSubLevel.sql | 4
schema/spacewalk/common/tables/rhnSatelliteChannelFamily.sql | 4
schema/spacewalk/common/tables/rhnServerAction.sql | 4
schema/spacewalk/common/tables/rhnServerArch.sql | 4
schema/spacewalk/common/tables/rhnServerChannel.sql | 4
schema/spacewalk/common/tables/rhnServerChannelArchCompat.sql | 4
schema/spacewalk/common/tables/rhnServerCustomDataValue.sql | 4
schema/spacewalk/common/tables/rhnServerGroup.sql | 10
schema/spacewalk/common/tables/rhnServerGroupMembers.sql | 4
schema/spacewalk/common/tables/rhnServerNeededCache.sql | 6
schema/spacewalk/common/tables/rhnServerPackageArchCompat.sql | 4
schema/spacewalk/common/tables/rhnServerPreserveFileList.sql | 4
schema/spacewalk/common/tables/rhnServerServerGroupArchCompat.sql | 4
schema/spacewalk/common/tables/rhnServerTokenRegs.sql | 4
schema/spacewalk/common/tables/rhnSnapshotConfigChannel.sql | 4
schema/spacewalk/common/tables/rhnSnapshotConfigRevision.sql | 4
schema/spacewalk/common/tables/rhnSnapshotTag.sql | 7
schema/spacewalk/common/tables/rhnSolarisPatchPackages.sql | 4
schema/spacewalk/common/tables/rhnSolarisPatchSetMembers.sql | 4
schema/spacewalk/common/views/rhnPrivateErrataMail.sql | 108 ----------
schema/spacewalk/common/views/views.deps | 2
schema/spacewalk/spacewalk-schema.spec | 6
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/239-rhnErrataNotificationQueue-indexes.sql | 10
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/240-rhnErrataPackage-indexes.sql | 5
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/241-rhnErrataPackageTmp-indexes.sql | 5
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/242-rhnKickstartPreserveFileList-indexes.sql | 4
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/243-rhnPackageArch-indexes.sql | 5
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/244-rhnPackageFile-indexes.sql | 5
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/245-rhnPrivateChannelFamily-indexes.sql | 5
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/246-rhnSGTypeVirtSubLevel-indexes.sql | 4
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/247-rhnSatelliteChannelFamily-indexes.sql | 4
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/248-rhnServerAction-indexes.sql | 5
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/249-rhnServerArch-indexes.sql | 5
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/250-rhnServerChannel-indexes.sql | 5
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/251-rhnServerChannelArchCompat-indexes.sql | 4
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/252-rhnServerCustomDataValue-indexes.sql | 3
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/253-rhnServerGroup-indexes.sql | 2
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/254-rhnServerGroupMembers-indexes.sql | 5
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/255-rhnServerNeededCache-indexes.sql | 1
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/256-rhnServerPackageArchCompat-indexes.sql | 4
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/257-rhnServerPreserveFileList-indexes.sql | 4
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/258-rhnServerServerGroupArchCompat-indexes.sql | 5
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/259-rhnServerTokenRegs-indexes.sql | 5
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/260-rhnSnapshotConfigChannel-indexes.sql | 4
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/261-rhnSnapshotConfigRevision-indexes.sql | 4
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/262-rhnSnapshotTag-indexes.sql | 5
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/263-rhnSolarisPatchPackages-indexes.sql | 3
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/264-rhnSolarisPatchSetMembers-indexes.sql | 4
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/531-rhnPrivateErrataMail-drop.sql | 1
57 files changed, 166 insertions(+), 187 deletions(-)
---
13 years, 7 months
28 commits - rel-eng/packages schema/spacewalk
by Michael Mraka
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/common/tables/rhnErrataNotificationQueue.sql | 8
schema/spacewalk/common/tables/rhnErrataPackage.sql | 4
schema/spacewalk/common/tables/rhnErrataPackageTmp.sql | 4
schema/spacewalk/common/tables/rhnKickstartPreserveFileList.sql | 4
schema/spacewalk/common/tables/rhnPackageArch.sql | 4
schema/spacewalk/common/tables/rhnPackageFile.sql | 4
schema/spacewalk/common/tables/rhnPrivateChannelFamily.sql | 4
schema/spacewalk/common/tables/rhnSGTypeVirtSubLevel.sql | 4
schema/spacewalk/common/tables/rhnSatelliteChannelFamily.sql | 4
schema/spacewalk/common/tables/rhnServerAction.sql | 4
schema/spacewalk/common/tables/rhnServerArch.sql | 4
schema/spacewalk/common/tables/rhnServerChannel.sql | 4
schema/spacewalk/common/tables/rhnServerChannelArchCompat.sql | 4
schema/spacewalk/common/tables/rhnServerCustomDataValue.sql | 4
schema/spacewalk/common/tables/rhnServerGroup.sql | 10
schema/spacewalk/common/tables/rhnServerGroupMembers.sql | 4
schema/spacewalk/common/tables/rhnServerNeededCache.sql | 6
schema/spacewalk/common/tables/rhnServerPackageArchCompat.sql | 4
schema/spacewalk/common/tables/rhnServerPreserveFileList.sql | 4
schema/spacewalk/common/tables/rhnServerServerGroupArchCompat.sql | 4
schema/spacewalk/common/tables/rhnServerTokenRegs.sql | 4
schema/spacewalk/common/tables/rhnSnapshotConfigChannel.sql | 4
schema/spacewalk/common/tables/rhnSnapshotConfigRevision.sql | 4
schema/spacewalk/common/tables/rhnSnapshotTag.sql | 7
schema/spacewalk/common/tables/rhnSolarisPatchPackages.sql | 4
schema/spacewalk/common/tables/rhnSolarisPatchSetMembers.sql | 4
schema/spacewalk/common/views/rhnPrivateErrataMail.sql | 108 ----------
schema/spacewalk/common/views/views.deps | 2
schema/spacewalk/spacewalk-schema.spec | 6
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/239-rhnErrataNotificationQueue-indexes.sql | 10
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/240-rhnErrataPackage-indexes.sql | 5
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/241-rhnErrataPackageTmp-indexes.sql | 5
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/242-rhnKickstartPreserveFileList-indexes.sql | 4
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/243-rhnPackageArch-indexes.sql | 5
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/244-rhnPackageFile-indexes.sql | 5
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/245-rhnPrivateChannelFamily-indexes.sql | 5
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/246-rhnSGTypeVirtSubLevel-indexes.sql | 4
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/247-rhnSatelliteChannelFamily-indexes.sql | 4
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/248-rhnServerAction-indexes.sql | 5
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/249-rhnServerArch-indexes.sql | 5
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/250-rhnServerChannel-indexes.sql | 5
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/251-rhnServerChannelArchCompat-indexes.sql | 4
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/252-rhnServerCustomDataValue-indexes.sql | 3
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/253-rhnServerGroup-indexes.sql | 2
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/254-rhnServerGroupMembers-indexes.sql | 5
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/255-rhnServerNeededCache-indexes.sql | 1
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/256-rhnServerPackageArchCompat-indexes.sql | 4
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/257-rhnServerPreserveFileList-indexes.sql | 4
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/258-rhnServerServerGroupArchCompat-indexes.sql | 5
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/259-rhnServerTokenRegs-indexes.sql | 5
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/260-rhnSnapshotConfigChannel-indexes.sql | 4
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/261-rhnSnapshotConfigRevision-indexes.sql | 4
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/262-rhnSnapshotTag-indexes.sql | 5
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/263-rhnSolarisPatchPackages-indexes.sql | 3
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/264-rhnSolarisPatchSetMembers-indexes.sql | 4
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/531-rhnPrivateErrataMail-drop.sql | 1
57 files changed, 166 insertions(+), 187 deletions(-)
New commits:
commit 5ef821d858e32e792cf39f1c30db5f24cdca04be
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 14:26:48 2010 +0200
Automatic commit of package [spacewalk-schema] release [1.2.50-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 2adc89d..b703709 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.2.49-1 schema/spacewalk/
+1.2.50-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index fb872e3..4622316 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.2.49
+Version: 1.2.50
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -59,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-schema-upgrade*
%changelog
+* Fri Oct 22 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.2.50-1
+- reviewed indexes
+- rhnPrivateErrataMail is unused; dropping
+
* Thu Oct 21 2010 Jan Pazdziora 1.2.49-1
- Need to add date_diff_in_days to schema upgrade scripts.
- Missed the rhnPackageChangeLog view from schema upgrades, fixing.
commit 275fac0197c7f190f8b595a807fc44bca6167216
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 12:06:12 2010 +0200
reviewed rhnSolarisPatchSetMembers indexes
diff --git a/schema/spacewalk/common/tables/rhnSolarisPatchSetMembers.sql b/schema/spacewalk/common/tables/rhnSolarisPatchSetMembers.sql
index 3f30e0d..3581543 100644
--- a/schema/spacewalk/common/tables/rhnSolarisPatchSetMembers.sql
+++ b/schema/spacewalk/common/tables/rhnSolarisPatchSetMembers.sql
@@ -38,7 +38,7 @@ CREATE INDEX rhn_solaris_psm_pid_psid_idx
ON rhnSolarisPatchSetMembers (patch_id, patch_set_id)
TABLESPACE [[4m_tbs]];
-CREATE INDEX rhn_solaris_psm_psid_pid_idx
- ON rhnSolarisPatchSetMembers (patch_set_id, patch_id)
+CREATE INDEX rhn_solaris_psm_psid_idx
+ ON rhnSolarisPatchSetMembers (patch_set_id)
TABLESPACE [[4m_tbs]];
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/264-rhnSolarisPatchSetMembers-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/264-rhnSolarisPatchSetMembers-indexes.sql
new file mode 100644
index 0000000..4d9293f
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/264-rhnSolarisPatchSetMembers-indexes.sql
@@ -0,0 +1,4 @@
+CREATE INDEX rhn_solaris_psm_psid_idx
+ ON rhnSolarisPatchSetMembers (patch_set_id)
+ TABLESPACE [[4m_tbs]];
+drop index rhn_solaris_psm_psid_pid_idx;
commit eaf5a203021dfe756652c2f31f3c92ae0e13877d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 12:05:22 2010 +0200
reviewed rhnSolarisPatchPackages indexes
diff --git a/schema/spacewalk/common/tables/rhnSolarisPatchPackages.sql b/schema/spacewalk/common/tables/rhnSolarisPatchPackages.sql
index 2d45684..03c799d 100644
--- a/schema/spacewalk/common/tables/rhnSolarisPatchPackages.sql
+++ b/schema/spacewalk/common/tables/rhnSolarisPatchPackages.sql
@@ -32,6 +32,6 @@ ENABLE ROW MOVEMENT
CREATE INDEX rhn_solaris_pp_pid_pnid_idx
ON rhnSolarisPatchPackages (patch_id, package_nevra_id);
-CREATE INDEX rhn_solaris_pp_pnid_pid_idx
- ON rhnSolarisPatchPackages (package_nevra_id, patch_id);
+CREATE INDEX rhn_solaris_pp_pnid_idx
+ ON rhnSolarisPatchPackages (package_nevra_id);
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/263-rhnSolarisPatchPackages-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/263-rhnSolarisPatchPackages-indexes.sql
new file mode 100644
index 0000000..ba6e21e
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/263-rhnSolarisPatchPackages-indexes.sql
@@ -0,0 +1,3 @@
+CREATE INDEX rhn_solaris_pp_pnid_idx
+ ON rhnSolarisPatchPackages (package_nevra_id);
+drop index rhn_solaris_pp_pnid_pid_idx;
commit 76c5f34b884553a66482514e62781358932f3732
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 12:04:21 2010 +0200
reviewed rhnSnapshotTag indexes
diff --git a/schema/spacewalk/common/tables/rhnSnapshotTag.sql b/schema/spacewalk/common/tables/rhnSnapshotTag.sql
index 1cbb94b..eb1a4b5 100644
--- a/schema/spacewalk/common/tables/rhnSnapshotTag.sql
+++ b/schema/spacewalk/common/tables/rhnSnapshotTag.sql
@@ -40,9 +40,6 @@ CREATE UNIQUE INDEX rhn_ss_tag_ssid_tid_uq
CREATE UNIQUE INDEX rhn_ss_tag_sid_tid_uq
ON rhnSnapshotTag (server_id, tag_id);
-CREATE INDEX rhn_ss_tag_tid_ssid_idx
- ON rhnSnapshotTag (tag_id, snapshot_id);
-
-CREATE INDEX rhn_ss_tag_tid_sid_idx
- ON rhnSnapshotTag (tag_id, server_id);
+CREATE INDEX rhn_ss_tag_tid_idx
+ ON rhnSnapshotTag (tag_id);
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/262-rhnSnapshotTag-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/262-rhnSnapshotTag-indexes.sql
new file mode 100644
index 0000000..e8ebb92
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/262-rhnSnapshotTag-indexes.sql
@@ -0,0 +1,5 @@
+drop index rhn_ss_tag_tid_ssid_idx;
+
+CREATE INDEX rhn_ss_tag_tid_idx
+ ON rhnSnapshotTag (tag_id);
+drop index rhn_ss_tag_tid_sid_idx;
commit c5f930bf730d8deb46b89b3d32f436ed62925500
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 11:55:01 2010 +0200
reviewed rhnSnapshotConfigRevision indexes
diff --git a/schema/spacewalk/common/tables/rhnSnapshotConfigRevision.sql b/schema/spacewalk/common/tables/rhnSnapshotConfigRevision.sql
index 7be859c..7eb664d 100644
--- a/schema/spacewalk/common/tables/rhnSnapshotConfigRevision.sql
+++ b/schema/spacewalk/common/tables/rhnSnapshotConfigRevision.sql
@@ -35,7 +35,7 @@ CREATE UNIQUE INDEX rhn_snapshotcr_sid_crid_uq
ON rhnSnapshotConfigRevision (snapshot_id, config_revision_id)
TABLESPACE [[2m_tbs]];
-CREATE INDEX rhn_sscr_crid_sid_idx
- ON rhnSnapshotConfigRevision (config_revision_id, snapshot_id)
+CREATE INDEX rhn_sscr_crid_idx
+ ON rhnSnapshotConfigRevision (config_revision_id)
TABLESPACE [[2m_tbs]];
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/261-rhnSnapshotConfigRevision-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/261-rhnSnapshotConfigRevision-indexes.sql
new file mode 100644
index 0000000..3a913df
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/261-rhnSnapshotConfigRevision-indexes.sql
@@ -0,0 +1,4 @@
+CREATE INDEX rhn_sscr_crid_idx
+ ON rhnSnapshotConfigRevision (config_revision_id)
+ TABLESPACE [[2m_tbs]];
+drop index rhn_sscr_crid_sid_idx;
commit 52e3439b0691dbd2c1e2530ca14a6fdb47912b1a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 11:51:07 2010 +0200
reviewed rhnSnapshotConfigChannel indexes
diff --git a/schema/spacewalk/common/tables/rhnSnapshotConfigChannel.sql b/schema/spacewalk/common/tables/rhnSnapshotConfigChannel.sql
index ee3a700..0f011dd 100644
--- a/schema/spacewalk/common/tables/rhnSnapshotConfigChannel.sql
+++ b/schema/spacewalk/common/tables/rhnSnapshotConfigChannel.sql
@@ -35,7 +35,7 @@ CREATE UNIQUE INDEX rhn_snapshotcc_sid_ccid_uq
ON rhnSnapshotConfigChannel (snapshot_id, config_channel_id)
TABLESPACE [[4m_tbs]];
-CREATE INDEX rhn_snpsht_cc_ccid_sid_idx
- ON rhnSnapshotConfigChannel (config_channel_id, snapshot_id)
+CREATE INDEX rhn_snpsht_cc_ccid_idx
+ ON rhnSnapshotConfigChannel (config_channel_id)
TABLESPACE [[4m_tbs]];
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/260-rhnSnapshotConfigChannel-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/260-rhnSnapshotConfigChannel-indexes.sql
new file mode 100644
index 0000000..85651fa
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/260-rhnSnapshotConfigChannel-indexes.sql
@@ -0,0 +1,4 @@
+CREATE INDEX rhn_snpsht_cc_ccid_idx
+ ON rhnSnapshotConfigChannel (config_channel_id)
+ TABLESPACE [[4m_tbs]];
+drop index rhn_snpsht_cc_ccid_sid_idx;
commit 00f012a8ce74f49d6c0f737f9b5c291280c07bcf
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 11:49:48 2010 +0200
reviewed rhnServerTokenRegs indexes
diff --git a/schema/spacewalk/common/tables/rhnServerTokenRegs.sql b/schema/spacewalk/common/tables/rhnServerTokenRegs.sql
index d896873..7cc824c 100644
--- a/schema/spacewalk/common/tables/rhnServerTokenRegs.sql
+++ b/schema/spacewalk/common/tables/rhnServerTokenRegs.sql
@@ -32,8 +32,8 @@ CREATE INDEX rhn_srv_reg_tok_ts_idx
TABLESPACE [[64k_tbs]]
NOLOGGING;
-CREATE INDEX RHN_SRVR_TKN_RGS_SID_TID_IDX
- ON rhnServerTokenRegs (server_id, token_id)
+CREATE INDEX RHN_SRVR_TKN_RGS_SID_IDX
+ ON rhnServerTokenRegs (server_id)
TABLESPACE [[64k_tbs]]
NOLOGGING;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/259-rhnServerTokenRegs-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/259-rhnServerTokenRegs-indexes.sql
new file mode 100644
index 0000000..01251a6
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/259-rhnServerTokenRegs-indexes.sql
@@ -0,0 +1,5 @@
+CREATE INDEX RHN_SRVR_TKN_RGS_SID_IDX
+ ON rhnServerTokenRegs (server_id)
+ TABLESPACE [[64k_tbs]]
+ NOLOGGING;
+drop index RHN_SRVR_TKN_RGS_SID_TID_IDX;
commit 53f01338ed8838cd4aa7d8880130e90f1fe0d9cc
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 11:48:41 2010 +0200
reviewed rhnServerServerGroupArchCompat indexes
diff --git a/schema/spacewalk/common/tables/rhnServerServerGroupArchCompat.sql b/schema/spacewalk/common/tables/rhnServerServerGroupArchCompat.sql
index 1f8e77b..11e7f33 100644
--- a/schema/spacewalk/common/tables/rhnServerServerGroupArchCompat.sql
+++ b/schema/spacewalk/common/tables/rhnServerServerGroupArchCompat.sql
@@ -34,8 +34,8 @@ CREATE UNIQUE INDEX rhn_ssg_ac_said_sgt_uq
ON rhnServerServerGroupArchCompat (server_arch_id, server_group_type)
TABLESPACE [[64k_tbs]];
-CREATE INDEX rhn_ssg_ac_sgt_said_idx
- ON rhnServerServerGroupArchCompat (server_group_type, server_arch_id)
+CREATE INDEX rhn_ssg_ac_sgt_idx
+ ON rhnServerServerGroupArchCompat (server_group_type)
TABLESPACE [[64k_tbs]]
NOLOGGING;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/258-rhnServerServerGroupArchCompat-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/258-rhnServerServerGroupArchCompat-indexes.sql
new file mode 100644
index 0000000..42415f6
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/258-rhnServerServerGroupArchCompat-indexes.sql
@@ -0,0 +1,5 @@
+CREATE INDEX rhn_ssg_ac_sgt_idx
+ ON rhnServerServerGroupArchCompat (server_group_type)
+ TABLESPACE [[64k_tbs]]
+ NOLOGGING;
+drop index rhn_ssg_ac_sgt_said_idx;
commit 2f77746c29710bebcdb54f18210bc51ca62a98e6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 11:45:57 2010 +0200
reviewed rhnServerPreserveFileList indexes
diff --git a/schema/spacewalk/common/tables/rhnServerPreserveFileList.sql b/schema/spacewalk/common/tables/rhnServerPreserveFileList.sql
index 6e2505c..9607e20 100644
--- a/schema/spacewalk/common/tables/rhnServerPreserveFileList.sql
+++ b/schema/spacewalk/common/tables/rhnServerPreserveFileList.sql
@@ -35,7 +35,7 @@ CREATE UNIQUE INDEX rhn_serverpfl_ksid_flid_uq
ON rhnServerPreserveFileList (server_id, file_list_id)
TABLESPACE [[8m_tbs]];
-CREATE INDEX rhn_serverpfl_flid_ksid_idx
- ON rhnServerPreserveFileList (file_list_id, server_id)
+CREATE INDEX rhn_serverpfl_flid_idx
+ ON rhnServerPreserveFileList (file_list_id)
TABLESPACE [[4m_tbs]];
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/257-rhnServerPreserveFileList-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/257-rhnServerPreserveFileList-indexes.sql
new file mode 100644
index 0000000..547b295
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/257-rhnServerPreserveFileList-indexes.sql
@@ -0,0 +1,4 @@
+CREATE INDEX rhn_serverpfl_flid_idx
+ ON rhnServerPreserveFileList (file_list_id)
+ TABLESPACE [[4m_tbs]];
+drop index rhn_serverpfl_flid_ksid_idx;
commit c025e7abc02b53bc9982e17470965a87f1213037
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 11:44:26 2010 +0200
reviewed rhnServerPackageArchCompat indexes
diff --git a/schema/spacewalk/common/tables/rhnServerPackageArchCompat.sql b/schema/spacewalk/common/tables/rhnServerPackageArchCompat.sql
index d117df5..7e79e0c 100644
--- a/schema/spacewalk/common/tables/rhnServerPackageArchCompat.sql
+++ b/schema/spacewalk/common/tables/rhnServerPackageArchCompat.sql
@@ -35,8 +35,8 @@ CREATE INDEX rhn_sp_ac_said_paid_pref
ON rhnServerPackageArchCompat (server_arch_id, package_arch_id, preference)
TABLESPACE [[64k_tbs]];
-CREATE INDEX rhn_sp_ac_paid_said_pref
- ON rhnServerPackageArchCompat (package_arch_id, server_arch_id, preference)
+CREATE INDEX rhn_sp_ac_paid_pref
+ ON rhnServerPackageArchCompat (package_arch_id)
TABLESPACE [[64k_tbs]];
ALTER TABLE rhnServerPackageArchCompat
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/256-rhnServerPackageArchCompat-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/256-rhnServerPackageArchCompat-indexes.sql
new file mode 100644
index 0000000..9e6291e
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/256-rhnServerPackageArchCompat-indexes.sql
@@ -0,0 +1,4 @@
+CREATE INDEX rhn_sp_ac_paid_pref
+ ON rhnServerPackageArchCompat (package_arch_id)
+ TABLESPACE [[64k_tbs]];
+drop index rhn_sp_ac_paid_said_pref;
commit 5e703dad3a4e53904bf243caf080fd7293c5073c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 11:39:35 2010 +0200
rhnPrivateErrataMail is unused; dropping
diff --git a/schema/spacewalk/common/views/rhnPrivateErrataMail.sql b/schema/spacewalk/common/views/rhnPrivateErrataMail.sql
deleted file mode 100644
index b386296..0000000
--- a/schema/spacewalk/common/views/rhnPrivateErrataMail.sql
+++ /dev/null
@@ -1,108 +0,0 @@
---
--- Copyright (c) 2008 Red Hat, Inc.
---
--- This software is licensed to you under the GNU General Public License,
--- version 2 (GPLv2). There is NO WARRANTY for this software, express or
--- implied, including the implied warranties of MERCHANTABILITY or FITNESS
--- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
--- along with this software; if not, see
--- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
---
--- Red Hat trademarks are not licensed under GPLv2. No permission is
--- granted to use or replicate Red Hat trademarks that are incorporated
--- in this software or its documentation.
---
--- This view is used for extracting data needed by the errata mailer
--- for private errata mails
---
---
-
-create or replace view
-rhnPrivateErrataMail
-as
-select
- w.id user_id,
- s.id server_id,
- w.org_id org_id,
- sc.channel_id channel_id,
- ce.errata_id errata_id
-from
- rhnServer s,
- web_user_personal_info wpi,
- rhnUserInfo ui,
- rhnChannelErrata ce,
- web_contact w,
- rhnServerChannel sc,
- rhnUserServerPerms usp
-where
- -- we plan on starting with org_id, and server group is the
- -- best place to find that that's near servers
- -- filter out servers that aren't in useful channels
- sc.channel_id = ce.channel_id
- -- find the server, so we can do s.arch comparisons
- and sc.server_id = s.id
- -- filter out users who don't want/can't get email
- and w.id = wpi.web_user_id
- and wpi.email is not null
- and w.id = ui.user_id
- and s.id = usp.server_id
- and usp.user_id = w.id
- -- filter out users who don't want mail about this server
- -- they get an entry if they _don't_ want mail
- and not exists (
- select usprefs.server_id
- from rhnUserServerPrefs usprefs
- where w.id = usprefs.user_id
- and sc.server_id = usprefs.server_id
- and usprefs.name = 'receive_notifications'
- )
- and ui.email_notify = 1
- -- check permissions. For this query being an org admin is the
- -- most common thing, so we test for that first
- and exists (
- select 1
- from
- rhnPackageEVR p_evr,
- rhnPackageEVR sp_evr,
- rhnServerPackage sp,
- rhnChannelPackage cp,
- rhnPackage p,
- rhnErrataPackage ep,
- rhnServerPackageArchCompat spac
- where 1=1
- -- packages from channels this server is subscribed to
- and sc.channel_id = cp.channel_id
- and cp.package_id = p.id
- -- part of an errata
- and ce.errata_id = ep.errata_id
- and ep.package_id = p.id
- -- and that errata maps back to the server channel
- and sc.channel_id = ce.channel_id
- and ce.errata_id = ep.errata_id
- -- also installed on this server
- and sc.server_id = sp.server_id
- and sp.name_id = p.name_id
- and sp.evr_id = sp_evr.id
- -- different evr
- and p.evr_id = p_evr.id
- and sp.evr_id != p.evr_id
- -- and newer evr
- and sp_evr.evr < p_evr.evr
- and sp_evr.evr = (
- select max(sq2_pe.evr) max_evr
- from rhnServerPackage sq2_sp,
- rhnPackageEVR sq2_pe
- where sq2_sp.evr_id = sq2_pe.id and
- sq2_sp.server_id = sp.server_id and
- sp.name_id = sq2_sp.name_id
- group by sq2_sp.server_id, sq2_sp.name_id
- )
- -- compat arch
- and p.package_arch_id = spac.package_arch_id
- and s.server_arch_id = spac.server_arch_id
- )
- and not exists ( select 1
- from rhnWebContactDisabled wcd
- where wcd.id = w.id )
-;
-
diff --git a/schema/spacewalk/common/views/views.deps b/schema/spacewalk/common/views/views.deps
index 9ec07d9..4172b66 100644
--- a/schema/spacewalk/common/views/views.deps
+++ b/schema/spacewalk/common/views/views.deps
@@ -56,8 +56,6 @@ rhnOrgErrata :: rhnChannelErrata rhnAvailableChannels
rhnOrgPackageOverview :: rhnPackageName rhnPackageEVR rhnPackageArch \
rhnChannelPackageArchCompat rhnPackage \
rhn_package.pks
-rhnPrivateErrataMail :: rhnServerPackage \
- rhnWebContactDisabled
rhnPackageUpgradeArchCompat :: rhnPackageArch
rhnServerErrataTypeView :: rhnErrata rhnServerNeededErrataCache
rhnServerFeaturesView :: rhnFeature rhnServerGroupTypeFeature \
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/531-rhnPrivateErrataMail-drop.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/531-rhnPrivateErrataMail-drop.sql
new file mode 100644
index 0000000..d1ab59d
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/531-rhnPrivateErrataMail-drop.sql
@@ -0,0 +1 @@
+drop view rhnPrivateErrataMail;
commit 00190429ebb2afaaa60f43d198d7e6945bfd40d2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 10:19:41 2010 +0200
reviewed rhnServerNeededCache indexes
diff --git a/schema/spacewalk/common/tables/rhnServerNeededCache.sql b/schema/spacewalk/common/tables/rhnServerNeededCache.sql
index 07a7395..251ace0 100644
--- a/schema/spacewalk/common/tables/rhnServerNeededCache.sql
+++ b/schema/spacewalk/common/tables/rhnServerNeededCache.sql
@@ -39,12 +39,6 @@ CREATE INDEX rhn_snc_pid_idx
TABLESPACE [[128m_tbs]]
NOLOGGING;
-CREATE INDEX rhn_snc_sid_idx
- ON rhnServerNeededCache (server_id)
- NOPARALLEL
- TABLESPACE [[128m_tbs]]
- NOLOGGING;
-
CREATE INDEX rhn_snc_eid_idx
ON rhnServerNeededCache (errata_id)
TABLESPACE [[128m_tbs]]
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/255-rhnServerNeededCache-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/255-rhnServerNeededCache-indexes.sql
new file mode 100644
index 0000000..4ca3257
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/255-rhnServerNeededCache-indexes.sql
@@ -0,0 +1 @@
+drop index rhn_snc_sid_idx;
commit 43b9f4b8632320f0560717029b3dcf36494770ee
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 10:18:26 2010 +0200
reviewed rhnServerGroupMembers indexes
diff --git a/schema/spacewalk/common/tables/rhnServerGroupMembers.sql b/schema/spacewalk/common/tables/rhnServerGroupMembers.sql
index c3845ef..918c30b 100644
--- a/schema/spacewalk/common/tables/rhnServerGroupMembers.sql
+++ b/schema/spacewalk/common/tables/rhnServerGroupMembers.sql
@@ -34,8 +34,8 @@ CREATE UNIQUE INDEX rhn_sgmembers_sid_sgid_uq
ON rhnServerGroupMembers (server_id, server_group_id)
TABLESPACE [[4m_tbs]];
-CREATE INDEX rhn_sgmembers_sgid_sid_idx
- ON rhnServerGroupMembers (server_group_id, server_id)
+CREATE INDEX rhn_sgmembers_sgid_idx
+ ON rhnServerGroupMembers (server_group_id)
TABLESPACE [[4m_tbs]]
NOLOGGING;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/254-rhnServerGroupMembers-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/254-rhnServerGroupMembers-indexes.sql
new file mode 100644
index 0000000..9946605
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/254-rhnServerGroupMembers-indexes.sql
@@ -0,0 +1,5 @@
+CREATE INDEX rhn_sgmembers_sgid_idx
+ ON rhnServerGroupMembers (server_group_id)
+ TABLESPACE [[4m_tbs]]
+ NOLOGGING;
+drop index rhn_sgmembers_sgid_sid_idx;
commit 656e8c1c3135935adbe4eeb4092c872ac423f1ee
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 10:16:59 2010 +0200
reviewed rhnServerGroup indexes
diff --git a/schema/spacewalk/common/tables/rhnServerGroup.sql b/schema/spacewalk/common/tables/rhnServerGroup.sql
index b4a5178..4024a22 100644
--- a/schema/spacewalk/common/tables/rhnServerGroup.sql
+++ b/schema/spacewalk/common/tables/rhnServerGroup.sql
@@ -43,20 +43,10 @@ CREATE UNIQUE INDEX rhn_servergroup_oid_name_uq
ON rhnServerGroup (org_id, name)
TABLESPACE [[4m_tbs]];
-CREATE INDEX rhn_sg_oid_id_name_idx
- ON rhnServerGroup (org_id, id, name)
- TABLESPACE [[8m_tbs]]
- NOLOGGING;
-
CREATE INDEX rhn_sg_type_id_idx
ON rhnServerGroup (group_type, id)
TABLESPACE [[4m_tbs]]
NOLOGGING;
-CREATE INDEX rhn_sg_oid_type_id_idx
- ON rhnServerGroup (org_id, group_type, id)
- TABLESPACE [[4m_tbs]]
- NOLOGGING;
-
CREATE SEQUENCE rhn_server_group_id_seq;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/253-rhnServerGroup-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/253-rhnServerGroup-indexes.sql
new file mode 100644
index 0000000..6ba8116
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/253-rhnServerGroup-indexes.sql
@@ -0,0 +1,2 @@
+drop index rhn_sg_oid_id_name_idx;
+drop index rhn_sg_oid_type_id_idx;
commit f848d89986b3b9276107036982e68cd0b5e8eca9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 10:13:26 2010 +0200
reviewed rhnServerCustomDataValue indexes
diff --git a/schema/spacewalk/common/tables/rhnServerCustomDataValue.sql b/schema/spacewalk/common/tables/rhnServerCustomDataValue.sql
index 50e6b4d..434b618 100644
--- a/schema/spacewalk/common/tables/rhnServerCustomDataValue.sql
+++ b/schema/spacewalk/common/tables/rhnServerCustomDataValue.sql
@@ -42,6 +42,6 @@ ENABLE ROW MOVEMENT
CREATE UNIQUE INDEX rhn_scdv_sid_kid_uq
ON rhnServerCustomDataValue (server_id, key_id);
-CREATE INDEX rhn_scdv_kid_sid_idx
- ON rhnServerCustomDataValue (key_id, server_id);
+CREATE INDEX rhn_scdv_kid_idx
+ ON rhnServerCustomDataValue (key_id);
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/252-rhnServerCustomDataValue-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/252-rhnServerCustomDataValue-indexes.sql
new file mode 100644
index 0000000..f4ed4fe
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/252-rhnServerCustomDataValue-indexes.sql
@@ -0,0 +1,3 @@
+CREATE INDEX rhn_scdv_kid_idx
+ ON rhnServerCustomDataValue (key_id);
+drop index rhn_scdv_kid_sid_idx;
commit 5de325ea5f655a467571fe2215cd9aed5c5b3f7a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 10:12:18 2010 +0200
reviewed rhnServerChannelArchCompat indexes
diff --git a/schema/spacewalk/common/tables/rhnServerChannelArchCompat.sql b/schema/spacewalk/common/tables/rhnServerChannelArchCompat.sql
index 9ad524e..b93f3b5 100644
--- a/schema/spacewalk/common/tables/rhnServerChannelArchCompat.sql
+++ b/schema/spacewalk/common/tables/rhnServerChannelArchCompat.sql
@@ -34,7 +34,7 @@ CREATE INDEX rhn_sc_ac_caid_paid
ON rhnServerChannelArchCompat (server_arch_id, channel_arch_id)
TABLESPACE [[64k_tbs]];
-CREATE INDEX rhn_sc_ac_paid_caid
- ON rhnServerChannelArchCompat (channel_arch_id, server_arch_id)
+CREATE INDEX rhn_sc_ac_caid
+ ON rhnServerChannelArchCompat (channel_arch_id)
TABLESPACE [[64k_tbs]];
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/251-rhnServerChannelArchCompat-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/251-rhnServerChannelArchCompat-indexes.sql
new file mode 100644
index 0000000..35d8393
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/251-rhnServerChannelArchCompat-indexes.sql
@@ -0,0 +1,4 @@
+CREATE INDEX rhn_sc_ac_caid
+ ON rhnServerChannelArchCompat (channel_arch_id)
+ TABLESPACE [[64k_tbs]];
+drop index rhn_sc_ac_paid_caid;
commit ff1d868534de3c978461b0864befc1b9a93b16d8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 10:11:04 2010 +0200
reviewed rhnServerChannel indexes
diff --git a/schema/spacewalk/common/tables/rhnServerChannel.sql b/schema/spacewalk/common/tables/rhnServerChannel.sql
index 1b6b20b..7892097 100644
--- a/schema/spacewalk/common/tables/rhnServerChannel.sql
+++ b/schema/spacewalk/common/tables/rhnServerChannel.sql
@@ -38,8 +38,8 @@ CREATE UNIQUE INDEX rhn_sc_sid_cid_uq
ON rhnServerChannel (server_id, channel_id)
TABLESPACE [[8m_tbs]];
-CREATE INDEX rhn_sc_cid_sid_idx
- ON rhnServerChannel (channel_id, server_id)
+CREATE INDEX rhn_sc_cid_idx
+ ON rhnServerChannel (channel_id)
TABLESPACE [[8m_tbs]]
NOLOGGING;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/250-rhnServerChannel-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/250-rhnServerChannel-indexes.sql
new file mode 100644
index 0000000..49b91f0
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/250-rhnServerChannel-indexes.sql
@@ -0,0 +1,5 @@
+CREATE INDEX rhn_sc_cid_idx
+ ON rhnServerChannel (channel_id)
+ TABLESPACE [[8m_tbs]]
+ NOLOGGING;
+drop index rhn_sc_cid_sid_idx;
commit 27093f3d66b670597f6b684c0fd922ef6cf10088
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 10:09:38 2010 +0200
reviewed rhnServerArch indexes
diff --git a/schema/spacewalk/common/tables/rhnServerArch.sql b/schema/spacewalk/common/tables/rhnServerArch.sql
index efcb0f6..f4f0172 100644
--- a/schema/spacewalk/common/tables/rhnServerArch.sql
+++ b/schema/spacewalk/common/tables/rhnServerArch.sql
@@ -34,10 +34,6 @@ CREATE INDEX rhn_sarch_id_l_n_idx
ON rhnServerArch (id, label, name)
TABLESPACE [[2m_tbs]];
-CREATE INDEX rhn_sarch_l_id_n_idx
- ON rhnServerArch (label, id, name)
- TABLESPACE [[2m_tbs]];
-
CREATE SEQUENCE rhn_server_arch_id_seq START WITH 1000;
ALTER TABLE rhnServerArch
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/249-rhnServerArch-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/249-rhnServerArch-indexes.sql
new file mode 100644
index 0000000..96e3415
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/249-rhnServerArch-indexes.sql
@@ -0,0 +1,5 @@
+ALTER TABLE rhnServerArch
+ disable CONSTRAINT rhn_sarch_label_uq;
+drop index rhn_sarch_l_id_n_idx;
+ALTER TABLE rhnServerArch
+ enable CONSTRAINT rhn_sarch_label_uq;
commit 1770d83cc07baf2955464e85408ee0544ccd10aa
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 10:06:36 2010 +0200
reviewed rhnServerAction indexes
diff --git a/schema/spacewalk/common/tables/rhnServerAction.sql b/schema/spacewalk/common/tables/rhnServerAction.sql
index 55ca121..440f5c1 100644
--- a/schema/spacewalk/common/tables/rhnServerAction.sql
+++ b/schema/spacewalk/common/tables/rhnServerAction.sql
@@ -44,8 +44,8 @@ CREATE INDEX rhn_ser_act_sid_aid_s_idx
ON rhnServerAction (server_id, action_id, status)
TABLESPACE [[8m_tbs]];
-CREATE INDEX rhn_ser_act_aid_sid_s_idx
- ON rhnServerAction (action_id, server_id, status)
+CREATE INDEX rhn_ser_act_aid_idx
+ ON rhnServerAction (action_id)
TABLESPACE [[8m_tbs]]
NOLOGGING;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/248-rhnServerAction-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/248-rhnServerAction-indexes.sql
new file mode 100644
index 0000000..389ea3d
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/248-rhnServerAction-indexes.sql
@@ -0,0 +1,5 @@
+CREATE INDEX rhn_ser_act_aid_idx
+ ON rhnServerAction (action_id)
+ TABLESPACE [[8m_tbs]]
+ NOLOGGING;
+drop index rhn_ser_act_aid_sid_s_idx;
commit d89c81eb9f032445d26c624201cd9c7931af0fb2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 10:04:33 2010 +0200
reviewed rhnSatelliteChannelFamily indexes
diff --git a/schema/spacewalk/common/tables/rhnSatelliteChannelFamily.sql b/schema/spacewalk/common/tables/rhnSatelliteChannelFamily.sql
index a47247e..dd523ac 100644
--- a/schema/spacewalk/common/tables/rhnSatelliteChannelFamily.sql
+++ b/schema/spacewalk/common/tables/rhnSatelliteChannelFamily.sql
@@ -36,8 +36,8 @@ CREATE INDEX rhn_sat_cf_sid_cfid_idx
ON rhnSatelliteChannelFamily (server_id, channel_family_id)
TABLESPACE [[2m_tbs]];
-CREATE INDEX rhn_sat_cf_cfid_sid_idx
- ON rhnSatelliteChannelFamily (channel_family_id, server_id)
+CREATE INDEX rhn_sat_cf_cfid_idx
+ ON rhnSatelliteChannelFamily (channel_family_id)
TABLESPACE [[2m_tbs]];
ALTER TABLE rhnSatelliteChannelFamily
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/247-rhnSatelliteChannelFamily-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/247-rhnSatelliteChannelFamily-indexes.sql
new file mode 100644
index 0000000..ef204c1
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/247-rhnSatelliteChannelFamily-indexes.sql
@@ -0,0 +1,4 @@
+CREATE INDEX rhn_sat_cf_cfid_idx
+ ON rhnSatelliteChannelFamily (channel_family_id)
+ TABLESPACE [[2m_tbs]];
+drop index rhn_sat_cf_cfid_sid_idx;
commit 81bcf3924d8ea19a958bc5d8ca0810d905207e31
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 10:03:02 2010 +0200
reviewed rhnSGTypeVirtSubLevel indexes
diff --git a/schema/spacewalk/common/tables/rhnSGTypeVirtSubLevel.sql b/schema/spacewalk/common/tables/rhnSGTypeVirtSubLevel.sql
index 9c49f26..8e4c5ce 100644
--- a/schema/spacewalk/common/tables/rhnSGTypeVirtSubLevel.sql
+++ b/schema/spacewalk/common/tables/rhnSGTypeVirtSubLevel.sql
@@ -34,7 +34,7 @@ CREATE INDEX rhn_sgtvsl_sgtid_vslid
ON rhnSGTypeVirtSubLevel (server_group_type_id, virt_sub_level_id)
TABLESPACE [[64k_tbs]];
-CREATE INDEX rhn_sgtvsl_vslid_sgtid
- ON rhnSGTypeVirtSubLevel (virt_sub_level_id, server_group_type_id)
+CREATE INDEX rhn_sgtvsl_vslid
+ ON rhnSGTypeVirtSubLevel (virt_sub_level_id)
TABLESPACE [[64k_tbs]];
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/246-rhnSGTypeVirtSubLevel-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/246-rhnSGTypeVirtSubLevel-indexes.sql
new file mode 100644
index 0000000..954abb6
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/246-rhnSGTypeVirtSubLevel-indexes.sql
@@ -0,0 +1,4 @@
+CREATE INDEX rhn_sgtvsl_vslid
+ ON rhnSGTypeVirtSubLevel (virt_sub_level_id)
+ TABLESPACE [[64k_tbs]];
+drop index rhn_sgtvsl_vslid_sgtid;
commit b91aef226c29eaea23ef2579c4ab608782f15a53
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 10:00:09 2010 +0200
reviewed rhnPrivateChannelFamily indexes
diff --git a/schema/spacewalk/common/tables/rhnPrivateChannelFamily.sql b/schema/spacewalk/common/tables/rhnPrivateChannelFamily.sql
index 6ee3516..57789b8 100644
--- a/schema/spacewalk/common/tables/rhnPrivateChannelFamily.sql
+++ b/schema/spacewalk/common/tables/rhnPrivateChannelFamily.sql
@@ -42,8 +42,8 @@ CREATE UNIQUE INDEX rhn_privcf_oid_cfid_uq
ON rhnPrivateChannelFamily (org_id, channel_family_id)
TABLESPACE [[2m_tbs]];
-CREATE INDEX rhn_cfperm_cfid_oid_idx
- ON rhnPrivateChannelFamily (channel_family_id, org_id)
+CREATE INDEX rhn_cfperm_cfid_idx
+ ON rhnPrivateChannelFamily (channel_family_id)
TABLESPACE [[2m_tbs]]
NOLOGGING;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/245-rhnPrivateChannelFamily-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/245-rhnPrivateChannelFamily-indexes.sql
new file mode 100644
index 0000000..710f343
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/245-rhnPrivateChannelFamily-indexes.sql
@@ -0,0 +1,5 @@
+CREATE INDEX rhn_cfperm_cfid_idx
+ ON rhnPrivateChannelFamily (channel_family_id)
+ TABLESPACE [[2m_tbs]]
+ NOLOGGING;
+drop index rhn_cfperm_cfid_oid_idx;
commit 2eadfdebc16682f923c61ef25a107f84bc0e6735
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 09:57:50 2010 +0200
reviewed rhnPackageFile indexes
diff --git a/schema/spacewalk/common/tables/rhnPackageFile.sql b/schema/spacewalk/common/tables/rhnPackageFile.sql
index 7c80243..ac81138 100644
--- a/schema/spacewalk/common/tables/rhnPackageFile.sql
+++ b/schema/spacewalk/common/tables/rhnPackageFile.sql
@@ -50,8 +50,8 @@ CREATE UNIQUE INDEX rhn_package_file_pid_cid_uq
ON rhnPackageFile (package_id, capability_id)
TABLESPACE [[32m_tbs]];
-CREATE INDEX rhn_package_file_cid_pid_idx
- ON rhnPackageFile (capability_id, package_id)
+CREATE INDEX rhn_package_file_cid_idx
+ ON rhnPackageFile (capability_id)
TABLESPACE [[32m_tbs]]
NOLOGGING;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/244-rhnPackageFile-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/244-rhnPackageFile-indexes.sql
new file mode 100644
index 0000000..9bb9fc9
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/244-rhnPackageFile-indexes.sql
@@ -0,0 +1,5 @@
+CREATE INDEX rhn_package_file_cid_idx
+ ON rhnPackageFile (capability_id)
+ TABLESPACE [[32m_tbs]]
+ NOLOGGING;
+drop index rhn_package_file_cid_pid_idx;
commit 1cd9813eac2e6ba25f73665f8437aa579de29592
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 09:51:11 2010 +0200
reviewed rhnPackageArch indexes
diff --git a/schema/spacewalk/common/tables/rhnPackageArch.sql b/schema/spacewalk/common/tables/rhnPackageArch.sql
index bae67b5..176b6a3 100644
--- a/schema/spacewalk/common/tables/rhnPackageArch.sql
+++ b/schema/spacewalk/common/tables/rhnPackageArch.sql
@@ -34,10 +34,6 @@ CREATE INDEX rhn_parch_id_l_n_idx
ON rhnPackageArch (id, label, name)
TABLESPACE [[2m_tbs]];
-CREATE INDEX rhn_parch_l_id_n_idx
- ON rhnPackageArch (label, id, name)
- TABLESPACE [[2m_tbs]];
-
CREATE SEQUENCE rhn_package_arch_id_seq START WITH 100;
ALTER TABLE rhnPackageArch
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/243-rhnPackageArch-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/243-rhnPackageArch-indexes.sql
new file mode 100644
index 0000000..ddcc0fc
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/243-rhnPackageArch-indexes.sql
@@ -0,0 +1,5 @@
+ALTER TABLE rhnPackageArch
+ disable CONSTRAINT rhn_parch_label_uq;
+drop index rhn_parch_l_id_n_idx;
+ALTER TABLE rhnPackageArch
+ enable CONSTRAINT rhn_parch_label_uq;
commit 7924d2b7adc0098db2d5870628ca9f48ca5ae58d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 09:46:33 2010 +0200
reviewed rhnKickstartPreserveFileList indexes
diff --git a/schema/spacewalk/common/tables/rhnKickstartPreserveFileList.sql b/schema/spacewalk/common/tables/rhnKickstartPreserveFileList.sql
index 513c87e..50dcdda 100644
--- a/schema/spacewalk/common/tables/rhnKickstartPreserveFileList.sql
+++ b/schema/spacewalk/common/tables/rhnKickstartPreserveFileList.sql
@@ -36,7 +36,7 @@ CREATE UNIQUE INDEX rhn_kspreservefl_ksid_flid_uq
ON rhnKickstartPreserveFileList (kickstart_id, file_list_id)
TABLESPACE [[4m_tbs]];
-CREATE INDEX rhn_kspreservefl_flid_ksid_idx
- ON rhnKickstartPreserveFileList (file_list_id, kickstart_id)
+CREATE INDEX rhn_kspreservefl_flid_idx
+ ON rhnKickstartPreserveFileList (file_list_id)
TABLESPACE [[8m_tbs]];
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/242-rhnKickstartPreserveFileList-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/242-rhnKickstartPreserveFileList-indexes.sql
new file mode 100644
index 0000000..a4c5179
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/242-rhnKickstartPreserveFileList-indexes.sql
@@ -0,0 +1,4 @@
+CREATE INDEX rhn_kspreservefl_flid_idx
+ ON rhnKickstartPreserveFileList (file_list_id)
+ TABLESPACE [[8m_tbs]];
+drop index rhn_kspreservefl_flid_ksid_idx;
commit a09c35f8b4a0b96b8ddb4a4773bb4987213913f1
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 09:39:59 2010 +0200
reviewed rhnErrataPackageTmp indexes
diff --git a/schema/spacewalk/common/tables/rhnErrataPackageTmp.sql b/schema/spacewalk/common/tables/rhnErrataPackageTmp.sql
index 626e1ec..c93b32c 100644
--- a/schema/spacewalk/common/tables/rhnErrataPackageTmp.sql
+++ b/schema/spacewalk/common/tables/rhnErrataPackageTmp.sql
@@ -35,8 +35,8 @@ CREATE UNIQUE INDEX rhn_err_pkgtmp_eid_pid_uq
ON rhnErrataPackageTmp (errata_id, package_id)
TABLESPACE [[64k_tbs]];
-CREATE INDEX rhn_err_pkgtmp_pid_eid_idx
- ON rhnErrataPackageTmp (package_id, errata_id)
+CREATE INDEX rhn_err_pkgtmp_pid_idx
+ ON rhnErrataPackageTmp (package_id)
TABLESPACE [[64k_tbs]]
NOLOGGING;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/241-rhnErrataPackageTmp-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/241-rhnErrataPackageTmp-indexes.sql
new file mode 100644
index 0000000..f5e6160
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/241-rhnErrataPackageTmp-indexes.sql
@@ -0,0 +1,5 @@
+CREATE INDEX rhn_err_pkgtmp_pid_idx
+ ON rhnErrataPackageTmp (package_id)
+ TABLESPACE [[64k_tbs]]
+ NOLOGGING;
+drop index rhn_err_pkgtmp_pid_eid_idx;
commit d6d6171d399e9449b544320d06e2831da9537ff9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 09:38:36 2010 +0200
reviewed rhnErrataPackage indexes
diff --git a/schema/spacewalk/common/tables/rhnErrataPackage.sql b/schema/spacewalk/common/tables/rhnErrataPackage.sql
index 7ad2a94..bfab256 100644
--- a/schema/spacewalk/common/tables/rhnErrataPackage.sql
+++ b/schema/spacewalk/common/tables/rhnErrataPackage.sql
@@ -36,8 +36,8 @@ CREATE UNIQUE INDEX rhn_err_pkg_eid_pid_uq
ON rhnErrataPackage (errata_id, package_id)
TABLESPACE [[64k_tbs]];
-CREATE INDEX rhn_err_pkg_pid_eid_idx
- ON rhnErrataPackage (package_id, errata_id)
+CREATE INDEX rhn_err_pkg_pid_idx
+ ON rhnErrataPackage (package_id)
TABLESPACE [[64k_tbs]]
NOLOGGING;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/240-rhnErrataPackage-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/240-rhnErrataPackage-indexes.sql
new file mode 100644
index 0000000..499db14
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/240-rhnErrataPackage-indexes.sql
@@ -0,0 +1,5 @@
+CREATE INDEX rhn_err_pkg_pid_idx
+ ON rhnErrataPackage (package_id)
+ TABLESPACE [[64k_tbs]]
+ NOLOGGING;
+drop index rhn_err_pkg_pid_eid_idx;
commit 1870bbb4d1850a5667e5210d930dc1ed22c0eab3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 22 09:34:58 2010 +0200
reviewed rhnErrataNotificationQueue indexes
diff --git a/schema/spacewalk/common/tables/rhnErrataNotificationQueue.sql b/schema/spacewalk/common/tables/rhnErrataNotificationQueue.sql
index bba1ff0..30d63bd 100644
--- a/schema/spacewalk/common/tables/rhnErrataNotificationQueue.sql
+++ b/schema/spacewalk/common/tables/rhnErrataNotificationQueue.sql
@@ -38,12 +38,8 @@ CREATE TABLE rhnErrataNotificationQueue
ENABLE ROW MOVEMENT
;
-CREATE INDEX rhn_enqueue_eid_idx
- ON rhnErrataNotificationQueue (errata_id, org_id)
- TABLESPACE [[4m_tbs]];
-
-CREATE INDEX rhn_enqueue_na_eid_idx
- ON rhnErrataNotificationQueue (next_action, errata_id)
+CREATE INDEX rhn_enqueue_na_idx
+ ON rhnErrataNotificationQueue (next_action)
TABLESPACE [[8m_tbs]];
ALTER TABLE rhnErrataNotificationQueue
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/239-rhnErrataNotificationQueue-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/239-rhnErrataNotificationQueue-indexes.sql
new file mode 100644
index 0000000..ec7d0f1
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/239-rhnErrataNotificationQueue-indexes.sql
@@ -0,0 +1,10 @@
+ALTER TABLE rhnErrataNotificationQueue
+ disable CONSTRAINT rhn_enqueue_eoid_uq;
+drop index rhn_enqueue_eid_idx;
+ALTER TABLE rhnErrataNotificationQueue
+ enable CONSTRAINT rhn_enqueue_eoid_uq;
+
+CREATE INDEX rhn_enqueue_na_idx
+ ON rhnErrataNotificationQueue (next_action)
+ TABLESPACE [[8m_tbs]];
+drop index rhn_enqueue_na_eid_idx;
13 years, 7 months
Changes to 'refs/tags/spacewalk-setup-1.2.12-1'
by Miroslav Suchý
Tag 'spacewalk-setup-1.2.12-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-10-22 09:58 +0000
Tagging package [spacewalk-setup] version [1.2.12-1] in directory [spacewalk/setup/].
Changes since spacewalk-backend-1.2.33-1:
Miroslav Suchý (2):
612581 - use new spacewalk namespace for spacewalk-setup
Automatic commit of package [spacewalk-setup] release [1.2.12-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/bin/cobbler-setup | 7 +++----
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
3 files changed, 8 insertions(+), 6 deletions(-)
---
13 years, 7 months
2 commits - rel-eng/packages spacewalk/setup
by Miroslav Suchý
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/bin/cobbler-setup | 7 +++----
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
3 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 9b3498241f0e4aa3fbdba3c3f1799dcda4295ea5
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Oct 22 11:58:54 2010 +0200
Automatic commit of package [spacewalk-setup] release [1.2.12-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 8d91b6c..ebe271b 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.2.11-1 spacewalk/setup/
+1.2.12-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 5046026..6a16436 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.2.11
+Version: 1.2.12
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -101,6 +101,9 @@ rm -rf %{buildroot}
%attr(755, apache, root) %{_var}/spacewalk
%changelog
+* Fri Oct 22 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.2.12-1
+- 612581 - use new spacewalk namespace for spacewalk-setup
+
* Fri Oct 15 2010 Jan Pazdziora 1.2.11-1
- Revert "avoid people install packages for different os"
- Revert "valid require format is name = version"
commit 5f1812be435be9e110f736618bb09f3d3b2af75a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Oct 22 11:55:42 2010 +0200
612581 - use new spacewalk namespace for spacewalk-setup
diff --git a/spacewalk/setup/bin/cobbler-setup b/spacewalk/setup/bin/cobbler-setup
index aad87f9..e742780 100755
--- a/spacewalk/setup/bin/cobbler-setup
+++ b/spacewalk/setup/bin/cobbler-setup
@@ -9,8 +9,7 @@ import sys
import re
import optparse
-sys.path.append('/usr/share/rhn')
-import common
+import spacewalk.common
TEMPLATES_DIR = '/usr/share/cobbler/installer_templates'
MODULES_TEMPLATE = join(TEMPLATES_DIR, 'modules.conf.template')
@@ -84,10 +83,10 @@ def main():
copy(TEMP_MODULES, MODULES)
m = re.compile(r"^cobbler\.host\s*=\s*", re.MULTILINE)
- conf_lines = open(common.rhnConfig._CONFIG_FILE).read()
+ conf_lines = open(spacewalk.common.rhnConfig._CONFIG_FILE).read()
if not m.search(conf_lines):
system ("echo 'cobbler.host = %s' >> %s " % (answers['server'],
- common.rhnConfig._CONFIG_FILE))
+ spacewalk.common.rhnConfig._CONFIG_FILE))
setup_pxe_services(options)
system("cobbler sync")
13 years, 7 months
Changes to 'refs/tags/spacewalk-backend-1.2.33-1'
by Miroslav Suchý
Tag 'spacewalk-backend-1.2.33-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-10-22 09:23 +0000
Tagging package [spacewalk-backend] version [1.2.33-1] in directory [backend/].
Changes since spacewalk-java-1.2.70-1:
Miroslav Suchý (3):
612581 - fixing dynamic import
612581 - removing /usr/share/rhn from PYTHONPATH
Automatic commit of package [spacewalk-backend] release [1.2.33-1].
---
backend/satellite_tools/reposync.py | 2 +-
backend/satellite_tools/rhn-satellite-activate | 4 +---
backend/satellite_tools/rhn-ssl-dbstore | 4 +---
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
---
13 years, 7 months
3 commits - backend/satellite_tools backend/spacewalk-backend.spec rel-eng/packages
by Miroslav Suchý
backend/satellite_tools/reposync.py | 2 +-
backend/satellite_tools/rhn-satellite-activate | 4 +---
backend/satellite_tools/rhn-ssl-dbstore | 4 +---
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit a16cc040d186e550ec75a716523696d9c0d6e78e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Oct 22 11:23:22 2010 +0200
Automatic commit of package [spacewalk-backend] release [1.2.33-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 9121746..3bffad5 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.2.32
+Version: 1.2.33
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -667,6 +667,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Oct 22 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.2.33-1
+- 612581 - removing /usr/share/rhn from PYTHONPATH
+- 612581 - fixing dynamic import
+
* Thu Oct 21 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.2.32-1
- 612581 - move python modules from /usr/share/rhn to python site-packages
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 1455a4f..4b749f8 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.2.32-1 backend/
+1.2.33-1 backend/
commit 8e4bb79e1f52813196a52590ed88759e3a4312a2
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Oct 22 11:22:35 2010 +0200
612581 - removing /usr/share/rhn from PYTHONPATH
we moved all modules to python site-packages dir, no need to append /usr/share/rhn to our path
diff --git a/backend/satellite_tools/rhn-satellite-activate b/backend/satellite_tools/rhn-satellite-activate
index a9de7a7..88a593a 100755
--- a/backend/satellite_tools/rhn-satellite-activate
+++ b/backend/satellite_tools/rhn-satellite-activate
@@ -24,8 +24,6 @@ except KeyboardInterrupt:
sys.exit(0)
-sys.path.append("@@ROOT@@")
-
mod_name = string.replace(os.path.basename(sys.argv[0]), '-', '_')
try:
mod = __import__("spacewalk.satellite_tools", globals(), locals(), [mod_name])
diff --git a/backend/satellite_tools/rhn-ssl-dbstore b/backend/satellite_tools/rhn-ssl-dbstore
index f141018..9eaa56f 100755
--- a/backend/satellite_tools/rhn-ssl-dbstore
+++ b/backend/satellite_tools/rhn-ssl-dbstore
@@ -25,8 +25,6 @@ except KeyboardInterrupt:
sys.exit(0)
-sys.path.append("@@ROOT@@")
-
mod_name = string.replace(os.path.basename(sys.argv[0]), '-', '_')
try:
mod = __import__("spacewalk.satellite_tools", globals(), locals(), [mod_name])
commit ad1c2d8d98b84c941d20cc6ef1d25aa42a29fd8d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Oct 22 11:19:14 2010 +0200
612581 - fixing dynamic import
we moved namespace of spacewalk-backend to spacewalk. and move it to site-packages
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index dd8124a..033aff9 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -125,7 +125,7 @@ class RepoSync:
def load_plugin(self):
name = self.type + "_src"
- mod = __import__('satellite_tools.repo_plugins', globals(), locals(), [name])
+ mod = __import__('spacewalk.satellite_tools.repo_plugins', globals(), locals(), [name])
submod = getattr(mod, name)
return getattr(submod, "ContentSource")
diff --git a/backend/satellite_tools/rhn-satellite-activate b/backend/satellite_tools/rhn-satellite-activate
index 18355a4..a9de7a7 100755
--- a/backend/satellite_tools/rhn-satellite-activate
+++ b/backend/satellite_tools/rhn-satellite-activate
@@ -28,7 +28,7 @@ sys.path.append("@@ROOT@@")
mod_name = string.replace(os.path.basename(sys.argv[0]), '-', '_')
try:
- mod = __import__("satellite_tools." + mod_name)
+ mod = __import__("spacewalk.satellite_tools", globals(), locals(), [mod_name])
except KeyboardInterrupt:
sys.stderr.write("\nUser interrupted process.\n")
sys.exit(0)
diff --git a/backend/satellite_tools/rhn-ssl-dbstore b/backend/satellite_tools/rhn-ssl-dbstore
index 5c026d5..f141018 100755
--- a/backend/satellite_tools/rhn-ssl-dbstore
+++ b/backend/satellite_tools/rhn-ssl-dbstore
@@ -29,7 +29,7 @@ sys.path.append("@@ROOT@@")
mod_name = string.replace(os.path.basename(sys.argv[0]), '-', '_')
try:
- mod = __import__("satellite_tools." + mod_name)
+ mod = __import__("spacewalk.satellite_tools", globals(), locals(), [mod_name])
except KeyboardInterrupt:
sys.stderr.write("\nUser interrupted process.\n")
sys.exit(0)
13 years, 7 months
Changes to 'refs/tags/spacewalk-java-1.2.70-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.2.70-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-10-21 19:13 +0000
Tagging package [spacewalk-java] version [1.2.70-1] in directory [java/].
Changes since spacewalk-schema-1.2.49-1:
Colin Coe (1):
Fix checkstyle errors
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.2.70-1].
---
java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 24 +++++++++++
java/spacewalk-java.spec | 5 +-
rel-eng/packages/spacewalk-java | 2
3 files changed, 29 insertions(+), 2 deletions(-)
---
13 years, 7 months
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit c6900757b35e96e4e9a2348fe957f9a3fec5105e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Oct 21 21:13:23 2010 +0200
Automatic commit of package [spacewalk-java] release [1.2.70-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 99e4123..f814f4a 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -19,7 +19,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.2.69
+Version: 1.2.70
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -358,6 +358,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Oct 21 2010 Jan Pazdziora 1.2.70-1
+- Fix checkstyle errors (colin.coe(a)gmail.com)
+
* Thu Oct 21 2010 Lukas Zapletal 1.2.69-1
- Fixed all LEFT OUTER JOINs in Channels
- Fixed LEFT OUTER JOIN for PostgreSQL in Software Channels
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 4ce414d..2fc09d4 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.2.69-1 java/
+1.2.70-1 java/
13 years, 7 months
java/code
by Colin Coe
java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 24 +++++++++++
1 file changed, 24 insertions(+)
New commits:
commit dfbcc4fb8f65b6f2ac6c0a0358e50c6084d46738
Author: Colin Coe <colin.coe(a)gmail.com>
Date: Fri Oct 22 03:07:52 2010 +0800
Fix checkstyle errors
diff --git a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
index 35acdb7..7270b9e 100644
--- a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
+++ b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
@@ -181,26 +181,50 @@ public class ConfigDefaults {
private ConfigDefaults() {
}
+ /**
+ * Returns the System Currency multiplier for critical security errata
+ * @return the System Currency multiplier for critical security errata
+ */
public Integer getSCCrit() {
return Config.get().getInt(SYSTEM_CURRENCY_CRIT);
}
+ /**
+ * Returns the System Currency multiplier for important security errata
+ * @return the System Currency multiplier for important security errata
+ */
public Integer getSCImp() {
return Config.get().getInt(SYSTEM_CURRENCY_IMP);
}
+ /**
+ * Returns the System Currency multiplier for moderate security errata
+ * @return the System Currency multiplier for moderate security errata
+ */
public Integer getSCMod() {
return Config.get().getInt(SYSTEM_CURRENCY_MOD);
}
+ /**
+ * Returns the System Currency multiplier for low security errata
+ * @return the System Currency multiplier for low security errata
+ */
public Integer getSCLow() {
return Config.get().getInt(SYSTEM_CURRENCY_LOW);
}
+ /**
+ * Returns the System Currency multiplier for bug fix errata
+ * @return the System Currency multiplier for bug fix errata
+ */
public Integer getSCBug() {
return Config.get().getInt(SYSTEM_CURRENCY_BUG);
}
+ /**
+ * Returns the System Currency multiplier for enhancement errata
+ * @return the System Currency multiplier for enhancement errata
+ */
public Integer getSCEnh() {
return Config.get().getInt(SYSTEM_CURRENCY_ENH);
}
13 years, 7 months