Промежуточный. Убрал рудимент связанный с хранением ключей задач. Настроил синхронизацию сапфоровских пакетов.

This commit is contained in:
2023-10-12 21:48:22 +03:00
parent d5ff1683cb
commit 6d7367894f
12 changed files with 59 additions and 94 deletions

View File

@@ -2,10 +2,10 @@ package TestingSystem;
import Common.Database.SQLITE.SQLiteDatabase;
import Common.Global;
import GlobalData.Settings.SettingName;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable;
import TestingSystem.TSetting.TSetting;
import TestingSystem.TSetting.TSettingsDBTable;
import TestingSystem.TaskKey.TaskKey_2022;
import TestingSystem.Tasks.TestCompilationTask;
import TestingSystem.Tasks.TestCompilationTasksDBTable;
import TestingSystem.Tasks.TestRunTask;
@@ -129,20 +129,6 @@ public class TasksDatabase extends SQLiteDatabase {
}
return res;
}
public void CheckKeysActuality() throws Exception {
Vector<TaskKey_2022> toDelete = new Vector<>();
for (TaskKey_2022 taskKey : Global.db.tasksKeys.Data.values()) {
if (!testRunTasks.containsKey(taskKey.task_id) || testRunTasks.get(taskKey.task_id).state.isComplete())
toDelete.add(taskKey);
}
System.out.println("to delete size = " + toDelete.size());
if (!toDelete.isEmpty()) {
Global.db.BeginTransaction();
for (TaskKey_2022 taskKey : toDelete)
Global.db.Delete(taskKey);
Global.db.Commit();
}
}
public long getQueueSize(long date) throws Exception {
long sum = 0L;
for (TasksPackage tasksPackage : packages.Data.values()) {
@@ -163,4 +149,11 @@ public class TasksDatabase extends SQLiteDatabase {
res.add(p);
return res;
}
public Vector<SapforTasksPackage> getActiveSapforPackages() {
Vector<SapforTasksPackage> res = new Vector<>();
for (SapforTasksPackage p : sapforTasksPackages.Data.values())
if (!p.state.equals(TasksPackageState.Done))
res.add(p);
return res;
}
}