Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d5609fc

Browse files
committed
More arginfo for RedisCluster
1 parent 4a0a46b commit d5609fc

3 files changed

Lines changed: 136 additions & 119 deletions

File tree

common.h

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -698,4 +698,94 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_key_value, 0, 0, 2)
698698
ZEND_ARG_INFO(0, value)
699699
ZEND_END_ARG_INFO()
700700

701+
ZEND_BEGIN_ARG_INFO_EX(arginfo_key_expire_value, 0, 0, 3)
702+
ZEND_ARG_INFO(0, key)
703+
ZEND_ARG_INFO(0, expire)
704+
ZEND_ARG_INFO(0, value)
705+
ZEND_END_ARG_INFO()
706+
707+
ZEND_BEGIN_ARG_INFO_EX(arginfo_pairs, 0, 0, 1)
708+
ZEND_ARG_ARRAY_INFO(0, pairs, 0)
709+
ZEND_END_ARG_INFO()
710+
711+
ZEND_BEGIN_ARG_INFO_EX(arginfo_nkeys, 0, 0, 1)
712+
ZEND_ARG_INFO(0, key)
713+
#if PHP_VERSION_ID >= 50600
714+
ZEND_ARG_VARIADIC_INFO(0, other_keys)
715+
#else
716+
ZEND_ARG_INFO(0, ...)
717+
#endif
718+
ZEND_END_ARG_INFO()
719+
720+
ZEND_BEGIN_ARG_INFO_EX(arginfo_dst_nkeys, 0, 0, 2)
721+
ZEND_ARG_INFO(0, dst)
722+
ZEND_ARG_INFO(0, key)
723+
#if PHP_VERSION_ID >= 50600
724+
ZEND_ARG_VARIADIC_INFO(0, other_keys)
725+
#else
726+
ZEND_ARG_INFO(0, ...)
727+
#endif
728+
ZEND_END_ARG_INFO()
729+
730+
ZEND_BEGIN_ARG_INFO_EX(arginfo_echo, 0, 0, 1)
731+
ZEND_ARG_INFO(0, msg)
732+
ZEND_END_ARG_INFO()
733+
734+
ZEND_BEGIN_ARG_INFO_EX(arginfo_set, 0, 0, 2)
735+
ZEND_ARG_INFO(0, key)
736+
ZEND_ARG_INFO(0, value)
737+
ZEND_ARG_INFO(0, timeout)
738+
ZEND_ARG_INFO(0, opt)
739+
ZEND_END_ARG_INFO()
740+
741+
ZEND_BEGIN_ARG_INFO_EX(arginfo_lset, 0, 0, 3)
742+
ZEND_ARG_INFO(0, key)
743+
ZEND_ARG_INFO(0, index)
744+
ZEND_ARG_INFO(0, value)
745+
ZEND_END_ARG_INFO()
746+
747+
ZEND_BEGIN_ARG_INFO_EX(arginfo_blrpop, 0, 0, 2)
748+
ZEND_ARG_INFO(0, key)
749+
ZEND_ARG_INFO(0, timeout_or_key)
750+
// Can't have variadic keys before timeout.
751+
#if PHP_VERSION_ID >= 50600
752+
ZEND_ARG_VARIADIC_INFO(0, extra_args)
753+
#else
754+
ZEND_ARG_INFO(0, ...)
755+
#endif
756+
ZEND_END_ARG_INFO()
757+
758+
ZEND_BEGIN_ARG_INFO_EX(arginfo_linsert, 0, 0, 4)
759+
ZEND_ARG_INFO(0, key)
760+
ZEND_ARG_INFO(0, position)
761+
ZEND_ARG_INFO(0, pivot)
762+
ZEND_ARG_INFO(0, value)
763+
ZEND_END_ARG_INFO()
764+
765+
ZEND_BEGIN_ARG_INFO_EX(arginfo_lindex, 0, 0, 2)
766+
ZEND_ARG_INFO(0, key)
767+
ZEND_ARG_INFO(0, index)
768+
ZEND_END_ARG_INFO()
769+
770+
ZEND_BEGIN_ARG_INFO_EX(arginfo_brpoplpush, 0, 0, 3)
771+
ZEND_ARG_INFO(0, src)
772+
ZEND_ARG_INFO(0, dst)
773+
ZEND_ARG_INFO(0, timeout)
774+
ZEND_END_ARG_INFO()
775+
776+
ZEND_BEGIN_ARG_INFO_EX(arginfo_rpoplpush, 0, 0, 2)
777+
ZEND_ARG_INFO(0, src)
778+
ZEND_ARG_INFO(0, dst)
779+
ZEND_END_ARG_INFO()
780+
781+
ZEND_BEGIN_ARG_INFO_EX(arginfo_sadd_array, 0, 0, 2)
782+
ZEND_ARG_INFO(0, key)
783+
ZEND_ARG_ARRAY_INFO(0, options, 0)
784+
ZEND_END_ARG_INFO()
785+
786+
ZEND_BEGIN_ARG_INFO_EX(arginfo_srand_member, 0, 0, 1)
787+
ZEND_ARG_INFO(0, key)
788+
ZEND_ARG_INFO(0, count)
789+
ZEND_END_ARG_INFO()
790+
701791
#endif

