Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
"psr-4": {"Utopia\\Queue\\": "src/Queue"}
},
"autoload-dev": {
"psr-4": {"Tests\\E2E\\": "tests/Queue/E2E"}
"psr-4": {
"Tests\\E2E\\": "tests/Queue/E2E"
}
},
"scripts":{
"test": "phpunit",
Expand Down
2 changes: 1 addition & 1 deletion src/Queue/Broker/AMQP.php
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public function close(): void
$this->channel?->getConnection()?->close();
}

public function enqueue(Queue $queue, array $payload): bool
public function enqueue(Queue $queue, array $payload, bool $priority = false): bool
{
$payload = [
'pid' => \uniqid(more_entropy: true),
Expand Down
2 changes: 1 addition & 1 deletion src/Queue/Broker/Pool.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public function __construct(
) {
}

public function enqueue(Queue $queue, array $payload): bool
public function enqueue(Queue $queue, array $payload, bool $priority = false): bool
{
return $this->delegatePublish(__FUNCTION__, \func_get_args());
}
Expand Down
5 changes: 4 additions & 1 deletion src/Queue/Broker/Redis.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,17 @@ public function close(): void
$this->closed = true;
}

public function enqueue(Queue $queue, array $payload): bool
public function enqueue(Queue $queue, array $payload, bool $priority = false): bool
{
$payload = [
'pid' => \uniqid(more_entropy: true),
'queue' => $queue->name,
'timestamp' => time(),
'payload' => $payload
];
if ($priority) {
return $this->connection->rightPushArray("{$queue->namespace}.queue.{$queue->name}", $payload);
}
return $this->connection->leftPushArray("{$queue->namespace}.queue.{$queue->name}", $payload);
}

Expand Down
2 changes: 1 addition & 1 deletion src/Queue/Publisher.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ interface Publisher
* @param array $payload
* @return bool
*/
public function enqueue(Queue $queue, array $payload): bool;
public function enqueue(Queue $queue, array $payload, bool $priority = false): bool;

/**
* Retries failed jobs.
Expand Down
9 changes: 9 additions & 0 deletions tests/Queue/E2E/Adapter/Base.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,15 @@ public function testConcurrency(): void
});
}

public function testEnqueuePriority(): void
{
$publisher = $this->getPublisher();

$result = $publisher->enqueue($this->getQueue(), ['type' => 'test_string', 'value' => 'priority'], priority: true);

$this->assertTrue($result);
}

/**
* @depends testEvents
*/
Expand Down
49 changes: 47 additions & 2 deletions tests/Queue/E2E/Adapter/SwooleRedisClusterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,59 @@

class SwooleRedisClusterTest extends Base
{
private function getConnection(): RedisCluster
{
return new RedisCluster([
'redis-cluster-0:6379',
'redis-cluster-1:6379',
'redis-cluster-2:6379',
]);
}

protected function getPublisher(): Publisher
{
$connection = new RedisCluster(['redis-cluster-0:6379', 'redis-cluster-1:6379', 'redis-cluster-2:6379']);
return new Redis($connection);
return new Redis($this->getConnection());
}

protected function getQueue(): Queue
{
return new Queue('swoole-redis-cluster');
}

public function testPriorityJobIsConsumedBeforeNormalJobs(): void
{
$connection = $this->getConnection();
$key = "{$this->getQueue()->namespace}.queue.{$this->getQueue()->name}";

// Flush any leftover state from previous runs.
while ($connection->rightPopArray($key, 1) !== false) {
// drain
}

// Enqueue three normal jobs (pushed to head/left).
$this->getPublisher()->enqueue($this->getQueue(), ['order' => 'normal-1']);
$this->getPublisher()->enqueue($this->getQueue(), ['order' => 'normal-2']);
$this->getPublisher()->enqueue($this->getQueue(), ['order' => 'normal-3']);

// Enqueue one priority job (pushed to tail/right — same end BRPOP reads from).
$this->getPublisher()->enqueue($this->getQueue(), ['order' => 'priority'], priority: true);

// The first pop should yield the priority job.
$first = $connection->rightPopArray($key, 1);
$this->assertNotFalse($first, 'Expected a job but queue was empty');
$this->assertSame('priority', $first['payload']['order'], 'Priority job should be consumed first');

// The remaining three should be normal jobs (consumed oldest-first).
$second = $connection->rightPopArray($key, 1);
$this->assertSame('normal-1', $second['payload']['order']);

$third = $connection->rightPopArray($key, 1);
$this->assertSame('normal-2', $third['payload']['order']);

$fourth = $connection->rightPopArray($key, 1);
$this->assertSame('normal-3', $fourth['payload']['order']);

// Queue should now be empty.
$this->assertFalse($connection->rightPopArray($key, 1));
}
}
45 changes: 43 additions & 2 deletions tests/Queue/E2E/Adapter/SwooleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,55 @@

class SwooleTest extends Base
{
private function getConnection(): Redis
{
return new Redis('redis', 6379);
}

protected function getPublisher(): Publisher
{
$connection = new Redis('redis', 6379);
return new RedisBroker($connection);
return new RedisBroker($this->getConnection());
}

protected function getQueue(): Queue
{
return new Queue('swoole');
}

public function testPriorityJobIsConsumedBeforeNormalJobs(): void
{
$connection = $this->getConnection();
$key = "{$this->getQueue()->namespace}.queue.{$this->getQueue()->name}";

// Flush any leftover state from previous runs.
while ($connection->rightPopArray($key, 1) !== false) {
// drain
}

// Enqueue three normal jobs (pushed to head/left).
$this->getPublisher()->enqueue($this->getQueue(), ['order' => 'normal-1']);
$this->getPublisher()->enqueue($this->getQueue(), ['order' => 'normal-2']);
$this->getPublisher()->enqueue($this->getQueue(), ['order' => 'normal-3']);

// Enqueue one priority job (pushed to tail/right — same end BRPOP reads from).
$this->getPublisher()->enqueue($this->getQueue(), ['order' => 'priority'], priority: true);

// The first pop should yield the priority job.
$first = $connection->rightPopArray($key, 1);
$this->assertNotFalse($first, 'Expected a job but queue was empty');
$this->assertSame('priority', $first['payload']['order'], 'Priority job should be consumed first');

// The remaining three should be normal jobs (consumed oldest-first).
$second = $connection->rightPopArray($key, 1);
$this->assertSame('normal-1', $second['payload']['order']);

$third = $connection->rightPopArray($key, 1);
$this->assertSame('normal-2', $third['payload']['order']);

$fourth = $connection->rightPopArray($key, 1);
$this->assertSame('normal-3', $fourth['payload']['order']);

// Queue should now be empty.
$this->assertFalse($connection->rightPopArray($key, 1));
}
}
Loading