cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject git commit: updated refs/heads/bugfix/CID-1241967 to eb7bfb2
Date Tue, 30 Sep 2014 08:12:36 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/bugfix/CID-1241967 [created] eb7bfb278


Small optimization possibility reported by Coverity

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/eb7bfb27
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/eb7bfb27
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/eb7bfb27

Branch: refs/heads/bugfix/CID-1241967
Commit: eb7bfb2783b2ca4a861f4a5eefb70947eb8023ca
Parents: ef4b5d4
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Authored: Tue Sep 30 10:12:09 2014 +0200
Committer: Hugo Trippaers <htrippaers@schubergphilis.com>
Committed: Tue Sep 30 10:12:09 2014 +0200

----------------------------------------------------------------------
 .../com/cloud/capacity/dao/CapacityDaoImpl.java | 199 ++++++++++---------
 1 file changed, 100 insertions(+), 99 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eb7bfb27/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
index 8636857..45b10f0 100755
--- a/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
+++ b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import javax.ejb.Local;
 import javax.inject.Inject;
@@ -55,14 +56,14 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long>
implements
 
     private static final String ADD_ALLOCATED_SQL = "UPDATE `cloud`.`op_host_capacity` SET
used_capacity = used_capacity + ? WHERE host_id = ? AND capacity_type = ?";
     private static final String SUBTRACT_ALLOCATED_SQL =
-        "UPDATE `cloud`.`op_host_capacity` SET used_capacity = used_capacity - ? WHERE host_id
= ? AND capacity_type = ?";
+            "UPDATE `cloud`.`op_host_capacity` SET used_capacity = used_capacity - ? WHERE
host_id = ? AND capacity_type = ?";
 
     private static final String LIST_CLUSTERSINZONE_BY_HOST_CAPACITIES_PART1 =
-        "SELECT DISTINCT capacity.cluster_id  FROM `cloud`.`op_host_capacity` capacity INNER
JOIN `cloud`.`cluster` cluster on (cluster.id = capacity.cluster_id AND cluster.removed is
NULL)   INNER JOIN `cloud`.`cluster_details` cluster_details ON (cluster.id = cluster_details.cluster_id
) WHERE ";
+            "SELECT DISTINCT capacity.cluster_id  FROM `cloud`.`op_host_capacity` capacity
INNER JOIN `cloud`.`cluster` cluster on (cluster.id = capacity.cluster_id AND cluster.removed
is NULL)   INNER JOIN `cloud`.`cluster_details` cluster_details ON (cluster.id = cluster_details.cluster_id
) WHERE ";
     private static final String LIST_CLUSTERSINZONE_BY_HOST_CAPACITIES_PART2 =
-        " AND capacity_type = ? AND cluster_details.name= ? AND ((total_capacity * cluster_details.value
) - used_capacity + reserved_capacity) >= ? AND capacity.cluster_id IN (SELECT distinct
capacity.cluster_id  FROM `cloud`.`op_host_capacity` capacity INNER JOIN  `cloud`.`cluster_details`
cluster_details ON (capacity.cluster_id = cluster_details.cluster_id ) WHERE ";
+            " AND capacity_type = ? AND cluster_details.name= ? AND ((total_capacity * cluster_details.value
) - used_capacity + reserved_capacity) >= ? AND capacity.cluster_id IN (SELECT distinct
capacity.cluster_id  FROM `cloud`.`op_host_capacity` capacity INNER JOIN  `cloud`.`cluster_details`
cluster_details ON (capacity.cluster_id = cluster_details.cluster_id ) WHERE ";
     private static final String LIST_CLUSTERSINZONE_BY_HOST_CAPACITIES_PART3 =
-        " AND capacity_type = ? AND cluster_details.name= ? AND ((total_capacity * cluster_details.value)
- used_capacity + reserved_capacity) >= ?) ";
+            " AND capacity_type = ? AND cluster_details.name= ? AND ((total_capacity * cluster_details.value)
- used_capacity + reserved_capacity) >= ?) ";
 
     private final SearchBuilder<CapacityVO> _hostIdTypeSearch;
     private final SearchBuilder<CapacityVO> _hostOrPoolIdSearch;
