Skip to content

Add subqueuettl driver integration test #28

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
Col-Waltz wants to merge 2 commits into from
Closed

Add subqueuettl driver integration test #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2d9492
tests: fix queue stats integration tests
Col-Waltz Oct 21, 2026
6d75f69
Add subqueuettl driver to the test
Col-Waltz Oct 21, 2026
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
32 changes: 16 additions & 16 deletions src/Queue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,24 +46,24 @@ public function put($data, array $options = []) : Task
);
}

public function take(float $timeout = null) : ?Task
public function take(float $timeout = null, array $opts = []) : ?Task
{
$result = $this->client->call("queue.tube.$this->name:take", $timeout);
$result = $this->client->call("queue.tube.$this->name:take", $timeout, $opts);

return empty($result[0]) ? null : Task::fromTuple($result[0]);
}

public function touch(int $taskId, float $increment) : ?Task
public function touch(int $taskId, float $increment, array $opts = []) : ?Task
{
$result = $this->client->call("queue.tube.$this->name:touch", $taskId, $increment);
$result = $this->client->call("queue.tube.$this->name:touch", $taskId, $increment, $opts);

return empty($result[0]) ? null : Task::fromTuple($result[0]);
}

public function ack(int $taskId) : Task
public function ack(int $taskId, array $opts = []) : Task
{
return Task::fromTuple(
$this->client->call("queue.tube.$this->name:ack", $taskId)[0]
$this->client->call("queue.tube.$this->name:ack", $taskId, $opts)[0]
);
}

Expand All @@ -74,35 +74,35 @@ public function release(int $taskId, array $options = []) : Task
);
}

public function peek(int $taskId) : Task
public function peek(int $taskId, array $opts = []) : Task
{
return Task::fromTuple(
$this->client->call("queue.tube.$this->name:peek", $taskId)[0]
$this->client->call("queue.tube.$this->name:peek", $taskId, $opts)[0]
);
}

public function bury(int $taskId) : Task
public function bury(int $taskId, array $opts = []) : Task
{
return Task::fromTuple(
$this->client->call("queue.tube.$this->name:bury", $taskId)[0]
$this->client->call("queue.tube.$this->name:bury", $taskId, $opts)[0]
);
}

public function kick(int $count) : int
public function kick(int $count, array $opts = []) : int
{
return $this->client->call("queue.tube.$this->name:kick", $count)[0];
return $this->client->call("queue.tube.$this->name:kick", $count, $opts)[0];
}

public function delete(int $taskId) : Task
public function delete(int $taskId, array $opts = []) : Task
{
return Task::fromTuple(
$this->client->call("queue.tube.$this->name:delete", $taskId)[0]
$this->client->call("queue.tube.$this->name:delete", $taskId, $opts)[0]
);
}

public function truncate() : void
public function truncate(array $opts = []) : void
{
$this->client->call("queue.tube.$this->name:truncate");
$this->client->call("queue.tube.$this->name:truncate", $opts);
}

/**
Expand Down
136 changes: 70 additions & 66 deletions tests/Integration/QueueTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ abstract class QueueTest extends TestCase
*/
public function testPut($data) : void
{
$task = $this->queue->put($data);
$task = $this->queue->put($data, $this->withSubqueue());

self::assertTask($task, 0, States::READY, $data);
}
Expand All @@ -46,22 +46,22 @@ public function provideTaskData() : iterable

/**
* @lua tube = create_tube('%tube_name%', '%tube_type%')
* @lua tube:put('peek_0')
* @lua tube:put('peek_0', {subqueue = %subqueue%})
*/
public function testPeek() : void
{
$task = $this->queue->peek(0);
$task = $this->queue->peek(0, $this->withSubqueue());

self::assertTask($task, 0, States::READY, 'peek_0');
}

/**
* @lua tube = create_tube('%tube_name%', '%tube_type%')
* @lua tube:put('take')
* @lua tube:put('take', {subqueue = %subqueue%})
*/
public function testTake() : void
{
$task = $this->queue->take();
$task = $this->queue->take(0, $this->withSubqueue());

self::assertTask($task, 0, States::TAKEN, 'take');
}
Expand All @@ -72,96 +72,96 @@ public function testTake() : void
public function testTakeNone() : void
{
$time = time();
$task = $this->queue->take(2);
$task = $this->queue->take(2, $this->withSubqueue());

self::assertGreaterThanOrEqual(2, time() - $time);
self::assertNull($task);
}

/**
* @lua tube = create_tube('%tube_name%', '%tube_type%')
* @lua tube:put('release_0')
* @lua tube:take()
* @lua tube:put('release_0', {subqueue = %subqueue%})
* @lua tube:take(0, {subqueue = %subqueue%})
*/
public function testRelease() : void
{
$task = $this->queue->release(0);
$task = $this->queue->release(0, $this->withSubqueue());

self::assertTask($task, 0, States::READY, 'release_0');
}

