dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #12465
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3842: Minor improvement in datamart
------------------------------------------------------------
revno: 3842
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-06-06 07:36:15 +0200
message:
Minor improvement in datamart
modified:
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/DataElementOperandList.java
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/dataelement/DefaultDataElementDataMart.java
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/DataElementOperandList.java'
--- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/DataElementOperandList.java 2011-06-05 16:40:42 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/DataElementOperandList.java 2011-06-06 05:36:15 +0000
@@ -1,5 +1,32 @@
package org.hisp.dhis.datamart;
+/*
+ * Copyright (c) 2004-2010, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
import java.util.Arrays;
import java.util.List;
@@ -7,6 +34,9 @@
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.period.Period;
+/**
+ * @author Lars Helge Overland
+ */
public class DataElementOperandList
{
private List<DataElementOperand> operands;
=== modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/dataelement/DefaultDataElementDataMart.java'
--- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/dataelement/DefaultDataElementDataMart.java 2011-06-05 16:40:02 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/dataelement/DefaultDataElementDataMart.java 2011-06-06 05:36:15 +0000
@@ -132,8 +132,8 @@
// DataMart functionality
// -------------------------------------------------------------------------
- public int exportDataValues( final Collection<DataElementOperand> operands, final Collection<Period> periods,
- final Collection<OrganisationUnit> organisationUnits, DataElementOperandList operandList, String key )
+ public int exportDataValues( Collection<DataElementOperand> operands, Collection<Period> periods,
+ Collection<OrganisationUnit> organisationUnits, DataElementOperandList operandList, String key )
{
final BatchHandler<AggregatedDataValue> batchHandler = batchHandlerFactory.createBatchHandler( AggregatedDataValueBatchHandler.class ).init();
@@ -167,27 +167,28 @@
valueMap.putAll( sumBoolAggregator.getAggregatedValues( sumBoolOperands, period, unit, level, hierarchy, key ) );
valueMap.putAll( averageBoolAggregator.getAggregatedValues( averageBoolOperands, period, unit, level, hierarchy, key ) );
- //TODO check size of value map
-
- for ( Entry<DataElementOperand, Double> entry : valueMap.entrySet() )
+ if ( valueMap.size() > 0 )
{
- aggregatedValue.clear();
-
- final double value = getRounded( entry.getValue(), DECIMALS );
-
- aggregatedValue.setDataElementId( entry.getKey().getDataElementId() );
- aggregatedValue.setCategoryOptionComboId( entry.getKey().getOptionComboId() );
- aggregatedValue.setPeriodId( period.getId() );
- aggregatedValue.setPeriodTypeId( period.getPeriodType().getId() );
- aggregatedValue.setOrganisationUnitId( unit.getId() );
- aggregatedValue.setLevel( level );
- aggregatedValue.setValue( value );
-
- batchHandler.addObject( aggregatedValue );
-
- operandList.addValue( entry.getKey(), value );
-
- count++;
+ for ( Entry<DataElementOperand, Double> entry : valueMap.entrySet() )
+ {
+ aggregatedValue.clear();
+
+ final double value = getRounded( entry.getValue(), DECIMALS );
+
+ aggregatedValue.setDataElementId( entry.getKey().getDataElementId() );
+ aggregatedValue.setCategoryOptionComboId( entry.getKey().getOptionComboId() );
+ aggregatedValue.setPeriodId( period.getId() );
+ aggregatedValue.setPeriodTypeId( period.getPeriodType().getId() );
+ aggregatedValue.setOrganisationUnitId( unit.getId() );
+ aggregatedValue.setLevel( level );
+ aggregatedValue.setValue( value );
+
+ batchHandler.addObject( aggregatedValue );
+
+ operandList.addValue( entry.getKey(), value );
+
+ count++;
+ }
}
if ( operandList.hasValues() )
=== 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-06-05 16:45:59 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java 2011-06-06 05:36:15 +0000
@@ -246,7 +246,7 @@
log.info( "Deleted existing aggregated data: " + TimeUtils.getHMS() );
// ---------------------------------------------------------------------
- // Data element export
+ // Export data element values
// ---------------------------------------------------------------------
state.setMessage( "exporting_data_for_data_elements" );
@@ -259,7 +259,15 @@
}
// ---------------------------------------------------------------------
- // Indicator export
+ // Drop crosstab table
+ // ---------------------------------------------------------------------
+
+ crossTabService.dropCrossTabTable( key );
+
+ log.info( "Dropped crosstab table: " + TimeUtils.getHMS() );
+
+ // ---------------------------------------------------------------------
+ // Export indicator values
// ---------------------------------------------------------------------
state.setMessage( "exporting_data_for_indicators" );
@@ -272,14 +280,12 @@
}
// ---------------------------------------------------------------------
- // Drop crosstab table and aggregated data cache
+ // Drop aggregated data cache
// ---------------------------------------------------------------------
- crossTabService.dropCrossTabTable( key ); //TODO move before indicator export
-
crossTabService.dropAggregatedDataCache( key );
- log.info( "Dropped crosstab table and aggregated data cache: " + TimeUtils.getHMS() );
+ log.info( "Dropped aggregated data cache: " + TimeUtils.getHMS() );
// ---------------------------------------------------------------------
// Create potential indexes