@@ -73,66 +74,66 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long>
implements
     protected ClusterDetailsDao _clusterDetailsDao;
 
     private static final String LIST_HOSTS_IN_CLUSTER_WITH_ENOUGH_CAPACITY =
-        " SELECT  host_capacity.host_id FROM (`cloud`.`host` JOIN `cloud`.`op_host_capacity`
host_capacity ON (host.id = host_capacity.host_id AND host.cluster_id = ?) JOIN `cloud`.`cluster_details`
cluster_details ON (host_capacity.cluster_id = cluster_details.cluster_id) AND  host.type
= ? AND cluster_details.name='cpuOvercommitRatio' AND ((host_capacity.total_capacity *cluster_details.value
) - host_capacity.used_capacity) >= ? and host_capacity.capacity_type = '1' "
-            + " AND  host_capacity.host_id IN (SELECT capacity.host_id FROM `cloud`.`op_host_capacity`
capacity JOIN `cloud`.`cluster_details` cluster_details ON (capacity.cluster_id= cluster_details.cluster_id)
where capacity_type='0' AND cluster_details.name='memoryOvercommitRatio' AND ((total_capacity*
cluster_details.value) - used_capacity ) >= ?)) ";
+            " SELECT  host_capacity.host_id FROM (`cloud`.`host` JOIN `cloud`.`op_host_capacity`
host_capacity ON (host.id = host_capacity.host_id AND host.cluster_id = ?) JOIN `cloud`.`cluster_details`
cluster_details ON (host_capacity.cluster_id = cluster_details.cluster_id) AND  host.type
= ? AND cluster_details.name='cpuOvercommitRatio' AND ((host_capacity.total_capacity *cluster_details.value
) - host_capacity.used_capacity) >= ? and host_capacity.capacity_type = '1' "
+                    + " AND  host_capacity.host_id IN (SELECT capacity.host_id FROM `cloud`.`op_host_capacity`
capacity JOIN `cloud`.`cluster_details` cluster_details ON (capacity.cluster_id= cluster_details.cluster_id)
where capacity_type='0' AND cluster_details.name='memoryOvercommitRatio' AND ((total_capacity*
cluster_details.value) - used_capacity ) >= ?)) ";
 
     private static final String ORDER_CLUSTERS_BY_AGGREGATE_CAPACITY_PART1 =
-        "SELECT capacity.cluster_id, SUM(used_capacity+reserved_capacity)/SUM(total_capacity
) FROM `cloud`.`op_host_capacity` capacity WHERE ";
+            "SELECT capacity.cluster_id, SUM(used_capacity+reserved_capacity)/SUM(total_capacity
) FROM `cloud`.`op_host_capacity` capacity WHERE ";
 
     private static final String ORDER_CLUSTERS_BY_AGGREGATE_CAPACITY_PART2 =
-        " AND capacity_type = ?  AND cluster_details.name =? GROUP BY capacity.cluster_id
ORDER BY SUM(used_capacity+reserved_capacity)/SUM(total_capacity * cluster_details.value)
ASC";
+            " AND capacity_type = ?  AND cluster_details.name =? GROUP BY capacity.cluster_id
ORDER BY SUM(used_capacity+reserved_capacity)/SUM(total_capacity * cluster_details.value)
ASC";
 
     private static final String ORDER_CLUSTERS_BY_AGGREGATE_OVERCOMMIT_CAPACITY_PART1 =
-        "SELECT capacity.cluster_id, SUM(used_capacity+reserved_capacity)/SUM(total_capacity
* cluster_details.value) FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster_details`
cluster_details ON (capacity.cluster_id = cluster_details.cluster_id) WHERE ";
+            "SELECT capacity.cluster_id, SUM(used_capacity+reserved_capacity)/SUM(total_capacity
* cluster_details.value) FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster_details`
cluster_details ON (capacity.cluster_id = cluster_details.cluster_id) WHERE ";
 
     private static final String ORDER_CLUSTERS_BY_AGGREGATE_OVERCOMMIT_CAPACITY_PART2 =
