diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/AbstractOmniscientTopLevelDataSetRegistrator.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/AbstractOmniscientTopLevelDataSetRegistrator.java
index 4ce3c66b7c0577dbbbfe90bbd48dee6374e55346..8013e99bd0cd0e2659ecd0c6649ace93be911e4c 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/AbstractOmniscientTopLevelDataSetRegistrator.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/AbstractOmniscientTopLevelDataSetRegistrator.java
@@ -230,11 +230,11 @@ public abstract class AbstractOmniscientTopLevelDataSetRegistrator<T extends Dat
{
// Registration succeeded -- delete original file
operationSuccessful =
- FileUtilities.deleteRecursively(incoming.getOriginalIncoming());
+ FileUtilities.deleteRecursively(incoming.getRealIncomingFile());
// If the parent of the hardlink copy file, which we generated, is empty, delete it
// too
- File hardlinkCopyParent = incoming.getPrestagingCopy().getParentFile();
+ File hardlinkCopyParent = incoming.getLogicalIncomingFile().getParentFile();
if (hardlinkCopyParent.list().length < 1)
{
hardlinkCopyParent.delete();
@@ -242,7 +242,7 @@ public abstract class AbstractOmniscientTopLevelDataSetRegistrator<T extends Dat
} else
{
// Registration failed -- remove the copy, leaving the original.
- operationSuccessful = FileUtilities.deleteRecursively(incoming.getPrestagingCopy());
+ operationSuccessful = FileUtilities.deleteRecursively(incoming.getLogicalIncomingFile());
}
boolean wrappedActionResult = wrappedAction.execute(didOperationSucceed);
@@ -432,7 +432,7 @@ public abstract class AbstractOmniscientTopLevelDataSetRegistrator<T extends Dat
{
Throwable firstError = service.getEncounteredErrors().get(0);
throw new EnvironmentFailureException("Could not process file "
- + incomingDataSetFile.getPrestagingCopy().getName(),
+ + incomingDataSetFile.getLogicalIncomingFile().getName(),
asSerializableException(firstError));
}
}
@@ -478,13 +478,13 @@ public abstract class AbstractOmniscientTopLevelDataSetRegistrator<T extends Dat
.getValidationScriptsOrNull());
List<ValidationError> validationErrors =
- validationScriptRunner.validate(incomingDataSetFile.getPrestagingCopy());
+ validationScriptRunner.validate(incomingDataSetFile.getLogicalIncomingFile());
if (validationErrors.size() > 0)
{
handleValidationErrors(validationErrors, incomingDataSetFile, service);
} else
{
- handleDataSet(incomingDataSetFile.getPrestagingCopy(), service);
+ handleDataSet(incomingDataSetFile.getLogicalIncomingFile(), service);
service.commit();
}
} catch (Throwable ex)
@@ -499,7 +499,7 @@ public abstract class AbstractOmniscientTopLevelDataSetRegistrator<T extends Dat
ErrorType.REGISTRATION_SCRIPT_ERROR, ex);
DataSetStorageRollbacker rollbacker =
new DataSetStorageRollbacker(getRegistratorState(), operationLog, action,
- incomingDataSetFile.getOriginalIncoming(), null, ex,
+ incomingDataSetFile.getRealIncomingFile(), null, ex,
ErrorType.REGISTRATION_SCRIPT_ERROR);
operationLog.info(rollbacker.getErrorMessageForLog());
rollbacker.doRollback();
@@ -524,7 +524,7 @@ public abstract class AbstractOmniscientTopLevelDataSetRegistrator<T extends Dat
sb.append("Validation script [");
sb.append(getGlobalState().getValidationScriptsOrNull());
sb.append("] found errors in incoming data set [");
- sb.append(incomingDataSetFile.getPrestagingCopy());
+ sb.append(incomingDataSetFile.getLogicalIncomingFile());
sb.append("]:\n");
for (ValidationError error : validationErrors)
{
@@ -539,7 +539,7 @@ public abstract class AbstractOmniscientTopLevelDataSetRegistrator<T extends Dat
System.err.println("compute undo action is "+action);
DataSetStorageRollbacker rollbacker =
new DataSetStorageRollbacker(getRegistratorState(), operationLog, action,
- incomingDataSetFile.getOriginalIncoming(), null, null,
+ incomingDataSetFile.getRealIncomingFile(), null, null,
ErrorType.INVALID_DATA_SET);
sb.append(rollbacker.getErrorMessageForLog());
operationLog.info(sb.toString());
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetFile.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetFile.java
index c2392d6be5ea06d381cc42e8d28ca94e3e8fdc3d..3a3cbcaf6d4dd2b45aa716dbcb93f13cb3f19a72 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetFile.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetFile.java
@@ -3,24 +3,25 @@ package ch.systemsx.cisd.etlserver.registrator;
import java.io.File;
/**
- * Wrapper for two copies of incoming dataset file. One is original file from the dropbox, second is
- * the prestaging copy;
+ * Wrapper that bundles two copies of incoming dataset file. One is original file from the dropbox
+ * (realIncomingFile), second is the prestaging copy (logicalIncomingFile). In most cases, clients
+ * should use the logicalIncomingFile. The exception being for actions that execute on error.
*
* @author jakubs
*/
public class DataSetFile
{
- private final File originalIncoming;
+ private final File realIncomingFile;
- private final File prestagingCopy;
+ private final File logicalIncomingFile;
/**
* Creates the dataset file with original incoming and prestaging copy
*/
public DataSetFile(File originalIncoming, File prestagingCopy)
{
- this.originalIncoming = originalIncoming;
- this.prestagingCopy = prestagingCopy;
+ this.realIncomingFile = originalIncoming;
+ this.logicalIncomingFile = prestagingCopy;
}
/**
@@ -28,18 +29,18 @@ public class DataSetFile
*/
public DataSetFile(File incoming)
{
- this.originalIncoming = this.prestagingCopy = incoming;
+ this.realIncomingFile = this.logicalIncomingFile = incoming;
}
-
+
/**
* This file should be used only when it is really important to do something on the original
* File.
*
* @returns the original incoming dataset.
*/
- public File getOriginalIncoming()
+ public File getRealIncomingFile()
{
- return originalIncoming;
+ return realIncomingFile;
}
/**
@@ -47,9 +48,9 @@ public class DataSetFile
*
* @returns The prestaging copy. If not available returns the original incoming file.
*/
- public File getPrestagingCopy()
+ public File getLogicalIncomingFile()
{
- return (prestagingCopy != null) ? prestagingCopy : originalIncoming;
+ return (logicalIncomingFile != null) ? logicalIncomingFile : realIncomingFile;
}
}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationService.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationService.java
index 45bd6b0458efe013c6599fdf1100ed2ce83a9c5d..5d00474396ddcdf00a19d0ed6831891be6287bbc 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationService.java
@@ -117,7 +117,7 @@ public class DataSetRegistrationService<T extends DataSetInformation> implements
new DssRegistrationLogDirectoryHelper(registratorContext.getGlobalState()
.getDssRegistrationLogDir());
this.dssRegistrationLog =
- dssRegistrationLogHelper.createNewLogFile(incomingDataSetFile.getPrestagingCopy().getName(),
+ dssRegistrationLogHelper.createNewLogFile(incomingDataSetFile.getLogicalIncomingFile().getName(),
threadParameters.getThreadName(),
this.registratorContext.getFileOperations());
this.stagingDirectory = registratorContext.getGlobalState().getStagingDir();
@@ -135,7 +135,7 @@ this.precommitDirectory = registratorContext.getGlobalState().getPreCommitDir();
*/
public IDataSetRegistrationTransaction transaction()
{
- return transaction(incomingDataSetFile.getPrestagingCopy(), getDataSetRegistrationDetailsFactory());
+ return transaction(incomingDataSetFile.getLogicalIncomingFile(), getDataSetRegistrationDetailsFactory());
}
/**
@@ -260,7 +260,7 @@ this.precommitDirectory = registratorContext.getGlobalState().getPreCommitDir();
{
DataSetStorageRollbacker rollbacker =
new DataSetStorageRollbacker(registratorContext, operationLog,
- UnstoreDataAction.MOVE_TO_ERROR, incomingDataSetFile.getOriginalIncoming(),
+ UnstoreDataAction.MOVE_TO_ERROR, incomingDataSetFile.getRealIncomingFile(),
dataSetTypeCodeOrNull, null);
return rollbacker.doRollback();
}
@@ -277,7 +277,7 @@ this.precommitDirectory = registratorContext.getGlobalState().getPreCommitDir();
registratorContext.getOnErrorActionDecision().computeUndoAction(errorType, ex);
DataSetStorageRollbacker rollbacker =
new DataSetStorageRollbacker(registratorContext, operationLog, action,
- incomingDataSetFile.getOriginalIncoming(), null, ex, errorType);
+ incomingDataSetFile.getRealIncomingFile(), null, ex, errorType);
operationLog.info(rollbacker.getErrorMessageForLog());
rollbacker.doRollback();
}