redis.c

Lines changed: 2 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -82,23 +82,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pconnect, 0, 0, 2)
8282
ZEND_ARG_INFO(0, timeout)
8383
ZEND_END_ARG_INFO()
8484

85-
ZEND_BEGIN_ARG_INFO_EX(arginfo_echo, 0, 0, 1)
86-
ZEND_ARG_INFO(0, msg)
87-
ZEND_END_ARG_INFO()
88-
89-
ZEND_BEGIN_ARG_INFO_EX(arginfo_set, 0, 0, 2)
90-
ZEND_ARG_INFO(0, key)
91-
ZEND_ARG_INFO(0, value)
92-
ZEND_ARG_INFO(0, timeout)
93-
ZEND_ARG_INFO(0, opt)
94-
ZEND_END_ARG_INFO()
95-
96-
ZEND_BEGIN_ARG_INFO_EX(arginfo_key_expire_value, 0, 0, 3)
97-
ZEND_ARG_INFO(0, key)
98-
ZEND_ARG_INFO(0, expire)
99-
ZEND_ARG_INFO(0, value)
100-
ZEND_END_ARG_INFO()
101-
10285
ZEND_BEGIN_ARG_INFO_EX(arginfo_key_newkey, 0, 0, 2)
10386
ZEND_ARG_INFO(0, key)
10487
ZEND_ARG_INFO(0, newkey)
@@ -161,17 +144,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_generic_sort, 0, 0, 1)
161144
ZEND_ARG_INFO(0, getList)
162145
ZEND_END_ARG_INFO()
163146

164-
ZEND_BEGIN_ARG_INFO_EX(arginfo_blrpop, 0, 0, 2)
165-
ZEND_ARG_INFO(0, key)
166-
ZEND_ARG_INFO(0, timeout_or_key)
167-
// Can't have variadic keys before timeout.
168-
#if PHP_VERSION_ID >= 50600
169-
ZEND_ARG_VARIADIC_INFO(0, extra_args)
170-
#else
171-
ZEND_ARG_INFO(0, ...)
172-
#endif
173-
ZEND_END_ARG_INFO()
174-
175147
ZEND_BEGIN_ARG_INFO_EX(arginfo_lrem, 0, 0, 3)
176148
ZEND_ARG_INFO(0, key)
177149
ZEND_ARG_INFO(0, value)
@@ -184,59 +156,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ltrim, 0, 0, 3)
184156
ZEND_ARG_INFO(0, stop)
185157
ZEND_END_ARG_INFO()
186158

