[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rhq-commits
Subject:    [rhq-project/rhq] 2b60db: Bug 1240854 - Group inventory pages (compatible, m...
From:       Libor Zoubek <lzoubek () redhat ! com>
Date:       2015-09-29 14:00:32
Message-ID: 560a9980e46fd_6a2d3f86450f92bc98914 () hookshot-fe5-cp1-prd ! iad ! github ! net ! mail
[Download RAW message or body]

Branch: refs/heads/hotfix/jon3.1.2
  Home:   https://github.com/rhq-project/rhq
  Commit: 2b60dba0b60cd962a8cdc9f8fd5644ad43e9c60f
      https://github.com/rhq-project/rhq/commit/2b60dba0b60cd962a8cdc9f8fd5644ad43e9c60f
  Author: Libor Zoubek <lzoubek@redhat.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    A 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

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


(cherry picked from commit 0f6a0f9498139d0baa49f4cd830204a1b80138b8)
(cherry picked from commit abfcbdbdcc0122cfef82a78aea213a5c696195c5)
(cherry picked from commit e835d8957e5d0a61d85d67f9755cf56c0f65c655)
(cherry picked from commit ee0902a5508e16363bbe6b482e423d109f4a0738)

Added various tests for findResourceGroupCompositesByCriteria

(cherry picked from commit 03d63872248b6eb07173cdb02f2a546bbb02ab9f)

Conflicts:
  modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LargeGroupCriteriaTest.java


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)
(cherry picked from commit fb177ff5b354af14fc05d13b165c5df953070cf0)
(cherry picked from commit 6e881b44f77beacaa83a1b9154c7439d417fec15)


[Attachment #3 (text/plain)]

_______________________________________________
rhq-commits mailing list
rhq-commits@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/rhq-commits


[prev in list] [next in list] [prev in thread] [next in thread]