M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

актуализация двм пакетов на новых объектах.

Browse Source
This commit is contained in:
02090095
2023-12-14 23:00:50 +03:00
parent 204d4ceca0
commit 106626eb9a
5 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/workspace.xml generated
View File

@@ -8,8 +8,10 @@
<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/TestingSystem/DVM/DVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.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/files/Planner/Supervisor.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Planner/Supervisor.h" 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/Visual_DVM_2021/Passes/All/ActualizeDVMPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ActualizeDVMPackages.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ActualizePackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ActualizePackages.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" />

4
src/Repository/Server/ServerCode.java
View File

@@ -87,7 +87,7 @@ public enum ServerCode {
ActualizeDVMPackages, ActualizeDVMPackages,
// PublishTestProject // PublishTestProject
GetFirstActiveDVMPackage, GetFirstActiveDVMPackage,
DVMPackageNeedsKill DVMPackageNeedsKill, // не доделано.
UpdateActiveDVMPackages
; ;
} }

22
src/TestingSystem/Common/TestingServer.java
View File

@@ -102,7 +102,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
//--->> //--->>
@Override @Override
protected void startAdditionalThreads() { protected void startAdditionalThreads() {
// testingThread.start(); // testingThread.start();
testingThread_2023.start(); testingThread_2023.start();
} }
protected TestingPlanner_OLD testingPlannerOLD = new TestingPlanner_OLD(); protected TestingPlanner_OLD testingPlannerOLD = new TestingPlanner_OLD();
@@ -382,6 +382,10 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
case DVMPackageNeedsKill: case DVMPackageNeedsKill:
DVMPackageNeedsKill(); DVMPackageNeedsKill();
break; break;
case UpdateActiveDVMPackages:
Print("Получить данные по пакетам DVM");
UpdateActiveDVMPackages();
break;
default: default:
throw new RepositoryRefuseException("Неподдерживаемый код: " + code); throw new RepositoryRefuseException("Неподдерживаемый код: " + code);
} }
@@ -400,7 +404,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
} }
response.object = res_; response.object = res_;
*/ */
} }
public void UpdateTestTasks() throws Exception { public void UpdateTestTasks() throws Exception {
Vector<TestCompilationTask> compilationTasks = (Vector<TestCompilationTask>) request.object; Vector<TestCompilationTask> compilationTasks = (Vector<TestCompilationTask>) request.object;
@@ -679,6 +682,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
} }
} }
//---------------------------------------------------------------------------------------------->>> //---------------------------------------------------------------------------------------------->>>
//устарели. убрать.
void ActualizeDVMPackages() throws Exception { void ActualizeDVMPackages() throws Exception {
Vector<Pair<Long, TasksPackageState>> keys_pairs = (Vector<Pair<Long, TasksPackageState>>) request.object; Vector<Pair<Long, TasksPackageState>> keys_pairs = (Vector<Pair<Long, TasksPackageState>>) request.object;
//-- //--
@@ -733,4 +737,18 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
//-- //--
} }
//-- //--
//---
void UpdateActiveDVMPackages() throws Exception {
Vector<Pair<Integer, TasksPackageState>> keys_pairs = (Vector<Pair<Integer, TasksPackageState>>) request.object;
Vector<DVMPackage> res = new Vector<>();
//--
for (Pair<Integer, TasksPackageState> p : keys_pairs) {
if (db.dvmPackages.containsKey(p.getKey())) {
DVMPackage tasksPackage = db.dvmPackages.get(p.getKey());
if (!p.getValue().equals(tasksPackage.state))
res.add(tasksPackage);
}
}
response.object = res;
}
} }

39
src/Visual_DVM_2021/Passes/All/ActualizeDVMPackages.java
View File

