Branch: refs/heads/release/jon3.3.x
Home:
https://github.com/rhq-project/rhq
Commit: d013835ff2fad09c548a61df04bd0de386890090
https://github.com/rhq-project/rhq/commit/d013835ff2fad09c548a61df04bd0de...
Author: Libor Zoubek <lzoubek(a)redhat.com>
Date: 2015-09-30 (Wed, 30 Sep 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)
Signed-off-by: Libor Zoubek <lzoubek(a)redhat.com>
Commit: 152a1085b301f444e6795a69bed59290fbfc80f5
https://github.com/rhq-project/rhq/commit/152a1085b301f444e6795a69bed5929...
Author: Libor Zoubek <lzoubek(a)redhat.com>
Date: 2015-09-30 (Wed, 30 Sep 2015)
Changed paths:
M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java
Log Message:
-----------
Bug 1240854 - Group inventory pages (compatible, mixed, all) fail to display
Fix counting total resource count (only count COMMITTED resources)
(cherry picked from commit 0f6a0f9498139d0baa49f4cd830204a1b80138b8)
Signed-off-by: Libor Zoubek <lzoubek(a)redhat.com>
Commit: e3fc0ba6e615661feec26a65599479cbb5f0e2ef
https://github.com/rhq-project/rhq/commit/e3fc0ba6e615661feec26a65599479c...
Author: Libor Zoubek <lzoubek(a)redhat.com>
Date: 2015-09-30 (Wed, 30 Sep 2015)
Changed paths:
M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java
Log Message:
-----------
Bug 1240854 - Group inventory pages (compatible, mixed, all) fail to display
PageList which contains in memory joined results *must* contain paging info
taken from one of original pagelists
(cherry picked from commit abfcbdbdcc0122cfef82a78aea213a5c696195c5)
Signed-off-by: Libor Zoubek <lzoubek(a)redhat.com>
Commit: b6639167915dbeb6eb040a475d59b9416100b985
https://github.com/rhq-project/rhq/commit/b6639167915dbeb6eb040a475d59b94...
Author: Libor Zoubek <lzoubek(a)redhat.com>
Date: 2015-09-30 (Wed, 30 Sep 2015)
Changed paths:
M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java
Log Message:
-----------
Bug 1240854 - Group inventory pages (compatible, mixed, all) fail to display
groups due to UI timeouts
use left (outer) joins, so we don't miss empty groups
(cherry picked from commit ee0902a5508e16363bbe6b482e423d109f4a0738)
Signed-off-by: Libor Zoubek <lzoubek(a)redhat.com>
Commit: a44c9a11f2f240610fd51c54a1469db300b9d6f5
https://github.com/rhq-project/rhq/commit/a44c9a11f2f240610fd51c54a1469db...
Author: Libor Zoubek <lzoubek(a)redhat.com>
Date: 2015-09-30 (Wed, 30 Sep 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
CriteriaQueryGenerator is now able to write group by aliases, based on
ordering fields. In a specific case, when we alter projection, override FROM
clause (whith several JOINs) override GROUP BY clause the resulting query
must be grouped by ordering fields - this fix in CriteriaQueryGenerator adds
a new flag, which enables this feature - so default behaviour does not
change. This fixes issue with ordering of ResourceGroupComposites based on
criteria.
(cherry picked from commit e835d8957e5d0a61d85d67f9755cf56c0f65c655)
Signed-off-by: Libor Zoubek <lzoubek(a)redhat.com>
Commit: cc9f5c0d50f5977a792d1aa23b692e00ef1957c1
https://github.com/rhq-project/rhq/commit/cc9f5c0d50f5977a792d1aa23b692e0...
Author: Libor Zoubek <lzoubek(a)redhat.com>
Date: 2015-09-30 (Wed, 30 Sep 2015)
Changed paths:
M
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LargeGroupCriteriaTest.java
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
Fix generated GROUP BY clauses. On oracle it is not enough to use group by
resourcegroup, but it need also the field name (so it has to look like
'resourcegroup.id'). Added various tests for
findResourceGroupCompositesByCriteria
(cherry picked from commit 03d63872248b6eb07173cdb02f2a546bbb02ab9f)
Signed-off-by: Libor Zoubek <lzoubek(a)redhat.com>
Commit: ddc8ac6f6489fd9fb82fb247fe2f7d82adac3d0a
https://github.com/rhq-project/rhq/commit/ddc8ac6f6489fd9fb82fb247fe2f7d8...
Author: Libor Zoubek <lzoubek(a)redhat.com>
Date: 2015-09-30 (Wed, 30 Sep 2015)
Changed paths:
M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java
Log Message:
-----------
Bug 1240854 - Group inventory pages (compatible, mixed, all) fail to display
Re-write to make queries even faster. We select only groups based on initial
criteria, then we select composites (implicit/explicit) but only by group
ids from first query. This should be faster, because database has to order
results only once - when selecting plain groups. Expensive join/composite
queries can be unordered.
(cherry picked from commit 62f0e6bf27f0ee6aeb09a1581795ba15c80f20c1)
Signed-off-by: Libor Zoubek <lzoubek(a)redhat.com>
Commit: bec870df3a5f3dfeba1038108930b3a6befbd266
https://github.com/rhq-project/rhq/commit/bec870df3a5f3dfeba1038108930b3a...
Author: Libor Zoubek <lzoubek(a)redhat.com>
Date: 2015-09-30 (Wed, 30 Sep 2015)
Changed paths:
M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java
Log Message:
-----------
Bug 1240854 - Group inventory pages (compatible, mixed, all) fail to …
…display
Use non-generic (JPA 1.0 compatible) way to create queries
(cherry picked from commit fb177ff5b354af14fc05d13b165c5df953070cf0)
Signed-off-by: Libor Zoubek <lzoubek(a)redhat.com>
Commit: 09ae6ab2dee9ed9f3eaaf6d7115173712c68e71f
https://github.com/rhq-project/rhq/commit/09ae6ab2dee9ed9f3eaaf6d71151737...
Author: Libor Zoubek <lzoubek(a)redhat.com>
Date: 2015-09-30 (Wed, 30 Sep 2015)
Changed paths:
M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java
Log Message:
-----------
Bug 1240854 - Group inventory pages (compatible, mixed, all) fail to display
groups due to UI timeouts
Load group facets to the right ResouceGroupComposite instances
(cherry picked from commit 6e881b44f77beacaa83a1b9154c7439d417fec15)
Signed-off-by: Libor Zoubek <lzoubek(a)redhat.com>
Commit: d822e24d62af87e5a201194f7ffa4cf854e080f6
https://github.com/rhq-project/rhq/commit/d822e24d62af87e5a201194f7ffa4cf...
Author: Libor Zoubek <lzoubek(a)jezzovo.net>
Date: 2015-09-30 (Wed, 30 Sep 2015)
Changed paths:
M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java
Log Message:
-----------
Bug 1240854 - Group inventory pages (compatible, mixed, all) fail to
Update copyright
(cherry picked from commit 8ebc027a5fbc93902f1ff1c4cea4b30a9740deaa)
Signed-off-by: Libor Zoubek <lzoubek(a)redhat.com>
Compare:
https://github.com/rhq-project/rhq/compare/5419181f4f88...d822e24d62af