From d939d67470a4031c6342aaf19daf751bb2679963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Svensson?= Date: Tue, 11 Jun 2024 14:28:15 +0200 Subject: [PATCH 1/7] Update header guards after move of files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Svensson --- include/valkey/sockcompat.h | 6 +++--- include/valkey/valkeycluster.h | 6 +++--- include/valkey/valkeycluster_ssl.h | 6 +++--- src/adlist.h | 6 +++--- src/command.h | 6 +++--- src/vkarray.h | 6 +++--- src/vkutil.h | 6 +++--- src/win32.h | 6 +++--- tests/test_utils.h | 8 ++++---- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/include/valkey/sockcompat.h b/include/valkey/sockcompat.h index 5298f152..84afeeab 100644 --- a/include/valkey/sockcompat.h +++ b/include/valkey/sockcompat.h @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __SOCKCOMPAT_H -#define __SOCKCOMPAT_H +#ifndef VALKEY_SOCKCOMPAT_H +#define VALKEY_SOCKCOMPAT_H #ifndef _WIN32 /* For POSIX systems we use the standard BSD socket API. */ @@ -92,4 +92,4 @@ int win32_valkeyKeepAlive(SOCKET sockfd, int interval_ms); #endif /* VALKEY_SOCKCOMPAT_IMPLEMENTATION */ #endif /* _WIN32 */ -#endif /* __SOCKCOMPAT_H */ +#endif /* VALKEY_SOCKCOMPAT_H */ diff --git a/include/valkey/valkeycluster.h b/include/valkey/valkeycluster.h index 0eef6c03..fe5c2c1f 100644 --- a/include/valkey/valkeycluster.h +++ b/include/valkey/valkeycluster.h @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __HIRCLUSTER_H -#define __HIRCLUSTER_H +#ifndef VALKEYCLUSTER_H +#define VALKEYCLUSTER_H #include "async.h" #include "dict.h" @@ -342,4 +342,4 @@ valkeyClusterNode *valkeyClusterGetNodeByKey(valkeyClusterContext *cc, } #endif -#endif +#endif /* VALKEYCLUSTER_H */ diff --git a/include/valkey/valkeycluster_ssl.h b/include/valkey/valkeycluster_ssl.h index 86cec0b6..06e9f8f8 100644 --- a/include/valkey/valkeycluster_ssl.h +++ b/include/valkey/valkeycluster_ssl.h @@ -26,8 +26,8 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __HIRCLUSTER_SSL_H -#define __HIRCLUSTER_SSL_H +#ifndef VALKEYCLUSTER_SSL_H +#define VALKEYCLUSTER_SSL_H #include "valkeycluster.h" #include "valkey_ssl.h" @@ -46,4 +46,4 @@ int valkeyClusterSetOptionEnableSSL(valkeyClusterContext *cc, } #endif -#endif /* __HIRCLUSTER_SSL_H */ +#endif /* VALKEYCLUSTER_SSL_H */ diff --git a/src/adlist.h b/src/adlist.h index 982894e4..18ee6008 100644 --- a/src/adlist.h +++ b/src/adlist.h @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __ADLIST_H__ -#define __ADLIST_H__ +#ifndef VALKEY_ADLIST_H +#define VALKEY_ADLIST_H /* Node, List, and Iterator are the only data structures used currently. */ @@ -91,4 +91,4 @@ void listRotate(hilist *list); #define AL_START_HEAD 0 #define AL_START_TAIL 1 -#endif /* __ADLIST_H__ */ +#endif /* VALKEY_ADLIST_H */ diff --git a/src/command.h b/src/command.h index eafd90a3..2a62f071 100644 --- a/src/command.h +++ b/src/command.h @@ -29,8 +29,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __COMMAND_H_ -#define __COMMAND_H_ +#ifndef VALKEY_COMMAND_H +#define VALKEY_COMMAND_H #include @@ -104,4 +104,4 @@ void valkey_parse_cmd(struct cmd *r); struct cmd *command_get(void); void command_destroy(struct cmd *command); -#endif +#endif /* VALKEY_COMMAND_H */ diff --git a/src/vkarray.h b/src/vkarray.h index 4f5f02ed..656088f9 100644 --- a/src/vkarray.h +++ b/src/vkarray.h @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __VKARRAY_H_ -#define __VKARRAY_H_ +#ifndef VALKEY_VKARRAY_H +#define VALKEY_VKARRAY_H #include @@ -76,4 +76,4 @@ void vkarray_swap(struct vkarray *a, struct vkarray *b); void vkarray_sort(struct vkarray *a, vkarray_compare_t compare); int vkarray_each(struct vkarray *a, vkarray_each_t func, void *data); -#endif +#endif /* VALKEY_VKARRAY_H */ diff --git a/src/vkutil.h b/src/vkutil.h index 06f7d0f3..178afb91 100644 --- a/src/vkutil.h +++ b/src/vkutil.h @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __VKUTIL_H_ -#define __VKUTIL_H_ +#ifndef VALKEY_VKUTIL_H +#define VALKEY_VKUTIL_H #include #include @@ -178,4 +178,4 @@ int64_t vk_msec_now(void); uint16_t crc16(const char *buf, int len); -#endif +#endif /* VALKEY_VKUTIL_H */ diff --git a/src/win32.h b/src/win32.h index c9ddd1ff..bd649334 100644 --- a/src/win32.h +++ b/src/win32.h @@ -28,8 +28,8 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _WIN32_HELPER_INCLUDE -#define _WIN32_HELPER_INCLUDE +#ifndef VALKEY_WIN32_H +#define VALKEY_WIN32_H #ifdef _MSC_VER #include /* for struct timeval */ @@ -100,4 +100,4 @@ __inline int c99_snprintf(char* str, size_t size, const char* format, ...) #endif /* _WIN32 */ -#endif /* _WIN32_HELPER_INCLUDE */ +#endif /* VALKEY_WIN32_H */ diff --git a/tests/test_utils.h b/tests/test_utils.h index 85dba3ae..f92b882f 100644 --- a/tests/test_utils.h +++ b/tests/test_utils.h @@ -1,5 +1,5 @@ -#ifndef __TEST_UTILS_H__ -#define __TEST_UTILS_H__ +#ifndef VALKEY_TEST_UTILS_H +#define VALKEY_TEST_UTILS_H #define ASSERT_MSG(_x, _msg) \ if (!(_x)) { \ @@ -69,9 +69,9 @@ #define ASSERT_STR_STARTS_WITH(_s1, _s2) \ { assert(strncmp(_s1, _s2, strlen(_s2)) == 0); } -#endif - struct valkeyClusterContext; void load_valkey_version(struct valkeyClusterContext *cc); int valkey_version_less_than(int major, int minor); + +#endif /* VALKEY_TEST_UTILS_H */ From 5126416a8ce7d1d0d17979ebae7af6e48a7a257d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Svensson?= Date: Fri, 21 Jun 2024 11:41:32 +0200 Subject: [PATCH 2/7] Fix ISO-C naming violation in ..SetError() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Svensson --- src/valkeycluster.c | 334 +++++++++++++++++++++----------------------- 1 file changed, 163 insertions(+), 171 deletions(-) diff --git a/src/valkeycluster.c b/src/valkeycluster.c index 03fa592d..31dba522 100644 --- a/src/valkeycluster.c +++ b/src/valkeycluster.c @@ -196,8 +196,8 @@ static unsigned int keyHashSlot(char *key, int keylen) { return crc16(key + s + 1, e - s - 1) & 0x3FFF; } -static void __valkeyClusterSetError(valkeyClusterContext *cc, int type, - const char *str) { +static void valkeyClusterSetError(valkeyClusterContext *cc, int type, + const char *str) { size_t len; if (cc == NULL) { @@ -366,13 +366,13 @@ static int authenticate(valkeyClusterContext *cc, valkeyContext *c) { } if (reply == NULL) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "Command AUTH reply error (NULL)"); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "Command AUTH reply error (NULL)"); goto error; } if (reply->type == VALKEY_REPLY_ERROR) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, reply->str); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, reply->str); goto error; } @@ -399,23 +399,23 @@ static valkeyClusterNode *node_get_with_slots(valkeyClusterContext *cc, } if (host_elem->type != VALKEY_REPLY_STRING || host_elem->len <= 0) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "Command(cluster slots) reply error: " - "node ip is not string."); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "Command(cluster slots) reply error: " + "node ip is not string."); goto error; } if (port_elem->type != VALKEY_REPLY_INTEGER || port_elem->integer <= 0) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "Command(cluster slots) reply error: " - "node port is not integer."); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "Command(cluster slots) reply error: " + "node port is not integer."); goto error; } if (!vk_valid_port((int)port_elem->integer)) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "Command(cluster slots) reply error: " - "node port is not valid."); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "Command(cluster slots) reply error: " + "node port is not valid."); goto error; } @@ -452,7 +452,7 @@ static valkeyClusterNode *node_get_with_slots(valkeyClusterContext *cc, return node; oom: - __valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); + valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); // passthrough error: @@ -507,7 +507,7 @@ static valkeyClusterNode *node_get_with_nodes(valkeyClusterContext *cc, /* Get the ip part */ if ((p = strrchr(node->addr, IP_PORT_SEPARATOR)) == NULL) { - __valkeyClusterSetError( + valkeyClusterSetError( cc, VALKEY_ERR_OTHER, "server address is incorrect, port separator missing."); goto error; @@ -524,7 +524,7 @@ static valkeyClusterNode *node_get_with_nodes(valkeyClusterContext *cc, return node; oom: - __valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); + valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); // passthrough error: @@ -610,15 +610,14 @@ static int cluster_master_slave_mapping_with_name(valkeyClusterContext *cc, } else { node_old = dictGetEntryVal(di); if (node_old == NULL) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "dict get value null"); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "dict get value null"); return VALKEY_ERR; } if (node->role == VALKEY_ROLE_MASTER && node_old->role == VALKEY_ROLE_MASTER) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "two masters have the same name"); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "two masters have the same name"); return VALKEY_ERR; } else if (node->role == VALKEY_ROLE_MASTER && node_old->role == VALKEY_ROLE_SLAVE) { @@ -670,7 +669,7 @@ static int cluster_master_slave_mapping_with_name(valkeyClusterContext *cc, return VALKEY_OK; oom: - __valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); + valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); return VALKEY_ERR; } @@ -700,9 +699,9 @@ dict *parse_cluster_slots(valkeyClusterContext *cc, valkeyReply *reply, } if (reply->type != VALKEY_REPLY_ARRAY || reply->elements <= 0) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "Command(cluster slots) reply error: " - "reply is not an array."); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "Command(cluster slots) reply error: " + "reply is not an array."); goto error; } @@ -710,9 +709,9 @@ dict *parse_cluster_slots(valkeyClusterContext *cc, valkeyReply *reply, elem_slots = reply->element[i]; if (elem_slots->type != VALKEY_REPLY_ARRAY || elem_slots->elements < 3) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "Command(cluster slots) reply error: " - "first sub_reply is not an array."); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "Command(cluster slots) reply error: " + "first sub_reply is not an array."); goto error; } @@ -726,27 +725,25 @@ dict *parse_cluster_slots(valkeyClusterContext *cc, valkeyReply *reply, if (idx == 0) { elem_slots_begin = elem_slots->element[idx]; if (elem_slots_begin->type != VALKEY_REPLY_INTEGER) { - __valkeyClusterSetError( - cc, VALKEY_ERR_OTHER, - "Command(cluster slots) reply error: " - "slot begin is not an integer."); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "Command(cluster slots) reply error: " + "slot begin is not an integer."); goto error; } slot->start = (int)(elem_slots_begin->integer); } else if (idx == 1) { elem_slots_end = elem_slots->element[idx]; if (elem_slots_end->type != VALKEY_REPLY_INTEGER) { - __valkeyClusterSetError( - cc, VALKEY_ERR_OTHER, - "Command(cluster slots) reply error: " - "slot end is not an integer."); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "Command(cluster slots) reply error: " + "slot end is not an integer."); goto error; } slot->end = (int)(elem_slots_end->integer); if (slot->start > slot->end) { - __valkeyClusterSetError( + valkeyClusterSetError( cc, VALKEY_ERR_OTHER, "Command(cluster slots) reply error: " "slot begin is bigger than slot end."); @@ -756,7 +753,7 @@ dict *parse_cluster_slots(valkeyClusterContext *cc, valkeyReply *reply, elem_nodes = elem_slots->element[idx]; if (elem_nodes->type != VALKEY_REPLY_ARRAY || elem_nodes->elements < 2) { - __valkeyClusterSetError( + valkeyClusterSetError( cc, VALKEY_ERR_OTHER, "Command(cluster slots) reply error: " "nodes sub_reply is not an correct array."); @@ -769,10 +766,9 @@ dict *parse_cluster_slots(valkeyClusterContext *cc, valkeyReply *reply, if (elem_ip == NULL || elem_port == NULL || elem_ip->type != VALKEY_REPLY_STRING || elem_port->type != VALKEY_REPLY_INTEGER) { - __valkeyClusterSetError( - cc, VALKEY_ERR_OTHER, - "Command(cluster slots) reply error: " - "master ip or port is not correct."); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "Command(cluster slots) reply error: " + "master ip or port is not correct."); goto error; } @@ -856,7 +852,7 @@ dict *parse_cluster_slots(valkeyClusterContext *cc, valkeyReply *reply, return nodes; oom: - __valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); + valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); // passthrough error: @@ -909,8 +905,8 @@ dict *parse_cluster_nodes(valkeyClusterContext *cc, char *str, int str_len, } if (count_part < 8) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "split cluster nodes error"); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "split cluster nodes error"); goto error; } @@ -952,7 +948,7 @@ dict *parse_cluster_nodes(valkeyClusterContext *cc, char *str, int str_len, ret = dictAdd(nodes, key, master); if (ret != DICT_OK) { // Key already exists, but possibly an OOM error - __valkeyClusterSetError( + valkeyClusterSetError( cc, VALKEY_ERR_OTHER, "The address already exists in the nodes"); sdsfree(key); @@ -1039,7 +1035,7 @@ dict *parse_cluster_nodes(valkeyClusterContext *cc, char *str, int str_len, } if (slot_ranges_found == 0) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "No slot information"); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "No slot information"); goto error; } @@ -1050,7 +1046,7 @@ dict *parse_cluster_nodes(valkeyClusterContext *cc, char *str, int str_len, return nodes; oom: - __valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); + valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); // passthrough error: @@ -1075,7 +1071,7 @@ static int clusterUpdateRouteSendCommand(valkeyClusterContext *cc, const char *msg = (cc->flags & VALKEYCLUSTER_FLAG_ROUTE_USE_SLOTS ? "Command (cluster slots) send error." : "Command (cluster nodes) send error."); - __valkeyClusterSetError(cc, c->err, msg); + valkeyClusterSetError(cc, c->err, msg); return VALKEY_ERR; } /* Flush buffer to socket. */ @@ -1091,20 +1087,20 @@ static int handleClusterSlotsReply(valkeyClusterContext *cc, valkeyContext *c) { int result = valkeyGetReply(c, (void **)&reply); if (result != VALKEY_OK) { if (c->err == VALKEY_ERR_TIMEOUT) { - __valkeyClusterSetError( + valkeyClusterSetError( cc, c->err, "Command (cluster slots) reply error (socket timeout)"); } else { - __valkeyClusterSetError( + valkeyClusterSetError( cc, VALKEY_ERR_OTHER, "Command (cluster slots) reply error (NULL)."); } return VALKEY_ERR; } else if (reply->type != VALKEY_REPLY_ARRAY) { if (reply->type == VALKEY_REPLY_ERROR) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, reply->str); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, reply->str); } else { - __valkeyClusterSetError( + valkeyClusterSetError( cc, VALKEY_ERR_OTHER, "Command (cluster slots) reply error: type is not array."); } @@ -1123,22 +1119,22 @@ static int handleClusterNodesReply(valkeyClusterContext *cc, valkeyContext *c) { int result = valkeyGetReply(c, (void **)&reply); if (result != VALKEY_OK) { if (c->err == VALKEY_ERR_TIMEOUT) { - __valkeyClusterSetError(cc, c->err, - "Command (cluster nodes) reply error " - "(socket timeout)"); + valkeyClusterSetError(cc, c->err, + "Command (cluster nodes) reply error " + "(socket timeout)"); } else { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "Command (cluster nodes) reply error " - "(NULL)."); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "Command (cluster nodes) reply error " + "(NULL)."); } return VALKEY_ERR; } else if (reply->type != VALKEY_REPLY_STRING) { if (reply->type == VALKEY_REPLY_ERROR) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, reply->str); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, reply->str); } else { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "Command(cluster nodes) reply error: " - "type is not string."); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "Command(cluster nodes) reply error: " + "type is not string."); } freeReplyObject(reply); return VALKEY_ERR; @@ -1172,7 +1168,7 @@ static int cluster_update_route_by_addr(valkeyClusterContext *cc, } if (ip == NULL || port <= 0) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "Ip or port error!"); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "Ip or port error!"); goto error; } @@ -1183,7 +1179,7 @@ static int cluster_update_route_by_addr(valkeyClusterContext *cc, c = valkeyConnectWithOptions(&options); if (c == NULL) { - __valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); + valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); return VALKEY_ERR; } @@ -1192,12 +1188,12 @@ static int cluster_update_route_by_addr(valkeyClusterContext *cc, } if (c->err) { - __valkeyClusterSetError(cc, c->err, c->errstr); + valkeyClusterSetError(cc, c->err, c->errstr); goto error; } if (cc->ssl && cc->ssl_init_fn(c, cc->ssl) != VALKEY_OK) { - __valkeyClusterSetError(cc, c->err, c->errstr); + valkeyClusterSetError(cc, c->err, c->errstr); goto error; } @@ -1242,8 +1238,8 @@ static int updateNodesAndSlotmap(valkeyClusterContext *cc, dict *nodes) { while ((de = dictNext(&di))) { valkeyClusterNode *master = dictGetEntryVal(de); if (master->role != VALKEY_ROLE_MASTER) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "Node role must be master"); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "Node role must be master"); goto error; } @@ -1258,14 +1254,14 @@ static int updateNodesAndSlotmap(valkeyClusterContext *cc, dict *nodes) { while ((ln = listNext(&li))) { cluster_slot *slot = listNodeValue(ln); if (slot->start > slot->end || slot->end >= VALKEYCLUSTER_SLOTS) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "Slot region for node is invalid"); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "Slot region for node is invalid"); goto error; } for (uint32_t i = slot->start; i <= slot->end; i++) { if (table[i] != NULL) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "Different node holds same slot"); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "Different node holds same slot"); goto error; } table[i] = master; @@ -1306,7 +1302,7 @@ static int updateNodesAndSlotmap(valkeyClusterContext *cc, dict *nodes) { return VALKEY_OK; oom: - __valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); + valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); // passthrough error: vk_free(table); @@ -1325,7 +1321,7 @@ int valkeyClusterUpdateSlotmap(valkeyClusterContext *cc) { } if (cc->nodes == NULL) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "no server address"); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "no server address"); return VALKEY_ERR; } @@ -1351,8 +1347,7 @@ int valkeyClusterUpdateSlotmap(valkeyClusterContext *cc) { } if (flag_err_not_set) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "no valid server address"); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "no valid server address"); } return VALKEY_ERR; @@ -1427,8 +1422,8 @@ void valkeyClusterFree(valkeyClusterContext *cc) { static int _valkeyClusterConnect2(valkeyClusterContext *cc) { if (cc->nodes == NULL || dictSize(cc->nodes) == 0) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "servers address does not set up"); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "servers address does not set up"); return VALKEY_ERR; } @@ -1519,7 +1514,7 @@ int valkeyClusterSetOptionAddNode(valkeyClusterContext *cc, const char *addr) { char *p; if ((p = strrchr(addr, IP_PORT_SEPARATOR)) == NULL) { - __valkeyClusterSetError( + valkeyClusterSetError( cc, VALKEY_ERR_OTHER, "server address is incorrect, port separator missing."); return VALKEY_ERR; @@ -1527,7 +1522,7 @@ int valkeyClusterSetOptionAddNode(valkeyClusterContext *cc, const char *addr) { // p includes separator if (p - addr <= 0) { /* length until separator */ - __valkeyClusterSetError( + valkeyClusterSetError( cc, VALKEY_ERR_OTHER, "server address is incorrect, address part missing."); return VALKEY_ERR; @@ -1540,7 +1535,7 @@ int valkeyClusterSetOptionAddNode(valkeyClusterContext *cc, const char *addr) { p++; // remove separator character if (strlen(p) <= 0) { - __valkeyClusterSetError( + valkeyClusterSetError( cc, VALKEY_ERR_OTHER, "server address is incorrect, port part missing."); goto error; @@ -1548,8 +1543,8 @@ int valkeyClusterSetOptionAddNode(valkeyClusterContext *cc, const char *addr) { port = vk_atoi(p, strlen(p)); if (port <= 0) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "server port is incorrect"); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "server port is incorrect"); goto error; } @@ -1580,7 +1575,7 @@ int valkeyClusterSetOptionAddNode(valkeyClusterContext *cc, const char *addr) { return VALKEY_OK; oom: - __valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); + valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); // passthrough error: @@ -1606,14 +1601,14 @@ int valkeyClusterSetOptionAddNodes(valkeyClusterContext *cc, address = sdssplitlen(addrs, strlen(addrs), CLUSTER_ADDRESS_SEPARATOR, strlen(CLUSTER_ADDRESS_SEPARATOR), &address_count); if (address == NULL) { - __valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); + valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); return VALKEY_ERR; } if (address_count <= 0) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "invalid server addresses (example format: " - "127.0.0.1:1234,127.0.0.2:5678)"); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "invalid server addresses (example format: " + "127.0.0.1:1234,127.0.0.2:5678)"); sdsfreesplitres(address, address_count); return VALKEY_ERR; } @@ -1734,7 +1729,7 @@ int valkeyClusterSetOptionConnectTimeout(valkeyClusterContext *cc, if (cc->connect_timeout == NULL) { cc->connect_timeout = vk_malloc(sizeof(struct timeval)); if (cc->connect_timeout == NULL) { - __valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); + valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); return VALKEY_ERR; } } @@ -1757,7 +1752,7 @@ int valkeyClusterSetOptionTimeout(valkeyClusterContext *cc, if (cc->command_timeout == NULL) { cc->command_timeout = vk_malloc(sizeof(struct timeval)); if (cc->command_timeout == NULL) { - __valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); + valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); return VALKEY_ERR; } } @@ -1842,7 +1837,7 @@ valkeyContext *ctx_get_by_node(valkeyClusterContext *cc, } if (cc->ssl && cc->ssl_init_fn(c, cc->ssl) != VALKEY_OK) { - __valkeyClusterSetError(cc, c->err, c->errstr); + valkeyClusterSetError(cc, c->err, c->errstr); } authenticate(cc, c); // err and errstr handled in function @@ -1862,7 +1857,7 @@ valkeyContext *ctx_get_by_node(valkeyClusterContext *cc, c = valkeyConnectWithOptions(&options); if (c == NULL) { - __valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); + valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); return NULL; } @@ -1871,13 +1866,13 @@ valkeyContext *ctx_get_by_node(valkeyClusterContext *cc, } if (c->err) { - __valkeyClusterSetError(cc, c->err, c->errstr); + valkeyClusterSetError(cc, c->err, c->errstr); valkeyFree(c); return NULL; } if (cc->ssl && cc->ssl_init_fn(c, cc->ssl) != VALKEY_OK) { - __valkeyClusterSetError(cc, c->err, c->errstr); + valkeyClusterSetError(cc, c->err, c->errstr); valkeyFree(c); return NULL; } @@ -1899,18 +1894,18 @@ static valkeyClusterNode *node_get_by_table(valkeyClusterContext *cc, } if (slot_num >= VALKEYCLUSTER_SLOTS) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "invalid slot"); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "invalid slot"); return NULL; } if (cc->table == NULL) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "slotmap not available"); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "slotmap not available"); return NULL; } if (cc->table[slot_num] == NULL) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "slot not served by any node"); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "slot not served by any node"); return NULL; } @@ -1942,13 +1937,13 @@ static int __valkeyClusterAppendCommand(valkeyClusterContext *cc, if (c == NULL) { return VALKEY_ERR; } else if (c->err) { - __valkeyClusterSetError(cc, c->err, c->errstr); + valkeyClusterSetError(cc, c->err, c->errstr); return VALKEY_ERR; } if (valkeyAppendFormattedCommand(c, command->cmd, command->clen) != VALKEY_OK) { - __valkeyClusterSetError(cc, c->err, c->errstr); + valkeyClusterSetError(cc, c->err, c->errstr); return VALKEY_ERR; } @@ -1976,12 +1971,12 @@ static int __valkeyClusterGetReplyFromNode(valkeyClusterContext *cc, cc->retry_count = 0; } } - __valkeyClusterSetError(cc, c->err, c->errstr); + valkeyClusterSetError(cc, c->err, c->errstr); return VALKEY_ERR; } if (valkeyGetReply(c, reply) != VALKEY_OK) { - __valkeyClusterSetError(cc, c->err, c->errstr); + valkeyClusterSetError(cc, c->err, c->errstr); return VALKEY_ERR; } @@ -2022,8 +2017,7 @@ static valkeyClusterNode *getNodeFromRedirectReply(valkeyClusterContext *cc, goto oom; } if (part_len != 3) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "failed to parse redirect"); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "failed to parse redirect"); goto done; } @@ -2035,16 +2029,16 @@ static valkeyClusterNode *getNodeFromRedirectReply(valkeyClusterContext *cc, /* Find the last occurance of the port separator since * IPv6 addresses can contain ':' */ if ((p = strrchr(part[2], IP_PORT_SEPARATOR)) == NULL) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "port separator missing in redirect"); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "port separator missing in redirect"); goto done; } // p includes separator /* Empty endpoint not supported yet */ if (p - part[2] == 0) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "endpoint missing in redirect"); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "endpoint missing in redirect"); goto done; } @@ -2085,7 +2079,7 @@ static valkeyClusterNode *getNodeFromRedirectReply(valkeyClusterContext *cc, return node; oom: - __valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); + valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); sdsfreesplitres(part, part_len); if (node != NULL) { sdsfree(node->addr); @@ -2135,7 +2129,7 @@ static void *valkey_cluster_command_execute(valkeyClusterContext *cc, if (c == NULL) { goto error; } else if (c->err) { - __valkeyClusterSetError(cc, c->err, c->errstr); + valkeyClusterSetError(cc, c->err, c->errstr); goto error; } } @@ -2145,7 +2139,7 @@ static void *valkey_cluster_command_execute(valkeyClusterContext *cc, if (valkeyAppendFormattedCommand(c, command->cmd, command->clen) != VALKEY_OK) { - __valkeyClusterSetError(cc, c->err, c->errstr); + valkeyClusterSetError(cc, c->err, c->errstr); goto error; } @@ -2157,7 +2151,7 @@ static void *valkey_cluster_command_execute(valkeyClusterContext *cc, } if (valkeyGetReply(c, &reply) != VALKEY_OK) { - __valkeyClusterSetError(cc, c->err, c->errstr); + valkeyClusterSetError(cc, c->err, c->errstr); /* We may need to update the slotmap if this node is removed from the * cluster, but the current request may have already timed out so we * schedule it for later. */ @@ -2170,8 +2164,8 @@ static void *valkey_cluster_command_execute(valkeyClusterContext *cc, if (error_type > CLUSTER_NOT_ERR && error_type < CLUSTER_ERR_SENTINEL) { cc->retry_count++; if (cc->retry_count > cc->max_retry_count) { - __valkeyClusterSetError(cc, VALKEY_ERR_CLUSTER_TOO_MANY_RETRIES, - "too many cluster retries"); + valkeyClusterSetError(cc, VALKEY_ERR_CLUSTER_TOO_MANY_RETRIES, + "too many cluster retries"); goto error; } @@ -2211,7 +2205,7 @@ static void *valkey_cluster_command_execute(valkeyClusterContext *cc, if (c == NULL) { goto error; } else if (c->err) { - __valkeyClusterSetError(cc, c->err, c->errstr); + valkeyClusterSetError(cc, c->err, c->errstr); goto error; } @@ -2231,13 +2225,13 @@ static void *valkey_cluster_command_execute(valkeyClusterContext *cc, if (c == NULL) { goto error; } else if (c->err) { - __valkeyClusterSetError(cc, c->err, c->errstr); + valkeyClusterSetError(cc, c->err, c->errstr); goto error; } reply = valkeyCommand(c, VALKEY_COMMAND_ASKING); if (reply == NULL) { - __valkeyClusterSetError(cc, c->err, c->errstr); + valkeyClusterSetError(cc, c->err, c->errstr); goto error; } @@ -2295,15 +2289,15 @@ static int prepareCommand(valkeyClusterContext *cc, struct cmd *command) { valkey_parse_cmd(command); if (command->result == CMD_PARSE_ENOMEM) { - __valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); + valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); return VALKEY_ERR; } if (command->result != CMD_PARSE_OK) { - __valkeyClusterSetError(cc, VALKEY_ERR_PROTOCOL, command->errstr); + valkeyClusterSetError(cc, VALKEY_ERR_PROTOCOL, command->errstr); return VALKEY_ERR; } if (vkarray_n(command->keys) <= 0) { - __valkeyClusterSetError( + valkeyClusterSetError( cc, VALKEY_ERR_OTHER, "No keys in command(must have keys for valkey cluster mode)"); return VALKEY_ERR; @@ -2378,7 +2372,7 @@ void *valkeyClusterFormattedCommand(valkeyClusterContext *cc, char *cmd, return reply; oom: - __valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); + valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); // passthrough error: @@ -2403,10 +2397,10 @@ void *valkeyClustervCommand(valkeyClusterContext *cc, const char *format, len = valkeyvFormatCommand(&cmd, format, ap); if (len == -1) { - __valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); + valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); return NULL; } else if (len == -2) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "Invalid format string"); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "Invalid format string"); return NULL; } @@ -2441,7 +2435,7 @@ void *valkeyClusterCommandToNode(valkeyClusterContext *cc, if (c == NULL) { return NULL; } else if (c->err) { - __valkeyClusterSetError(cc, c->err, c->errstr); + valkeyClusterSetError(cc, c->err, c->errstr); return NULL; } @@ -2455,7 +2449,7 @@ void *valkeyClusterCommandToNode(valkeyClusterContext *cc, va_end(ap); if (ret != VALKEY_OK) { - __valkeyClusterSetError(cc, c->err, c->errstr); + valkeyClusterSetError(cc, c->err, c->errstr); return NULL; } @@ -2467,7 +2461,7 @@ void *valkeyClusterCommandToNode(valkeyClusterContext *cc, } if (valkeyGetReply(c, &reply) != VALKEY_OK) { - __valkeyClusterSetError(cc, c->err, c->errstr); + valkeyClusterSetError(cc, c->err, c->errstr); if (c->err != VALKEY_ERR_OOM) cc->need_update_route = 1; return NULL; @@ -2493,7 +2487,7 @@ void *valkeyClusterCommandArgv(valkeyClusterContext *cc, int argc, len = valkeyFormatCommandArgv(&cmd, argc, argv, argvlen); if (len == -1) { - __valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); + valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); return NULL; } @@ -2539,7 +2533,7 @@ int valkeyClusterAppendFormattedCommand(valkeyClusterContext *cc, char *cmd, return VALKEY_OK; oom: - __valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); + valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); // passthrough error: @@ -2558,10 +2552,10 @@ int valkeyClustervAppendCommand(valkeyClusterContext *cc, const char *format, len = valkeyvFormatCommand(&cmd, format, ap); if (len == -1) { - __valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); + valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); return VALKEY_ERR; } else if (len == -2) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "Invalid format string"); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "Invalid format string"); return VALKEY_ERR; } @@ -2610,7 +2604,7 @@ int valkeyClusterAppendCommandToNode(valkeyClusterContext *cc, if (c == NULL) { return VALKEY_ERR; } else if (c->err) { - __valkeyClusterSetError(cc, c->err, c->errstr); + valkeyClusterSetError(cc, c->err, c->errstr); return VALKEY_ERR; } @@ -2622,13 +2616,13 @@ int valkeyClusterAppendCommandToNode(valkeyClusterContext *cc, if (len == -1) { goto oom; } else if (len == -2) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "Invalid format string"); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "Invalid format string"); return VALKEY_ERR; } // Append the command to the outgoing valkey buffer if (valkeyAppendFormattedCommand(c, cmd, len) != VALKEY_OK) { - __valkeyClusterSetError(cc, c->err, c->errstr); + valkeyClusterSetError(cc, c->err, c->errstr); vk_free(cmd); return VALKEY_ERR; } @@ -2652,7 +2646,7 @@ int valkeyClusterAppendCommandToNode(valkeyClusterContext *cc, oom: command_destroy(command); - __valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); + valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); return VALKEY_ERR; } @@ -2664,7 +2658,7 @@ int valkeyClusterAppendCommandArgv(valkeyClusterContext *cc, int argc, len = valkeyFormatCommandArgv(&cmd, argc, argv, argvlen); if (len == -1) { - __valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); + valkeyClusterSetError(cc, VALKEY_ERR_OOM, "Out of memory"); return VALKEY_ERR; } @@ -2777,8 +2771,8 @@ int valkeyClusterGetReply(valkeyClusterContext *cc, void **reply) { command = list_command->value; if (command == NULL) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "command in the requests list is null"); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "command in the requests list is null"); goto error; } @@ -2798,8 +2792,8 @@ int valkeyClusterGetReply(valkeyClusterContext *cc, void **reply) { return __valkeyClusterGetReplyFromNode(cc, dictGetEntryVal(de), reply); } else { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "command was sent to a now unknown node"); + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "command was sent to a now unknown node"); goto error; } } @@ -2857,8 +2851,8 @@ void valkeyClusterReset(valkeyClusterContext *cc) { /*############valkey cluster async############*/ -static void __valkeyClusterAsyncSetError(valkeyClusterAsyncContext *acc, - int type, const char *str) { +static void valkeyClusterAsyncSetError(valkeyClusterAsyncContext *acc, int type, + const char *str) { size_t len; @@ -2941,7 +2935,7 @@ valkeyAsyncContext *actx_get_by_node(valkeyClusterAsyncContext *acc, * the cluster node object. Return an error until done. * An example scenario is when sending a command from a command * callback, which has a NULL reply due to a disconnect. */ - __valkeyClusterAsyncSetError(acc, ac->c.err, ac->c.errstr); + valkeyClusterAsyncSetError(acc, ac->c.err, ac->c.errstr); return NULL; } } @@ -2949,8 +2943,8 @@ valkeyAsyncContext *actx_get_by_node(valkeyClusterAsyncContext *acc, // No async context exists, perform a connect if (node->host == NULL || node->port <= 0) { - __valkeyClusterAsyncSetError(acc, VALKEY_ERR_OTHER, - "node host or port is error"); + valkeyClusterAsyncSetError(acc, VALKEY_ERR_OTHER, + "node host or port is error"); return NULL; } @@ -2963,19 +2957,19 @@ valkeyAsyncContext *actx_get_by_node(valkeyClusterAsyncContext *acc, ac = valkeyAsyncConnectWithOptions(&options); if (ac == NULL) { - __valkeyClusterAsyncSetError(acc, VALKEY_ERR_OOM, "Out of memory"); + valkeyClusterAsyncSetError(acc, VALKEY_ERR_OOM, "Out of memory"); return NULL; } if (ac->err) { - __valkeyClusterAsyncSetError(acc, ac->err, ac->errstr); + valkeyClusterAsyncSetError(acc, ac->err, ac->errstr); valkeyAsyncFree(ac); return NULL; } if (acc->cc->ssl && acc->cc->ssl_init_fn(&ac->c, acc->cc->ssl) != VALKEY_OK) { - __valkeyClusterAsyncSetError(acc, ac->c.err, ac->c.errstr); + valkeyClusterAsyncSetError(acc, ac->c.err, ac->c.errstr); valkeyAsyncFree(ac); return NULL; } @@ -2991,7 +2985,7 @@ valkeyAsyncContext *actx_get_by_node(valkeyClusterAsyncContext *acc, } if (ret != VALKEY_OK) { - __valkeyClusterAsyncSetError(acc, ac->c.err, ac->c.errstr); + valkeyClusterAsyncSetError(acc, ac->c.err, ac->c.errstr); valkeyAsyncFree(ac); return NULL; } @@ -3000,8 +2994,8 @@ valkeyAsyncContext *actx_get_by_node(valkeyClusterAsyncContext *acc, if (acc->adapter) { ret = acc->attach_fn(ac, acc->adapter); if (ret != VALKEY_OK) { - __valkeyClusterAsyncSetError(acc, VALKEY_ERR_OTHER, - "Failed to attach event adapter"); + valkeyClusterAsyncSetError(acc, VALKEY_ERR_OTHER, + "Failed to attach event adapter"); valkeyAsyncFree(ac); return NULL; } @@ -3196,8 +3190,7 @@ static int updateSlotMapAsync(valkeyClusterAsyncContext *acc, if (ac == NULL) { if (acc->cc->nodes == NULL) { - __valkeyClusterAsyncSetError(acc, VALKEY_ERR_OTHER, - "no nodes added"); + valkeyClusterAsyncSetError(acc, VALKEY_ERR_OTHER, "no nodes added"); goto error; } @@ -3275,7 +3268,7 @@ static void valkeyClusterAsyncCallback(valkeyAsyncContext *ac, void *r, if (reply == NULL) { /* Copy reply specific error from libvalkey */ - __valkeyClusterAsyncSetError(acc, ac->err, ac->errstr); + valkeyClusterAsyncSetError(acc, ac->err, ac->errstr); node = (valkeyClusterNode *)ac->data; if (node == NULL) @@ -3295,9 +3288,8 @@ static void valkeyClusterAsyncCallback(valkeyAsyncContext *ac, void *r, cad->retry_count++; if (cad->retry_count > cc->max_retry_count) { cad->retry_count = 0; - __valkeyClusterAsyncSetError(acc, - VALKEY_ERR_CLUSTER_TOO_MANY_RETRIES, - "too many cluster retries"); + valkeyClusterAsyncSetError(acc, VALKEY_ERR_CLUSTER_TOO_MANY_RETRIES, + "too many cluster retries"); goto done; } @@ -3309,7 +3301,7 @@ static void valkeyClusterAsyncCallback(valkeyAsyncContext *ac, void *r, node = getNodeFromRedirectReply(cc, reply, &slot); if (node == NULL) { - __valkeyClusterAsyncSetError(acc, cc->err, cc->errstr); + valkeyClusterAsyncSetError(acc, cc->err, cc->errstr); goto done; } /* Update the slot mapping entry for this slot. */ @@ -3322,7 +3314,7 @@ static void valkeyClusterAsyncCallback(valkeyAsyncContext *ac, void *r, case CLUSTER_ERR_ASK: node = getNodeFromRedirectReply(cc, reply, NULL); if (node == NULL) { - __valkeyClusterAsyncSetError(acc, cc->err, cc->errstr); + valkeyClusterAsyncSetError(acc, cc->err, cc->errstr); goto done; } @@ -3430,7 +3422,7 @@ int valkeyClusterAsyncFormattedCommand(valkeyClusterAsyncContext *acc, command->clen = len; if (prepareCommand(cc, command) != VALKEY_OK) { - __valkeyClusterAsyncSetError(acc, cc->err, cc->errstr); + valkeyClusterAsyncSetError(acc, cc->err, cc->errstr); goto error; } @@ -3440,7 +3432,7 @@ int valkeyClusterAsyncFormattedCommand(valkeyClusterAsyncContext *acc, throttledUpdateSlotMapAsync(acc, NULL); /* node_get_by_table() has set the error on cc. */ - __valkeyClusterAsyncSetError(acc, cc->err, cc->errstr); + valkeyClusterAsyncSetError(acc, cc->err, cc->errstr); goto error; } @@ -3468,7 +3460,7 @@ int valkeyClusterAsyncFormattedCommand(valkeyClusterAsyncContext *acc, return VALKEY_OK; oom: - __valkeyClusterAsyncSetError(acc, VALKEY_ERR_OOM, "Out of memory"); + valkeyClusterAsyncSetError(acc, VALKEY_ERR_OOM, "Out of memory"); // passthrough error: @@ -3535,7 +3527,7 @@ int valkeyClusterAsyncFormattedCommandToNode(valkeyClusterAsyncContext *acc, return VALKEY_OK; oom: - __valkeyClusterAsyncSetError(acc, VALKEY_ERR_OTHER, "Out of memory"); + valkeyClusterAsyncSetError(acc, VALKEY_ERR_OTHER, "Out of memory"); // passthrough error: @@ -3556,11 +3548,11 @@ int valkeyClustervAsyncCommand(valkeyClusterAsyncContext *acc, len = valkeyvFormatCommand(&cmd, format, ap); if (len == -1) { - __valkeyClusterAsyncSetError(acc, VALKEY_ERR_OOM, "Out of memory"); + valkeyClusterAsyncSetError(acc, VALKEY_ERR_OOM, "Out of memory"); return VALKEY_ERR; } else if (len == -2) { - __valkeyClusterAsyncSetError(acc, VALKEY_ERR_OTHER, - "Invalid format string"); + valkeyClusterAsyncSetError(acc, VALKEY_ERR_OTHER, + "Invalid format string"); return VALKEY_ERR; } @@ -3599,11 +3591,11 @@ int valkeyClusterAsyncCommandToNode(valkeyClusterAsyncContext *acc, va_end(ap); if (len == -1) { - __valkeyClusterAsyncSetError(acc, VALKEY_ERR_OTHER, "Out of memory"); + valkeyClusterAsyncSetError(acc, VALKEY_ERR_OTHER, "Out of memory"); return VALKEY_ERR; } else if (len == -2) { - __valkeyClusterAsyncSetError(acc, VALKEY_ERR_OTHER, - "Invalid format string"); + valkeyClusterAsyncSetError(acc, VALKEY_ERR_OTHER, + "Invalid format string"); return VALKEY_ERR; } @@ -3623,7 +3615,7 @@ int valkeyClusterAsyncCommandArgv(valkeyClusterAsyncContext *acc, len = valkeyFormatCommandArgv(&cmd, argc, argv, argvlen); if (len == -1) { - __valkeyClusterAsyncSetError(acc, VALKEY_ERR_OOM, "Out of memory"); + valkeyClusterAsyncSetError(acc, VALKEY_ERR_OOM, "Out of memory"); return VALKEY_ERR; } @@ -3647,7 +3639,7 @@ int valkeyClusterAsyncCommandArgvToNode(valkeyClusterAsyncContext *acc, len = valkeyFormatCommandArgv(&cmd, argc, argv, argvlen); if (len == -1) { - __valkeyClusterAsyncSetError(acc, VALKEY_ERR_OOM, "Out of memory"); + valkeyClusterAsyncSetError(acc, VALKEY_ERR_OOM, "Out of memory"); return VALKEY_ERR; } From 302b1e3c81002a7c620930afdc2833ac69dbfcd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Svensson?= Date: Fri, 21 Jun 2024 11:49:51 +0200 Subject: [PATCH 3/7] Rename __valkeyClusterGetReplyFromNode() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Svensson --- src/valkeycluster.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/valkeycluster.c b/src/valkeycluster.c index 31dba522..fa2f2c7a 100644 --- a/src/valkeycluster.c +++ b/src/valkeycluster.c @@ -1952,9 +1952,9 @@ static int __valkeyClusterAppendCommand(valkeyClusterContext *cc, /* Helper functions for the valkeyClusterGetReply* family of functions. */ -static int __valkeyClusterGetReplyFromNode(valkeyClusterContext *cc, - valkeyClusterNode *node, - void **reply) { +static int valkeyClusterGetReplyFromNode(valkeyClusterContext *cc, + valkeyClusterNode *node, + void **reply) { valkeyContext *c; if (cc == NULL || node == NULL || reply == NULL) @@ -1998,7 +1998,7 @@ static int __valkeyClusterGetReply(valkeyClusterContext *cc, int slot_num, return VALKEY_ERR; } - return __valkeyClusterGetReplyFromNode(cc, node, reply); + return valkeyClusterGetReplyFromNode(cc, node, reply); } /* Parses a MOVED or ASK error reply and returns the destination node. The slot @@ -2789,8 +2789,8 @@ int valkeyClusterGetReply(valkeyClusterContext *cc, void **reply) { de = dictFind(cc->nodes, command->node_addr); if (de != NULL) { listDelNode(cc->requests, list_command); - return __valkeyClusterGetReplyFromNode(cc, dictGetEntryVal(de), - reply); + return valkeyClusterGetReplyFromNode(cc, dictGetEntryVal(de), + reply); } else { valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "command was sent to a now unknown node"); From 2d69f3d322621fa3042312a82a947d02f8bed613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Svensson?= Date: Fri, 21 Jun 2024 11:59:32 +0200 Subject: [PATCH 4/7] Rename __valkeyClusterAppendCommand() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Svensson --- src/valkeycluster.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/valkeycluster.c b/src/valkeycluster.c index fa2f2c7a..302480cd 100644 --- a/src/valkeycluster.c +++ b/src/valkeycluster.c @@ -1918,8 +1918,8 @@ static valkeyClusterNode *node_get_by_table(valkeyClusterContext *cc, * is used, you need to call valkeyGetReply yourself to retrieve * the reply (or replies in pub/sub). */ -static int __valkeyClusterAppendCommand(valkeyClusterContext *cc, - struct cmd *command) { +static int valkeyClusterAppendCommandInternal(valkeyClusterContext *cc, + struct cmd *command) { valkeyClusterNode *node; valkeyContext *c = NULL; @@ -2521,7 +2521,7 @@ int valkeyClusterAppendFormattedCommand(valkeyClusterContext *cc, char *cmd, goto error; } - if (__valkeyClusterAppendCommand(cc, command) != VALKEY_OK) { + if (valkeyClusterAppendCommandInternal(cc, command) != VALKEY_OK) { goto error; } From 32a06bf5375bfd0f5db23b47a43927904a676eb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Svensson?= Date: Fri, 21 Jun 2024 12:09:19 +0200 Subject: [PATCH 5/7] Remove internal func _valkeyClusterConnect2() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Svensson --- src/valkeycluster.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/valkeycluster.c b/src/valkeycluster.c index 302480cd..dbee8f82 100644 --- a/src/valkeycluster.c +++ b/src/valkeycluster.c @@ -1416,20 +1416,6 @@ void valkeyClusterFree(valkeyClusterContext *cc) { vk_free(cc); } -/* Connect to a Valkey cluster. On error the field error in the returned - * context will be set to the return value of the error function. - * When no set of reply functions is given, the default set will be used. */ -static int _valkeyClusterConnect2(valkeyClusterContext *cc) { - - if (cc->nodes == NULL || dictSize(cc->nodes) == 0) { - valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "servers address does not set up"); - return VALKEY_ERR; - } - - return valkeyClusterUpdateSlotmap(cc); -} - /* Connect to a Valkey cluster. On error the field error in the returned * context will be set to the return value of the error function. * When no set of reply functions is given, the default set will be used. */ @@ -1817,7 +1803,12 @@ int valkeyClusterConnect2(valkeyClusterContext *cc) { return VALKEY_ERR; } - return _valkeyClusterConnect2(cc); + if (cc->nodes == NULL || dictSize(cc->nodes) == 0) { + valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "server address not configured"); + return VALKEY_ERR; + } + return valkeyClusterUpdateSlotmap(cc); } valkeyContext *ctx_get_by_node(valkeyClusterContext *cc, From 0cc4f654fe3d0b956e8d740d3e7f7991f60ba21a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Svensson?= Date: Fri, 21 Jun 2024 12:15:25 +0200 Subject: [PATCH 6/7] Remove internal func __valkeyClusterGetReply() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Svensson --- src/valkeycluster.c | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/src/valkeycluster.c b/src/valkeycluster.c index dbee8f82..e397f7e9 100644 --- a/src/valkeycluster.c +++ b/src/valkeycluster.c @@ -1977,21 +1977,6 @@ static int valkeyClusterGetReplyFromNode(valkeyClusterContext *cc, return VALKEY_OK; } -static int __valkeyClusterGetReply(valkeyClusterContext *cc, int slot_num, - void **reply) { - valkeyClusterNode *node; - - if (cc == NULL || slot_num < 0 || reply == NULL) - return VALKEY_ERR; - - node = node_get_by_table(cc, (uint32_t)slot_num); - if (node == NULL) { - return VALKEY_ERR; - } - - return valkeyClusterGetReplyFromNode(cc, node, reply); -} - /* Parses a MOVED or ASK error reply and returns the destination node. The slot * is returned by pointer, if provided. */ static valkeyClusterNode *getNodeFromRedirectReply(valkeyClusterContext *cc, @@ -2770,27 +2755,27 @@ int valkeyClusterGetReply(valkeyClusterContext *cc, void **reply) { /* Get reply when the command was sent via slot */ slot_num = command->slot_num; if (slot_num >= 0) { + valkeyClusterNode *node; + if ((node = node_get_by_table(cc, (uint32_t)slot_num)) == NULL) + goto error; + listDelNode(cc->requests, list_command); - return __valkeyClusterGetReply(cc, slot_num, reply); + return valkeyClusterGetReplyFromNode(cc, node, reply); } /* Get reply when the command was sent to a given node */ if (command->node_addr != NULL) { - dictEntry *de; - - de = dictFind(cc->nodes, command->node_addr); - if (de != NULL) { - listDelNode(cc->requests, list_command); - return valkeyClusterGetReplyFromNode(cc, dictGetEntryVal(de), - reply); - } else { + dictEntry *de = dictFind(cc->nodes, command->node_addr); + if (de == NULL) { valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "command was sent to a now unknown node"); goto error; } + + listDelNode(cc->requests, list_command); + return valkeyClusterGetReplyFromNode(cc, dictGetEntryVal(de), reply); } error: - listDelNode(cc->requests, list_command); return VALKEY_ERR; } From f76825ce2172940950523ab9d93f84e40c5ab398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Svensson?= Date: Fri, 21 Jun 2024 13:15:17 +0200 Subject: [PATCH 7/7] Rename internal func _valkeyClusterConnect() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Svensson --- src/valkeycluster.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/valkeycluster.c b/src/valkeycluster.c index e397f7e9..47158437 100644 --- a/src/valkeycluster.c +++ b/src/valkeycluster.c @@ -1416,21 +1416,12 @@ void valkeyClusterFree(valkeyClusterContext *cc) { vk_free(cc); } -/* Connect to a Valkey cluster. On error the field error in the returned - * context will be set to the return value of the error function. - * When no set of reply functions is given, the default set will be used. */ -static valkeyClusterContext *_valkeyClusterConnect(valkeyClusterContext *cc, - const char *addrs) { - - int ret; - - ret = valkeyClusterSetOptionAddNodes(cc, addrs); - if (ret != VALKEY_OK) { +static valkeyClusterContext * +valkeyClusterConnectInternal(valkeyClusterContext *cc, const char *addrs) { + if (valkeyClusterSetOptionAddNodes(cc, addrs) != VALKEY_OK) { return cc; } - valkeyClusterUpdateSlotmap(cc); - return cc; } @@ -1445,7 +1436,7 @@ valkeyClusterContext *valkeyClusterConnect(const char *addrs, int flags) { cc->flags = flags; - return _valkeyClusterConnect(cc, addrs); + return valkeyClusterConnectInternal(cc, addrs); } valkeyClusterContext *valkeyClusterConnectWithTimeout(const char *addrs, @@ -1470,7 +1461,7 @@ valkeyClusterContext *valkeyClusterConnectWithTimeout(const char *addrs, memcpy(cc->connect_timeout, &tv, sizeof(struct timeval)); - return _valkeyClusterConnect(cc, addrs); + return valkeyClusterConnectInternal(cc, addrs); } int valkeyClusterSetOptionAddNode(valkeyClusterContext *cc, const char *addr) {