dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #41959
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 21422: Resource tables. Executing create index statement one by one, as multi-statements are not enabled...
------------------------------------------------------------
revno: 21422
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-12-11 12:32:19 +0100
message:
Resource tables. Executing create index statement one by one, as multi-statements are not enabled on mysql by default.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/resourcetable/ResourceTable.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/jdbc/JdbcResourceTableStore.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/CategoryOptionComboNameResourceTable.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/CategoryOptionComboResourceTable.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/CategoryOptionGroupSetResourceTable.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/CategoryResourceTable.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/DataApprovalMinLevelResourceTable.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/DataElementGroupSetResourceTable.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/DataElementResourceTable.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/DatePeriodResourceTable.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/IndicatorGroupSetResourceTable.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/OrganisationUnitGroupSetResourceTable.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/OrganisationUnitStructureResourceTable.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/PeriodResourceTable.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-api/src/main/java/org/hisp/dhis/resourcetable/ResourceTable.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/resourcetable/ResourceTable.java 2015-10-03 09:03:51 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/resourcetable/ResourceTable.java 2015-12-11 11:32:19 +0000
@@ -103,10 +103,10 @@
public abstract Optional<List<Object[]>> getPopulateTempTableContent();
/**
- * Creates a SQL index create statement for the temp table. Note that the
- * index name must have a random component to avoid uniqueness conflicts.
+ * Returns SQL index create statements for the temp table. Note that the
+ * indexes name must have a random component to avoid uniqueness conflicts.
*
* @return a SQL statement.
*/
- public abstract Optional<String> getCreateIndexStatement();
+ public abstract List<String> getCreateIndexStatements();
}
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/jdbc/JdbcResourceTableStore.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/jdbc/JdbcResourceTableStore.java 2015-11-12 18:37:11 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/jdbc/JdbcResourceTableStore.java 2015-12-11 11:32:19 +0000
@@ -73,7 +73,7 @@
final String createTableSql = resourceTable.getCreateTempTableStatement();
final Optional<String> populateTableSql = resourceTable.getPopulateTempTableStatement();
final Optional<List<Object[]>> populateTableContent = resourceTable.getPopulateTempTableContent();
- final Optional<String> createIndexSql = resourceTable.getCreateIndexStatement();
+ final List<String> createIndexSql = resourceTable.getCreateIndexStatements();
// ---------------------------------------------------------------------
// Create table
@@ -108,14 +108,14 @@
}
// ---------------------------------------------------------------------
- // Create index
+ // Create indexes
// ---------------------------------------------------------------------
- if ( createIndexSql.isPresent() )
+ for ( final String sql : createIndexSql )
{
- log.info( "Create index SQL: " + createIndexSql.get() );
+ log.info( "Create index SQL: " + sql );
- jdbcTemplate.execute( createIndexSql.get() );
+ jdbcTemplate.execute( sql );
}
// ---------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/CategoryOptionComboNameResourceTable.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/CategoryOptionComboNameResourceTable.java 2015-10-02 16:41:20 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/CategoryOptionComboNameResourceTable.java 2015-12-11 11:32:19 +0000
@@ -38,6 +38,8 @@
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
import org.hisp.dhis.resourcetable.ResourceTable;
+import com.google.common.collect.Lists;
+
/**
* @author Lars Helge Overland
*/
@@ -98,8 +100,8 @@
}
@Override
- public Optional<String> getCreateIndexStatement()
+ public List<String> getCreateIndexStatements()
{
- return Optional.empty();
+ return Lists.newArrayList();
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/CategoryOptionComboResourceTable.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/CategoryOptionComboResourceTable.java 2015-10-02 17:20:28 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/CategoryOptionComboResourceTable.java 2015-12-11 11:32:19 +0000
@@ -34,6 +34,8 @@
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
import org.hisp.dhis.resourcetable.ResourceTable;
+import com.google.common.collect.Lists;
+
/**
* @author Lars Helge Overland
*/
@@ -85,12 +87,12 @@
}
@Override
- public Optional<String> getCreateIndexStatement()
+ public List<String> getCreateIndexStatements()
{
String name = "in_dataelementcategoryoptioncombo_" + getRandomSuffix();
String sql = "create index " + name + " on " + getTempTableName() + "(dataelementuid, categoryoptioncombouid)";
- return Optional.of( sql );
+ return Lists.newArrayList( sql );
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/CategoryOptionGroupSetResourceTable.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/CategoryOptionGroupSetResourceTable.java 2015-10-02 16:41:20 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/CategoryOptionGroupSetResourceTable.java 2015-12-11 11:32:19 +0000
@@ -37,6 +37,8 @@
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
import org.hisp.dhis.resourcetable.ResourceTable;
+import com.google.common.collect.Lists;
+
/**
* @author Lars Helge Overland
*/
@@ -107,8 +109,8 @@
}
@Override
- public Optional<String> getCreateIndexStatement()
+ public List<String> getCreateIndexStatements()
{
- return Optional.empty();
+ return Lists.newArrayList();
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/CategoryResourceTable.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/CategoryResourceTable.java 2015-10-02 16:41:20 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/CategoryResourceTable.java 2015-12-11 11:32:19 +0000
@@ -35,6 +35,8 @@
import org.hisp.dhis.dataelement.DataElementCategory;
import org.hisp.dhis.resourcetable.ResourceTable;
+import com.google.common.collect.Lists;
+
/**
* @author Lars Helge Overland
*/
@@ -109,8 +111,8 @@
}
@Override
- public Optional<String> getCreateIndexStatement()
+ public List<String> getCreateIndexStatements()
{
- return Optional.empty();
+ return Lists.newArrayList();
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/DataApprovalMinLevelResourceTable.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/DataApprovalMinLevelResourceTable.java 2015-10-02 17:20:28 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/DataApprovalMinLevelResourceTable.java 2015-12-11 11:32:19 +0000
@@ -35,6 +35,8 @@
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.resourcetable.ResourceTable;
+import com.google.common.collect.Lists;
+
/**
* @author Lars Helge Overland
*/
@@ -99,7 +101,7 @@
}
@Override
- public Optional<String> getCreateIndexStatement()
+ public List<String> getCreateIndexStatements()
{
String sql =
"create index in_dataapprovalminlevel_datasetid_" + getRandomSuffix() + " on " + getTempTableName() + "(datasetid);" +
@@ -107,6 +109,6 @@
"create index in_dataapprovalminlevel_organisationunitid_" + getRandomSuffix() + " on " + getTempTableName() + "(organisationunitid);" +
"create index in_dataapprovalminlevel_attributeoptioncomboid_" + getRandomSuffix() + " on " + getTempTableName() + "(attributeoptioncomboid);";
- return Optional.of( sql );
+ return Lists.newArrayList( sql );
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/DataElementGroupSetResourceTable.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/DataElementGroupSetResourceTable.java 2015-10-02 16:41:20 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/DataElementGroupSetResourceTable.java 2015-12-11 11:32:19 +0000
@@ -35,6 +35,8 @@
import org.hisp.dhis.dataelement.DataElementGroupSet;
import org.hisp.dhis.resourcetable.ResourceTable;
+import com.google.common.collect.Lists;
+
/**
* @author Lars Helge Overland
*/
@@ -107,8 +109,8 @@
}
@Override
- public Optional<String> getCreateIndexStatement()
+ public List<String> getCreateIndexStatements()
{
- return Optional.empty();
+ return Lists.newArrayList();
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/DataElementResourceTable.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/DataElementResourceTable.java 2015-11-30 03:36:54 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/DataElementResourceTable.java 2015-12-11 11:32:19 +0000
@@ -39,6 +39,8 @@
import org.hisp.dhis.period.PeriodType;
import org.hisp.dhis.resourcetable.ResourceTable;
+import com.google.common.collect.Lists;
+
/**
* @author Lars Helge Overland
*/
@@ -113,14 +115,12 @@
}
@Override
- public Optional<String> getCreateIndexStatement()
+ public List<String> getCreateIndexStatements()
{
- String sql =
- "create unique index in_dataelementstructure_dataelementuid_" + getRandomSuffix() + " on " + getTempTableName() + "(dataelementuid);" +
- "create index in_dataelementstructure_datasetid_" + getRandomSuffix() + " on " + getTempTableName() + "(datasetid);" +
- "create index in_dataelementstructure_datasetuid_" + getRandomSuffix() + " on " + getTempTableName() + "(datasetuid);" +
- "create index in_dataelementstructure_periodtypeid_" + getRandomSuffix() + " on " + getTempTableName() + "(periodtypeid);";
-
- return Optional.of( sql );
+ return Lists.newArrayList(
+ "create unique index in_dataelementstructure_dataelementuid_" + getRandomSuffix() + " on " + getTempTableName() + "(dataelementuid);",
+ "create index in_dataelementstructure_datasetid_" + getRandomSuffix() + " on " + getTempTableName() + "(datasetid);",
+ "create index in_dataelementstructure_datasetuid_" + getRandomSuffix() + " on " + getTempTableName() + "(datasetuid);",
+ "create index in_dataelementstructure_periodtypeid_" + getRandomSuffix() + " on " + getTempTableName() + "(periodtypeid);" );
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/DatePeriodResourceTable.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/DatePeriodResourceTable.java 2015-10-02 17:00:44 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/DatePeriodResourceTable.java 2015-12-11 11:32:19 +0000
@@ -41,6 +41,8 @@
import org.hisp.dhis.period.PeriodType;
import org.hisp.dhis.resourcetable.ResourceTable;
+import com.google.common.collect.Lists;
+
/**
* @author Lars Helge Overland
*/
@@ -111,8 +113,8 @@
}
@Override
- public Optional<String> getCreateIndexStatement()
+ public List<String> getCreateIndexStatements()
{
- return Optional.empty();
+ return Lists.newArrayList();
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/IndicatorGroupSetResourceTable.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/IndicatorGroupSetResourceTable.java 2015-10-02 16:41:20 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/IndicatorGroupSetResourceTable.java 2015-12-11 11:32:19 +0000
@@ -35,6 +35,8 @@
import org.hisp.dhis.indicator.IndicatorGroupSet;
import org.hisp.dhis.resourcetable.ResourceTable;
+import com.google.common.collect.Lists;
+
/**
* @author Lars Helge Overland
*/
@@ -107,8 +109,8 @@
}
@Override
- public Optional<String> getCreateIndexStatement()
+ public List<String> getCreateIndexStatements()
{
- return Optional.empty();
+ return Lists.newArrayList();
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/OrganisationUnitGroupSetResourceTable.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/OrganisationUnitGroupSetResourceTable.java 2015-10-02 16:41:20 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/OrganisationUnitGroupSetResourceTable.java 2015-12-11 11:32:19 +0000
@@ -35,6 +35,8 @@
import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet;
import org.hisp.dhis.resourcetable.ResourceTable;
+import com.google.common.collect.Lists;
+
/**
* @author Lars Helge Overland
*/
@@ -107,8 +109,8 @@
}
@Override
- public Optional<String> getCreateIndexStatement()
+ public List<String> getCreateIndexStatements()
{
- return Optional.empty();
+ return Lists.newArrayList();
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/OrganisationUnitStructureResourceTable.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/OrganisationUnitStructureResourceTable.java 2015-10-02 16:41:20 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/OrganisationUnitStructureResourceTable.java 2015-12-11 11:32:19 +0000
@@ -39,6 +39,8 @@
import org.hisp.dhis.organisationunit.OrganisationUnitService;
import org.hisp.dhis.resourcetable.ResourceTable;
+import com.google.common.collect.Lists;
+
/**
* @author Lars Helge Overland
*/
@@ -130,12 +132,12 @@
}
@Override
- public Optional<String> getCreateIndexStatement()
+ public List<String> getCreateIndexStatements()
{
String name = "in_orgunitstructure_organisationunituid_" + getRandomSuffix();
String sql = "create unique index " + name + " on " + getTempTableName() + "(organisationunituid)";
- return Optional.of( sql );
+ return Lists.newArrayList( sql );
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/PeriodResourceTable.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/PeriodResourceTable.java 2015-10-02 17:00:44 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/table/PeriodResourceTable.java 2015-12-11 11:32:19 +0000
@@ -39,6 +39,8 @@
import org.hisp.dhis.period.PeriodType;
import org.hisp.dhis.resourcetable.ResourceTable;
+import com.google.common.collect.Lists;
+
/**
* @author Lars Helge Overland
*/
@@ -119,12 +121,12 @@
}
@Override
- public Optional<String> getCreateIndexStatement()
+ public List<String> getCreateIndexStatements()
{
String name = "in_periodstructure_iso_" + getRandomSuffix();
String sql = "create unique index " + name + " on " + getTempTableName() + "(iso)";
- return Optional.of( sql );
+ return Lists.newArrayList( sql );
}
}
