обновление задач пакета одной операцией.
This commit is contained in:
4
.idea/workspace.xml
generated
4
.idea/workspace.xml
generated
@@ -8,7 +8,9 @@
|
|||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/TestsSupervisor_2022.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TestsSupervisor_2022.java" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
|||||||
@@ -80,6 +80,7 @@ public enum ServerCode {
|
|||||||
GetActualSapforPackageData,
|
GetActualSapforPackageData,
|
||||||
//--
|
//--
|
||||||
PublishObject,
|
PublishObject,
|
||||||
PublishObjects
|
PublishObjects,
|
||||||
|
UpdateTestTasks
|
||||||
// PublishTestProject
|
// PublishTestProject
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,14 +36,11 @@ import Visual_DVM_2021.Passes.Pass_2021;
|
|||||||
import javafx.util.Pair;
|
import javafx.util.Pair;
|
||||||
import org.apache.commons.io.FileUtils;
|
import org.apache.commons.io.FileUtils;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.Timer;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.nio.file.Paths;
|
import java.nio.file.Paths;
|
||||||
import java.util.Arrays;
|
import java.util.*;
|
||||||
import java.util.Comparator;
|
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
import java.util.Vector;
|
|
||||||
|
|
||||||
import static Common.Constants.tests_db_name;
|
import static Common.Constants.tests_db_name;
|
||||||
public class TestingServer extends RepositoryServer<TestsDatabase> {
|
public class TestingServer extends RepositoryServer<TestsDatabase> {
|
||||||
@@ -392,10 +389,29 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
RefreshDVMTests((Account) request.object, Integer.parseInt(request.arg));
|
RefreshDVMTests((Account) request.object, Integer.parseInt(request.arg));
|
||||||
break;
|
break;
|
||||||
//--
|
//--
|
||||||
|
case UpdateTestTasks:
|
||||||
|
Print("Обновить задачи на компиляцию и запуск");
|
||||||
|
SetCurrentAccountDB(request.arg);
|
||||||
|
UpdateTestTasks();
|
||||||
|
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
throw new RepositoryRefuseException("Неподдерживаемый код: " + code);
|
throw new RepositoryRefuseException("Неподдерживаемый код: " + code);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
public void UpdateTestTasks() throws Exception {
|
||||||
|
Vector<TestCompilationTask> compilationTasks = (Vector<TestCompilationTask>) request.object;
|
||||||
|
account_db.BeginTransaction();
|
||||||
|
for (TestCompilationTask compilationTask : compilationTasks) {
|
||||||
|
compilationTask.ChangeDate = new Date().getTime();
|
||||||
|
account_db.Update(compilationTask);
|
||||||
|
for (TestRunTask runTask : compilationTask.runTasks) {
|
||||||
|
compilationTask.ChangeDate = new Date().getTime();
|
||||||
|
account_db.Update(runTask);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
account_db.Commit();
|
||||||
|
}
|
||||||
//->>
|
//->>
|
||||||
//->>
|
//->>
|
||||||
Pair<Group, Vector<File>> ConvertDirectoryToGroup(File src, LanguageName languageName, TestType
|
Pair<Group, Vector<File>> ConvertDirectoryToGroup(File src, LanguageName languageName, TestType
|
||||||
|
|||||||
@@ -226,7 +226,7 @@ public class TestsSupervisor_2022 {
|
|||||||
for (TestCompilationTask testCompilationTask : compilationTasks) {
|
for (TestCompilationTask testCompilationTask : compilationTasks) {
|
||||||
ct_count++;
|
ct_count++;
|
||||||
if (CheckTask(testCompilationTask)) {
|
if (CheckTask(testCompilationTask)) {
|
||||||
planner.UpdateTask(testCompilationTask);
|
// planner.UpdateTask(testCompilationTask);
|
||||||
for (TestRunTask testRunTask : testCompilationTask.runTasks) {
|
for (TestRunTask testRunTask : testCompilationTask.runTasks) {
|
||||||
rt_count++;
|
rt_count++;
|
||||||
testRunTask.compilation_state = testCompilationTask.state;
|
testRunTask.compilation_state = testCompilationTask.state;
|
||||||
@@ -237,7 +237,7 @@ public class TestsSupervisor_2022 {
|
|||||||
} else {
|
} else {
|
||||||
CheckTask(testRunTask);
|
CheckTask(testRunTask);
|
||||||
}
|
}
|
||||||
planner.UpdateTask(testRunTask);
|
// planner.UpdateTask(testRunTask);
|
||||||
if (testRunTask.state.equals(TaskState.Finished)) {
|
if (testRunTask.state.equals(TaskState.Finished)) {
|
||||||
//анализ задачи на запуск.
|
//анализ задачи на запуск.
|
||||||
List<String> output_lines = Arrays.asList(testRunTask.output.split("\n"));
|
List<String> output_lines = Arrays.asList(testRunTask.output.split("\n"));
|
||||||
@@ -287,11 +287,14 @@ public class TestsSupervisor_2022 {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
planner.UpdateTask(testRunTask);
|
//planner.UpdateTask(testRunTask);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
System.out.println("ct_count=" + ct_count + " rt count=" + rt_count);
|
System.out.println("ct_count=" + ct_count + " rt count=" + rt_count);
|
||||||
|
//теперь обновить их единым списком.
|
||||||
|
planner.ServerCommand(ServerCode.UpdateTestTasks, compilationTasks);
|
||||||
|
|
||||||
}
|
}
|
||||||
public boolean CheckTask(TestTask testTask) throws Exception {
|
public boolean CheckTask(TestTask testTask) throws Exception {
|
||||||
if (testTask.state.equals(TaskState.ResultsDownloaded)) {
|
if (testTask.state.equals(TaskState.ResultsDownloaded)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user