dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #18559
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7862: Improved logging in data mart
------------------------------------------------------------
revno: 7862
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2012-08-05 22:08:25 +0200
message:
Improved logging in data mart
modified:
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/engine/DefaultDataMartEngine.java'
--- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java 2012-07-26 20:37:31 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java 2012-08-05 20:08:25 +0000
@@ -376,7 +376,7 @@
dataMartManager.copyAggregatedDataValuesFromTemp();
clock.logTime( "Copied data element data from temporary table" );
- notifier.notify( id, DATAMART, "Exporting data for indicator data" );
+ notifier.notify( id, DATAMART, "Creating data element index" );
// ---------------------------------------------------------------------
// 6. Create data element index
@@ -432,8 +432,8 @@
dataMartManager.copyAggregatedIndicatorValuesFromTemp();
- clock.logTime( "Copied aggregated indicator data from temporary table" );
- notifier.notify( id, DATAMART, "Creating indexes" );
+ clock.logTime( "Copied indicator data from temporary table" );
+ notifier.notify( id, DATAMART, "Creating indicator index" );
// ---------------------------------------------------------------------
// 11. Create indicator index
@@ -488,13 +488,13 @@
notifier.notify( id, DATAMART, "Dropping data element data indexes" );
// -----------------------------------------------------------------
- // 3. Drop potential indexes
+ // 3. Drop data element index
// -----------------------------------------------------------------
dataMartManager.dropOrgUnitDataValueIndex();
clock.logTime( "Dropped org unit data element index" );
- notifier.notify( id, DATAMART, "Deleting existing data element data" );
+ notifier.notify( id, DATAMART, "Deleting existing org unit data element data" );
// ---------------------------------------------------------------------
// 4. Delete existing aggregated data values
@@ -511,8 +511,8 @@
dataMartManager.copyAggregatedOrgUnitDataValuesFromTemp();
- clock.logTime( "Copied aggregated org unit data element data from temporary table" );
- notifier.notify( id, DATAMART, "Exporting org unit indicator data" );
+ clock.logTime( "Copied org unit data element data from temporary table" );
+ notifier.notify( id, DATAMART, "Creating org unit data element index" );
// ---------------------------------------------------------------------
// 6. Create org unit data element index
@@ -521,10 +521,10 @@
dataMartManager.createOrgUnitDataValueIndex();
clock.logTime( "Created org unit data element index" );
- notifier.notify( id, DATAMART, "Exporting data for indicator data" );
+ notifier.notify( id, DATAMART, "Exporting data for org unit indicator data" );
// ---------------------------------------------------------------------
- // 6. Export indicator values
+ // 7. Export indicator values
// ---------------------------------------------------------------------
if ( isIndicators )
@@ -541,43 +541,44 @@
}
clock.logTime( "Exported values for indicators (" + indicators.size() + "), pages: " + organisationUnitPages.size() + ", " + SystemUtils.getMemoryString() );
+ notifier.notify( id, DATAMART, "Dropping org unit indicator index" );
// ---------------------------------------------------------------------
- // 7. Drop aggregated data cache and indicator index
+ // 8. Drop aggregated data cache and indicator index
// ---------------------------------------------------------------------
crossTabService.dropAggregatedOrgUnitDataCache( key );
dataMartManager.dropOrgUnitIndicatorValueIndex();
clock.logTime( "Dropped org unit indicator index, " + SystemUtils.getMemoryString() );
- notifier.notify( id, DATAMART, "Deleting existing indicator data" );
+ notifier.notify( id, DATAMART, "Deleting existing org unit indicator data" );
// ---------------------------------------------------------------------
- // 8. Delete existing aggregated indicatorvalues
+ // 9. Delete existing aggregated indicator values
// ---------------------------------------------------------------------
dataMartManager.deleteAggregatedOrgUnitIndicatorValues( periodIds );
clock.logTime( "Deleted existing aggregated org unit indicatorvalues" );
- notifier.notify( id, DATAMART, "Copying indicator data from temporary table" );
+ notifier.notify( id, DATAMART, "Copying org unit indicator data from temporary table" );
// ---------------------------------------------------------------------
- // 9. Copy aggregated org unit indicator values from temporary table
+ // 10. Copy aggregated org unit indicator values from temporary table
// ---------------------------------------------------------------------
dataMartManager.copyAggregatedOrgUnitIndicatorValuesFromTemp();
- clock.logTime( "Copied aggregated org unit indicator data from temporary table" );
- notifier.notify( id, DATAMART, "Creating data element indexes" );
+ clock.logTime( "Copied org unit indicator data from temporary table" );
+ notifier.notify( id, DATAMART, "Creating org unit indicator indexes" );
// ---------------------------------------------------------------------
- // 10. Create org unit indicator index
+ // 11. Create org unit indicator index
// ---------------------------------------------------------------------
dataMartManager.createOrgUnitIndicatorValueIndex();
- clock.logTime( "Created org unit indexes" );
- clock.logTime( "Aggregated organisation unit data export done" );
+ clock.logTime( "Created org unit indicator index" );
+ clock.logTime( "Aggregated org unit data export done" );
}
// ---------------------------------------------------------------------
