From 48a79a0b0e9a62a83393bb80be96311ce0505231 Mon Sep 17 00:00:00 2001
From: Petr Bainar <petr.bainar@hotmail.com>
Date: Tue, 30 Jan 2018 16:41:07 +0100
Subject: [PATCH] iss1011: resolving of TaskComputation inputs, outputs and
logs
---
.../core/TaskComputation.java | 73 +++++++++++++------
1 file changed, 51 insertions(+), 22 deletions(-)
diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/TaskComputation.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/TaskComputation.java
index 36a81feb..af0bec07 100644
--- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/TaskComputation.java
+++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/TaskComputation.java
@@ -1,5 +1,6 @@
package cz.it4i.fiji.haas_spim_benchmark.core;
+import java.util.Arrays;
import java.util.Collection;
import java.util.LinkedList;
import java.util.Scanner;
@@ -7,25 +8,40 @@ import java.util.Scanner;
import cz.it4i.fiji.haas_java_client.JobState;
public class TaskComputation {
+
+ // A single-purpose class dedicated to help with TaskComputation members initialization
+ private class ParsedTaskComputationValues {
+ private final Collection<String> logs;
+ private final Collection<String> inputs;
+ private final Collection<String> outputs;
+ private final Long id;
+
+ public ParsedTaskComputationValues(Collection<String> inputs, Collection<String> outputs, Collection<String> logs, Long id) {
+ this.inputs = inputs;
+ this.outputs = outputs;
+ this.logs = logs;
+ this.id = id;
+ }
+ }
- private final SPIMComputationAccessor outputHolder;
private final Task task;
private final int timepoint;
+ private final Collection<String> inputs;
+ private final Collection<String> outputs;
+ private final Collection<String> logs;
private final Long id;
//TASK 1011 what states will be defined and how it will be defined
private JobState state = JobState.Unknown;
- private Collection<String> logs = new LinkedList<>();
- private Collection<String> outputs = new LinkedList<>();
- private Collection<String> inputs = new LinkedList<>();
-
-
public TaskComputation(SPIMComputationAccessor outputHolder, Task task, int timepoint) {
- this.outputHolder = outputHolder;
this.task = task;
- this.timepoint = timepoint;
- this.id = resolveId();
+ this.timepoint = timepoint;
+ ParsedTaskComputationValues parsedValues = parseStuff(outputHolder);
+ this.inputs = parsedValues.inputs;
+ this.outputs = parsedValues.outputs;
+ this.logs = parsedValues.logs;
+ this.id = parsedValues.id;
}
public JobState getState() {
@@ -39,7 +55,7 @@ public class TaskComputation {
return;
}
- String snakeOutput = outputHolder.getActualOutput();
+ //String snakeOutput = outputHolder.getActualOutput();
//TASK 1011
//resolve if job is queued (defined id), started (exists log file), finished (in log is Finished job 10.) or
@@ -50,34 +66,47 @@ public class TaskComputation {
return id;
}
- private Long resolveId() {
+ private ParsedTaskComputationValues parseStuff(SPIMComputationAccessor outputHolder) {
final String OUTPUT_PARSING_RULE = "rule ";
- final String OUTPUT_PARSING_JOB_ID = "jobid: ";
final String OUTPUT_PARSING_COLON = ":";
+ final String OUTPUT_PARSING_COMMA_SPACE = ", ";
final String desiredPattern = OUTPUT_PARSING_RULE + task.getDescription() + OUTPUT_PARSING_COLON;
+ final String OUTPUT_PARSING_INPUTS = "input: ";
+ final String OUTPUT_PARSING_OUTPUTS = "output: ";
+ final String OUTPUT_PARSING_LOGS = "log: ";
+ final String OUTPUT_PARSING_JOB_ID = "jobid: ";
+
Scanner scanner = new Scanner(outputHolder.getActualOutput());
- int jobsToSkip = timepoint - 1;
- do {
+ int jobsToSkip = timepoint;
+ while (scanner.hasNextLine() && jobsToSkip > 0) {
if (scanner.nextLine().equals(desiredPattern)) {
jobsToSkip--;
}
- } while (jobsToSkip >= 0 && scanner.hasNextLine());
+ }
String currentLine;
+ Collection<String> resolvedInputs = new LinkedList<>();
+ Collection<String> resolvedOutputs = new LinkedList<>();
+ Collection<String> resolvedLogs = new LinkedList<>();
Long resolvedId = null;
while (scanner.hasNextLine()) {
currentLine = scanner.nextLine();
- if (!currentLine.contains(OUTPUT_PARSING_JOB_ID)) {
- continue;
+ if (currentLine.contains(OUTPUT_PARSING_INPUTS)) {
+ resolvedInputs = Arrays.asList(currentLine.split(OUTPUT_PARSING_INPUTS)[1].split(OUTPUT_PARSING_COMMA_SPACE));
+ } else if (currentLine.contains(OUTPUT_PARSING_OUTPUTS)) {
+ resolvedOutputs = Arrays.asList(currentLine.split(OUTPUT_PARSING_OUTPUTS)[1].split(OUTPUT_PARSING_COMMA_SPACE));
+ } else if (currentLine.contains(OUTPUT_PARSING_LOGS)) {
+ resolvedLogs = Arrays.asList(currentLine.split(OUTPUT_PARSING_LOGS)[1].split(OUTPUT_PARSING_COMMA_SPACE));
+ } else if (currentLine.contains(OUTPUT_PARSING_JOB_ID)) {
+ resolvedId = Long.parseLong(currentLine.split(OUTPUT_PARSING_JOB_ID)[1]);
+ } else if (currentLine.trim().isEmpty()) {
+ break;
}
- resolvedId = Long.parseLong(currentLine.split(OUTPUT_PARSING_JOB_ID)[1]);
- break;
}
scanner.close();
- return resolvedId;
- }
-
+ return new ParsedTaskComputationValues(resolvedInputs, resolvedOutputs, resolvedLogs, resolvedId);
+ }
}
--
GitLab