Skip to content

Commit 03c40ab

Browse files
committed
Added write lock
1 parent 41823bf commit 03c40ab

2 files changed

Lines changed: 15 additions & 12 deletions

File tree

‎pkg/dbal/DbalConsumerHelperTrait.php‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Enqueue\Dbal;
66

77
use Doctrine\DBAL\Connection;
8+
use Doctrine\DBAL\ParameterType;
89
use Doctrine\DBAL\Types\Type;
910

1011
trait DbalConsumerHelperTrait
@@ -20,20 +21,22 @@ protected function fetchMessage(array $queues, string $deliveryId, int $redelive
2021

2122
$this->getConnection()->beginTransaction();
2223

23-
$message = $this->getConnection()->createQueryBuilder()
24+
$query = $this->getConnection()->createQueryBuilder()
2425
->select('*')
2526
->from($this->getContext()->getTableName())
2627
->andWhere('delivery_id IS NULL')
2728
->andWhere('delayed_until IS NULL OR delayed_until <= :delayedUntil')
2829
->andWhere('queue IN (:queues)')
2930
->addOrderBy('priority', 'desc')
3031
->addOrderBy('published_at', 'asc')
31-
->setParameter('delayedUntil', $now, \Doctrine\DBAL\ParameterType::INTEGER)
32-
->setParameter('queues', array_values($queues), \Doctrine\DBAL\Connection::PARAM_STR_ARRAY)
33-
->setMaxResults(1)
34-
->execute()
35-
->fetch()
36-
;
32+
->setMaxResults(1);
33+
34+
// select for update
35+
$message = $this->getConnection()->executeQuery(
36+
$query->getSQL().' '.$this->getConnection()->getDatabasePlatform()->getWriteLockSQL(),
37+
['delayedUntil' => $now, 'queues' => array_values($queues)],
38+
['delayedUntil' => ParameterType::INTEGER, 'queues' => Connection::PARAM_STR_ARRAY]
39+
)->fetch();
3740

3841
if (!$message) {
3942
$this->getConnection()->commit();
@@ -50,7 +53,8 @@ protected function fetchMessage(array $queues, string $deliveryId, int $redelive
5053
->setParameter('id', $message['id'], Type::GUID)
5154
->setParameter('deliveryId', $deliveryId, Type::STRING)
5255
->setParameter('redeliverAfter', $now + $redeliveryDelay, Type::BIGINT)
53-
->execute();
56+
->execute()
57+
;
5458

5559
$this->getConnection()->commit();
5660

@@ -61,7 +65,8 @@ protected function fetchMessage(array $queues, string $deliveryId, int $redelive
6165
->setParameter('deliveryId', $deliveryId, Type::STRING)
6266
->setMaxResults(1)
6367
->execute()
64-
->fetch();
68+
->fetch()
69+
;
6570

6671
return $deliveredMessage ?: null;
6772
} catch (\Exception $e) {

‎pkg/dbal/Tests/Functional/DbalConsumerTest.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public function testShouldSetPublishedAtDateToReceivedMessage()
4949

5050
$producer = $context->createProducer();
5151

52-
/** @var DbalMessage $message */
5352
$message = $context->createMessage($expectedBody);
5453
$message->setPublishedAt($time);
5554
$producer->send($queue, $message);
@@ -62,7 +61,7 @@ public function testShouldSetPublishedAtDateToReceivedMessage()
6261
$this->assertSame($time, $message->getPublishedAt());
6362
}
6463

65-
public function testShouldOrderMessagesWithSamePriorityByPublishedAtDateee()
64+
public function testShouldOrderMessagesWithSamePriorityByPublishedAtDate()
6665
{
6766
$context = $this->context;
6867
$queue = $context->createQueue(__METHOD__);
@@ -80,7 +79,6 @@ public function testShouldOrderMessagesWithSamePriorityByPublishedAtDateee()
8079

8180
$producer = $context->createProducer();
8281

83-
/** @var DbalMessage $message */
8482
$message = $context->createMessage($expectedPriority5Body);
8583
$message->setPriority(5);
8684
$message->setPublishedAt($time);

0 commit comments

Comments
 (0)