dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #33843
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 17334: Analytics, skip vacuum on tables execpt for routine data tables
------------------------------------------------------------
revno: 17334
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2014-11-02 10:02:27 -0500
message:
Analytics, skip vacuum on tables execpt for routine data tables
modified:
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.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/AbstractJdbcTableManager.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java 2014-10-20 18:08:35 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java 2014-11-02 15:02:27 +0000
@@ -236,29 +236,6 @@
}
@Override
- @Async
- public Future<?> vacuumTablesAsync( ConcurrentLinkedQueue<AnalyticsTable> tables )
- {
- taskLoop : while ( true )
- {
- AnalyticsTable table = tables.poll();
-
- if ( table == null )
- {
- break taskLoop;
- }
-
- final String sql = statementBuilder.getVacuum( table.getTempTableName() );
-
- log.info( "Vacuum SQL: " + sql );
-
- jdbcTemplate.execute( sql );
- }
-
- return null;
- }
-
- @Override
public void dropTable( String tableName )
{
final String realTable = tableName.replaceFirst( TABLE_TEMP_SUFFIX, "" );
=== 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 2014-10-26 19:03:48 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManager.java 2014-11-02 15:02:27 +0000
@@ -393,6 +393,29 @@
return null;
}
+ @Override
+ @Async
+ public Future<?> vacuumTablesAsync( ConcurrentLinkedQueue<AnalyticsTable> tables )
+ {
+ taskLoop : while ( true )
+ {
+ AnalyticsTable table = tables.poll();
+
+ if ( table == null )
+ {
+ break taskLoop;
+ }
+
+ final String sql = statementBuilder.getVacuum( table.getTempTableName() );
+
+ log.info( "Vacuum SQL: " + sql );
+
+ jdbcTemplate.execute( sql );
+ }
+
+ return null;
+ }
+
/**
* Indicates whether the system should ignore data which has not been approved
* in analytics tables.
=== 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 2014-10-19 09:09:02 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTableManager.java 2014-11-02 15:02:27 +0000
@@ -215,4 +215,11 @@
{
return null; // Not relevant
}
+
+ @Override
+ @Async
+ public Future<?> vacuumTablesAsync( ConcurrentLinkedQueue<AnalyticsTable> tables )
+ {
+ return null; // Not needed
+ }
}
=== 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 2014-10-19 09:09:02 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTargetTableManager.java 2014-11-02 15:02:27 +0000
@@ -188,4 +188,11 @@
{
return null; // Not relevant
}
+
+ @Override
+ @Async
+ public Future<?> vacuumTablesAsync( ConcurrentLinkedQueue<AnalyticsTable> tables )
+ {
+ return null; // Not needed
+ }
}
=== 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 2014-10-19 09:09:02 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java 2014-11-02 15:02:27 +0000
@@ -308,4 +308,11 @@
{
return null; // Not relevant
}
+
+ @Override
+ @Async
+ public Future<?> vacuumTablesAsync( ConcurrentLinkedQueue<AnalyticsTable> tables )
+ {
+ return null; // Not needed
+ }
}
=== 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 2014-10-19 09:09:02 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcOrgUnitTargetTableManager.java 2014-11-02 15:02:27 +0000
@@ -178,4 +178,11 @@
{
return null; // Not relevant
}
+
+ @Override
+ @Async
+ public Future<?> vacuumTablesAsync( ConcurrentLinkedQueue<AnalyticsTable> tables )
+ {
+ return null; // Not needed
+ }
}
