From 1c980c5b29b464c335318c5acec9ad5678706882 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 24 Apr 2020 18:50:36 +0000
Subject: [PATCH] The workerqueue is now using a view as well

---
 src/Core/Worker.php      | 8 +++-----
 static/dbview.config.php | 9 +++++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index f41636bed..6fb8bd40f 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -684,7 +684,7 @@ class Worker
 				self::$db_duration_stat += (microtime(true) - $stamp);
 				while ($entry = DBA::fetch($jobs)) {
 					$stamp = (float)microtime(true);
-					$processes = DBA::p("SELECT COUNT(*) AS `running` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` WHERE NOT `done` AND `priority` = ?", $entry["priority"]);
+					$processes = DBA::p("SELECT COUNT(*) AS `running` FROM `workerqueue-view` WHERE `priority` = ?", $entry["priority"]);
 					self::$db_duration += (microtime(true) - $stamp);
 					self::$db_duration_stat += (microtime(true) - $stamp);
 					if ($process = DBA::fetch($processes)) {
@@ -698,7 +698,7 @@ class Worker
 			} else {
 				$waiting_processes =  self::totalEntries();
 				$stamp = (float)microtime(true);
-				$jobs = DBA::p("SELECT COUNT(*) AS `running`, `priority` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` AND NOT `done` GROUP BY `priority` ORDER BY `priority`");
+				$jobs = DBA::p("SELECT COUNT(*) AS `running`, `priority` FROM `workerqueue-view` GROUP BY `priority` ORDER BY `priority`");
 				self::$db_duration += (microtime(true) - $stamp);
 				self::$db_duration_stat += (microtime(true) - $stamp);
 
@@ -839,9 +839,7 @@ class Worker
 		$running = [];
 		$running_total = 0;
 		$stamp = (float)microtime(true);
-		$processes = DBA::p("SELECT COUNT(DISTINCT(`process`.`pid`)) AS `running`, `priority` FROM `process`
-			INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid`
-			WHERE NOT `done` GROUP BY `priority`");
+		$processes = DBA::p("SELECT COUNT(DISTINCT(`pid`)) AS `running`, `priority` FROM `workerqueue-view` GROUP BY `priority`");
 		self::$db_duration += (microtime(true) - $stamp);
 		while ($process = DBA::fetch($processes)) {
 			$running[$process['priority']] = $process['running'];
diff --git a/static/dbview.config.php b/static/dbview.config.php
index 7e0ce0a0f..715fb30cc 100755
--- a/static/dbview.config.php
+++ b/static/dbview.config.php
@@ -209,5 +209,14 @@ return [
 			INNER JOIN `contact` ON `register`.`uid` = `contact`.`uid`
 			INNER JOIN `user` ON `register`.`uid` = `user`.`uid`"
 	],
+	"workerqueue-view" => [
+		"fields" => [
+			"pid" => ["process", "pid"],
+			"priority" => ["workerqueue", "priority"],
+		],
+		"query" => "FROM `process`
+			INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid`
+			WHERE NOT `workerqueue`.`done`"
+	],
 ];