/**
* @lua tube = create_tube('%tube_name%', '%tube_type%')
* @lua tube:put('ack_0')
* @lua tube:take()
* @lua tube:put('ack_0', {subqueue = %subqueue%})
* @lua tube:take(0, {subqueue = %subqueue%})
*/
public function testAck() : void
{
$task = $this->queue->ack(0);
$task = $this->queue->ack(0, $this->withSubqueue());

self::assertTask($task, 0, States::DONE, 'ack_0');
}

/**
* @lua tube = create_tube('%tube_name%', '%tube_type%')
* @lua tube:put('bury_0')
* @lua tube:put('bury_0', {subqueue = %subqueue%})
*/
public function testBury() : void
{
$task = $this->queue->bury(0);
$task = $this->queue->bury(0, $this->withSubqueue());

self::assertTask($task, 0, States::BURIED, 'bury_0');
}

/**
* @lua tube = create_tube('%tube_name%', '%tube_type%')
* @lua tube:put('kick_1')
* @lua tube:bury(0)
* @lua tube:put('kick_1', {subqueue = %subqueue%})
* @lua tube:bury(0, {subqueue = %subqueue%})
*/
public function testKickOne() : void
{
$count = $this->queue->kick(1);
$count = $this->queue->kick(1, $this->withSubqueue());

self::assertSame(1, $count);
}

/**
* @lua tube = create_tube('%tube_name%', '%tube_type%')
* @lua tube:put('kick_1')
* @lua tube:put('kick_2')
* @lua tube:put('kick_3')
* @lua tube:bury(0)
* @lua tube:bury(1)
* @lua tube:bury(2)
* @lua tube:put('kick_1', {subqueue = %subqueue%})
* @lua tube:put('kick_2', {subqueue = %subqueue%})
* @lua tube:put('kick_3', {subqueue = %subqueue%})
* @lua tube:bury(0, {subqueue = %subqueue%})
* @lua tube:bury(1, {subqueue = %subqueue%})
* @lua tube:bury(2, {subqueue = %subqueue%})
*/
public function testKickMany() : void
{
$count = $this->queue->kick(3);
$count = $this->queue->kick(3, $this->withSubqueue());

self::assertSame(3, $count);
}

/**
* @lua tube = create_tube('%tube_name%', '%tube_type%')
* @lua tube:put('delete_0')
* @lua tube:put('delete_0', {subqueue = %subqueue%})
*/
public function testDelete() : void
{
$task = $this->queue->delete(0);
$task = $this->queue->delete(0, $this->withSubqueue());

self::assertTask($task, 0, States::DONE, 'delete_0');
}

/**
* @lua tube = create_tube('%tube_name%', '%tube_type%')
* @lua tube:put('truncate_0')
* @lua tube:put('truncate_1')
* @lua tube:put('truncate_0', {subqueue = %subqueue%})
* @lua tube:put('truncate_1', {subqueue = %subqueue%})
*/
public function testTruncate() : void
{
self::assertSame(2, $this->queue->stats('tasks.total'));

$this->queue->truncate();
$this->queue->truncate($this->withSubqueue());

self::assertSame(0, $this->queue->stats('tasks.total'));
}
Expand All @@ -180,20 +180,20 @@ public function testTruncateEmpty() : void

/**
* @lua tube = create_tube('%tube_name%', '%tube_type%')
* @lua tube:put('stat_0')
* @lua tube:put('stat_1')
* @lua tube:put('stat_2')
* @lua tube:put('stat_3')
* @lua tube:put('stat_4')
* @lua tube:delete(4)
* @lua tube:take(.001)
* @lua tube:release(0)
* @lua tube:take(.001)
* @lua tube:ack(0)
* @lua tube:bury(1)
* @lua tube:bury(2)
* @lua tube:kick(1)
* @lua tube:take(.001)
* @lua tube:put('stat_0', {subqueue = %subqueue%})
* @lua tube:put('stat_1', {subqueue = %subqueue%})
* @lua tube:put('stat_2', {subqueue = %subqueue%})
* @lua tube:put('stat_3', {subqueue = %subqueue%})
* @lua tube:put('stat_4', {subqueue = %subqueue%})
* @lua tube:delete(4, {subqueue = %subqueue%})
* @lua tube:take(.001, {subqueue = %subqueue%})
* @lua tube:release(0, {subqueue = %subqueue%})
* @lua tube:take(.001, {subqueue = %subqueue%})
* @lua tube:ack(0, {subqueue = %subqueue%})
* @lua tube:bury(1, {subqueue = %subqueue%})
* @lua tube:bury(2, {subqueue = %subqueue%})
* @lua tube:kick(1, {subqueue = %subqueue%})
* @lua tube:take(.001, {subqueue = %subqueue%})
*/
public function testStats() : void
{
Expand All @@ -220,6 +220,8 @@ public function testStats() : void
'ttr' => 0,
'delay' => 0,
'ttl' => 0,
],
'extra' => [
],
], $stats);
}
Expand Down Expand Up @@ -252,34 +254,36 @@ public function testEmptyStats() : void
'ttr' => 0,
'delay' => 0,
'ttl' => 0,
],
'extra' => [
],
], $stats);
}

