Attachment 857965 Details for Bug 997609 – Patch for RHQ_4_9_0 v2

[patch] Patch for RHQ_4_9_0 v2

0003-BZ-997609-Drift-cannot-be-updated-with-1000-resource.patch (text/plain), 2.60 KB, created by Elias Ross on 2014-01-31 20:09:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elias Ross

Created: 2014-01-31 20:09:58 UTC

Size: 2.60 KB

patch

obsolete

>From 873c6487e20e47a6e1bb168c7deb8a7b929682a2 Mon Sep 17 00:00:00 2001
>From: Elias Ross <elias_ross@apple.com>
>Date: Tue, 28 Jan 2014 11:57:54 -0800
>Subject: [PATCH 3/4] BZ 997609 - Drift cannot be updated with > 1000
> resources; ORA-01795
>
>---
> .../enterprise/server/drift/DriftServerServiceImpl.java  | 16 ++++++++++++----
> 1 file changed, 12 insertions(+), 4 deletions(-)
>
>diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftServerServiceImpl.java
>index 1bb4111..e724519 100644
>--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftServerServiceImpl.java
>+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftServerServiceImpl.java
>@@ -79,6 +79,18 @@ public void repeatChangeSet(int resourceId, String driftDefName, int version) {
> 
>     @Override
>     public Map<Integer, List<DriftDefinition>> getDriftDefinitions(Set<Integer> resourceIds) {
>+        List<Integer> ids = new ArrayList<Integer>(resourceIds);
>+        Map<Integer, List<DriftDefinition>> result = new HashMap<Integer, List<DriftDefinition>>();
>+        while (!ids.isEmpty()) {
>+            // fix for Oracle > 1000 entries
>+            List<Integer> subList = ids.subList(0, Math.min(500, ids.size()));
>+            getDriftDefinitions0(result, subList);
>+            subList.clear(); // removes entries from parent
>+        }
>+        return result;
>+    }
>+
>+    private void getDriftDefinitions0(Map<Integer, List<DriftDefinition>> result, List<Integer> resourceIds) {
>         DriftDefinitionCriteria criteria = new DriftDefinitionCriteria();
>         criteria.addFilterResourceIds(resourceIds.toArray(new Integer[resourceIds.size()]));
>         criteria.fetchConfiguration(true);
>@@ -96,8 +108,6 @@ public void repeatChangeSet(int resourceId, String driftDefName, int version) {
>         CriteriaQuery<DriftDefinition, DriftDefinitionCriteria> definitions = new CriteriaQuery<DriftDefinition, DriftDefinitionCriteria>(
>             criteria, queryExecutor);
> 
>-        Map<Integer, List<DriftDefinition>> result = new HashMap<Integer, List<DriftDefinition>>();
>-
>         for (DriftDefinition driftDef : definitions) {
>             Integer resourceId = driftDef.getResource().getId();
>             List<DriftDefinition> list = result.get(resourceId);
>@@ -107,8 +117,6 @@ public void repeatChangeSet(int resourceId, String driftDefName, int version) {
>             }
>             list.add(driftDef);
>         }
>-
>-        return result;
>     }
> 
>     @Override
>-- 
>1.8.1.2
>

Actions: View | Diff

Attachments on bug 997609: 856821 | 857965