spacewalk-commits
November 2013
spacewalk-commits@lists.fedorahosted.org
- 9 participants
- 202 discussions
Changes to 'refs/tags/spacewalk-java-2.1.64-1'
by Michael Mraka
Tag 'spacewalk-java-2.1.64-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-11-04 12:33 +0000
Tagging package [spacewalk-java] version [2.1.64-1] in directory [java/].
Changes since spacewalk-web-2.1.29-1:
Michael Mraka (3):
1022279 - added hints for PostgreSQL 8.4 optimizer
1022279 - modified query to work better with PostgreSQL 8.4 optimizer
Automatic commit of package [spacewalk-java] release [2.1.64-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 9 ++++++++-
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 14 insertions(+), 3 deletions(-)
---
10 years, 7 months
- 1
- 0
3 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Michael Mraka
java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 9 ++++++++-
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 14 insertions(+), 3 deletions(-)
New commits:
commit b00794a693cd07a66efd361d8fb28a9cccbeb407
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Nov 4 13:33:12 2013 +0100
Automatic commit of package [spacewalk-java] release [2.1.64-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 913781f..328ac1c 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.63
+Version: 2.1.64
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -785,6 +785,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Nov 04 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.64-1
+- 1022279 - modified query to work better with PostgreSQL 8.4 optimizer
+- 1022279 - added hints for PostgreSQL 8.4 optimizer
+
* Thu Oct 31 2013 Matej Kollar <mkollar(a)redhat.com> 2.1.63-1
- 1020952 - Single db root cert + option name change
- Checkstyle fix, follow JSL for method modifiers
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 973a89b..6a77c60 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.63-1 java/
+2.1.64-1 java/
commit ccd106a5ca81fb7a45ddcbe9c01c6e7dcb4bcb40
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Nov 4 13:31:26 2013 +0100
1022279 - modified query to work better with PostgreSQL 8.4 optimizer
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 a17217f..5504c2f 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
@@ -171,13 +171,16 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
)
and not exists (
-- rule out records where the server has the same package name with higher evr
- select 1 from rhnServerPackage sp, rhnPackageEVR sevr, rhnPackageUpgradeArchCompat puac
+ select 1 from rhnServerPackage sp, rhnPackageEVR sevr, rhnPackageUpgradeArchCompat puac,
+ rhnErrataPackage jep, rhnPackage jp
where rhnServerPackage.server_id = sp.server_id
and rhnServerPackage.name_id = sp.name_id
and sp.evr_id = sevr.id
and rhnPackageEVR.evr <= sevr.evr
and rhnServerPackage.package_arch_id = puac.package_arch_id
and puac.package_upgrade_arch_id = sp.package_arch_id
+ and jep.errata_id = :errata_id and jep.package_id = jp.id and jp.name_id = sp.name_id
+-- ^ helping PostgreSQL 8.4 optimizer, see BZ#1022279 for details
)
and not exists (
-- rule out records where other channel provides the same package name with higher evr
commit e431dc48db2d5197a1ef1888c6ef14fcfe869730
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Nov 4 13:26:38 2013 +0100
1022279 - added hints for PostgreSQL 8.4 optimizer
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 a55bd09..a17217f 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
@@ -166,6 +166,8 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
and rhnChannelNewestPackage.package_id = cp.package_id
and rhnServerChannel.server_id = csc.server_id
and cp.channel_id < rhnChannelNewestPackage.channel_id
+ and cp.channel_id = :channel_id
+-- ^ helping PostgreSQL 8.4 optimizer, see BZ#1022279 for details
)
and not exists (
-- rule out records where the server has the same package name with higher evr
@@ -187,6 +189,8 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
and rhnPackageEVR.evr < oevr.evr
and rhnServerPackage.package_arch_id = puac.package_arch_id
and puac.package_upgrade_arch_id = ocnp.package_arch_id
+ and csc.channel_id = :channel_id
+-- ^ helping PostgreSQL 8.4 optimizer, see BZ#1022279 for details
)
--
) SNV
10 years, 7 months
- 1
- 0