Branch: refs/heads/release/jon3.1.x Home: https://github.com/rhq-project/rhq Commit: 76a84574a357a061f7a38d0972023baff9cecb66 https://github.com/rhq-project/rhq/commit/76a84574a357a061f7a38d0972023baff9... Author: Libor Zoubek lzoubek@redhat.com Date: 2015-08-04 (Tue, 04 Aug 2015)
Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
Log Message: ----------- Bug 1240854 - Group inventory pages (compatible, mixed, all) fail to display groups due to UI timeouts
Replace subqueries by JOINs. Due to JPA limitation of subqueries (One cannot write select x from (select y from z)). One query has been replaced with 2 (or 3) queries which we have to join in memory. This should not be a perf issue, since we're joining composite instance sets (max count of such set equals to total resource group count in DB). A case when 2 (or 3) subsequent queries could return sets of different sizes (due to underlying group deletion/addition) is handled as well.
(cherry picked from commit 5cc77db6b8ec6873a95d596d04376f4dccf08b32)
Conflicts: modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
Fix counting total resource count (only count COMMITTED resources)
(cherry picked from commit 0f6a0f9498139d0baa49f4cd830204a1b80138b8)
PageList which contains in memory joined results *must* contain paging info taken from one of original pagelists
(cherry picked from commit abfcbdbdcc0122cfef82a78aea213a5c696195c5)