-        " AND capacity_type = ?  AND cluster_details.name =? GROUP BY capacity.cluster_id
ORDER BY SUM(used_capacity+reserved_capacity)/SUM(total_capacity * cluster_details.value)
ASC";
+            " AND capacity_type = ?  AND cluster_details.name =? GROUP BY capacity.cluster_id
ORDER BY SUM(used_capacity+reserved_capacity)/SUM(total_capacity * cluster_details.value)
ASC";
 
     private static final String LIST_PODSINZONE_BY_HOST_CAPACITY_TYPE =
-        "SELECT DISTINCT capacity.pod_id FROM `cloud`.`op_host_capacity` capacity INNER JOIN
`cloud`.`host_pod_ref` pod "
-            + " ON (pod.id = capacity.pod_id AND pod.removed is NULL) INNER JOIN `cloud`.`cluster_details`
cluster_details ON (capacity.cluster_id = cluster_details.cluster_id ) WHERE capacity.data_center_id
= ? AND capacity_type = ? AND cluster_details.name= ? AND ((total_capacity * cluster_details.value
) - used_capacity + reserved_capacity) >= ? ";
+            "SELECT DISTINCT capacity.pod_id FROM `cloud`.`op_host_capacity` capacity INNER
JOIN `cloud`.`host_pod_ref` pod "
+                    + " ON (pod.id = capacity.pod_id AND pod.removed is NULL) INNER JOIN
`cloud`.`cluster_details` cluster_details ON (capacity.cluster_id = cluster_details.cluster_id
) WHERE capacity.data_center_id = ? AND capacity_type = ? AND cluster_details.name= ? AND
((total_capacity * cluster_details.value ) - used_capacity + reserved_capacity) >= ? ";
 
     private static final String ORDER_PODS_BY_AGGREGATE_CAPACITY =
-        " SELECT capacity.pod_id, SUM(used_capacity+reserved_capacity)/SUM(total_capacity)
FROM `cloud`.`op_host_capacity` capacity WHERE data_center_id= ? AND capacity_type = ? GROUP
BY capacity.pod_id ORDER BY SUM(used_capacity+reserved_capacity)/SUM(total_capacity) ASC ";
+            " SELECT capacity.pod_id, SUM(used_capacity+reserved_capacity)/SUM(total_capacity)
FROM `cloud`.`op_host_capacity` capacity WHERE data_center_id= ? AND capacity_type = ? GROUP
BY capacity.pod_id ORDER BY SUM(used_capacity+reserved_capacity)/SUM(total_capacity) ASC ";
 
     private static final String ORDER_PODS_BY_AGGREGATE_OVERCOMMIT_CAPACITY =
-        "SELECT capacity.pod_id, SUM(used_capacity+reserved_capacity)/SUM(total_capacity
* cluster_details.value) FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster_details`
cluster_details ON (capacity.cluster_id = cluster_details.cluster_id) WHERE data_center_id=?
AND capacity_type = ?  AND cluster_details.name = ? GROUP BY capacity.pod_id ORDER BY SUM(used_capacity+reserved_capacity)/SUM(total_capacity
* cluster_details.value) ASC";
+            "SELECT capacity.pod_id, SUM(used_capacity+reserved_capacity)/SUM(total_capacity
* cluster_details.value) FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster_details`
cluster_details ON (capacity.cluster_id = cluster_details.cluster_id) WHERE data_center_id=?
AND capacity_type = ?  AND cluster_details.name = ? GROUP BY capacity.pod_id ORDER BY SUM(used_capacity+reserved_capacity)/SUM(total_capacity
* cluster_details.value) ASC";
 
     private static final String LIST_CAPACITY_BY_RESOURCE_STATE =
