java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 9 ++++++++- java/spacewalk-java.spec | 9 ++++++++- rel-eng/packages/spacewalk-java | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-)
New commits: commit c60a633b442607eb5c5e789dd521cb7f3b470f1d Author: Michael Mraka michael.mraka@redhat.com Date: Wed Nov 6 10:12:23 2013 +0100
Automatic commit of package [spacewalk-java] release [2.1.66-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index e88f31a..f801a29 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.65 +Version: 2.1.66 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -785,6 +785,13 @@ fi %{jardir}/postgresql-jdbc.jar
%changelog +* Wed Nov 06 2013 Michael Mraka michael.mraka@redhat.com 2.1.66-1 +- 1024395 - modified query to work better with PostgreSQL 8.4 optimizer +- Reorder snippet tabs +- Broken link in SSM index fixed +- 1025626 - Prevent NPE with system.getDetails() API call for virtual systems + with no virtualization type + * Mon Nov 04 2013 Tomas Lestach tlestach@redhat.com 2.1.65-1 - 1023482 - spped up /rhn/channels/manage/errata/AddRedHatErrata.do page - Fix navigation for the default snippets page diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 380fef6..2444a70 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.65-1 java/ +2.1.66-1 java/
commit 6db02257d8fceaec60b0f70dfe20c660e593f4d4 Author: Michael Mraka michael.mraka@redhat.com Date: Wed Nov 6 10:11:12 2013 +0100
1024395 - 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 5504c2f..214608f 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 @@ -529,16 +529,21 @@ 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#1024395 for details ) 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#1024395 for details ) and not exists ( -- rule out records where other channel provides the same package name with higher evr @@ -550,6 +555,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#1024395 for details ) -- ) snv
spacewalk-commits@lists.fedorahosted.org