From 1445e5f58a458c12d8f85855ea0b35d78353b426 Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Fri, 14 Mar 2014 16:13:11 +0000
Subject: [PATCH] SP-1240 / BIS-677 : Data Set Size Filling Maintenance Task -
rename a property
SVN: 31150
---
...penbisDBFromPathInfoDBMaintenanceTask.java | 22 +++++++++----------
...isDBFromPathInfoDBMaintenanceTaskTest.java | 22 +++++++++----------
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTask.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTask.java
index ae050130a5e..c47b814e2b0 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTask.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTask.java
@@ -69,9 +69,9 @@ public class FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTask impl
static final String LAST_SEEN_DATA_SET_FILE_DEFAULT = "fillUnknownDataSetSizeTaskLastSeen";
- static final String DROP_LAST_SEEN_DATA_SET_FILE_INTERVAL_PROPERTY = "drop-last-seen-data-set-file-interval";
+ static final String DELETE_LAST_SEEN_DATA_SET_FILE_INTERVAL_PROPERTY = "delete-last-seen-data-set-file-interval";
- static final long DROP_LAST_SEEN_DATA_SET_FILE_INTERVAL_DEFAULT = DateUtils.MILLIS_PER_DAY * 7;
+ static final long DELETE_LAST_SEEN_DATA_SET_FILE_INTERVAL_DEFAULT = DateUtils.MILLIS_PER_DAY * 7;
private IEncapsulatedOpenBISService service;
@@ -87,7 +87,7 @@ public class FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTask impl
private File lastSeenDataSetFile;
- private long dropLastSeenDataSetFileInterval;
+ private long deleteLastSeenDataSetFileInterval;
public FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTask()
{
@@ -124,9 +124,9 @@ public class FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTask impl
lastSeenDataSetFile = new File(lastSeenDataSetFileProperty);
}
- dropLastSeenDataSetFileInterval =
- DateTimeUtils.getDurationInMillis(properties, DROP_LAST_SEEN_DATA_SET_FILE_INTERVAL_PROPERTY,
- DROP_LAST_SEEN_DATA_SET_FILE_INTERVAL_DEFAULT);
+ deleteLastSeenDataSetFileInterval =
+ DateTimeUtils.getDurationInMillis(properties, DELETE_LAST_SEEN_DATA_SET_FILE_INTERVAL_PROPERTY,
+ DELETE_LAST_SEEN_DATA_SET_FILE_INTERVAL_DEFAULT);
StringBuilder logBuilder = new StringBuilder();
@@ -134,8 +134,8 @@ public class FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTask impl
logBuilder.append("\t" + CHUNK_SIZE_PROPERTY + ": " + chunkSize + "\n");
logBuilder.append("\t" + TIME_LIMIT_PROPERTY + ": " + DateTimeUtils.renderDuration(timeLimit) + "\n");
logBuilder.append("\t" + LAST_SEEN_DATA_SET_FILE_PROPERTY + ": " + lastSeenDataSetFile.getAbsolutePath() + "\n");
- logBuilder.append("\t" + DROP_LAST_SEEN_DATA_SET_FILE_INTERVAL_PROPERTY + ": "
- + DateTimeUtils.renderDuration(dropLastSeenDataSetFileInterval));
+ logBuilder.append("\t" + DELETE_LAST_SEEN_DATA_SET_FILE_INTERVAL_PROPERTY + ": "
+ + DateTimeUtils.renderDuration(deleteLastSeenDataSetFileInterval));
operationLog.info(logBuilder.toString());
}
@@ -232,13 +232,13 @@ public class FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTask impl
operationLog.info("Created last seen data set file.");
} else if (content.getFileCreationTime() == null
- || timeProvider.getTimeInMilliseconds() > content.getFileCreationTime() + dropLastSeenDataSetFileInterval)
+ || timeProvider.getTimeInMilliseconds() > content.getFileCreationTime() + deleteLastSeenDataSetFileInterval)
{
lastSeenDataSetFile.delete();
operationLog.info("Deleted last seen data set file because its age was unknown or its age was greater than "
- + DateTimeUtils.renderDuration(dropLastSeenDataSetFileInterval) +
- " ('" + DROP_LAST_SEEN_DATA_SET_FILE_INTERVAL_PROPERTY + "' property value).");
+ + DateTimeUtils.renderDuration(deleteLastSeenDataSetFileInterval) +
+ " ('" + DELETE_LAST_SEEN_DATA_SET_FILE_INTERVAL_PROPERTY + "' property value).");
content = new LastSeenDataSetFileContent();
content.setFileCreationTime(timeProvider.getTimeInMilliseconds());
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTaskTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTaskTest.java
index 416e728fa36..a0f5913054a 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTaskTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTaskTest.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.etlserver.plugins;
import static ch.systemsx.cisd.common.test.ArrayContainsExactlyMatcher.containsExactly;
import static ch.systemsx.cisd.etlserver.plugins.FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTask.CHUNK_SIZE_DEFAULT;
import static ch.systemsx.cisd.etlserver.plugins.FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTask.CHUNK_SIZE_PROPERTY;
-import static ch.systemsx.cisd.etlserver.plugins.FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTask.DROP_LAST_SEEN_DATA_SET_FILE_INTERVAL_PROPERTY;
+import static ch.systemsx.cisd.etlserver.plugins.FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTask.DELETE_LAST_SEEN_DATA_SET_FILE_INTERVAL_PROPERTY;
import static ch.systemsx.cisd.etlserver.plugins.FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTask.LAST_SEEN_DATA_SET_FILE_PROPERTY;
import static ch.systemsx.cisd.etlserver.plugins.FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTask.TIME_LIMIT_PROPERTY;
@@ -381,7 +381,7 @@ public class FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTaskTest
TestResources resources = new TestResources(getClass());
final long lastSeenCreationTime = System.currentTimeMillis();
- final long dropLastSeenFileInterval = 100L;
+ final long deleteLastSeenFileInterval = 100L;
final File lastSeenFile = resources.getResourceFile("upToDateLastSeenFile");
LastSeenDataSetFileContent lastSeenContent = new LastSeenDataSetFileContent();
@@ -393,7 +393,7 @@ public class FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTaskTest
{
{
allowing(timeProvider).getTimeInMilliseconds();
- will(returnValue(lastSeenCreationTime + dropLastSeenFileInterval / 2));
+ will(returnValue(lastSeenCreationTime + deleteLastSeenFileInterval / 2));
one(service).listPhysicalDataSetsWithUnknownSize(CHUNK_SIZE_DEFAULT, dataSet1.getDataSetCode());
will(returnValue(Arrays.asList(dataSet2, dataSet3)));
@@ -406,7 +406,7 @@ public class FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTaskTest
}
});
- execute(null, null, lastSeenFile, dropLastSeenFileInterval);
+ execute(null, null, lastSeenFile, deleteLastSeenFileInterval);
lastSeenContent = LastSeenDataSetFileContent.readFromFile(lastSeenFile);
Assert.assertEquals(lastSeenContent.getFileCreationTime(), Long.valueOf(lastSeenCreationTime));
@@ -421,7 +421,7 @@ public class FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTaskTest
TestResources resources = new TestResources(getClass());
final long lastSeenCreationTime = System.currentTimeMillis();
- final long dropLastSeenFileInterval = 100L;
+ final long deleteLastSeenFileInterval = 100L;
final File lastSeenFile = resources.getResourceFile("outOfDateLastSeenFile");
LastSeenDataSetFileContent lastSeenContent = new LastSeenDataSetFileContent();
@@ -433,7 +433,7 @@ public class FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTaskTest
{
{
allowing(timeProvider).getTimeInMilliseconds();
- will(returnValue(lastSeenCreationTime + 2 * dropLastSeenFileInterval));
+ will(returnValue(lastSeenCreationTime + 2 * deleteLastSeenFileInterval));
one(service).listPhysicalDataSetsWithUnknownSize(CHUNK_SIZE_DEFAULT, null);
will(returnValue(Arrays.asList(dataSet1, dataSet2, dataSet3)));
@@ -451,10 +451,10 @@ public class FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTaskTest
}
});
- execute(null, null, lastSeenFile, dropLastSeenFileInterval);
+ execute(null, null, lastSeenFile, deleteLastSeenFileInterval);
lastSeenContent = LastSeenDataSetFileContent.readFromFile(lastSeenFile);
- Assert.assertEquals(lastSeenContent.getFileCreationTime(), Long.valueOf(lastSeenCreationTime + 2 * dropLastSeenFileInterval));
+ Assert.assertEquals(lastSeenContent.getFileCreationTime(), Long.valueOf(lastSeenCreationTime + 2 * deleteLastSeenFileInterval));
Assert.assertEquals(lastSeenContent.getLastSeenDataSetCode(), dataSet3.getDataSetCode());
assertLogThatSomeDataSetsHaveNotBeenFixedYet();
@@ -508,7 +508,7 @@ public class FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTaskTest
assertLogThatAllDataSetsHaveBeenFixed();
}
- private void execute(Long timeLimit, Integer chunkSize, File lastSeenFile, Long dropLastSeenFileInterval)
+ private void execute(Long timeLimit, Integer chunkSize, File lastSeenFile, Long deleteLastSeenFileInterval)
{
FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTask task =
new FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTask(service, dao, timeProvider, configProvider);
@@ -527,9 +527,9 @@ public class FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTaskTest
{
properties.setProperty(LAST_SEEN_DATA_SET_FILE_PROPERTY, lastSeenFile.getAbsolutePath());
}
- if (dropLastSeenFileInterval != null)
+ if (deleteLastSeenFileInterval != null)
{
- properties.setProperty(DROP_LAST_SEEN_DATA_SET_FILE_INTERVAL_PROPERTY, dropLastSeenFileInterval.toString() + " ms");
+ properties.setProperty(DELETE_LAST_SEEN_DATA_SET_FILE_INTERVAL_PROPERTY, deleteLastSeenFileInterval.toString() + " ms");
}
task.setUp("fill-unknown-sizes", properties);
--
GitLab