187-
ZEND_BEGIN_ARG_INFO_EX(arginfo_lget, 0, 0, 2)
188-
ZEND_ARG_INFO(0, key)
189-
ZEND_ARG_INFO(0, index)
190-
ZEND_END_ARG_INFO()
191-
192-
ZEND_BEGIN_ARG_INFO_EX(arginfo_lset, 0, 0, 3)
193-
ZEND_ARG_INFO(0, key)
194-
ZEND_ARG_INFO(0, index)
195-
ZEND_ARG_INFO(0, value)
196-
ZEND_END_ARG_INFO()
197-
198-
ZEND_BEGIN_ARG_INFO_EX(arginfo_linsert, 0, 0, 4)
199-
ZEND_ARG_INFO(0, key)
200-
ZEND_ARG_INFO(0, position)
201-
ZEND_ARG_INFO(0, pivot)
202-
ZEND_ARG_INFO(0, value)
203-
ZEND_END_ARG_INFO()
204-
205-
ZEND_BEGIN_ARG_INFO_EX(arginfo_sadd_array, 0, 0, 2)
206-
ZEND_ARG_INFO(0, key)
207-
ZEND_ARG_ARRAY_INFO(0, options, 0)
208-
ZEND_END_ARG_INFO()
209-
210159
ZEND_BEGIN_ARG_INFO_EX(arginfo_smove, 0, 0, 3)
211160
ZEND_ARG_INFO(0, src)
212161
ZEND_ARG_INFO(0, dst)
213162
ZEND_ARG_INFO(0, value)
214163
ZEND_END_ARG_INFO()
215164

216-
ZEND_BEGIN_ARG_INFO_EX(arginfo_srand_member, 0, 0, 1)
217-
ZEND_ARG_INFO(0, key)
218-
ZEND_ARG_INFO(0, count)
219-
ZEND_END_ARG_INFO()
220-
221-
ZEND_BEGIN_ARG_INFO_EX(arginfo_nkeys, 0, 0, 1)
222-
ZEND_ARG_INFO(0, key)
223-
#if PHP_VERSION_ID >= 50600
224-
ZEND_ARG_VARIADIC_INFO(0, other_keys)
225-
#else
226-
ZEND_ARG_INFO(0, ...)
227-
#endif
228-
ZEND_END_ARG_INFO()
229-
230-
ZEND_BEGIN_ARG_INFO_EX(arginfo_dst_nkeys, 0, 0, 2)
231-
ZEND_ARG_INFO(0, dst)
232-
ZEND_ARG_INFO(0, key)
233-
#if PHP_VERSION_ID >= 50600
234-
ZEND_ARG_VARIADIC_INFO(0, other_keys)
235-
#else
236-
ZEND_ARG_INFO(0, ...)
237-
#endif
238-
ZEND_END_ARG_INFO()
239-
240165
ZEND_BEGIN_ARG_INFO_EX(arginfo_set_timeout, 0, 0, 2)
241166
ZEND_ARG_INFO(0, key)
242167
ZEND_ARG_INFO(0, timeout)
@@ -300,21 +225,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_evalsha, 0, 0, 1)
300225
ZEND_END_ARG_INFO()
301226
/* }}} */
302227

