branch feature/8180 updated (1399fe4 -> 85d1ca3)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 1399fe4 Fix test due to mooring acoustic import test new c576083 Improve the perfomance on search duplicate cell (ref #8165) new 85d1ca3 Improve the perfomance on search duplicate cell (ref #8165) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 85d1ca3d589c525492455129fcb807afc4778b91 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Jun 27 16:23:19 2016 +0200 Improve the perfomance on search duplicate cell (ref #8165) commit c5760837eccac8476e8e4c96002b89f07934f6a7 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Jun 27 16:22:50 2016 +0200 Improve the perfomance on search duplicate cell (ref #8165) Summary of changes: .../echobase/entities/data/CellTopiaDao.java | 26 +++++++++++++++++++++ ...WorkingDbMigrationCallBackForVersion3_906.java} | 4 ++-- .../migration/workingDb/3.906-add-indexes.sql | 1 + .../services/service/UserDbPersistenceService.java | 2 +- .../echobase-catches-and-voyage-result.h2.db.gz | Bin 1006684 -> 1006743 bytes .../import-data/echobase-catches.h2.db.gz | Bin 936410 -> 936475 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 369737 -> 369793 bytes .../import-data/echobase-mooring.h2.db.gz | Bin 938417 -> 936865 bytes .../resources/import-data/echobase-nodata.h2.db.gz | Bin 318393 -> 318448 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 784771 -> 784803 bytes .../import-data/echobase-operation.h2.db.gz | Bin 507566 -> 507627 bytes .../src/test/resources/log4j.properties | 1 + 12 files changed, 31 insertions(+), 3 deletions(-) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_908.java => WorkingDbMigrationCallBackForVersion3_906.java} (85%) create mode 100644 echobase-domain/src/main/resources/migration/workingDb/3.906-add-indexes.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit c5760837eccac8476e8e4c96002b89f07934f6a7 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Jun 27 16:22:50 2016 +0200 Improve the perfomance on search duplicate cell (ref #8165) --- .../echobase/entities/data/CellTopiaDao.java | 26 ++++++++++++++++ .../WorkingDbMigrationCallBackForVersion3_906.java | 33 +++++++++++++++++++++ .../migration/workingDb/3.906-add-indexes.sql | 1 + .../services/service/UserDbPersistenceService.java | 2 +- .../echobase-catches-and-voyage-result.h2.db.gz | Bin 1006684 -> 1006743 bytes .../import-data/echobase-catches.h2.db.gz | Bin 936410 -> 936475 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 369737 -> 369793 bytes .../import-data/echobase-mooring.h2.db.gz | Bin 938417 -> 936865 bytes .../resources/import-data/echobase-nodata.h2.db.gz | Bin 318393 -> 318448 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 784771 -> 784803 bytes .../import-data/echobase-operation.h2.db.gz | Bin 507566 -> 507627 bytes .../src/test/resources/log4j.properties | 1 + 12 files changed, 62 insertions(+), 1 deletion(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CellTopiaDao.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CellTopiaDao.java index e5ae8a8..02620be 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CellTopiaDao.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CellTopiaDao.java @@ -69,6 +69,13 @@ public class CellTopiaDao extends AbstractCellTopiaDao<Cell> { return topiaSqlSupport.findMultipleResult(query); } + public Boolean containsCellByName(String name) throws TopiaException { + TopiaSqlQuery<Boolean> query = containsCellByNameQuery(name); + + Boolean result = topiaSqlSupport.findSingleResult(query); + return result != null; + } + protected TopiaSqlQuery<Long> newCountVoyageOrphanCellsQuery(final Voyage voyage) { return new TopiaSqlQuery<Long>() { @Override @@ -230,4 +237,23 @@ public class CellTopiaDao extends AbstractCellTopiaDao<Cell> { } }; } + + protected TopiaSqlQuery<Boolean> containsCellByNameQuery(String name) { + return new TopiaSqlQuery<Boolean>() { + @Override + public PreparedStatement prepareQuery(Connection connection) throws SQLException { + String hql = "SELECT 1 FROM Cell c " + + "WHERE c.name = ? " + + "LIMIT 1"; + PreparedStatement result = connection.prepareStatement(hql); + result.setString(1, name); + return result; + } + + @Override + public Boolean prepareResult(ResultSet set) throws SQLException { + return set.getInt(1) == 1; + } + }; + } } diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_906.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_906.java new file mode 100644 index 0000000..0677dae --- /dev/null +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_906.java @@ -0,0 +1,33 @@ +package fr.ifremer.echobase.persistence.migration.workingDb; + +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; +import org.nuiton.version.Version; +import org.nuiton.version.Versions; + +import java.util.List; + +/** + * Created on 26/04/16. + * + * @author Julien Ruchaud - ruchaud@codelutin.com + * @since 4.0 + */ +public class WorkingDbMigrationCallBackForVersion3_906 extends WorkingDbMigrationCallBackForVersionSupport { + + @Override + public Version getVersion() { + return Versions.valueOf("3.907"); + } + + @Override + protected void prepareMigrationScript(TopiaSqlSupport sqlSupport, + List<String> queries, + boolean showSql, + boolean showProgression) throws TopiaException { + + // update the model structure + addScript("3.906-add-indexes.sql", queries); + } + +} diff --git a/echobase-domain/src/main/resources/migration/workingDb/3.906-add-indexes.sql b/echobase-domain/src/main/resources/migration/workingDb/3.906-add-indexes.sql new file mode 100644 index 0000000..e2ba3ad --- /dev/null +++ b/echobase-domain/src/main/resources/migration/workingDb/3.906-add-indexes.sql @@ -0,0 +1 @@ +CREATE INDEX IDX_CELL_NAME ON CELL (NAME); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java index 6476c9f..a80067b 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java @@ -222,7 +222,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //------------------------------------------------------------------------// public boolean containsCellByName(String cellName) { - return persistenceContext.getCellDao().forNameEquals(cellName).exists(); + return persistenceContext.getCellDao().containsCellByName(cellName); } public boolean containsPostVoyageCellByName(Voyage voyage, String cellName) { diff --git a/echobase-services/src/test/resources/import-data/echobase-catches-and-voyage-result.h2.db.gz b/echobase-services/src/test/resources/import-data/echobase-catches-and-voyage-result.h2.db.gz index 82d2193..c8a0e23 100644 Binary files a/echobase-services/src/test/resources/import-data/echobase-catches-and-voyage-result.h2.db.gz and b/echobase-services/src/test/resources/import-data/echobase-catches-and-voyage-result.h2.db.gz differ diff --git a/echobase-services/src/test/resources/import-data/echobase-catches.h2.db.gz b/echobase-services/src/test/resources/import-data/echobase-catches.h2.db.gz index fd4ab13..994598c 100644 Binary files a/echobase-services/src/test/resources/import-data/echobase-catches.h2.db.gz and b/echobase-services/src/test/resources/import-data/echobase-catches.h2.db.gz differ diff --git a/echobase-services/src/test/resources/import-data/echobase-commonData.h2.db.gz b/echobase-services/src/test/resources/import-data/echobase-commonData.h2.db.gz index b667bd6..a854105 100644 Binary files a/echobase-services/src/test/resources/import-data/echobase-commonData.h2.db.gz and b/echobase-services/src/test/resources/import-data/echobase-commonData.h2.db.gz differ diff --git a/echobase-services/src/test/resources/import-data/echobase-mooring.h2.db.gz b/echobase-services/src/test/resources/import-data/echobase-mooring.h2.db.gz index 2200f22..32fa1b1 100644 Binary files a/echobase-services/src/test/resources/import-data/echobase-mooring.h2.db.gz and b/echobase-services/src/test/resources/import-data/echobase-mooring.h2.db.gz differ diff --git a/echobase-services/src/test/resources/import-data/echobase-nodata.h2.db.gz b/echobase-services/src/test/resources/import-data/echobase-nodata.h2.db.gz index 4ebb8bd..f283ae8 100644 Binary files a/echobase-services/src/test/resources/import-data/echobase-nodata.h2.db.gz and b/echobase-services/src/test/resources/import-data/echobase-nodata.h2.db.gz differ diff --git a/echobase-services/src/test/resources/import-data/echobase-operation-total-samples.h2.db.gz b/echobase-services/src/test/resources/import-data/echobase-operation-total-samples.h2.db.gz index 730afbe..0e83c97 100644 Binary files a/echobase-services/src/test/resources/import-data/echobase-operation-total-samples.h2.db.gz and b/echobase-services/src/test/resources/import-data/echobase-operation-total-samples.h2.db.gz differ diff --git a/echobase-services/src/test/resources/import-data/echobase-operation.h2.db.gz b/echobase-services/src/test/resources/import-data/echobase-operation.h2.db.gz index ca8668f..b1cd243 100644 Binary files a/echobase-services/src/test/resources/import-data/echobase-operation.h2.db.gz and b/echobase-services/src/test/resources/import-data/echobase-operation.h2.db.gz differ diff --git a/echobase-services/src/test/resources/log4j.properties b/echobase-services/src/test/resources/log4j.properties index c4899ef..c9de6bb 100644 --- a/echobase-services/src/test/resources/log4j.properties +++ b/echobase-services/src/test/resources/log4j.properties @@ -28,3 +28,4 @@ log4j.appender.stdout.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p [%t] # package level log4j.logger.fr.ifremer.echobase=INFO log4j.logger.org.nuiton.topia.migration=INFO +#log4j.logger.org.hibernate.SQL=DEBUG -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 85d1ca3d589c525492455129fcb807afc4778b91 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Jun 27 16:23:19 2016 +0200 Improve the perfomance on search duplicate cell (ref #8165) --- .../migration/workingDb/WorkingDbMigrationCallBackForVersion3_906.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_906.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_906.java index 0677dae..70d8a8f 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_906.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_906.java @@ -17,7 +17,7 @@ public class WorkingDbMigrationCallBackForVersion3_906 extends WorkingDbMigratio @Override public Version getVersion() { - return Versions.valueOf("3.907"); + return Versions.valueOf("3.906"); } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm