java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 33
+++++-----
java/spacewalk-java.spec | 6 +
rel-eng/packages/spacewalk-java | 2
3 files changed, 25 insertions(+), 16 deletions(-)
New commits:
commit 19cabfceb44af8cf8b57f1f19bf29b272730534c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 7 15:37:49 2013 +0100
Automatic commit of package [spacewalk-java] release [2.1.68-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index bdb69aa..eafc9ca 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.67
+Version: 2.1.68
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
+* Thu Nov 07 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.68-1
+- 1027050 - optimized system_config_files_with_diffs eleborator for PostgreSQL
+- 1027454 - fix ISE, when renaming channel to channel name already in use
+
* Wed Nov 06 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.67-1
- ConfigTest: do not rely on hardcoded paths, preexisting files
- Use kickstart icon on the snippets page
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 32506ac..73e79e8 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.67-1 java/
+2.1.68-1 java/
commit c6e300d50faf814621579daa15365b0df9745efd
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 7 15:34:25 2013 +0100
1027050 - optimized system_config_files_with_diffs eleborator for PostgreSQL
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 44f9edc..dd1417b 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
@@ -1284,21 +1284,26 @@ ORDER BY UPPER(COALESCE(SERVER_NAME, '(none)')),
SERVER_ID
<query name="system_config_files_with_diffs">
SELECT ACR.server_id AS ID, count(*) AS config_files_with_differences
- FROM rhnActionConfigRevision ACR
- INNER JOIN rhnActionConfigRevisionResult ACRR ON ACR.id =
ACRR.action_config_revision_id
- WHERE ACR.action_id = (
- SELECT MAX(rA.id)
- FROM rhnAction rA
- INNER JOIN rhnServerAction rSA ON rSA.action_id = rA.id
- INNER JOIN rhnActionStatus rAS ON rAS.id = rSA.status
- INNER JOIN rhnActionType rAT ON rAT.id = rA.action_type
- WHERE rSA.server_id = ACR.server_id
- AND rAS.name in ('Completed', 'Failed')
- AND rAT.label = 'configfiles.diff'
- )
- AND ACR.failure_id is null
+ FROM
+ (SELECT rSA.server_id, MAX(rA.id)
+ FROM rhnAction rA
+ JOIN rhnServerAction rSA
+ ON rSA.action_id = rA.id
+ JOIN rhnActionStatus rAS
+ ON rAS.id = rSA.status
+ JOIN rhnActionType rAT
+ ON rAT.id = rA.action_type
+ WHERE RSA.server_id in (%s)
+ AND rAS.name in ('Completed', 'Failed')
+ AND rAT.label = 'configfiles.diff'
+ GROUP BY rSA.server_id
+ ) X
+ JOIN rhnActionConfigRevision ACR
+ ON X.server_id = ACR.server_id
+ JOIN rhnActionConfigRevisionResult ACRR
+ ON ACR.id = ACRR.action_config_revision_id
+ WHERE ACR.failure_id is null
AND ACRR.result is not null
- AND ACR.server_id in (%s)
GROUP BY ACR.server_id
</query>