From e72d1a49dba002b41b86eb4a3060e41e43b03fc9 Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Tue, 12 Jun 2012 08:18:15 +0000
Subject: [PATCH] BIS-41 SP-57 Fix tests and bug fixes.
SVN: 25648
---
.../ch/systemsx/cisd/openbis/generic/server/ETLService.java | 4 ++++
.../openbis/generic/server/batch/BatchOperationExecutor.java | 2 ++
openbis/sourceTest/sql/postgresql/108/schema-108.sql | 2 +-
3 files changed, 7 insertions(+), 1 deletion(-)
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 30357e35a56..bc496b785cc 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 4601a92ea17..e88a463902a 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 bb8ac9deeb6..771ab37e2c8 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,
--
GitLab