Sitelet https://github.com/phpredis/phpredis/commit/84f1f28b
Skip to content

Commit 84f1f28

Browse files
michael-grundermichael-grunder
committed
Implement SWAPDB command
1 parent 837dee4 commit 84f1f28

7 files changed

Lines changed: 39 additions & 0 deletions

File tree

‎common.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -782,6 +782,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_key_offset_value, 0, 0, 3)
782782
ZEND_ARG_INFO(0, value)
783783
ZEND_END_ARG_INFO()
784784

785+
ZEND_BEGIN_ARG_INFO_EX(arginfo_swapdb, 0, 0, 2)
786+
ZEND_ARG_INFO(0, srcdb)
787+
ZEND_ARG_INFO(0, dstdb)
788+
ZEND_END_ARG_INFO()
789+
785790
ZEND_BEGIN_ARG_INFO_EX(arginfo_key_start_end, 0, 0, 3)
786791
ZEND_ARG_INFO(0, key)
787792
ZEND_ARG_INFO(0, start)

‎php_redis.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ PHP_METHOD(Redis, pttl);
108108
PHP_METHOD(Redis, persist);
109109
PHP_METHOD(Redis, info);
110110
PHP_METHOD(Redis, select);
111+
PHP_METHOD(Redis, swapdb);
111112
PHP_METHOD(Redis, move);
112113
PHP_METHOD(Redis, zAdd);
113114
PHP_METHOD(Redis, zDelete);

‎redis.c‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,7 @@ static zend_function_entry redis_functions[] = {
387387
PHP_ME(Redis, sscan, arginfo_kscan, ZEND_ACC_PUBLIC)
388388
PHP_ME(Redis, strlen, arginfo_key, ZEND_ACC_PUBLIC)
389389
PHP_ME(Redis, subscribe, arginfo_subscribe, ZEND_ACC_PUBLIC)
390+
PHP_ME(Redis, swapdb, arginfo_swapdb, ZEND_ACC_PUBLIC)
390391
PHP_ME(Redis, time, arginfo_void, ZEND_ACC_PUBLIC)
391392
PHP_ME(Redis, ttl, arginfo_key, ZEND_ACC_PUBLIC)
392393
PHP_ME(Redis, type, arginfo_key, ZEND_ACC_PUBLIC)
@@ -1832,6 +1833,11 @@ PHP_METHOD(Redis, select) {
18321833
}
18331834
/* }}} */
18341835

1836+
/* {{{ proto bool Redis::swapdb(long srcdb, long dstdb) */
1837+
PHP_METHOD(Redis, swapdb) {
1838+
REDIS_PROCESS_KW_CMD("SWAPDB", redis_long_long_cmd, redis_boolean_response);
1839+
}
1840+
18351841
/* {{{ proto bool Redis::move(string key, long dbindex) */
18361842
PHP_METHOD(Redis, move) {
18371843
REDIS_PROCESS_KW_CMD("MOVE", redis_key_long_cmd, redis_1_response);

‎redis_commands.c‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,24 @@ int redis_key_long_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
333333
return SUCCESS;
334334
}
335335

336+
/* long, long */
337+
int redis_long_long_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
338+
char *kw, char **cmd, int *cmd_len, short *slot,
339+
void **ctx)
340+
{
341+
zend_long v1, v2;
342+
343+
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll", &v1, &v2)
344+
== FAILURE)
345+
{
346+
return FAILURE;
347+
}
348+
349+
*cmd_len = REDIS_CMD_SPPRINTF(cmd, kw, "ll", v1, v2);
350+
351+
return SUCCESS;
352+
}
353+
336354
/* key, long, long */
337355
int redis_key_long_long_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
338356
char *kw, char **cmd, int *cmd_len, short *slot,

‎redis_commands.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ int redis_key_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
6464
int redis_key_long_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
6565
char *kw, char **cmd, int *cmd_len, short *slot, void **ctx);
6666

67+
int redis_long_long_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
68+
char *kw, char **cmd, int *cmd_len, short *slot, void **ctx);
69+
6770
int redis_key_long_long_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
6871
char *kw, char **cmd, int *cmd_len, short *slot, void **ctx);
6972

‎tests/RedisClusterTest.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public function testSelect() { return $this->markTestSkipped(); }
3434
public function testReconnectSelect() { return $this->markTestSkipped(); }
3535
public function testMultipleConnect() { return $this->markTestSkipped(); }
3636
public function testDoublePipeNoOp() { return $this->markTestSkipped(); }
37+
public function testSwapDB() { return $this->markTestSkipped(); }
3738

3839
/* Load our seeds on construction */
3940
public function __construct() {

‎tests/RedisTest.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1903,6 +1903,11 @@ public function testSelect() {
19031903
$this->assertTrue($this->redis->select(0));
19041904
}
19051905

1906+
public function testSwapDB() {
1907+
$this->assertTrue($this->redis->swapdb(0, 1));
1908+
$this->assertTrue($this->redis->swapdb(0, 1));
1909+
}
1910+
19061911
public function testMset() {
19071912
$this->redis->del('x', 'y', 'z'); // remove x y z
19081913
$this->assertTrue($this->redis->mset(array('x' => 'a', 'y' => 'b', 'z' => 'c'))); // set x y z

0 commit comments

Comments
 (0)