-        "SELECT capacity.data_center_id, sum(capacity.used_capacity), sum(capacity.reserved_quantity),
sum(capacity.total_capacity), capacity_capacity_type "
-            + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`data_center`
dc ON (dc.id = capacity.data_center_id AND dc.removed is NULL)"
-            + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`host_pod_ref`
pod ON (pod.id = capacity.pod_id AND pod.removed is NULL)"
-            + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster` cluster
ON (cluster.id = capacity.cluster_id AND cluster.removed is NULL)"
-            + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`host` host ON
(host.id = capacity.host_id AND host.removed is NULL)"
-            + "WHERE dc.allocation_state = ? AND pod.allocation_state = ? AND cluster.allocation_state
= ? AND host.resource_state = ? AND capacity_type not in (3,4) ";
+            "SELECT capacity.data_center_id, sum(capacity.used_capacity), sum(capacity.reserved_quantity),
sum(capacity.total_capacity), capacity_capacity_type "
+                    + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`data_center`
dc ON (dc.id = capacity.data_center_id AND dc.removed is NULL)"
+                    + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`host_pod_ref`
pod ON (pod.id = capacity.pod_id AND pod.removed is NULL)"
+                    + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster`
cluster ON (cluster.id = capacity.cluster_id AND cluster.removed is NULL)"
+                    + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`host`
host ON (host.id = capacity.host_id AND host.removed is NULL)"
+                    + "WHERE dc.allocation_state = ? AND pod.allocation_state = ? AND cluster.allocation_state
= ? AND host.resource_state = ? AND capacity_type not in (3,4) ";
 
     private static final String LIST_CAPACITY_GROUP_BY_ZONE_TYPE_PART1 =
-        "SELECT sum(capacity.used_capacity), sum(capacity.reserved_capacity),"
-            + " (case capacity_type when 1 then (sum(total_capacity) * (select value from
`cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))"
-            + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details`
where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))"
-            + "else sum(total_capacity) end),"
-            + "((sum(capacity.used_capacity) + sum(capacity.reserved_capacity)) / ( case
capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details`
where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))"
-            + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details`
where cluster_details.name='memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else
sum(total_capacity) end)) percent,"
-            + "capacity.capacity_type, capacity.data_center_id, pod_id, cluster_id FROM `cloud`.`op_host_capacity`
capacity WHERE  total_capacity > 0 AND data_center_id is not null AND capacity_state='Enabled'";
+            "SELECT sum(capacity.used_capacity), sum(capacity.reserved_capacity),"
+                    + " (case capacity_type when 1 then (sum(total_capacity) * (select value
from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))"
+                    + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details`
where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))"
+                    + "else sum(total_capacity) end),"
+                    + "((sum(capacity.used_capacity) + sum(capacity.reserved_capacity)) /
( case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details`
where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))"
+                    + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details`
where cluster_details.name='memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else
sum(total_capacity) end)) percent,"
+                    + "capacity.capacity_type, capacity.data_center_id, pod_id, cluster_id
FROM `cloud`.`op_host_capacity` capacity WHERE  total_capacity > 0 AND data_center_id is
not null AND capacity_state='Enabled'";
 
     private static final String LIST_CAPACITY_GROUP_BY_ZONE_TYPE_PART2 = " GROUP BY data_center_id,
capacity_type order by percent desc limit ";
     private static final String LIST_CAPACITY_GROUP_BY_POD_TYPE_PART1 =
-        "SELECT sum(capacity.used_capacity), sum(capacity.reserved_capacity),"
-            + " (case capacity_type when 1 then (sum(total_capacity) * (select value from
`cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))
"
-            + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details`
where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else
sum(total_capacity) end),"
-            + "((sum(capacity.used_capacity) + sum(capacity.reserved_capacity)) / ( case
capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details`
where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))
"
-            + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details`
where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else
sum(total_capacity) end)) percent,"
-            + "capacity.capacity_type, capacity.data_center_id, pod_id, cluster_id  FROM
`cloud`.`op_host_capacity` capacity WHERE  total_capacity > 0 AND data_center_id is not
null AND capacity_state='Enabled' ";
+            "SELECT sum(capacity.used_capacity), sum(capacity.reserved_capacity),"
+                    + " (case capacity_type when 1 then (sum(total_capacity) * (select value
from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))
"
+                    + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details`
where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else
sum(total_capacity) end),"
+                    + "((sum(capacity.used_capacity) + sum(capacity.reserved_capacity)) /
( case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details`
where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))
"
+                    + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details`
where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else
sum(total_capacity) end)) percent,"
+                    + "capacity.capacity_type, capacity.data_center_id, pod_id, cluster_id
 FROM `cloud`.`op_host_capacity` capacity WHERE  total_capacity > 0 AND data_center_id
is not null AND capacity_state='Enabled' ";
 
     private static final String LIST_CAPACITY_GROUP_BY_POD_TYPE_PART2 = " GROUP BY pod_id,
capacity_type order by percent desc limit ";
 
     private static final String LIST_CAPACITY_GROUP_BY_CLUSTER_TYPE_PART1 =
