dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #36010
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18446: Analytics tables, better logging
------------------------------------------------------------
revno: 18446
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-02-27 13:31:01 +0100
message:
Analytics tables, better logging
modified:
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManager.java
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTableManager.java
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTargetTableManager.java
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcOrgUnitTargetTableManager.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-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java 2015-02-20 14:46:12 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java 2015-02-27 12:31:01 +0000
@@ -115,7 +115,7 @@
final List<AnalyticsTable> tables = tableManager.getTables( earliest );
- clock.logTime( "Partition tables: " + tables + ", last years: " + lastYears );
+ clock.logTime( "Partition tables: " + tables + ", last years: " + lastYears + ", earliest: " + earliest );
notifier.notify( taskId, "Creating analytics tables, processes: " + processNo + ", org unit levels: " + orgUnitLevelNo );
createTables( tables );
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManager.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManager.java 2015-02-27 11:50:10 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManager.java 2015-02-27 12:31:01 +0000
@@ -115,7 +115,7 @@
final String sqlDrop = "drop table " + tableName;
executeSilently( sqlDrop );
-
+
String sqlCreate = "create table " + tableName + " (";
List<String[]> columns = getDimensionColumns( table );
@@ -131,7 +131,7 @@
sqlCreate += statementBuilder.getTableOptions( false );
- log.info( "Creating table: " + tableName );
+ log.info( "Creating table: " + tableName + ", columns: " + columns.size() );
log.debug( "Create SQL: " + sqlCreate );
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTableManager.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTableManager.java 2015-02-27 11:50:10 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTableManager.java 2015-02-27 12:31:01 +0000
@@ -91,7 +91,7 @@
sqlCreate += statementBuilder.getTableOptions( false );
- log.info( "Creating table: " + tableName );
+ log.info( "Creating table: " + tableName + ", columns: " + columns.size() );
log.debug( "Create SQL: " + sqlCreate );
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTargetTableManager.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTargetTableManager.java 2015-02-27 11:50:10 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTargetTableManager.java 2015-02-27 12:31:01 +0000
@@ -98,7 +98,7 @@
sqlCreate += statementBuilder.getTableOptions( false );
- log.info( "Creating table: " + tableName );
+ log.info( "Creating table: " + tableName + ", columns: " + columns.size() );
log.debug( "Create SQL: " + sqlCreate );
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java 2015-02-27 11:50:10 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java 2015-02-27 12:31:01 +0000
@@ -155,7 +155,7 @@
sqlCreate += statementBuilder.getTableOptions( false );
- log.info( "Creating table: " + tableName );
+ log.info( "Creating table: " + tableName + ", columns: " + columns.size() );
log.debug( "Create SQL: " + sqlCreate );
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcOrgUnitTargetTableManager.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcOrgUnitTargetTableManager.java 2015-02-27 11:50:10 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcOrgUnitTargetTableManager.java 2015-02-27 12:31:01 +0000
@@ -97,7 +97,7 @@
sqlCreate += statementBuilder.getTableOptions( false );
- log.info( "Creating table: " + tableName );
+ log.info( "Creating table: " + tableName + ", columns: " + columns.size() );
log.debug( "Create SQL: " + sqlCreate );
