Skip to content

Commit a6728d5

Browse files
vladvildanovvladvildanov
authored
Merge branch 'v2.x' into vv-indexing-empty-values
2 parents 366a4b0 + c27dafa commit a6728d5

File tree

7 files changed

+271
-7
lines changed

7 files changed

+271
-7
lines changed

‎.github/workflows/tests.yml

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jobs:
3535
- 5
3636
- 6
3737
- 7
38+
- 7.4-rc1
3839

3940
services:
4041
redis:

‎src/ClientInterface.php

+1
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@
281281
* @method array xrevrange(string $key, string $end, string $start, ?int $count = null)
282282
* @method array xrange(string $key, string $start, string $end, ?int $count = null)
283283
* @method string xtrim(string $key, array|string $strategy, string $threshold, ?array $options = null)
284+
* @method array|null xread(int $count = null, int $block = null, array $streams = null, string ...$id)
284285
* @method int zadd(string $key, array $membersAndScoresDictionary)
285286
* @method int zcard(string $key)
286287
* @method string zcount(string $key, int|string $min, int|string $max)

‎src/Command/Redis/HSCAN.php

+19-7
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
*/
2020
class HSCAN extends RedisCommand
2121
{
22+
/**
23+
* @var array
24+
*/
25+
private $arguments;
26+
2227
/**
2328
* {@inheritdoc}
2429
*/
@@ -37,6 +42,7 @@ public function setArguments(array $arguments)
3742
$arguments = array_merge($arguments, $options);
3843
}
3944

45+
$this->arguments = $arguments;
4046
parent::setArguments($arguments);
4147
}
4248

@@ -62,6 +68,10 @@ protected function prepareOptions($options)
6268
$normalized[] = $options['COUNT'];
6369
}
6470

71+
if (!empty($options['NOVALUES']) && true === $options['NOVALUES']) {
72+
$normalized[] = 'NOVALUES';
73+
}
74+
6575
return $normalized;
6676
}
6777

@@ -70,15 +80,17 @@ protected function prepareOptions($options)
7080
*/
7181
public function parseResponse($data)
7282
{
73-
if (is_array($data)) {
74-
$fields = $data[1];
75-
$result = [];
83+
if (!in_array('NOVALUES', $this->arguments, true)) {
84+
if (is_array($data)) {
85+
$fields = $data[1];
86+
$result = [];
7687

77-
for ($i = 0; $i < count($fields); ++$i) {
78-
$result[$fields[$i]] = $fields[++$i];
79-
}
88+
for ($i = 0; $i < count($fields); ++$i) {
89+
$result[$fields[$i]] = $fields[++$i];
90+
}
8091

81-
$data[1] = $result;
92+
$data[1] = $result;
93+
}
8294
}
8395

8496
return $data;

‎src/Command/Redis/XREAD.php

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Predis package.
5+
*
6+
* (c) 2009-2020 Daniele Alessandri
7+
* (c) 2021-2023 Till Krüss
8+
*
9+
* For the full copyright and license information, please view the LICENSE
10+
* file that was distributed with this source code.
11+
*/
12+
13+
namespace Predis\Command\Redis;
14+
15+
use Predis\Command\Command as RedisCommand;
16+
17+
class XREAD extends RedisCommand
18+
{
19+
public function getId()
20+
{
21+
return 'XREAD';
22+
}
23+
24+
public function setArguments(array $arguments)
25+
{
26+
$processedArguments = [];
27+
28+
if (array_key_exists(0, $arguments) && null !== $arguments[0]) {
29+
array_push($processedArguments, 'COUNT', $arguments[0]);
30+
}
31+
32+
if (array_key_exists(1, $arguments) && null !== $arguments[1]) {
33+
array_push($processedArguments, 'BLOCK', $arguments[1]);
34+
}
35+
36+
if (array_key_exists(2, $arguments) && null !== $arguments[2]) {
37+
$processedArguments[] = 'STREAMS';
38+
$processedArguments = array_merge($processedArguments, $arguments[2]);
39+
}
40+
41+
$ids = array_slice($arguments, 3);
42+
$processedArguments = array_merge($processedArguments, $ids);
43+
44+
parent::setArguments($processedArguments);
45+
}
46+
47+
public function parseResponse($data)
48+
{
49+
$processedData = [];
50+
51+
foreach ($data as $stream) {
52+
$processedData[$stream[0]] = $stream[1];
53+
}
54+
55+
return $processedData;
56+
}
57+
}

‎tests/Predis/Command/Redis/CLIENT_Test.php

+11
Original file line numberDiff line numberDiff line change
@@ -237,4 +237,15 @@ public function testThrowsExceptionWhenKillingUnknownClient(): void
237237

238238
$redis->client('KILL', '127.0.0.1:65535');
239239
}
240+
241+
/**
242+
* @group connected
243+
* @requiresRedisVersion >= 7.3.0
244+
*/
245+
public function testKillWithMaxAgeOption(): void
246+
{
247+
$redis = $this->getClient();
248+
249+
$this->assertSame(0, $redis->client('KILL', 'MAXAGE', 100));
250+
}
240251
}

