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

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

Browse Source
This commit is contained in:
02090095
2023-10-12 21:48:22 +03:00
parent d5ff1683cb
commit 6d7367894f
12 changed files with 59 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/TestingSystem/TaskKey/TaskKey_2022.java
View File

@@ -1,28 +0,0 @@
package TestingSystem.TaskKey;
import Common.Database.DBObject;
import com.sun.org.glassfish.gmbal.Description;
public class TaskKey_2022 extends DBObject {
@Description("PRIMARY KEY, UNIQUE")
public long task_id = 0;
public String package_id = "";
@Override
public Object getPK() {
return task_id;
}
public TaskKey_2022(TaskKey_2022 src) {
this.SynchronizeFields(src);
}
public TaskKey_2022(long task_id_in, String package_id_in) {
task_id = task_id_in;
package_id = package_id_in;
}
public TaskKey_2022() {
}
@Override
public void SynchronizeFields(DBObject src) {
super.SynchronizeFields(src);
TaskKey_2022 key = (TaskKey_2022) src;
task_id = key.task_id;
package_id = key.package_id;
}
}

7
src/TestingSystem/TaskKey/TaskKeysDBTable.java
View File

@@ -1,7 +0,0 @@
package TestingSystem.TaskKey;
import Common.Database.DBTable;
public class TaskKeysDBTable extends DBTable<Long, TaskKey_2022> {
public TaskKeysDBTable() {
super(Long.class, TaskKey_2022.class);
}
}

23
src/TestingSystem/TasksDatabase.java
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;
}
}