diff --git a/classes/DataWarehouse/Query/Jobs/Statistics/AverageProcessorCountStatistic.php b/classes/DataWarehouse/Query/Jobs/Statistics/AverageProcessorCountStatistic.php index 46d61b05e5..31b0a95a8f 100644 --- a/classes/DataWarehouse/Query/Jobs/Statistics/AverageProcessorCountStatistic.php +++ b/classes/DataWarehouse/Query/Jobs/Statistics/AverageProcessorCountStatistic.php @@ -13,7 +13,7 @@ class AverageProcessorCountStatistic extends \DataWarehouse\Query\Jobs\Statistic public function __construct($query_instance = NULL) { $job_count_formula = $query_instance->getQueryType() == 'aggregate'?'job_count':'running_job_count'; - parent::__construct('coalesce(ceil(sum(jf.processors*jf.'.$job_count_formula.')/sum(jf.'.$job_count_formula.')),0)', 'avg_processors', 'Job Size: Per Job', 'Core Count',1); + parent::__construct('coalesce(sum(jf.processors*jf.'.$job_count_formula.')/sum(jf.'.$job_count_formula.'),0)', 'avg_processors', 'Job Size: Per Job', 'Core Count',1); } public function getInfo() @@ -23,4 +23,4 @@ public function getInfo() } } -?> \ No newline at end of file +?> diff --git a/classes/DataWarehouse/Query/Jobs/Statistics/MaxProcessorCountStatistic.php b/classes/DataWarehouse/Query/Jobs/Statistics/MaxProcessorCountStatistic.php index c1717492bf..5482025c5e 100644 --- a/classes/DataWarehouse/Query/Jobs/Statistics/MaxProcessorCountStatistic.php +++ b/classes/DataWarehouse/Query/Jobs/Statistics/MaxProcessorCountStatistic.php @@ -12,7 +12,7 @@ class MaxProcessorCountStatistic extends \DataWarehouse\Query\Jobs\Statistic { public function __construct($query_instance = NULL) { - parent::__construct('coalesce(ceil(max(jf.processors)),0)', 'max_processors', 'Job Size: Max', 'Core Count',0); + parent::__construct('coalesce(max(jf.processors),0)', 'max_processors', 'Job Size: Max', 'Core Count',0); } public function getInfo() @@ -22,4 +22,4 @@ public function getInfo() } } -?> \ No newline at end of file +?> diff --git a/classes/DataWarehouse/Query/Jobs/Statistics/MinProcessorCountStatistic.php b/classes/DataWarehouse/Query/Jobs/Statistics/MinProcessorCountStatistic.php index 0eb630b67a..2d0920929b 100644 --- a/classes/DataWarehouse/Query/Jobs/Statistics/MinProcessorCountStatistic.php +++ b/classes/DataWarehouse/Query/Jobs/Statistics/MinProcessorCountStatistic.php @@ -12,7 +12,7 @@ class MinProcessorCountStatistic extends \DataWarehouse\Query\Jobs\Statistic { public function __construct($query_instance = NULL) { - parent::__construct('coalesce(ceil(min(case when jf.processors = 0 then null else jf.processors end)),0)', 'min_processors', 'Job Size: Min', 'Core Count',0); + parent::__construct('coalesce(min(case when jf.processors = 0 then null else jf.processors end),0)', 'min_processors', 'Job Size: Min', 'Core Count',0); $this->setOrderByStat(SORT_DESC); } public function getInfo() @@ -22,4 +22,4 @@ public function getInfo() } } -?> \ No newline at end of file +?> diff --git a/classes/DataWarehouse/Query/Jobs/Statistics/NormalizedAverageProcessorCountStatistic.php b/classes/DataWarehouse/Query/Jobs/Statistics/NormalizedAverageProcessorCountStatistic.php index 4bd9ee8334..d0aa8557e9 100644 --- a/classes/DataWarehouse/Query/Jobs/Statistics/NormalizedAverageProcessorCountStatistic.php +++ b/classes/DataWarehouse/Query/Jobs/Statistics/NormalizedAverageProcessorCountStatistic.php @@ -13,7 +13,7 @@ class NormalizedAverageProcessorCountStatistic extends \DataWarehouse\Query\Jobs public function __construct($query_instance = NULL) { $job_count_formula = $query_instance->getQueryType() == 'aggregate'?'job_count':'running_job_count'; - parent::__construct('100.0*coalesce(ceil(sum(jf.processors*jf.'.$job_count_formula.')/sum(jf.'.$job_count_formula.'))/(select sum(rrf.processors) from modw.resourcespecs rrf where find_in_set(rrf.resource_id,group_concat(distinct jf.resource_id)) <> 0 and '.$query_instance->getAggregationUnit()->getUnitName().'_end_ts >= rrf.start_date_ts and (rrf.end_date_ts is null or '.$query_instance->getAggregationUnit()->getUnitName().'_end_ts <= rrf.end_date_ts)),0)', 'normalized_avg_processors', 'Job Size: Normalized', '% of Total Cores',1); + parent::__construct('100.0*coalesce(sum(jf.processors*jf.'.$job_count_formula.')/sum(jf.'.$job_count_formula.')/(select sum(rrf.processors) from modw.resourcespecs rrf where find_in_set(rrf.resource_id,group_concat(distinct jf.resource_id)) <> 0 and '.$query_instance->getAggregationUnit()->getUnitName().'_end_ts >= rrf.start_date_ts and (rrf.end_date_ts is null or '.$query_instance->getAggregationUnit()->getUnitName().'_end_ts <= rrf.end_date_ts)),0)', 'normalized_avg_processors', 'Job Size: Normalized', '% of Total Cores',1); } public function getInfo() @@ -23,4 +23,4 @@ public function getInfo() } } -?> \ No newline at end of file +?>