‎tests/Predis/Command/Redis/HSCAN_Test.php

+15
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ public function testParseResponse(): void
8585
$expected = ['3', ['field:1' => '1', 'field:2' => '2', 'field:3' => '3']];
8686

8787
$command = $this->getCommand();
88+
$command->setArguments($raw);
8889

8990
$this->assertSame($expected, $command->parseResponse($raw));
9091
}
@@ -123,6 +124,20 @@ public function testScanWithMatchingMembers(): void
123124
$this->assertSame(['two', 'three'], array_values($response[1]));
124125
}
125126

127+
/**
128+
* @group connected
129+
* @requiresRedisVersion >= 7.3.0
130+
*/
131+
public function testScanWithNoValues(): void
132+
{
133+
$redis = $this->getClient();
134+
$redis->hmset('key', ['field:one' => 'one', 'field:two' => 'two', 'field:three' => 'three', 'field:four' => 'four']);
135+
136+
$response = $redis->hscan('key', 0, ['MATCH' => 'field:t*', 'NOVALUES' => true]);
137+
138+
$this->assertSame(['field:two', 'field:three'], $response[1]);
139+
}
140+
126141
/**
127142
* @group connected
128143
* @requiresRedisVersion >= 2.8.0

‎tests/Predis/Command/Redis/XREAD_Test.php

+167
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Predis package.
5+
*
6+
* (c) 2009-2020 Daniele Alessandri
7+
* (c) 2021-2023 Till Krüss
8+
*
9+
* For the full copyright and license information, please view the LICENSE
10+
* file that was distributed with this source code.
11+
*/
12+
13+
namespace Predis\Command\Redis;
14+
15+
class XREAD_Test extends PredisCommandTestCase
16+
{
17+
/**
18+
* {@inheritDoc}
19+
*/
20+
protected function getExpectedCommand(): string
21+
{
22+
return XREAD::class;
23+
}
24+
25+
/**
26+
* {@inheritDoc}
27+
*/
28+
protected function getExpectedId(): string
29+
{
30+
return 'XREAD';
31+
}
32+
33+
/**
34+
* @dataProvider argumentsProvider
35+
* @group disconnected
36+
*/
37+
public function testFilterArguments(array $actualArguments, array $expectedArguments): void
38+
{
39+
$command = $this->getCommand();
40+
$command->setArguments($actualArguments);
41+
42+
$this->assertSame($expectedArguments, $command->getArguments());
43+
}
44+
45+
/**
46+
* @group disconnected
47+
*/
48+
public function testParseResponse(): void
49+
{
50+
$this->assertSame(
51+
['stream1' => [['id1', ['field', 'value']], ['id2', ['field', 'value']]]],
52+
$this->getCommand()->parseResponse(
53+
[['stream1', [['id1', ['field', 'value']], ['id2', ['field', 'value']]]]])
54+
);
55+
}
56+
57+
/**
58+
* @group connected
59+
* @group relay-incompatible
60+
* @return void
61+
* @requiresRedisVersion >= 5.0.0
62+
*/
63+
public function testReadFromTheBeginningOfGivenStreams(): void
64+
{
65+
$redis = $this->getClient();
66+
67+
$stream1Id = $redis->xadd('stream1', ['field' => 'value']);
68+
$stream2Id = $redis->xadd('stream2', ['field' => 'value']);
69+
70+
$expectedResponse = [
71+
'stream1' => [
72+
[$stream1Id, ['field', 'value']],
73+
],
74+
'stream2' => [
75+
[$stream2Id, ['field', 'value']],
76+
],
77+
];
78+
79+
$response = $redis->xread(2, null, ['stream1', 'stream2'], '0-0', '0-0');
80+
81+
$this->assertSame($expectedResponse, $response);
82+
}
83+
84+
/**
85+
* @group medium
86+
* @group connected
87+
* @group relay-incompatible
88+
* @return void
89+
* @requiresRedisVersion >= 5.0.0
90+
*/
91+
public function testReadFromTheBeginningOfGivenStreamsWithBlocking(): void
92+
{
93+
$redis = $this->getClient();
94+
95+
$stream1Id = $redis->xadd('stream1', ['field' => 'value']);
96+
$stream2Id = $redis->xadd('stream2', ['field' => 'value']);
97+
98+
$expectedResponse = [
99+
'stream1' => [
100+
[$stream1Id, ['field', 'value']],
101+
],
102+
'stream2' => [
103+
[$stream2Id, ['field', 'value']],
104+
],
105+
];
106+
107+
$response = $redis->xread(2, 20, ['stream1', 'stream2'], '0-0', '0-0');
108+
109+
$this->assertSame($expectedResponse, $response);
110+
}
111+
112+
/**
113+
* @group connected
114+
* @group relay-incompatible
115+
* @return void
116+
* @requiresRedisVersion >= 7.3.0
117+
*/
118+
public function testReadFromGivenStreamsStartingFromLastAvailableId(): void
119+
{
120+
$redis = $this->getClient();
121+
122+
$redis->xadd('stream1', ['otherField' => 'otherValue']);
123+
$redis->xadd('stream2', ['otherField' => 'otherValue']);
124+
125+
$stream1Id = $redis->xadd('stream1', ['field' => 'value']);
126+
$stream2Id = $redis->xadd('stream2', ['field' => 'value']);
127+
128+
$expectedResponse = [
129+
'stream1' => [
130+
[$stream1Id, ['field', 'value']],
131+
],
132+
'stream2' => [
133+
[$stream2Id, ['field', 'value']],
134+
],
135+
];
136+
137+
$response = $redis->xread(2, null, ['stream1', 'stream2'], '+', '+');
138+
139+
$this->assertSame($expectedResponse, $response);
140+
}
141+
142+
public function argumentsProvider(): array
143+
{
144+
return [
145+
'with default arguments' => [
146+
[null, null, null, '0-0', '0-1'],
147+
['0-0', '0-1'],
148+
],
149+
'with COUNT argument' => [
150+
[2, null, null, '0-0', '0-1'],
151+
['COUNT', 2, '0-0', '0-1'],
152+
],
153+
'with BLOCK argument' => [
154+
[null, 20, null, '0-0', '0-1'],
155+
['BLOCK', 20, '0-0', '0-1'],
156+
],
157+
'with STREAMS argument' => [
158+
[null, null, ['key1', 'key2'], '0-0', '0-1'],
159+
['STREAMS', 'key1', 'key2', '0-0', '0-1'],
160+
],
161+
'with all arguments' => [
162+
[2, 20, ['key1', 'key2'], '0-0', '0-1'],
163+
['COUNT', 2, 'BLOCK', 20, 'STREAMS', 'key1', 'key2', '0-0', '0-1'],
164+
],
165+
];
166+
}
167+
}

0 commit comments

Comments
 (0)