Skip to content

Commit 7d5777c

Browse files
vladvildanovvladvildanov
authored
Merge branch 'v2.x' into feature-v2.x-optimize-cluster-slotmap
2 parents 2d3faec + 067b051 commit 7d5777c

File tree

6 files changed

+210
-0
lines changed

6 files changed

+210
-0
lines changed

‎src/ClientContextInterface.php

+2
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
* @method $this bitcount(string $key, $start = null, $end = null, string $index = 'byte')
8484
* @method $this bitop($operation, $destkey, $key)
8585
* @method $this bitfield($key, $subcommand, ...$subcommandArg)
86+
* @method $this bitfield_ro(string $key, ?array $encodingOffsetMap = null)
8687
* @method $this bitpos($key, $bit, $start = null, $end = null, string $index = 'byte')
8788
* @method $this blmpop(int $timeout, array $keys, string $modifier = 'left', int $count = 1)
8889
* @method $this bzpopmax(array $keys, int $timeout)
@@ -111,6 +112,7 @@
111112
* @method $this failover(?To $to = null, bool $abort = false, int $timeout = -1)
112113
* @method $this fcall(string $function, array $keys, ...$args)
113114
* @method $this fcall_ro(string $function, array $keys, ...$args)
115+
* @method $this ft_list()
114116
* @method $this ftaggregate(string $index, string $query, ?AggregateArguments $arguments = null)
115117
* @method $this ftaliasadd(string $alias, string $index)
116118
* @method $this ftaliasdel(string $alias)

‎src/ClientInterface.php

+2
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
* @method int bitcount(string $key, $start = null, $end = null, string $index = 'byte')
9393
* @method int bitop($operation, $destkey, $key)
9494
* @method array|null bitfield(string $key, $subcommand, ...$subcommandArg)
95+
* @method array|null bitfield_ro(string $key, ?array $encodingOffsetMap = null)
9596
* @method int bitpos(string $key, $bit, $start = null, $end = null, string $index = 'byte')
9697
* @method array blmpop(int $timeout, array $keys, string $modifier = 'left', int $count = 1)
9798
* @method array bzpopmax(array $keys, int $timeout)
@@ -120,6 +121,7 @@
120121
* @method Status failover(?To $to = null, bool $abort = false, int $timeout = -1)
121122
* @method mixed fcall(string $function, array $keys, ...$args)
122123
* @method mixed fcall_ro(string $function, array $keys, ...$args)
124+
* @method array ft_list()
123125
* @method array ftaggregate(string $index, string $query, ?AggregateArguments $arguments = null)
124126
* @method Status ftaliasadd(string $alias, string $index)
125127
* @method Status ftaliasdel(string $alias)

‎src/Command/Redis/BITFIELD_RO.php

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Predis package.
5+
*
6+
* (c) 2009-2020 Daniele Alessandri
7+
* (c) 2021-2025 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 BITFIELD_RO extends RedisCommand
18+
{
19+
/**
20+
* @return string
21+
*/
22+
public function getId()
23+
{
24+
return 'BITFIELD_RO';
25+
}
26+
27+
/**
28+
* @param array $arguments
29+
* @return void
30+
*/
31+
public function setArguments(array $arguments)
32+
{
33+
$processedArguments = [$arguments[0]];
34+
35+
if (array_key_exists(1, $arguments) && is_array($arguments[1])) {
36+
// Convert encoding => offset, into GET, encoding, offset
37+
array_walk($arguments[1], function ($value, $key) use (&$processedArguments) {
38+
array_push($processedArguments, 'GET', $key, $value);
39+
});
40+
}
41+
42+
parent::setArguments($processedArguments);
43+
}
44+
}

‎src/Command/Redis/Search/FT_LIST.php

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Predis package.
5+
*
6+
* (c) 2009-2020 Daniele Alessandri
7+
* (c) 2021-2025 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\Search;
14+
15+
use Predis\Command\Command as RedisCommand;
16+
17+
class FT_LIST extends RedisCommand
18+
{
19+
/**
20+
* @return string
21+
*/
22+
public function getId()
23+
{
24+
return 'FT._LIST';
25+
}
26+
}

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

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Predis package.
5+
*
6+
* (c) 2009-2020 Daniele Alessandri
7+
* (c) 2021-2025 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 BITFIELD_RO_Test extends PredisCommandTestCase
16+
{
17+
/**
18+
* {@inheritdoc}
19+
*/
20+
protected function getExpectedCommand(): string
21+
{
22+
return BITFIELD_RO::class;
23+
}
24+
25+
/**
26+
* {@inheritdoc}
27+
*/
28+
protected function getExpectedId(): string
29+
{
30+
return 'BITFIELD_RO';
31+
}
32+
33+
/**
34+
* @group disconnected
35+
* @dataProvider argumentsProvider
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 connected
47+
* @return void
48+
* @requiresRedisVersion >= 6.2.0
49+
*/
50+
public function testReturnBitsOfSpecificString()
51+
{
52+
$redis = $this->getClient();
53+
54+
$redis->set('foo', 'bar');
55+
56+
$this->assertSame([6, 98], $redis->bitfield_ro('foo', ['u4' => 0, 'i8' => 0]));
57+
}
58+
59+
public function argumentsProvider(): array
60+
{
61+
return [
62+
'with default arguments' => [
63+
['key'],
64+
['key'],
65+
],
66+
'with single encoding-offset entry' => [
67+
['key', ['encoding' => 'offset']],
68+
['key', 'GET', 'encoding', 'offset'],
69+
],
70+
'with multiple encoding-offset entry' => [
71+
['key', ['encoding' => 'offset', 'encoding1' => 'offset1', 'encoding2' => 'offset2']],
72+
['key', 'GET', 'encoding', 'offset', 'GET', 'encoding1', 'offset1', 'GET', 'encoding2', 'offset2'],
73+
],
74+
];
75+
}
76+
}

‎tests/Predis/Command/Redis/Search/FT_LIST_Test.php

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Predis package.
5+
*
6+
* (c) 2009-2020 Daniele Alessandri
7+
* (c) 2021-2025 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\Search;
14+
15+
use Predis\Command\Argument\Search\SchemaFields\TextField;
16+
use Predis\Command\Redis\PredisCommandTestCase;
17+
18+
class FT_LIST_Test extends PredisCommandTestCase
19+
{
20+
/**
21+
* {@inheritDoc}
22+
*/
23+
protected function getExpectedCommand(): string
24+
{
25+
return FT_LIST::class;
26+
}
27+
28+
/**
29+
* {@inheritDoc}
30+
*/
31+
protected function getExpectedId(): string
32+
{
33+
return 'FT_LIST';
34+
}
35+
36+
/**
37+
* @group disconnected
38+
*/
39+
public function testFilterArguments(): void
40+
{
41+
$this->assertEmpty($this->getCommand()->getArguments());
42+
}
43+
44+
/**
45+
* @group connected
46+
* @return void
47+
* @requiresRediSearchVersion >= 2.0.0
48+
*/
49+
public function testReturnListOfExistingIndices(): void
50+
{
51+
$redis = $this->getClient();
52+
53+
$this->assertEquals('OK', $redis->ftcreate('idx1', [new TextField('text')]));
54+
$this->assertEquals('OK', $redis->ftcreate('idx2', [new TextField('text')]));
55+
56+
$this->sleep(0.1);
57+
58+
$this->assertSameValues(['idx1', 'idx2'], $redis->ft_list());
59+
}
60+
}

0 commit comments

Comments
 (0)