geckon01/predis
1
0
Fork 0
mirror of https://github.com/predis/predis.git synced 2026-09-18 22:38:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

New command: ZREMRANGEBYLEX (Redis 2.8.9).

Browse Source 
Closes #177.
This commit is contained in:
Daniele Alessandri
2014-06-09 14:17:40 +02:00
parent 0a580c9d1b
commit 8d353cc223
10 changed files with 217 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Predis/Cluster/PredisClusterHashStrategy.php
+1
View File
@@ -140,6 +140,7 @@ class PredisClusterHashStrategy implements CommandHashStrategyInterface
'ZSCAN' => $keyIsFirstArgument,
'ZLEXCOUNT' => $keyIsFirstArgument,
'ZRANGEBYLEX' => $keyIsFirstArgument,
'ZREMRANGEBYLEX' => $keyIsFirstArgument,
/* commands operating on hashes */
'HDEL' => $keyIsFirstArgument,
lib/Predis/Cluster/RedisClusterHashStrategy.php
+1
View File
@@ -126,6 +126,7 @@ class RedisClusterHashStrategy implements CommandHashStrategyInterface
'ZSCAN' => $keyIsFirstArgument,
'ZLEXCOUNT' => $keyIsFirstArgument,
'ZRANGEBYLEX' => $keyIsFirstArgument,
'ZREMRANGEBYLEX' => $keyIsFirstArgument,
/* commands operating on hashes */
'HDEL' => $keyIsFirstArgument,
lib/Predis/Command/ZSetRemoveRangeByLex.php
+27
View File
@@ -0,0 +1,27 @@
<?php
/*
* This file is part of the Predis package.
*
* (c) Daniele Alessandri <suppakilla@gmail.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Predis\Command;
/**
* @link http://redis.io/commands/zremrangebylex
* @author Daniele Alessandri <suppakilla@gmail.com>
*/
class ZSetRemoveRangeByLex extends PrefixableCommand
{
/**
* {@inheritdoc}
*/
public function getId()
{
return 'ZREMRANGEBYLEX';
}
}
lib/Predis/Profile/ServerVersion28.php
+1
View File
@@ -241,6 +241,7 @@ class ServerVersion28 extends ServerProfile
'zscan' => 'Predis\Command\ZSetScan',
'zlexcount' => 'Predis\Command\ZSetLexCount',
'zrangebylex' => 'Predis\Command\ZSetRangeByLex',
'zremrangebylex' => 'Predis\Command\ZSetRemoveRangeByLex',
/* commands operating on hashes */
'hscan' => 'Predis\Command\HashScan',
tests/Predis/Cluster/PredisClusterHashStrategyTest.php
+1
View File
@@ -344,6 +344,7 @@ class PredisClusterHashStrategyTest extends PredisTestCase
'ZSCAN' => 'keys-first',
'ZLEXCOUNT' => 'keys-first',
'ZRANGEBYLEX' => 'keys-first',
'ZREMRANGEBYLEX' => 'keys-first',
/* commands operating on hashes */
'HDEL' => 'keys-first',
tests/Predis/Cluster/RedisClusterHashStrategyTest.php
+1
View File
@@ -344,6 +344,7 @@ class RedisClusterHashStrategyTest extends PredisTestCase
'ZSCAN' => 'keys-first',
'ZLEXCOUNT' => 'keys-first',
'ZRANGEBYLEX' => 'keys-first',
'ZREMRANGEBYLEX' => 'keys-first',
/* commands operating on hashes */
'HDEL' => 'keys-first',
tests/Predis/Command/ZSetRemoveRangeByLexTest.php
+174
View File
@@ -0,0 +1,174 @@
<?php
/*
* This file is part of the Predis package.
*
* (c) Daniele Alessandri <suppakilla@gmail.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Predis\Command;
/**
* @group commands
* @group realm-zset
*/
class ZSetRemoveRangeByLexTest extends PredisCommandTestCase
{
/**
* {@inheritdoc}
*/
protected function getExpectedCommand()
{
return 'Predis\Command\ZSetRemoveRangeByLex';
}
/**
* {@inheritdoc}
*/
protected function getExpectedId()
{
return 'ZREMRANGEBYLEX';
}
/**
* @group disconnected
*/
public function testFilterArguments()
{
$arguments = array('key', '[a', '[b');
$expected = array('key', '[a', '[b');
$command = $this->getCommand();
$command->setArguments($arguments);
$this->assertSame($expected, $command->getArguments());
}
/**
* @group disconnected
*/
public function testParseResponse()
{
$this->assertSame(1, $this->getCommand()->parseResponse(1));
}
/**
* @group disconnected
*/
public function testPrefixKeys()
{
$arguments = array('key', '[a', '[b');
$expected = array('prefix:key', '[a', '[b');
$command = $this->getCommandWithArgumentsArray($arguments);
$command->prefixKeys('prefix:');
$this->assertSame($expected, $command->getArguments());
}
/**
* @group disconnected
*/
public function testPrefixKeysIgnoredOnEmptyArguments()
{
$command = $this->getCommand();
$command->prefixKeys('prefix:');
$this->assertSame(array(), $command->getArguments());
}
/**
* @group connected
*/
public function testRemovesRangeByLexWithWholeRange()
{
$this->markTestSkippedOnRedisVersionBelow('2.8.9', 'Lexicographical operations on sorted sets require Redis >= 2.8.9.', true);
$redis = $this->getClient();
$redis->zadd('letters', 0, 'a', 0, 'b', 0, 'c', 0, 'd', 0, 'e', 0, 'f', 0, 'g');
$this->assertSame(0, $redis->zremrangebylex('letters', '+', '-'));
$this->assertSame(7, $redis->zremrangebylex('letters', '-', '+'));
$this->assertSame(array(), $redis->zrange('letters', 0, -1));
}
/**
* @group connected
*/
public function testRemovesRangeByLexWithInclusiveRange()
{
$this->markTestSkippedOnRedisVersionBelow('2.8.9', 'Lexicographical operations on sorted sets require Redis >= 2.8.9.', true);
$redis = $this->getClient();
$redis->zadd('letters', 0, 'a', 0, 'b', 0, 'c', 0, 'd', 0, 'e', 0, 'f', 0, 'g');
$this->assertSame(3, $redis->zremrangebylex('letters', '[b', '[d'));
$this->assertSame(array('a', 'e', 'f', 'g'), $redis->zrange('letters', 0, -1));
}
/**
* @group connected
*/
public function testRemovesRangeByLexWithExclusiveRange()
{
$this->markTestSkippedOnRedisVersionBelow('2.8.9', 'Lexicographical operations on sorted sets require Redis >= 2.8.9.', true);
$redis = $this->getClient();
$redis->zadd('letters', 0, 'a', 0, 'b', 0, 'c', 0, 'd', 0, 'e', 0, 'f', 0, 'g');
$this->assertSame(3, $redis->zremrangebylex('letters', '(a', '(e'));
$this->assertSame(array('a', 'e', 'f', 'g'), $redis->zrange('letters', 0, -1));
}
/**
* @group connected
*/
public function testRemovesRangeByLexWithMixedRange()
{
$this->markTestSkippedOnRedisVersionBelow('2.8.9', 'Lexicographical operations on sorted sets require Redis >= 2.8.9.', true);
$redis = $this->getClient();
$redis->zadd('letters', 0, 'a', 0, 'b', 0, 'c', 0, 'd', 0, 'e', 0, 'f', 0, 'g');
$this->assertSame(3, $redis->zremrangebylex('letters', '[b', '(e'));
$this->assertSame(array('a', 'e', 'f', 'g'), $redis->zrange('letters', 0, -1));
}
/**
* @group connected
* @expectedException Predis\ServerException
* @expectedExceptionMessage min or max not valid string range item
*/
public function testThrowsExceptionOnInvalidRangeFormat()
{
$this->markTestSkippedOnRedisVersionBelow('2.8.9', 'Lexicographical operations on sorted sets require Redis >= 2.8.9.', true);
$redis = $this->getClient();
$redis->zadd('letters', 0, 'a', 0, 'b', 0, 'c', 0, 'd', 0, 'e', 0, 'f', 0, 'g');
$redis->zremrangebylex('letters', 'b', 'f');
}
/**
* @group connected
* @expectedException Predis\ServerException
* @expectedExceptionMessage Operation against a key holding the wrong kind of value
*/
public function testThrowsExceptionOnWrongType()
{
$this->markTestSkippedOnRedisVersionBelow('2.8.9', 'Lexicographical operations on sorted sets require Redis >= 2.8.9.', true);
$redis = $this->getClient();
$redis->set('foo', 'bar');
$redis->zremrangebylex('foo', '[a', '[b');
}
}
tests/Predis/Profile/ServerVersion28Test.php
+5 -4
View File
@@ -178,10 +178,11 @@ class ServerVersion28Test extends PredisProfileTestCase
137 => 'zscan',
138 => 'zlexcount',
139 => 'zrangebylex',
140 => 'hscan',
141 => 'pfadd',
142 => 'pfcount',
143 => 'pfmerge',
140 => 'zremrangebylex',
141 => 'hscan',
142 => 'pfadd',
143 => 'pfcount',
144 => 'pfmerge',
);
}
}
tests/Predis/Profile/ServerVersionNextTest.php
+5 -4
View File
@@ -178,10 +178,11 @@ class ServerVersionNextTest extends PredisProfileTestCase
137 => 'zscan',
138 => 'zlexcount',
139 => 'zrangebylex',
140 => 'hscan',
141 => 'pfadd',
142 => 'pfcount',
143 => 'pfmerge',
140 => 'zremrangebylex',
141 => 'hscan',
142 => 'pfadd',
143 => 'pfcount',
144 => 'pfmerge',
);
}
}
tests/Predis/Replication/ReplicationStrategyTest.php
+1
View File
@@ -344,6 +344,7 @@ class ReplicationStrategyTest extends PredisTestCase
'ZSCAN' => 'read',
'ZLEXCOUNT' => 'read',
'ZRANGEBYLEX' => 'read',
'ZREMRANGEBYLEX' => 'write',
/* commands operating on hashes */
'HDEL' => 'write',