Sitelet https://github.com/phpredis/phpredis/commit/81a0303
Skip to content

Commit 81a0303

Browse files
yatsukhnenkoyatsukhnenko
committed
More arginfo for RedisCluster
This commit finally fixes issue #1055
1 parent d5609fc commit 81a0303

3 files changed

Lines changed: 410 additions & 400 deletions

File tree

‎common.h‎

Lines changed: 322 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_key_expire_value, 0, 0, 3)
704704
ZEND_ARG_INFO(0, value)
705705
ZEND_END_ARG_INFO()
706706

707+
ZEND_BEGIN_ARG_INFO_EX(arginfo_key_newkey, 0, 0, 2)
708+
ZEND_ARG_INFO(0, key)
709+
ZEND_ARG_INFO(0, newkey)
710+
ZEND_END_ARG_INFO()
711+
707712
ZEND_BEGIN_ARG_INFO_EX(arginfo_pairs, 0, 0, 1)
708713
ZEND_ARG_ARRAY_INFO(0, pairs, 0)
709714
ZEND_END_ARG_INFO()
@@ -727,10 +732,64 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_dst_nkeys, 0, 0, 2)
727732
#endif
728733
ZEND_END_ARG_INFO()
729734

735+
ZEND_BEGIN_ARG_INFO_EX(arginfo_key_min_max, 0, 0, 3)
736+
ZEND_ARG_INFO(0, key)
737+
ZEND_ARG_INFO(0, min)
738+
ZEND_ARG_INFO(0, max)
739+
ZEND_END_ARG_INFO()
740+
741+
ZEND_BEGIN_ARG_INFO_EX(arginfo_key_member, 0, 0, 2)
742+
ZEND_ARG_INFO(0, key)
743+
ZEND_ARG_INFO(0, member)
744+
ZEND_END_ARG_INFO()
745+
746+
ZEND_BEGIN_ARG_INFO_EX(arginfo_key_member_value, 0, 0, 3)
747+
ZEND_ARG_INFO(0, key)
748+
ZEND_ARG_INFO(0, member)
749+
ZEND_ARG_INFO(0, value)
750+
ZEND_END_ARG_INFO()
751+
752+
ZEND_BEGIN_ARG_INFO_EX(arginfo_key_members, 0, 0, 2)
753+
ZEND_ARG_INFO(0, key)
754+
ZEND_ARG_INFO(0, member)
755+
#if PHP_VERSION_ID >= 50600
756+
ZEND_ARG_VARIADIC_INFO(0, other_members)
757+
#else
758+
ZEND_ARG_INFO(0, ...)
759+
#endif
760+
ZEND_END_ARG_INFO()
761+
762+
ZEND_BEGIN_ARG_INFO_EX(arginfo_key_timestamp, 0, 0, 2)
763+
ZEND_ARG_INFO(0, key)
764+
ZEND_ARG_INFO(0, timestamp)
765+
ZEND_END_ARG_INFO()
766+
767+
ZEND_BEGIN_ARG_INFO_EX(arginfo_key_offset, 0, 0, 2)
768+
ZEND_ARG_INFO(0, key)
769+
ZEND_ARG_INFO(0, offset)
770+
ZEND_END_ARG_INFO()
771+
772+
ZEND_BEGIN_ARG_INFO_EX(arginfo_key_offset_value, 0, 0, 3)
773+
ZEND_ARG_INFO(0, key)
774+
ZEND_ARG_INFO(0, offset)
775+
ZEND_ARG_INFO(0, value)
776+
ZEND_END_ARG_INFO()
777+
778+
ZEND_BEGIN_ARG_INFO_EX(arginfo_key_start_end, 0, 0, 3)
779+
ZEND_ARG_INFO(0, key)
780+
ZEND_ARG_INFO(0, start)
781+
ZEND_ARG_INFO(0, end)
782+
ZEND_END_ARG_INFO()
783+
730784
ZEND_BEGIN_ARG_INFO_EX(arginfo_echo, 0, 0, 1)
731785
ZEND_ARG_INFO(0, msg)
732786
ZEND_END_ARG_INFO()
733787

788+
ZEND_BEGIN_ARG_INFO_EX(arginfo_expire, 0, 0, 2)
789+
ZEND_ARG_INFO(0, key)
790+
ZEND_ARG_INFO(0, timeout)
791+
ZEND_END_ARG_INFO()
792+
734793
ZEND_BEGIN_ARG_INFO_EX(arginfo_set, 0, 0, 2)
735794
ZEND_ARG_INFO(0, key)
736795
ZEND_ARG_INFO(0, value)
@@ -788,4 +847,267 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_srand_member, 0, 0, 1)
788847
ZEND_ARG_INFO(0, count)
789848
ZEND_END_ARG_INFO()
790849

