=== modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java' --- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java 2011-11-03 14:35:44 +0000 +++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java 2011-11-03 15:30:48 +0000 @@ -173,7 +173,9 @@ Collections.shuffle( organisationUnits ); FilterUtils.filter( dataElements, new AggregatableDataElementFilter() ); expressionService.filterInvalidIndicators( indicators ); - + + clock.logTime( "Filtered objects" ); + // --------------------------------------------------------------------- // Explode indicator expressions // --------------------------------------------------------------------- @@ -183,7 +185,9 @@ indicator.setExplodedNumerator( expressionService.explodeExpression( indicator.getNumerator() ) ); indicator.setExplodedDenominator( expressionService.explodeExpression( indicator.getDenominator() ) ); } - + + clock.logTime( "Exploded indicator expressions" ); + // --------------------------------------------------------------------- // Get operands // --------------------------------------------------------------------- @@ -195,7 +199,7 @@ allOperands.addAll( dataElementOperands ); allOperands.addAll( indicatorOperands ); - clock.logTime( "Filtered data elements, number of operands: " + allOperands.size() ); + clock.logTime( "Retrieved operands: " + allOperands.size() ); // --------------------------------------------------------------------- // Filter out future periods