Optimize job list

genepi · Jun 3, 2023 · 79719d9 · 79719d9
1 parent e738a40
commit 79719d9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/src/main/java/cloudgene/mapred/api/v2/admin/GetAllJobs.java b/src/main/java/cloudgene/mapred/api/v2/admin/GetAllJobs.java
@@ -65,13 +65,6 @@ public Representation getJobs() {
 		case "current":
 
 			jobs = dao.findAllNotRetiredJobs();
-			List<AbstractJob> toRemove = new Vector<AbstractJob>();
-			for (AbstractJob job : jobs) {
-				if (engine.isInQueue(job)) {
-					toRemove.add(job);
-				}
-			}
-			jobs.removeAll(toRemove);
 			break;
 
 		case "retired":
@@ -99,15 +92,15 @@ public Representation getJobs() {
 		int running = 0;
 
 		for (AbstractJob job : jobs) {
-			
+
 			String workspace = getSettings().getLocalWorkspace();
 			String folder = FileUtil.path(workspace, job.getId());
 			File file = new File(folder);
 			if (file.exists()) {
 				long size = FileUtils.sizeOfDirectory(file);
 				job.setWorkspaceSize(FileUtils.byteCountToDisplaySize(size));
 			}
-			
+
 			if (job.getState() == AbstractJob.STATE_EXPORTING || job.getState() == AbstractJob.STATE_RUNNING) {
 				running++;
 			}

diff --git a/src/main/java/cloudgene/mapred/database/JobDao.java b/src/main/java/cloudgene/mapred/database/JobDao.java
@@ -267,14 +267,19 @@ public List<AbstractJob> findAllNotRetiredJobs() {
 		sql.append("select * ");
 		sql.append("from job ");
 		sql.append("join `user` on job.user_id = `user`.id ");
-		sql.append("where state != ? AND state != ? ");
+		sql.append("where state  not in (?,?,?,?,?,?,?) ");
 		sql.append("order by job.id desc ");
 
 		List<AbstractJob> result = new Vector<AbstractJob>();
 
-		Object[] params = new Object[2];
-		params[0] = AbstractJob.STATE_RETIRED;
-		params[1] = AbstractJob.STATE_DELETED;
+		Object[] params = new Object[7];
+		params[0] = AbstractJob.STATE_WAITING;
+		params[1] = AbstractJob.STATE_RUNNING;
+		params[2] = AbstractJob.STATE_EXPORTING;
+		params[3] = AbstractJob.STATE_RETIRED;
+		params[4] = AbstractJob.STATE_DELETED;
+		params[5] = AbstractJob.STATE_RETIRED;
+		params[6] = AbstractJob.STATE_DELETED;
 
 		try {