Merge pull request #22326 from totten/master-sqlpara

SqlParallel - Enable more tests. Fix compatiblity with `release_time`
civicrm · Dec 31, 2021 · ded7073 · ded7073
2 parents 6b4125f + 8ec1da4
commit ded7073
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CRM/Queue/Queue/SqlParallel.php b/CRM/Queue/Queue/SqlParallel.php
@@ -116,12 +116,13 @@ public function claimItem($lease_time = 3600) {
     $sql = "SELECT id, queue_name, submit_time, release_time, data
         FROM civicrm_queue_item
         WHERE queue_name = %1
-              AND release_time IS NULL
+              AND (release_time IS NULL OR release_time < %2)
         ORDER BY weight ASC, id ASC
         LIMIT 1
       ";
     $params = [
       1 => [$this->getName(), 'String'],
+      2 => [CRM_Utils_Time::getTime(), 'Timestamp'],
     ];
     $dao = CRM_Core_DAO::executeQuery($sql, $params, TRUE, 'CRM_Queue_DAO_QueueItem');
     if (is_a($dao, 'DB_Error')) {

diff --git a/tests/phpunit/CRM/Queue/QueueTest.php b/tests/phpunit/CRM/Queue/QueueTest.php
@@ -36,6 +36,12 @@ public function getQueueSpecs() {
         'name' => 'test-queue',
       ],
     ];
+    $queueSpecs[] = [
+      [
+        'type' => 'SqlParallel',
+        'name' => 'test-queue-sqlparallel',
+      ],
+    ];
     return $queueSpecs;
   }