850+
ZEND_BEGIN_ARG_INFO_EX(arginfo_zadd, 0, 0, 3)
851+
ZEND_ARG_INFO(0, key)
852+
ZEND_ARG_INFO(0, score)
853+
ZEND_ARG_INFO(0, value)
854+
ZEND_END_ARG_INFO()
855+
856+
ZEND_BEGIN_ARG_INFO_EX(arginfo_zincrby, 0, 0, 3)
857+
ZEND_ARG_INFO(0, key)
858+
ZEND_ARG_INFO(0, value)
859+
ZEND_ARG_INFO(0, member)
860+
ZEND_END_ARG_INFO()
861+
862+
ZEND_BEGIN_ARG_INFO_EX(arginfo_hmget, 0, 0, 2)
863+
ZEND_ARG_INFO(0, key)
864+
ZEND_ARG_ARRAY_INFO(0, keys, 0)
865+
ZEND_END_ARG_INFO()
866+
867+
ZEND_BEGIN_ARG_INFO_EX(arginfo_hmset, 0, 0, 2)
868+
ZEND_ARG_INFO(0, key)
869+
ZEND_ARG_ARRAY_INFO(0, pairs, 0)
870+
ZEND_END_ARG_INFO()
871+
872+
ZEND_BEGIN_ARG_INFO_EX(arginfo_bitop, 0, 0, 3)
873+
ZEND_ARG_INFO(0, operation)
874+
ZEND_ARG_INFO(0, ret_key)
875+
ZEND_ARG_INFO(0, key)
876+
#if PHP_VERSION_ID >= 50600
877+
ZEND_ARG_VARIADIC_INFO(0, other_keys)
878+
#else
879+
ZEND_ARG_INFO(0, ...)
880+
#endif
881+
ZEND_END_ARG_INFO()
882+
883+
ZEND_BEGIN_ARG_INFO_EX(arginfo_bitpos, 0, 0, 2)
884+
ZEND_ARG_INFO(0, key)
885+
ZEND_ARG_INFO(0, bit)
886+
ZEND_ARG_INFO(0, start)
887+
ZEND_ARG_INFO(0, end)
888+
ZEND_END_ARG_INFO()
889+
890+
ZEND_BEGIN_ARG_INFO_EX(arginfo_ltrim, 0, 0, 3)
891+
ZEND_ARG_INFO(0, key)
892+
ZEND_ARG_INFO(0, start)
893+
ZEND_ARG_INFO(0, stop)
894+
ZEND_END_ARG_INFO()
895+
896+
ZEND_BEGIN_ARG_INFO_EX(arginfo_publish, 0, 0, 2)
897+
ZEND_ARG_INFO(0, channel)
898+
ZEND_ARG_INFO(0, message)
899+
ZEND_END_ARG_INFO()
900+
901+
ZEND_BEGIN_ARG_INFO_EX(arginfo_pfadd, 0, 0, 2)
902+
ZEND_ARG_INFO(0, key)
903+
ZEND_ARG_ARRAY_INFO(0, elements, 0)
904+
ZEND_END_ARG_INFO()
905+
906+
ZEND_BEGIN_ARG_INFO_EX(arginfo_pfmerge, 0, 0, 2)
907+
ZEND_ARG_INFO(0, dstkey)
908+
ZEND_ARG_ARRAY_INFO(0, keys, 0)
909+
ZEND_END_ARG_INFO()
910+
911+
ZEND_BEGIN_ARG_INFO_EX(arginfo_restore, 0, 0, 3)
912+
ZEND_ARG_INFO(0, ttl)
913+
ZEND_ARG_INFO(0, key)
914+
ZEND_ARG_INFO(0, value)
915+
ZEND_END_ARG_INFO()
916+
917+
ZEND_BEGIN_ARG_INFO_EX(arginfo_smove, 0, 0, 3)
918+
ZEND_ARG_INFO(0, src)
919+
ZEND_ARG_INFO(0, dst)
920+
ZEND_ARG_INFO(0, value)
921+
ZEND_END_ARG_INFO()
922+
923+
ZEND_BEGIN_ARG_INFO_EX(arginfo_zrange, 0, 0, 3)
924+
ZEND_ARG_INFO(0, key)
925+
ZEND_ARG_INFO(0, start)
926+
ZEND_ARG_INFO(0, end)
927+
ZEND_ARG_INFO(0, scores)
928+
ZEND_END_ARG_INFO()
929+
930+
ZEND_BEGIN_ARG_INFO_EX(arginfo_zrangebyscore, 0, 0, 3)
931+
ZEND_ARG_INFO(0, key)
932+
ZEND_ARG_INFO(0, start)
933+
ZEND_ARG_INFO(0, end)
934+
ZEND_ARG_ARRAY_INFO(0, options, 0)
935+
ZEND_END_ARG_INFO()
936+
937+
ZEND_BEGIN_ARG_INFO_EX(arginfo_zrangebylex, 0, 0, 3)
938+
ZEND_ARG_INFO(0, key)
939+
ZEND_ARG_INFO(0, min)
940+
ZEND_ARG_INFO(0, max)
941+
ZEND_ARG_INFO(0, offset)
942+
ZEND_ARG_INFO(0, limit)
943+
ZEND_END_ARG_INFO()
944+
945+
ZEND_BEGIN_ARG_INFO_EX(arginfo_zstore, 0, 0, 2)
946+
ZEND_ARG_INFO(0, key)
947+
ZEND_ARG_ARRAY_INFO(0, keys, 0)
948+
ZEND_ARG_ARRAY_INFO(0, weights, 1)
949+
ZEND_ARG_INFO(0, aggregate)
950+
ZEND_END_ARG_INFO()
951+
952+
ZEND_BEGIN_ARG_INFO_EX(arginfo_sort, 0, 0, 1)
953+
ZEND_ARG_INFO(0, key)
954+
ZEND_ARG_ARRAY_INFO(0, options, 0)
955+
ZEND_END_ARG_INFO()
956+
957+
ZEND_BEGIN_ARG_INFO_EX(arginfo_object, 0, 0, 2)
958+
ZEND_ARG_INFO(0, field)
959+
ZEND_ARG_INFO(0, key)
960+
ZEND_END_ARG_INFO()
961+
962+
ZEND_BEGIN_ARG_INFO_EX(arginfo_subscribe, 0, 0, 1)
963+
ZEND_ARG_ARRAY_INFO(0, channels, 0)
964+
ZEND_END_ARG_INFO()
965+
966+
ZEND_BEGIN_ARG_INFO_EX(arginfo_psubscribe, 0, 0, 1)
967+
ZEND_ARG_ARRAY_INFO(0, patterns, 0)
968+
ZEND_END_ARG_INFO()
969+
970+
ZEND_BEGIN_ARG_INFO_EX(arginfo_unsubscribe, 0, 0, 1)
971+
ZEND_ARG_INFO(0, channel)
972+
#if PHP_VERSION_ID >= 50600
973+
ZEND_ARG_VARIADIC_INFO(0, other_channels)
974+
#else
975+
ZEND_ARG_INFO(0, ...)
976+
#endif
977+
ZEND_END_ARG_INFO()
978+
979+
ZEND_BEGIN_ARG_INFO_EX(arginfo_punsubscribe, 0, 0, 1)
980+
ZEND_ARG_INFO(0, pattern)
981+
#if PHP_VERSION_ID >= 50600
982+
ZEND_ARG_VARIADIC_INFO(0, other_patterns)
983+
#else
984+
ZEND_ARG_INFO(0, ...)
985+
#endif
986+
ZEND_END_ARG_INFO()
987+
988+
ZEND_BEGIN_ARG_INFO_EX(arginfo_eval, 0, 0, 1)
989+
ZEND_ARG_INFO(0, script)
990+
ZEND_ARG_INFO(0, args)
991+
ZEND_ARG_INFO(0, num_keys)
992+
ZEND_END_ARG_INFO()
993+
994+
ZEND_BEGIN_ARG_INFO_EX(arginfo_evalsha, 0, 0, 1)
995+
ZEND_ARG_INFO(0, script_sha)
996+
ZEND_ARG_INFO(0, args)
997+
ZEND_ARG_INFO(0, num_keys)
998+
ZEND_END_ARG_INFO()
999+
1000+
ZEND_BEGIN_ARG_INFO_EX(arginfo_getoption, 0, 0, 1)
1001+
ZEND_ARG_INFO(0, option)
1002+
ZEND_END_ARG_INFO()
1003+
1004+
ZEND_BEGIN_ARG_INFO_EX(arginfo_setoption, 0, 0, 2)
1005+
ZEND_ARG_INFO(0, option)
1006+
ZEND_ARG_INFO(0, value)
1007+
ZEND_END_ARG_INFO()
1008+
1009+
ZEND_BEGIN_ARG_INFO_EX(arginfo_watch, 0, 0, 1)
1010+
ZEND_ARG_INFO(0, key)
1011+
#if PHP_VERSION_ID >= 50600
1012+
ZEND_ARG_VARIADIC_INFO(0, other_keys)
1013+
#else
1014+
ZEND_ARG_INFO(0, ...)
1015+
#endif
1016+
ZEND_END_ARG_INFO()
1017+
1018+
ZEND_BEGIN_ARG_INFO_EX(arginfo_info, 0, 0, 0)
1019+
ZEND_ARG_INFO(0, option)
1020+
ZEND_END_ARG_INFO()
1021+
1022+
ZEND_BEGIN_ARG_INFO_EX(arginfo_command, 0, 0, 0)
1023+
#if PHP_VERSION_ID >= 50600
1024+
ZEND_ARG_VARIADIC_INFO(0, args)
1025+
#else
1026+
ZEND_ARG_INFO(0, ...)
1027+
#endif
1028+
ZEND_END_ARG_INFO()
1029+
1030+
ZEND_BEGIN_ARG_INFO_EX(arginfo_rawcommand, 0, 0, 1)
1031+
ZEND_ARG_INFO(0, cmd)
1032+
#if PHP_VERSION_ID >= 50600
1033+
ZEND_ARG_VARIADIC_INFO(0, args)
1034+
#else
1035+
ZEND_ARG_INFO(0, ...)
1036+
#endif
1037+
ZEND_END_ARG_INFO()
1038+
1039+
ZEND_BEGIN_ARG_INFO_EX(arginfo_client, 0, 0, 1)
1040+
ZEND_ARG_INFO(0, cmd)
1041+
#if PHP_VERSION_ID >= 50600
1042+
ZEND_ARG_VARIADIC_INFO(0, args)
1043+
#else
1044+
ZEND_ARG_INFO(0, ...)
1045+
#endif
1046+
ZEND_END_ARG_INFO()
1047+
1048+
ZEND_BEGIN_ARG_INFO_EX(arginfo_config, 0, 0, 2)
1049+
ZEND_ARG_INFO(0, cmd)
1050+
ZEND_ARG_INFO(0, key)
1051+
ZEND_ARG_INFO(0, value)
1052+
ZEND_END_ARG_INFO()
1053+
1054+
ZEND_BEGIN_ARG_INFO_EX(arginfo_pubsub, 0, 0, 1)
1055+
ZEND_ARG_INFO(0, cmd)
1056+
#if PHP_VERSION_ID >= 50600
1057+
ZEND_ARG_VARIADIC_INFO(0, args)
1058+
#else
1059+
ZEND_ARG_INFO(0, ...)
1060+
#endif
1061+
ZEND_END_ARG_INFO()
1062+
1063+
ZEND_BEGIN_ARG_INFO_EX(arginfo_script, 0, 0, 1)
1064+
ZEND_ARG_INFO(0, cmd)
1065+
#if PHP_VERSION_ID >= 50600
1066+
ZEND_ARG_VARIADIC_INFO(0, args)
1067+
#else
1068+
ZEND_ARG_INFO(0, ...)
1069+
#endif
1070+
ZEND_END_ARG_INFO()
1071+
1072+
ZEND_BEGIN_ARG_INFO_EX(arginfo_slowlog, 0, 0, 1)
1073+
ZEND_ARG_INFO(0, arg)
1074+
ZEND_ARG_INFO(0, option)
1075+
ZEND_END_ARG_INFO()
1076+
1077+
ZEND_BEGIN_ARG_INFO_EX(arginfo_geoadd, 0, 0, 4)
1078+
ZEND_ARG_INFO(0, key)
1079+
ZEND_ARG_INFO(0, lng)
1080+
ZEND_ARG_INFO(0, lat)
1081+
ZEND_ARG_INFO(0, member)
1082+
#if PHP_VERSION_ID >= 50600
1083+
ZEND_ARG_VARIADIC_INFO(0, other_triples)
1084+
#else
1085+
ZEND_ARG_INFO(0, ...)
1086+
#endif
1087+
ZEND_END_ARG_INFO()
1088+
1089+
ZEND_BEGIN_ARG_INFO_EX(arginfo_geodist, 0, 0, 3)
1090+
ZEND_ARG_INFO(0, key)
1091+
ZEND_ARG_INFO(0, src)
1092+
ZEND_ARG_INFO(0, dst)
1093+
ZEND_ARG_INFO(0, unit)
1094+
ZEND_END_ARG_INFO()
1095+
1096+
ZEND_BEGIN_ARG_INFO_EX(arginfo_georadius, 0, 0, 5)
1097+
ZEND_ARG_INFO(0, key)
1098+
ZEND_ARG_INFO(0, lng)
1099+
ZEND_ARG_INFO(0, lan)
1100+
ZEND_ARG_INFO(0, radius)
1101+
ZEND_ARG_INFO(0, unit)
1102+
ZEND_ARG_ARRAY_INFO(0, opts, 0)
1103+
ZEND_END_ARG_INFO()
1104+
1105+
ZEND_BEGIN_ARG_INFO_EX(arginfo_georadiusbymember, 0, 0, 4)
1106+
ZEND_ARG_INFO(0, key)
1107+
ZEND_ARG_INFO(0, member)
1108+
ZEND_ARG_INFO(0, radius)
1109+
ZEND_ARG_INFO(0, unit)
1110+
ZEND_ARG_ARRAY_INFO(0, opts, 0)
1111+
ZEND_END_ARG_INFO()
1112+
7911113
#endif

0 commit comments

Comments
 (0)