modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java | 15 ---------- modules/core/domain/src/test/java/org/rhq/core/domain/test/QueriesTest.java | 8 ++++- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java | 4 +- 3 files changed, 8 insertions(+), 19 deletions(-)
New commits: commit dbd7dc1a375b47eb91075a9404f5f92e8a0f46d0 Merge: 83c59bb... ae4c7c2... Author: Heiko W. Rupp hwr@redhat.com Date: Fri Jul 30 12:27:48 2010 +0200
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit 83c59bb8502776784ab83a360130d7b3b961ecd0 Author: Heiko W. Rupp hwr@redhat.com Date: Thu Jul 29 21:52:24 2010 +0200
Cater for Oracle returning -2 and just add 1 item instead
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java index 770ae6e..65bf0e3 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java @@ -330,7 +330,7 @@ public class CallTimeDataManagerBean implements CallTimeDataManagerLocal, CallTi + results[i] + "] for batch command [" + i + "] is less than 0 or greater than 1."); }
- insertedRowCount += results[i]; + insertedRowCount += results[i]==-2 ? 1 : results[i] ; // If Oracle returns -2, just count 1 row }
log.debug("Inserted new call-time data key rows for " + ((insertedRowCount >= 0) ? insertedRowCount : "?") @@ -406,7 +406,7 @@ public class CallTimeDataManagerBean implements CallTimeDataManagerLocal, CallTi + results[i] + "] for batch command [" + i + "] does not equal 1."); }
- insertedRowCount += results[i]; + insertedRowCount += results[i]==-2 ? 1 : results[i] ; // If Oracle returns -2, just count 1 row; }
notifyAlertConditionCacheManager("insertCallTimeDataValues", callTimeDataSet
commit 4f675366f3743d33b8da8b9c73389550d515f162 Merge: c0c02b6... 50a5832... Author: Heiko W. Rupp hwr@redhat.com Date: Wed Jul 28 17:30:44 2010 +0200
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit c0c02b6a66332cd2c5d0605830ec2e69b59afc61 Author: Heiko W. Rupp hwr@redhat.com Date: Tue Jul 27 14:21:37 2010 +0200
This query is no longer needed
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java index bae5e26..8f4e45f 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java @@ -709,20 +709,6 @@ import org.rhq.core.domain.util.Summary; + " r.parentResource = NULL, " // takes resources out of the hierarchy, so we don't have to change ResourceSyncInfo logic + " r.resourceKey = 'deleted' " // + " WHERE r.id IN (:resourceIds ) "), // - @NamedQuery(name = Resource.QUERY_MARK_RESOURCES_FOR_ASYNC_DELETION, query = "" // - + "UPDATE Resource r " // - + " SET r.inventoryStatus = :status, " // - + " r.agent = NULL, " // - + " r.parentResource = NULL, " // takes resources out of the hierarchy, so we don't have to change ResourceSyncInfo logic - + " r.resourceKey = 'deleted' " // - + " WHERE r.id = :resourceId " // - + " OR r.id IN (SELECT rr.id FROM Resource rr JOIN rr.parentResource p1 WHERE p1.id = :resourceId) " - + " OR r.id IN (SELECT rr.id FROM Resource rr JOIN rr.parentResource.parentResource p2 WHERE p2.id = :resourceId) " - + " OR r.id IN (SELECT rr.id FROM Resource rr JOIN rr.parentResource.parentResource.parentResource p3 WHERE p3.id = :resourceId) " - + " OR r.id IN (SELECT rr.id FROM Resource rr JOIN rr.parentResource.parentResource.parentResource.parentResource p4 WHERE p4.id = :resourceId) " - + " OR r.id IN (SELECT rr.id FROM Resource rr JOIN rr.parentResource.parentResource.parentResource.parentResource.parentResource p5 WHERE p5.id = :resourceId) " - + " OR r.id IN (SELECT rr.id FROM Resource rr JOIN rr.parentResource.parentResource.parentResource.parentResource.parentResource.parentResource p6 WHERE p6.id = :resourceId) " - + " "), // @NamedQuery(name = Resource.QUERY_FIND_RESOURCES_MARKED_FOR_ASYNC_DELETION, query = "" // + "SELECT r.id FROM Resource AS r WHERE r.agent IS NULL"),
@@ -866,7 +852,6 @@ public class Resource implements Comparable<Resource>, Serializable { public static final String QUERY_FIND_DESCENDENTS_BY_TYPE_AND_NAME = "Resource.findDescendentsByTypeAndName"; public static final String QUERY_FIND_DESCENDENTS = "Resource.findDescendents"; public static final String QUERY_MARK_RESOURCES_FOR_ASYNC_DELETION_QUICK = "Resource.markResourcesForAsyncDeletionQuick"; - public static final String QUERY_MARK_RESOURCES_FOR_ASYNC_DELETION = "Resource.markResourcesForAsyncDeletion"; public static final String QUERY_FIND_RESOURCES_MARKED_FOR_ASYNC_DELETION = "Resource.findResourcesMarkedForAsyncDeletion";
public static final String QUERY_RESOURCE_REPORT = "Resource.findResourceReport"; diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/test/QueriesTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/test/QueriesTest.java index b1328e9..a60fa33 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/test/QueriesTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/test/QueriesTest.java @@ -22,7 +22,9 @@ */ package org.rhq.core.domain.test;
+import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.TreeMap;
@@ -149,8 +151,10 @@ public class QueriesTest extends AbstractEJB3Test { tx.begin();
EntityManager entityManager = getEntityManager(); - Query q = entityManager.createNamedQuery(Resource.QUERY_MARK_RESOURCES_FOR_ASYNC_DELETION); - q.setParameter("resourceId", 1); + Query q = entityManager.createNamedQuery(Resource.QUERY_MARK_RESOURCES_FOR_ASYNC_DELETION_QUICK); + List<Integer> ids = new ArrayList<Integer>(); + ids.add(1); + q.setParameter("resourceIds", ids); q.setParameter("status", InventoryStatus.UNINVENTORIED); q.executeUpdate(); }
rhq-commits@lists.fedorahosted.org