Skip to content

No waiting between tube switch for dbal subscription #1201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

No waiting between tube switch for dbal subscription #1201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce454a7
Merge pull request #1 from mordilion/hotfix/wait-between-subsciption-…
mordilion Apr 21, 2021
f011768
Merge branch 'php-enqueue:master' into master
mordilion Sep 29, 2021
11c7252
order by queues to iterate through the differen queues without ignori…
Sep 30, 2021
bf03b47
change var names to rerun checks ... maybe timeout happens
Sep 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions pkg/dbal/DbalConsumerHelperTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,34 @@ protected function fetchMessage(array $queues, int $redeliveryDelay): ?DbalMessa

$endAt = microtime(true) + 0.2; // add 200ms

$selectQueryParameters = [
'queues' => $queues,
'delayedUntil' => $now,
];
$selectQueryParameterTypes = [
'queues' => Connection::PARAM_STR_ARRAY,
'delayedUntil' => DbalType::INTEGER,
];

$i = 0;
$orderByQueues = [];
foreach ($queues as $queue) {
$parameterName = 'queue'.$i;
$orderByQueues[] = sprintf('WHEN queue = :%s THEN %d', $parameterName, $i++);
$selectQueryParameters[$parameterName] = $queue;
$selectQueryParameterTypes[$parameterName] = DbalType::STRING;
}

$select = $this->getConnection()->createQueryBuilder()
->select('id')
->from($this->getContext()->getTableName())
->andWhere('queue IN (:queues)')
->andWhere('delayed_until IS NULL OR delayed_until <= :delayedUntil')
->andWhere('delivery_id IS NULL')
->addOrderBy('priority', 'asc')
->addOrderBy('CASE '.implode(' ', $orderByQueues).' ELSE -1 END')
->addOrderBy('published_at', 'asc')
->setParameter('queues', $queues, Connection::PARAM_STR_ARRAY)
->setParameter('delayedUntil', $now, DbalType::INTEGER)
->setParameters($selectQueryParameters, $selectQueryParameterTypes)
->setMaxResults(1);

$update = $this->getConnection()->createQueryBuilder()
Expand Down
8 changes: 6 additions & 2 deletions pkg/dbal/DbalSubscriptionConsumer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,9 @@ public function consume(int $timeout = 0): void

$queueNames = [];
foreach (array_keys($this->subscribers) as $queueName) {
$queueNames[$queueName] = $queueName;
$queueNames[] = $queueName;
}
$queueNames = array_unique($queueNames);

$timeout /= 1000;
$now = time();
Expand All @@ -114,7 +115,10 @@ public function consume(int $timeout = 0): void
return;
}

unset($currentQueueNames[$message->getQueue()]);
$queueNames = array_filter($queueNames, static function ($queueName) use ($message) {
return $message->getQueue() !== $queueName;
});
$queueNames[] = $message->getQueue();
} else {
$currentQueueNames = [];

Expand Down