/**
* @lua tube = create_tube('%tube_name%', '%tube_type%')
* @lua tube:put('stat_0')
* @lua tube:put('stat_1')
* @lua tube:put('stat_2')
* @lua tube:put('stat_3')
* @lua tube:put('stat_4')
* @lua tube:put('stat_5')
* @lua tube:put('stat_6')
* @lua tube:put('stat_7')
* @lua tube:put('stat_8')
* @lua tube:put('stat_9')
* @lua tube:take(.001)
* @lua tube:release(0)
* @lua tube:take(.001)
* @lua tube:ack(0)
* @lua tube:bury(1)
* @lua tube:bury(2)
* @lua tube:bury(3)
* @lua tube:kick(1)
* @lua tube:delete(6)
* @lua tube:delete(7)
* @lua tube:delete(8)
* @lua tube:take(.001)
* @lua tube:put('stat_0', {subqueue = %subqueue%})
* @lua tube:put('stat_1', {subqueue = %subqueue%})
* @lua tube:put('stat_2', {subqueue = %subqueue%})
* @lua tube:put('stat_3', {subqueue = %subqueue%})
* @lua tube:put('stat_4', {subqueue = %subqueue%})
* @lua tube:put('stat_5', {subqueue = %subqueue%})
* @lua tube:put('stat_6', {subqueue = %subqueue%})
* @lua tube:put('stat_7', {subqueue = %subqueue%})
* @lua tube:put('stat_8', {subqueue = %subqueue%})
* @lua tube:put('stat_9', {subqueue = %subqueue%})
* @lua tube:take(.001, {subqueue = %subqueue%})
* @lua tube:release(0, {subqueue = %subqueue%})
* @lua tube:take(.001, {subqueue = %subqueue%})
* @lua tube:ack(0, {subqueue = %subqueue%})
* @lua tube:bury(1, {subqueue = %subqueue%})
* @lua tube:bury(2, {subqueue = %subqueue%})
* @lua tube:bury(3, {subqueue = %subqueue%})
* @lua tube:kick(1, {subqueue = %subqueue%})
* @lua tube:delete(6, {subqueue = %subqueue%})
* @lua tube:delete(7, {subqueue = %subqueue%})
* @lua tube:delete(8, {subqueue = %subqueue%})
* @lua tube:take(.001, {subqueue = %subqueue%})
*/
public function testStatsPath() : void
{
Expand Down Expand Up @@ -368,7 +372,7 @@ public function testThrowException(string $methodName, array $args) : void
{
$this->expectException(\Throwable::class);

$this->queue->$methodName(...$args);
$this->queue->$methodName(...array_merge($args, [$this->withSubqueue()]));
}

public function provideFailureCallbackData() : iterable
Expand Down
50 changes: 50 additions & 0 deletions tests/Integration/SubqueuettlQueueTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?php

declare(strict_types=1);

namespace Tarantool\Queue\Tests\Integration;

final class SubqueuettlQueueTest extends QueueTest
{
use Ttl;
private const SUBQUEUE = 'test_subqueue';

public function testEmptyStats(): void
{
$stats = $this->queue->stats();
self::assertSame(0, $stats['tasks']['total']);
self::assertArrayHasKey('subqueues', $stats['extra']);
}

public function getSubqueue() : ?string
{
return self::SUBQUEUE;
}

public function testStats() : void
{
$stats = $this->queue->stats();

self::assertEquals([
'tasks' => [
'taken' => 0, 'buried' => 1, 'ready' => 2,
'done' => 2, 'delayed' => 0, 'total' => 3,
],
'calls' => [
'ack' => 1, 'delete' => 1, 'take' => 3, 'kick' => 1,
'release' => 2, 'touch' => 0, 'put' => 5, 'bury' => 2,
'ttr' => 0, 'delay' => 0, 'ttl' => 0,
],
], array_diff_key($stats, ['extra' => '']));

self::assertArrayHasKey('subqueues', $stats['extra']);
self::assertArrayHasKey('test_subqueue', $stats['extra']['subqueues']);

$sub = $stats['extra']['subqueues']['test_subqueue'];
self::assertSame(2, $sub['ready']);
self::assertSame(0, $sub['taken']);
self::assertSame(1, $sub['buried']);
self::assertSame(0, $sub['delayed']);
self::assertSame(3, $sub['total']);
}
}
Loading