use SKIP LOCKED for mysql 8.1 and pgsql 9.5 queue workers (#31287)

laravel · Jan 29, 2020 · 1f2175d · 1f2175d
1 parent ea3d291
commit 1f2175d
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/src/Illuminate/Database/Query/Grammars/SQLiteGrammar.php b/src/Illuminate/Database/Query/Grammars/SQLiteGrammar.php
@@ -19,6 +19,18 @@ class SQLiteGrammar extends Grammar
         '&', '|', '<<', '>>',
     ];
 
+    /**
+     * Compile the lock into SQL.
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query
+     * @param  bool|string  $value
+     * @return string
+     */
+    protected function compileLock(Builder $query, $value)
+    {
+        return '';
+    }
+
     /**
      * Wrap a union subquery in parentheses.
      *

diff --git a/src/Illuminate/Queue/DatabaseQueue.php b/src/Illuminate/Queue/DatabaseQueue.php
@@ -7,6 +7,7 @@
 use Illuminate\Queue\Jobs\DatabaseJob;
 use Illuminate\Queue\Jobs\DatabaseJobRecord;
 use Illuminate\Support\Carbon;
+use PDO;
 
 class DatabaseQueue extends Queue implements QueueContract
 {
@@ -211,7 +212,7 @@ public function pop($queue = null)
     protected function getNextAvailableJob($queue)
     {
         $job = $this->database->table($this->table)
-                    ->lockForUpdate()
+                    ->lock($this->getLockForPopping())
                     ->where('queue', $this->getQueue($queue))
                     ->where(function ($query) {
                         $this->isAvailable($query);
@@ -223,6 +224,24 @@ protected function getNextAvailableJob($queue)
         return $job ? new DatabaseJobRecord((object) $job) : null;
     }
 
+    /**
+     * Get the lock required for popping the next job.
+     *
+     * @return string
+     */
+    protected function getLockForPopping()
+    {
+        $databaseEngine = $this->database->getPdo()->getAttribute(PDO::ATTR_DRIVER_NAME);
+        $databaseVersion = $this->database->getPdo()->getAttribute(PDO::ATTR_SERVER_VERSION);
+
+        if ($databaseEngine == 'mysql' && version_compare($databaseVersion, '8.0.1', '>=') ||
+            $databaseEngine == 'pgsql' && version_compare($databaseVersion, '9.5', '>=')) {
+            return 'FOR UPDATE SKIP LOCKED';
+        }
+
+        return 'FOR UPDATE';
+    }
+
     /**
      * Modify the query to check for available jobs.
      *