-        "SELECT sum(capacity.used_capacity), sum(capacity.reserved_capacity),"
-            + " (case capacity_type when 1 then (sum(total_capacity) * (select value from
`cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))
"
-            + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details`
where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else
sum(total_capacity) end),"
-            + "((sum(capacity.used_capacity) + sum(capacity.reserved_capacity)) / ( case
capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details`
where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))
"
-            + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details`
where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else
sum(total_capacity) end)) percent,"
-            + "capacity.capacity_type, capacity.data_center_id, pod_id, cluster_id FROM `cloud`.`op_host_capacity`
capacity WHERE  total_capacity > 0 AND data_center_id is not null AND capacity_state='Enabled'
";
+            "SELECT sum(capacity.used_capacity), sum(capacity.reserved_capacity),"
+                    + " (case capacity_type when 1 then (sum(total_capacity) * (select value
from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))
"
+                    + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details`
where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else
sum(total_capacity) end),"
+                    + "((sum(capacity.used_capacity) + sum(capacity.reserved_capacity)) /
( case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details`
where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))
"
+                    + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details`
where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else
sum(total_capacity) end)) percent,"
+                    + "capacity.capacity_type, capacity.data_center_id, pod_id, cluster_id
FROM `cloud`.`op_host_capacity` capacity WHERE  total_capacity > 0 AND data_center_id is
not null AND capacity_state='Enabled' ";
 
     private static final String LIST_CAPACITY_GROUP_BY_CLUSTER_TYPE_PART2 = " GROUP BY cluster_id,
capacity_type, pod_id order by percent desc limit ";
     private static final String UPDATE_CAPACITY_STATE = "UPDATE `cloud`.`op_host_capacity`
SET capacity_state = ? WHERE ";
@@ -148,43 +149,43 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long>
implements
     private static final String LIST_CAPACITY_GROUP_BY_CAPACITY_DATA_CENTER_POD_CLUSTER =
" GROUP BY data_center_id, pod_id, cluster_id, capacity_type";
 
     /* In the below query"LIST_CLUSTERS_CROSSING_THRESHOLD" the threshold value is getting
from the cluster_details table if not present then it gets from the global configuration
-    *
-    * CASE statement works like
-    * if (cluster_details table has threshold value)
-    * then
-    *     if (value from the cluster_details table is not null)
-    *     then
-    *         query from the cluster_details table
-    *     else
-    *         query from the configuration table
-    * else
-    *     query from the configuration table
-    *
-    *     */
+     *
+     * CASE statement works like
+     * if (cluster_details table has threshold value)
+     * then
+     *     if (value from the cluster_details table is not null)
+     *     then
+     *         query from the cluster_details table
+     *     else
+     *         query from the configuration table
+     * else
+     *     query from the configuration table
+     *
+     *     */
 
     private static final String LIST_CLUSTERS_CROSSING_THRESHOLD = "SELECT clusterList.cluster_id
"
-        +
-        "FROM (SELECT cluster.cluster_id cluster_id, ( (sum(cluster.used) + sum(cluster.reserved)
+ ?)/sum(cluster.total) ) ratio, cluster.configValue value "
-        +
-        "FROM (SELECT capacity.cluster_id cluster_id, capacity.used_capacity used, capacity.reserved_capacity
reserved, capacity.total_capacity * overcommit.value total, "
-        +
-        "CASE (SELECT count(*) FROM `cloud`.`cluster_details` details WHERE details.cluster_id
= capacity.cluster_id AND details.name = ? ) "
-        +
-        "WHEN 1 THEN (CASE WHEN (SELECT details.value FROM `cloud`.`cluster_details` details
WHERE details.cluster_id = capacity.cluster_id AND details.name = ?) is NULL "
-        +
-        "THEN (SELECT config.value FROM `cloud`.`configuration` config WHERE config.name
= ?)" +
-        "ELSE (SELECT details.value FROM `cloud`.`cluster_details` details WHERE details.cluster_id
= capacity.cluster_id AND details.name = ? ) END )" +
-        "ELSE (SELECT config.value FROM `cloud`.`configuration` config WHERE config.name
= ?) " +
-        "END configValue " +
-        "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster_details` overcommit
ON overcommit.cluster_id = capacity.cluster_id " +
-        "WHERE capacity.data_center_id = ? AND capacity.capacity_type = ? AND capacity.total_capacity
> 0 AND overcommit.name = ?) cluster " +
+            +
+            "FROM (SELECT cluster.cluster_id cluster_id, ( (sum(cluster.used) + sum(cluster.reserved)
+ ?)/sum(cluster.total) ) ratio, cluster.configValue value "
+            +
+            "FROM (SELECT capacity.cluster_id cluster_id, capacity.used_capacity used, capacity.reserved_capacity
reserved, capacity.total_capacity * overcommit.value total, "
+            +
+            "CASE (SELECT count(*) FROM `cloud`.`cluster_details` details WHERE details.cluster_id
= capacity.cluster_id AND details.name = ? ) "
+            +
+            "WHEN 1 THEN (CASE WHEN (SELECT details.value FROM `cloud`.`cluster_details`
details WHERE details.cluster_id = capacity.cluster_id AND details.name = ?) is NULL "
+            +
+            "THEN (SELECT config.value FROM `cloud`.`configuration` config WHERE config.name
= ?)" +
+            "ELSE (SELECT details.value FROM `cloud`.`cluster_details` details WHERE details.cluster_id
= capacity.cluster_id AND details.name = ? ) END )" +
+            "ELSE (SELECT config.value FROM `cloud`.`configuration` config WHERE config.name
= ?) " +
+            "END configValue " +
+            "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster_details`
overcommit ON overcommit.cluster_id = capacity.cluster_id " +
+            "WHERE capacity.data_center_id = ? AND capacity.capacity_type = ? AND capacity.total_capacity
> 0 AND overcommit.name = ?) cluster " +
 
         "GROUP BY cluster.cluster_id)  clusterList " +
         "WHERE clusterList.ratio > clusterList.value; ";
 
     private static final String FIND_CLUSTER_CONSUMPTION_RATIO = "select ( (sum(capacity.used_capacity)
