=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java 2013-03-22 07:57:02 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java 2013-03-22 13:56:53 +0000 @@ -105,7 +105,6 @@ import org.hisp.dhis.system.util.ListUtils; import org.hisp.dhis.system.util.MathUtils; import org.hisp.dhis.system.util.SystemUtils; -import org.hisp.dhis.system.util.Timer; import org.hisp.dhis.user.CurrentUserService; import org.hisp.dhis.user.User; import org.springframework.beans.factory.annotation.Autowired; @@ -376,14 +375,10 @@ */ private Map getAggregatedValueMap( DataQueryParams params, String tableName ) { - Timer t = new Timer().start(); - int optimalQueries = MathUtils.getWithin( SystemUtils.getCpuCores(), 1, MAX_QUERIES ); List queries = queryPlanner.planQuery( params, optimalQueries, tableName ); - t.getTime( "Planned query for optimal: " + optimalQueries + ", got: " + queries.size() ); - List>> futures = new ArrayList>>(); Map map = new HashMap(); @@ -413,8 +408,6 @@ } } - t.getTime( "Got aggregated values" ); - return map; } === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java 2013-03-14 14:31:25 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java 2013-03-22 13:56:53 +0000 @@ -112,7 +112,7 @@ sql += getGroupByClause( params ); - log.info( sql ); + log.debug( sql ); Map map = null;