@@ -4,6 +4,7 @@ import Common.Global;
import Common.UI.UI; import Common.UI.UI;
import Repository.Server.ServerCode; import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021; import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.DVM.DVMPackage.DVMPackage;
import TestingSystem.DVM.Tasks.TestRunTask; import TestingSystem.DVM.Tasks.TestRunTask;
import TestingSystem.DVM.TasksPackage.TasksPackage; import TestingSystem.DVM.TasksPackage.TasksPackage;
import TestingSystem.DVM.TasksPackage.TasksPackageState; import TestingSystem.DVM.TasksPackage.TasksPackageState;
@@ -11,7 +12,7 @@ import Visual_DVM_2021.Passes.Server.TestingSystemPass;
import javafx.util.Pair; import javafx.util.Pair;
import java.util.Vector; import java.util.Vector;
public class ActualizeDVMPackages extends TestingSystemPass<Vector<Pair<Long, TasksPackageState>>> { public class ActualizeDVMPackages extends TestingSystemPass<Vector<Pair<Integer, TasksPackageState>>> {
@Override @Override
protected boolean needsAnimation() { protected boolean needsAnimation() {
return false; return false;
@@ -19,42 +20,26 @@ public class ActualizeDVMPackages extends TestingSystemPass<Vector<Pair<Long, Ta
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
target = new Vector<>(); target = new Vector<>();
for (TasksPackage tasksPackage : Global.testingServer.account_db.packages.Data.values()) { for (DVMPackage dvmPackage : Global.testingServer.db.dvmPackages.Data.values()) {
if (tasksPackage.state.isActive()) if (dvmPackage.state.isActive())
target.add(new Pair<>(tasksPackage.id, tasksPackage.state)); target.add(new Pair(dvmPackage.id, dvmPackage.state));
} }
return !target.isEmpty(); return !target.isEmpty();
} }
@Override @Override
protected void ServerAction() throws Exception { protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.ActualizeDVMPackages, Current.getAccount().email, target)); Command(new ServerExchangeUnit_2021(ServerCode.UpdateActiveDVMPackages, "", target));
} }
@Override @Override
protected void performDone() throws Exception { protected void performDone() throws Exception {
int i = 0; Vector<DVMPackage> res = (Vector<DVMPackage>) response.object;
Vector<Pair<TasksPackage, Vector<TestRunTask>>> res = (Vector<Pair<TasksPackage, Vector<TestRunTask>>>) response.object; Global.testingServer.db.BeginTransaction();
Global.testingServer.account_db.BeginTransaction(); for (DVMPackage dvmPackage : res)
for (Pair<TasksPackage, Vector<TestRunTask>> pair : res) { Global.testingServer.db.UpdateWithCheck(dvmPackage);
TasksPackage tasksPackage = pair.getKey(); Global.testingServer.db.Commit();
Global.testingServer.account_db.UpdateWithCheck(tasksPackage);
if (tasksPackage.state.equals(TasksPackageState.Done)) {
++i;
for (TestRunTask task : pair.getValue()) {
Global.testingServer.account_db.UpdateWithCheck(task);
}
}
}
Global.testingServer.account_db.Commit();
/*
if (i == target.size()) {
UI.testingBar.autorefreshButton.doClick();
System.out.println("All packages are not active");
}
*/
} }
@Override @Override
protected void showDone() throws Exception { protected void showDone() throws Exception {
Global.testingServer.account_db.packages.RefreshUI(); Global.testingServer.db.dvmPackages.RefreshUI();
Global.testingServer.account_db.testRunTasks.ShowUI();
} }
} }

2
src/Visual_DVM_2021/Passes/All/ActualizePackages.java
View File

@@ -9,6 +9,6 @@ public class ActualizePackages extends Pass_2021 {
@Override @Override
protected void body() throws Exception { protected void body() throws Exception {
passes.get(PassCode_2021.ActualizeDVMPackages).Do(); passes.get(PassCode_2021.ActualizeDVMPackages).Do();
passes.get(PassCode_2021.ActualizeSAPFORPackages).Do(); // passes.get(PassCode_2021.ActualizeSAPFORPackages).Do();
} }
} }