+ sum(capacity.reserved_capacity) + ?)/sum(capacity.total_capacity) ) "
-        +
-        "from op_host_capacity capacity where cluster_id = ? and capacity_type = ?;";
+            +
+            "from op_host_capacity capacity where cluster_id = ? and capacity_type = ?;";
 
     public CapacityDaoImpl() {
         _hostIdTypeSearch = createSearchBuilder();
@@ -322,17 +323,17 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long>
implements
         List<Long> resourceIdList = new ArrayList<Long>();
 
         switch (level) {
-            case 1: // List all the capacities grouped by zone, capacity Type
-                finalQuery.append(LIST_CAPACITY_GROUP_BY_ZONE_TYPE_PART1);
-                break;
+        case 1: // List all the capacities grouped by zone, capacity Type
+            finalQuery.append(LIST_CAPACITY_GROUP_BY_ZONE_TYPE_PART1);
+            break;
 
-            case 2: // List all the capacities grouped by pod, capacity Type
-                finalQuery.append(LIST_CAPACITY_GROUP_BY_POD_TYPE_PART1);
-                break;
+        case 2: // List all the capacities grouped by pod, capacity Type
+            finalQuery.append(LIST_CAPACITY_GROUP_BY_POD_TYPE_PART1);
+            break;
 
-            case 3: // List all the capacities grouped by cluster, capacity Type
-                finalQuery.append(LIST_CAPACITY_GROUP_BY_CLUSTER_TYPE_PART1);
-                break;
+        case 3: // List all the capacities grouped by cluster, capacity Type
+            finalQuery.append(LIST_CAPACITY_GROUP_BY_CLUSTER_TYPE_PART1);
+            break;
         }
 
         if (zoneId != null) {
@@ -353,17 +354,17 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long>
implements
         }
 
         switch (level) {
-            case 1: // List all the capacities grouped by zone, capacity Type
+        case 1: // List all the capacities grouped by zone, capacity Type
             finalQuery.append(LIST_CAPACITY_GROUP_BY_CLUSTER_TYPE_PART2);
-                break;
+            break;
 
-            case 2: // List all the capacities grouped by pod, capacity Type
+        case 2: // List all the capacities grouped by pod, capacity Type
             finalQuery.append(LIST_CAPACITY_GROUP_BY_CLUSTER_TYPE_PART2);
-                break;
+            break;
 
-            case 3: // List all the capacities grouped by cluster, capacity Type
-                finalQuery.append(LIST_CAPACITY_GROUP_BY_CLUSTER_TYPE_PART2);
-                break;
+        case 3: // List all the capacities grouped by cluster, capacity Type
+            finalQuery.append(LIST_CAPACITY_GROUP_BY_CLUSTER_TYPE_PART2);
+            break;
         }
 
         finalQuery.append("?");
@@ -385,25 +386,25 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long>
implements
                     capacityClusterId = rs.getLong(7);
 
                 SummedCapacity summedCapacity =
-                    new SummedCapacity(rs.getLong(1), rs.getLong(2), rs.getLong(3), rs.getFloat(4),
(short)rs.getLong(5), rs.getLong(6), capacityPodId, capacityClusterId);
+                        new SummedCapacity(rs.getLong(1), rs.getLong(2), rs.getLong(3), rs.getFloat(4),
(short)rs.getLong(5), rs.getLong(6), capacityPodId, capacityClusterId);
 
                 results.add(summedCapacity);
             }
 
             HashMap<Integer, SummedCapacity> capacityMap = new HashMap<Integer,
