dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #18077
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7471: Improved performance of report* objects through queries
------------------------------------------------------------
revno: 7471
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2012-07-01 09:33:25 +0200
message:
Improved performance of report* objects through queries
added:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardContentStore.java
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/hibernate/
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/hibernate/HibernateDashboardContentStore.java
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardService.java
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/DashboardContentDeletionHandler.java
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/impl/DefaultDashboardService.java
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml
--
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
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardContentStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardContentStore.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardContentStore.java 2012-07-01 07:33:25 +0000
@@ -0,0 +1,49 @@
+package org.hisp.dhis.dashboard;
+
+/*
+ * Copyright (c) 2004-2012, 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 org.hisp.dhis.common.GenericStore;
+import org.hisp.dhis.document.Document;
+import org.hisp.dhis.mapping.MapView;
+import org.hisp.dhis.report.Report;
+import org.hisp.dhis.reporttable.ReportTable;
+
+/**
+ * @author Lars Helge Overland
+ */
+public interface DashboardContentStore
+ extends GenericStore<DashboardContent>
+{
+ void removeDocumentAssociations( Document document );
+
+ void removeMapViewAssocations( MapView mapView );
+
+ void removeReportAssociations( Report report );
+
+ void removeReportTableAssociations( ReportTable reportTable );
+}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardService.java 2012-06-30 16:16:19 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardService.java 2012-07-01 07:33:25 +0000
@@ -27,6 +27,10 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import org.hisp.dhis.document.Document;
+import org.hisp.dhis.mapping.MapView;
+import org.hisp.dhis.report.Report;
+import org.hisp.dhis.reporttable.ReportTable;
import org.hisp.dhis.user.User;
import java.util.Collection;
@@ -48,4 +52,12 @@
Collection<DashboardContent> getAllDashboardContent();
void deleteDashboardContent( DashboardContent content );
+
+ void removeDocumentAssociations( Document document );
+
+ void removeMapViewAssocations( MapView mapView );
+
+ void removeReportAssociations( Report report );
+
+ void removeReportTableAssociations( ReportTable reportTable );
}
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/DashboardContentDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/DashboardContentDeletionHandler.java 2012-07-01 07:12:58 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/DashboardContentDeletionHandler.java 2012-07-01 07:33:25 +0000
@@ -57,54 +57,28 @@
return DashboardContent.class.getSimpleName();
}
- //TODO Improve performance with queries
-
@Override
public void deleteReport( Report report )
{
- for ( DashboardContent content : dashboardService.getAllDashboardContent() )
- {
- if ( content.getReports().remove( report ) )
- {
- dashboardService.saveDashboardContent( content );
- }
- }
+ dashboardService.removeReportAssociations( report );
}
@Override
public void deleteDocument( Document document )
{
- for ( DashboardContent content : dashboardService.getAllDashboardContent() )
- {
- if ( content.getDocuments().remove( document ) )
- {
- dashboardService.saveDashboardContent( content );
- }
- }
+ dashboardService.removeDocumentAssociations( document );
}
@Override
public void deleteReportTable( ReportTable reportTable )
{
- for ( DashboardContent content : dashboardService.getAllDashboardContent() )
- {
- if ( content.getReportTables().remove( reportTable ) )
- {
- dashboardService.saveDashboardContent( content );
- }
- }
+ dashboardService.removeReportTableAssociations( reportTable );
}
@Override
public void deleteMapView( MapView mapView )
{
- for ( DashboardContent content : dashboardService.getAllDashboardContent() )
- {
- if ( content.getMapViews().remove( mapView ) )
- {
- dashboardService.saveDashboardContent( content );
- }
- }
+ dashboardService.removeMapViewAssocations( mapView );
}
@Override
=== added directory 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/hibernate'
=== added file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/hibernate/HibernateDashboardContentStore.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/hibernate/HibernateDashboardContentStore.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/hibernate/HibernateDashboardContentStore.java 2012-07-01 07:33:25 +0000
@@ -0,0 +1,67 @@
+package org.hisp.dhis.dashboard.hibernate;
+
+/*
+ * Copyright (c) 2004-2012, 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 org.hisp.dhis.dashboard.DashboardContent;
+import org.hisp.dhis.dashboard.DashboardContentStore;
+import org.hisp.dhis.document.Document;
+import org.hisp.dhis.hibernate.HibernateGenericStore;
+import org.hisp.dhis.mapping.MapView;
+import org.hisp.dhis.report.Report;
+import org.hisp.dhis.reporttable.ReportTable;
+
+/**
+ * @author Lars Helge Overland
+ */
+public class HibernateDashboardContentStore
+ extends HibernateGenericStore<DashboardContent> implements DashboardContentStore
+{
+ public void removeDocumentAssociations( Document document )
+ {
+ final String sql = "delete from dashboardcontent_documents where documentid = " + document.getId();
+ jdbcTemplate.execute( sql );
+ }
+
+ public void removeMapViewAssocations( MapView mapView )
+ {
+ final String sql = "delete from dashboardcontent_mapviews where mapviewid = " + mapView.getId();
+ jdbcTemplate.execute( sql );
+ }
+
+ public void removeReportAssociations( Report report )
+ {
+ final String sql = "delete from dashboardcontent_reports where reportid = " + report.getId();
+ jdbcTemplate.execute( sql );
+ }
+
+ public void removeReportTableAssociations( ReportTable reportTable )
+ {
+ final String sql = "delete from dashboardcontent_reporttables where reporttableid = " + reportTable.getId();
+ jdbcTemplate.execute( sql );
+ }
+}
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/impl/DefaultDashboardService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/impl/DefaultDashboardService.java 2012-06-30 16:16:19 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/impl/DefaultDashboardService.java 2012-07-01 07:33:25 +0000
@@ -29,15 +29,20 @@
import java.util.Collection;
-import org.hisp.dhis.common.GenericStore;
import org.hisp.dhis.dashboard.DashboardContent;
+import org.hisp.dhis.dashboard.DashboardContentStore;
import org.hisp.dhis.dashboard.DashboardService;
+import org.hisp.dhis.document.Document;
+import org.hisp.dhis.mapping.MapView;
+import org.hisp.dhis.report.Report;
+import org.hisp.dhis.reporttable.ReportTable;
import org.hisp.dhis.user.User;
import org.springframework.transaction.annotation.Transactional;
/**
+ * Note: The remove associations methods must be altered if caching is introduced.
+ *
* @author Lars Helge Overland
- * @version $Id$
*/
@Transactional
public class DefaultDashboardService
@@ -47,9 +52,9 @@
// Dependencies
// -------------------------------------------------------------------------
- private GenericStore<DashboardContent> dashboardContentStore;
+ private DashboardContentStore dashboardContentStore;
- public void setDashboardContentStore( GenericStore<DashboardContent> dashboardContentStore )
+ public void setDashboardContentStore( DashboardContentStore dashboardContentStore )
{
this.dashboardContentStore = dashboardContentStore;
}
@@ -85,4 +90,24 @@
{
dashboardContentStore.delete( content );
}
+
+ public void removeDocumentAssociations( Document document )
+ {
+ dashboardContentStore.removeDocumentAssociations( document );
+ }
+
+ public void removeMapViewAssocations( MapView mapView )
+ {
+ dashboardContentStore.removeMapViewAssocations( mapView );
+ }
+
+ public void removeReportAssociations( Report report )
+ {
+ dashboardContentStore.removeReportAssociations( report );
+ }
+
+ public void removeReportTableAssociations( ReportTable reportTable )
+ {
+ dashboardContentStore.removeReportTableAssociations( reportTable );
+ }
}
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml 2012-06-30 16:05:30 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml 2012-07-01 07:33:25 +0000
@@ -149,9 +149,10 @@
<!-- Dashboard -->
- <bean id="org.hisp.dhis.dashboard.DashboardContentStore" class="org.hisp.dhis.hibernate.HibernateGenericStore">
+ <bean id="org.hisp.dhis.dashboard.DashboardContentStore" class="org.hisp.dhis.dashboard.hibernate.HibernateDashboardContentStore">
<property name="clazz" value="org.hisp.dhis.dashboard.DashboardContent" />
<property name="sessionFactory" ref="sessionFactory" />
+ <property name="jdbcTemplate" ref="jdbcTemplate" />
<property name="cacheable" value="true" />
</bean>
