diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java index 30357e35a561a94d1c7d1bd0434fc9d451a8e138..bc496b785cc7f4cee893c87dbac4f8324a9a7deb 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java @@ -1534,6 +1534,10 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements AtomicEntityOperationDetails operationDetails, IProgressListener progress) { List<SampleUpdatesDTO> sampleUpdates = operationDetails.getSampleUpdates(); + if (sampleUpdates.size() < 1) + { + return Collections.emptyList(); + } ISampleTable sampleTable = businessObjectFactory.createSampleTable(session); BatchOperationExecutor.executeInBatches(new SampleUpdate(sampleTable, sampleUpdates), progress, "updateSamples"); diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/batch/BatchOperationExecutor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/batch/BatchOperationExecutor.java index 4601a92ea17850f52fcef619973af21e254c7524..e88a463902a507e7350b67ca7ecc6b9c37e1a862 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/batch/BatchOperationExecutor.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/batch/BatchOperationExecutor.java @@ -69,6 +69,8 @@ public class BatchOperationExecutor endIndex, endIndex = Math.min(startIndex + batchSize, maxIndex)) { final List<S> batch = allEntities.subList(startIndex, endIndex); + operationLog.info(String.format("%s %s progress: %d/%d", strategy.getEntityName(), + strategy.getOperationName(), startIndex, maxIndex)); strategy.execute(batch); if (null != progressListenerOrNull) { diff --git a/openbis/sourceTest/sql/postgresql/108/schema-108.sql b/openbis/sourceTest/sql/postgresql/108/schema-108.sql index bb8ac9deeb6799d8024da7a610bc7a33c92d84a2..771ab37e2c82e04c587687a60705cbe2aef8757c 100644 --- a/openbis/sourceTest/sql/postgresql/108/schema-108.sql +++ b/openbis/sourceTest/sql/postgresql/108/schema-108.sql @@ -493,7 +493,7 @@ CREATE SEQUENCE code_seq NO MINVALUE NO MAXVALUE CACHE 1; -SELECT pg_catalog.setval('code_seq', 1, false); +SELECT pg_catalog.setval('code_seq', 10, false); CREATE TABLE controlled_vocabularies ( id tech_id NOT NULL, code code NOT NULL,