303-
ZEND_BEGIN_ARG_INFO_EX(arginfo_pairs, 0, 0, 1)
304-
ZEND_ARG_ARRAY_INFO(0, pairs, 0)
305-
ZEND_END_ARG_INFO()
306-
307-
ZEND_BEGIN_ARG_INFO_EX(arginfo_rpoplpush, 0, 0, 2)
308-
ZEND_ARG_INFO(0, src)
309-
ZEND_ARG_INFO(0, dst)
310-
ZEND_END_ARG_INFO()
311-
312-
ZEND_BEGIN_ARG_INFO_EX(arginfo_brpoplpush, 0, 0, 3)
313-
ZEND_ARG_INFO(0, src)
314-
ZEND_ARG_INFO(0, dst)
315-
ZEND_ARG_INFO(0, timeout)
316-
ZEND_END_ARG_INFO()
317-
318228
ZEND_BEGIN_ARG_INFO_EX(arginfo_zadd, 0, 0, 3)
319229
ZEND_ARG_INFO(0, key)
320230
ZEND_ARG_INFO(0, score)
@@ -641,7 +551,7 @@ static zend_function_entry redis_functions[] = {
641551
PHP_ME(Redis, lSize, arginfo_key, ZEND_ACC_PUBLIC)
642552
PHP_ME(Redis, lRemove, arginfo_lrem, ZEND_ACC_PUBLIC)
643553
PHP_ME(Redis, listTrim, arginfo_ltrim, ZEND_ACC_PUBLIC)
644-
PHP_ME(Redis, lGet, arginfo_lget, ZEND_ACC_PUBLIC)
554+
PHP_ME(Redis, lGet, arginfo_lindex, ZEND_ACC_PUBLIC)
645555
PHP_ME(Redis, lGetRange, arginfo_key_start_end, ZEND_ACC_PUBLIC)
646556
PHP_ME(Redis, lSet, arginfo_lset, ZEND_ACC_PUBLIC)
647557
PHP_ME(Redis, lInsert, arginfo_linsert, ZEND_ACC_PUBLIC)
@@ -828,7 +738,7 @@ static zend_function_entry redis_functions[] = {
828738
PHP_MALIAS(Redis, keys, getKeys, arginfo_keys, ZEND_ACC_PUBLIC)
829739
PHP_MALIAS(Redis, lrem, lRemove, arginfo_lrem, ZEND_ACC_PUBLIC)
830740
PHP_MALIAS(Redis, ltrim, listTrim, arginfo_ltrim, ZEND_ACC_PUBLIC)
831-
PHP_MALIAS(Redis, lindex, lGet, arginfo_lget, ZEND_ACC_PUBLIC)
741+
PHP_MALIAS(Redis, lindex, lGet, arginfo_lindex, ZEND_ACC_PUBLIC)
832742
PHP_MALIAS(Redis, lrange, lGetRange, arginfo_key_start_end, ZEND_ACC_PUBLIC)
833743
PHP_MALIAS(Redis, scard, sSize, arginfo_key, ZEND_ACC_PUBLIC)
834744
PHP_MALIAS(Redis, srem, sRemove, arginfo_key_value, ZEND_ACC_PUBLIC)

redis_cluster.c

Lines changed: 44 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,23 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ctor, 0, 0, 1)
4848
ZEND_ARG_INFO(0, persistent)
4949
ZEND_END_ARG_INFO();
5050

51+
ZEND_BEGIN_ARG_INFO_EX(arginfo_del, 0, 0, 1)
52+
ZEND_ARG_INFO(0, key)
53+
#if PHP_VERSION_ID >= 50600
54+
ZEND_ARG_VARIADIC_INFO(0, other_keys)
55+
#else
56+
ZEND_ARG_INFO(0, ...)
57+
#endif
58+
ZEND_END_ARG_INFO()
59+
60+
ZEND_BEGIN_ARG_INFO_EX(arginfo_mget, 0, 0, 1)
61+
ZEND_ARG_ARRAY_INFO(0, keys, 0)
62+
ZEND_END_ARG_INFO()
63+
64+
ZEND_BEGIN_ARG_INFO_EX(arginfo_keys, 0, 0, 1)
65+
ZEND_ARG_INFO(0, pattern)
66+
ZEND_END_ARG_INFO()
67+
5168
/* Argument info for HSCAN, SSCAN, HSCAN */
5269
ZEND_BEGIN_ARG_INFO_EX(arginfo_kscan_cl, 0, 0, 2)
5370
ZEND_ARG_INFO(0, str_key)
@@ -69,47 +86,47 @@ zend_function_entry redis_cluster_functions[] = {
6986
PHP_ME(RedisCluster, __construct, arginfo_ctor, ZEND_ACC_CTOR | ZEND_ACC_PUBLIC)
7087
PHP_ME(RedisCluster, close, arginfo_void, ZEND_ACC_PUBLIC)
7188
PHP_ME(RedisCluster, get, arginfo_key, ZEND_ACC_PUBLIC)
72-
PHP_ME(RedisCluster, set, arginfo_key_value, ZEND_ACC_PUBLIC)
73-
PHP_ME(RedisCluster, mget, NULL, ZEND_ACC_PUBLIC)
74-
PHP_ME(RedisCluster, mset, NULL, ZEND_ACC_PUBLIC)
75-
PHP_ME(RedisCluster, msetnx, NULL, ZEND_ACC_PUBLIC)
76-
PHP_ME(RedisCluster, del, NULL, ZEND_ACC_PUBLIC)
77-
PHP_ME(RedisCluster, setex, NULL, ZEND_ACC_PUBLIC)
78-
PHP_ME(RedisCluster, psetex, NULL, ZEND_ACC_PUBLIC)
89+
PHP_ME(RedisCluster, set, arginfo_set, ZEND_ACC_PUBLIC)
90+
PHP_ME(RedisCluster, mget, arginfo_mget, ZEND_ACC_PUBLIC)
91+
PHP_ME(RedisCluster, mset, arginfo_pairs, ZEND_ACC_PUBLIC)
92+
PHP_ME(RedisCluster, msetnx, arginfo_pairs, ZEND_ACC_PUBLIC)
93+
PHP_ME(RedisCluster, del, arginfo_del, ZEND_ACC_PUBLIC)
94+
PHP_ME(RedisCluster, setex, arginfo_key_expire_value, ZEND_ACC_PUBLIC)
95+
PHP_ME(RedisCluster, psetex, arginfo_key_expire_value, ZEND_ACC_PUBLIC)
7996
PHP_ME(RedisCluster, setnx, arginfo_key_value, ZEND_ACC_PUBLIC)
8097
PHP_ME(RedisCluster, getset, arginfo_key_value, ZEND_ACC_PUBLIC)
8198
PHP_ME(RedisCluster, exists, arginfo_key, ZEND_ACC_PUBLIC)
82-
PHP_ME(RedisCluster, keys, NULL, ZEND_ACC_PUBLIC)
83-
PHP_ME(RedisCluster, type, NULL, ZEND_ACC_PUBLIC)
99+
PHP_ME(RedisCluster, keys, arginfo_keys, ZEND_ACC_PUBLIC)
100+
PHP_ME(RedisCluster, type, arginfo_key, ZEND_ACC_PUBLIC)
84101
PHP_ME(RedisCluster, lpop, arginfo_key, ZEND_ACC_PUBLIC)
85102
PHP_ME(RedisCluster, rpop, arginfo_key, ZEND_ACC_PUBLIC)
86-
PHP_ME(RedisCluster, lset, NULL, ZEND_ACC_PUBLIC)
87-
PHP_ME(RedisCluster, spop, NULL, ZEND_ACC_PUBLIC)
103+
PHP_ME(RedisCluster, lset, arginfo_lset, ZEND_ACC_PUBLIC)
104+
PHP_ME(RedisCluster, spop, arginfo_key, ZEND_ACC_PUBLIC)
88105
PHP_ME(RedisCluster, lpush, arginfo_key_value, ZEND_ACC_PUBLIC)
89106
PHP_ME(RedisCluster, rpush, arginfo_key_value, ZEND_ACC_PUBLIC)
90-
PHP_ME(RedisCluster, blpop, NULL, ZEND_ACC_PUBLIC)
91-
PHP_ME(RedisCluster, brpop, NULL, ZEND_ACC_PUBLIC)
107+
PHP_ME(RedisCluster, blpop, arginfo_blrpop, ZEND_ACC_PUBLIC)
108+
PHP_ME(RedisCluster, brpop, arginfo_blrpop, ZEND_ACC_PUBLIC)
92109
PHP_ME(RedisCluster, rpushx, arginfo_key_value, ZEND_ACC_PUBLIC)
93110
PHP_ME(RedisCluster, lpushx, arginfo_key_value, ZEND_ACC_PUBLIC)
94-
PHP_ME(RedisCluster, linsert, NULL, ZEND_ACC_PUBLIC)
95-
PHP_ME(RedisCluster, lindex, NULL, ZEND_ACC_PUBLIC)
111+
PHP_ME(RedisCluster, linsert, arginfo_linsert, ZEND_ACC_PUBLIC)
112+
PHP_ME(RedisCluster, lindex, arginfo_lindex, ZEND_ACC_PUBLIC)
96113
PHP_ME(RedisCluster, lrem, arginfo_key_value, ZEND_ACC_PUBLIC)
97-
PHP_ME(RedisCluster, brpoplpush, NULL, ZEND_ACC_PUBLIC)
98-
PHP_ME(RedisCluster, rpoplpush, NULL, ZEND_ACC_PUBLIC)
114+
PHP_ME(RedisCluster, brpoplpush, arginfo_brpoplpush, ZEND_ACC_PUBLIC)
115+
PHP_ME(RedisCluster, rpoplpush, arginfo_rpoplpush, ZEND_ACC_PUBLIC)
99116
PHP_ME(RedisCluster, llen, arginfo_key, ZEND_ACC_PUBLIC)
100-
PHP_ME(RedisCluster, scard, NULL, ZEND_ACC_PUBLIC)
117+
PHP_ME(RedisCluster, scard, arginfo_key, ZEND_ACC_PUBLIC)
101118
PHP_ME(RedisCluster, smembers, arginfo_key, ZEND_ACC_PUBLIC)
102119
PHP_ME(RedisCluster, sismember, arginfo_key_value, ZEND_ACC_PUBLIC)
103120
PHP_ME(RedisCluster, sadd, arginfo_key_value, ZEND_ACC_PUBLIC)
104-
PHP_ME(RedisCluster, saddarray, NULL, ZEND_ACC_PUBLIC)
121+
PHP_ME(RedisCluster, saddarray, arginfo_sadd_array, ZEND_ACC_PUBLIC)
105122
PHP_ME(RedisCluster, srem, arginfo_key_value, ZEND_ACC_PUBLIC)
106-
PHP_ME(RedisCluster, sunion, NULL, ZEND_ACC_PUBLIC)
107-
PHP_ME(RedisCluster, sunionstore, NULL, ZEND_ACC_PUBLIC)
108-
PHP_ME(RedisCluster, sinter, NULL, ZEND_ACC_PUBLIC)
109-
PHP_ME(RedisCluster, sinterstore, NULL, ZEND_ACC_PUBLIC)
110-
PHP_ME(RedisCluster, sdiff, NULL, ZEND_ACC_PUBLIC)
111-
PHP_ME(RedisCluster, sdiffstore, NULL, ZEND_ACC_PUBLIC)
112-
PHP_ME(RedisCluster, srandmember, NULL, ZEND_ACC_PUBLIC)
123+
PHP_ME(RedisCluster, sunion, arginfo_nkeys, ZEND_ACC_PUBLIC)
124+
PHP_ME(RedisCluster, sunionstore, arginfo_dst_nkeys, ZEND_ACC_PUBLIC)
125+
PHP_ME(RedisCluster, sinter, arginfo_nkeys, ZEND_ACC_PUBLIC)
126+
PHP_ME(RedisCluster, sinterstore, arginfo_dst_nkeys, ZEND_ACC_PUBLIC)
127+
PHP_ME(RedisCluster, sdiff, arginfo_nkeys, ZEND_ACC_PUBLIC)
128+
PHP_ME(RedisCluster, sdiffstore, arginfo_dst_nkeys, ZEND_ACC_PUBLIC)
129+
PHP_ME(RedisCluster, srandmember, arginfo_srand_member, ZEND_ACC_PUBLIC)
113130
PHP_ME(RedisCluster, strlen, arginfo_key, ZEND_ACC_PUBLIC)
114131
PHP_ME(RedisCluster, persist, arginfo_key, ZEND_ACC_PUBLIC)
115132
PHP_ME(RedisCluster, ttl, arginfo_key, ZEND_ACC_PUBLIC)
@@ -220,7 +237,7 @@ zend_function_entry redis_cluster_functions[] = {
220237
PHP_ME(RedisCluster, time, arginfo_void, ZEND_ACC_PUBLIC)
221238
PHP_ME(RedisCluster, randomkey, arginfo_void, ZEND_ACC_PUBLIC)
222239
PHP_ME(RedisCluster, ping, arginfo_void, ZEND_ACC_PUBLIC)
223-
PHP_ME(RedisCluster, echo, NULL, ZEND_ACC_PUBLIC)
240+
PHP_ME(RedisCluster, echo, arginfo_echo, ZEND_ACC_PUBLIC)
224241
PHP_ME(RedisCluster, command, NULL, ZEND_ACC_PUBLIC)
225242
PHP_ME(RedisCluster, rawcommand, NULL, ZEND_ACC_PUBLIC)
226243
PHP_ME(RedisCluster, cluster, NULL, ZEND_ACC_PUBLIC)

0 commit comments

Comments
 (0)