SummedCapacity>();
             for (SummedCapacity result: results) {
-                 if (capacityMap.containsKey(result.getCapacityType().intValue())) {
-                     SummedCapacity tempCapacity = capacityMap.get(result.getCapacityType().intValue());
-                     tempCapacity.setUsedCapacity(tempCapacity.getUsedCapacity()+result.getUsedCapacity());
-                     tempCapacity.setReservedCapacity(tempCapacity.getReservedCapacity()+result.getReservedCapacity());
-                     tempCapacity.setSumTotal(tempCapacity.getTotalCapacity()+result.getTotalCapacity());
-                 }else {
-                     capacityMap.put(result.getCapacityType().intValue(),result);
-                 }
+                if (capacityMap.containsKey(result.getCapacityType().intValue())) {
+                    SummedCapacity tempCapacity = capacityMap.get(result.getCapacityType().intValue());
+                    tempCapacity.setUsedCapacity(tempCapacity.getUsedCapacity()+result.getUsedCapacity());
+                    tempCapacity.setReservedCapacity(tempCapacity.getReservedCapacity()+result.getReservedCapacity());
+                    tempCapacity.setSumTotal(tempCapacity.getTotalCapacity()+result.getTotalCapacity());
+                }else {
+                    capacityMap.put(result.getCapacityType().intValue(),result);
+                }
             }
             List<SummedCapacity> summedCapacityList = new ArrayList<SummedCapacity>();
-            for (Integer capacity_type : capacityMap.keySet()) {
-                summedCapacityList.add(capacityMap.get(capacity_type));
+            for (Entry<Integer, SummedCapacity> entry : capacityMap.entrySet()) {
+                summedCapacityList.add(entry.getValue());
             }
             return summedCapacityList;
         } catch (SQLException e) {
@@ -473,8 +474,8 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long>
implements
                     key=String.valueOf(result.getCapacityType());
                 }
                 else {
-                     // sum the values based on the zoneId.
-                     key=String.valueOf(result.getDataCenterId())+String.valueOf(result.getCapacityType());
+                    // sum the values based on the zoneId.
+                    key=String.valueOf(result.getDataCenterId())+String.valueOf(result.getCapacityType());
                 }
                 SummedCapacity tempCapacity=null;
                 if (capacityMap.containsKey(key)) {
@@ -750,7 +751,7 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long>
implements
         SearchBuilder<StoragePoolVO> nonSharedStorage = _storagePoolDao.createSearchBuilder();
         nonSharedStorage.and("poolTypes", nonSharedStorage.entity().getPoolType(), SearchCriteria.Op.IN);
         SummedCapacitySearch.join("nonSharedStorage", nonSharedStorage, nonSharedStorage.entity().getId(),
SummedCapacitySearch.entity().getHostOrPoolId(),
-            JoinType.INNER);
+                JoinType.INNER);
         nonSharedStorage.done();
 
         if (zoneId != null) {


Mime
View raw message