From 6ce9fef1e98e8564e73ec4082c67e5049076ef7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Svensson?= Date: Tue, 11 Jun 2024 11:42:46 +0200 Subject: [PATCH] Format libvalkeycluster code after renaming --- libvalkeycluster/adapters/ae.h | 2 +- libvalkeycluster/adapters/glib.h | 2 +- libvalkeycluster/adapters/libev.h | 2 +- libvalkeycluster/adapters/libevent.h | 2 +- libvalkeycluster/adapters/libuv.h | 2 +- libvalkeycluster/adlist.c | 2 +- libvalkeycluster/dict.c | 2 +- libvalkeycluster/examples/src/example.c | 5 +- libvalkeycluster/examples/src/example_async.c | 12 +- libvalkeycluster/examples/src/example_tls.c | 9 +- libvalkeycluster/tests/clusterclient_async.c | 4 +- .../tests/clusterclient_reconnect_async.c | 7 +- libvalkeycluster/tests/ct_async.c | 10 +- libvalkeycluster/tests/ct_async_glib.c | 2 +- libvalkeycluster/tests/ct_async_libev.c | 4 +- libvalkeycluster/tests/ct_async_libuv.c | 4 +- libvalkeycluster/tests/ct_commands.c | 20 +- libvalkeycluster/tests/ct_connection.c | 4 +- libvalkeycluster/tests/ct_connection_ipv6.c | 2 +- .../tests/ct_out_of_memory_handling.c | 18 +- libvalkeycluster/tests/ct_pipeline.c | 11 +- libvalkeycluster/tests/ct_specific_nodes.c | 38 +- libvalkeycluster/tests/main_async_tls.c | 6 +- libvalkeycluster/tests/main_tls.c | 5 +- libvalkeycluster/tests/test_utils.h | 14 +- libvalkeycluster/tests/ut_parse_cmd.c | 8 +- libvalkeycluster/valkeycluster.c | 335 ++++++++++-------- libvalkeycluster/valkeycluster.h | 118 +++--- libvalkeycluster/valkeycluster_ssl.c | 4 +- libvalkeycluster/valkeycluster_ssl.h | 2 +- libvalkeycluster/vkarray.c | 2 +- libvalkeycluster/vkutil.c | 2 +- 32 files changed, 351 insertions(+), 309 deletions(-) diff --git a/libvalkeycluster/adapters/ae.h b/libvalkeycluster/adapters/ae.h index ed26162d..9e188802 100644 --- a/libvalkeycluster/adapters/ae.h +++ b/libvalkeycluster/adapters/ae.h @@ -39,7 +39,7 @@ static int valkeyAeAttach_link(valkeyAsyncContext *ac, void *base) { } static int valkeyClusterAeAttach(aeEventLoop *loop, - valkeyClusterAsyncContext *acc) { + valkeyClusterAsyncContext *acc) { if (acc == NULL || loop == NULL) { return VALKEY_ERR; diff --git a/libvalkeycluster/adapters/glib.h b/libvalkeycluster/adapters/glib.h index 5cd2749f..96eeeae9 100644 --- a/libvalkeycluster/adapters/glib.h +++ b/libvalkeycluster/adapters/glib.h @@ -47,7 +47,7 @@ static int valkeyGlibAttach_link(valkeyAsyncContext *ac, void *adapter) { } static int valkeyClusterGlibAttach(valkeyClusterAsyncContext *acc, - valkeyClusterGlibAdapter *adapter) { + valkeyClusterGlibAdapter *adapter) { if (acc == NULL || adapter == NULL) { return VALKEY_ERR; } diff --git a/libvalkeycluster/adapters/libev.h b/libvalkeycluster/adapters/libev.h index 54b95afd..77d20141 100644 --- a/libvalkeycluster/adapters/libev.h +++ b/libvalkeycluster/adapters/libev.h @@ -39,7 +39,7 @@ static int valkeyLibevAttach_link(valkeyAsyncContext *ac, void *loop) { } static int valkeyClusterLibevAttach(valkeyClusterAsyncContext *acc, - struct ev_loop *loop) { + struct ev_loop *loop) { if (loop == NULL || acc == NULL) { return VALKEY_ERR; } diff --git a/libvalkeycluster/adapters/libevent.h b/libvalkeycluster/adapters/libevent.h index ff5604d7..818eb7c0 100644 --- a/libvalkeycluster/adapters/libevent.h +++ b/libvalkeycluster/adapters/libevent.h @@ -39,7 +39,7 @@ static int valkeyLibeventAttach_link(valkeyAsyncContext *ac, void *base) { } static int valkeyClusterLibeventAttach(valkeyClusterAsyncContext *acc, - struct event_base *base) { + struct event_base *base) { if (acc == NULL || base == NULL) { return VALKEY_ERR; diff --git a/libvalkeycluster/adapters/libuv.h b/libvalkeycluster/adapters/libuv.h index 9f59769a..2150f9e4 100644 --- a/libvalkeycluster/adapters/libuv.h +++ b/libvalkeycluster/adapters/libuv.h @@ -39,7 +39,7 @@ static int valkeyLibuvAttach_link(valkeyAsyncContext *ac, void *loop) { } static int valkeyClusterLibuvAttach(valkeyClusterAsyncContext *acc, - uv_loop_t *loop) { + uv_loop_t *loop) { if (acc == NULL || loop == NULL) { return VALKEY_ERR; diff --git a/libvalkeycluster/adlist.c b/libvalkeycluster/adlist.c index 50e5243f..d25e9ce4 100644 --- a/libvalkeycluster/adlist.c +++ b/libvalkeycluster/adlist.c @@ -27,8 +27,8 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include #include +#include #include "adlist.h" #include "vkutil.h" diff --git a/libvalkeycluster/dict.c b/libvalkeycluster/dict.c index bc98a2a5..d793cd47 100644 --- a/libvalkeycluster/dict.c +++ b/libvalkeycluster/dict.c @@ -34,9 +34,9 @@ */ #include -#include #include #include +#include #include "dict.h" diff --git a/libvalkeycluster/examples/src/example.c b/libvalkeycluster/examples/src/example.c index d3ad9f85..518f8928 100644 --- a/libvalkeycluster/examples/src/example.c +++ b/libvalkeycluster/examples/src/example.c @@ -1,6 +1,6 @@ -#include #include #include +#include int main(int argc, char **argv) { UNUSED(argc); @@ -23,7 +23,8 @@ int main(int argc, char **argv) { printf("SET: %s\n", reply->str); freeReplyObject(reply); - valkeyReply *reply2 = (valkeyReply *)valkeyClusterCommand(cc, "GET %s", "key"); + valkeyReply *reply2 = + (valkeyReply *)valkeyClusterCommand(cc, "GET %s", "key"); printf("GET: %s\n", reply2->str); freeReplyObject(reply2); diff --git a/libvalkeycluster/examples/src/example_async.c b/libvalkeycluster/examples/src/example_async.c index df2a564b..82cb220e 100644 --- a/libvalkeycluster/examples/src/example_async.c +++ b/libvalkeycluster/examples/src/example_async.c @@ -1,7 +1,7 @@ -#include -#include #include #include +#include +#include void getCallback(valkeyClusterAsyncContext *cc, void *r, void *privdata) { valkeyReply *reply = (valkeyReply *)r; @@ -60,25 +60,25 @@ int main(int argc, char **argv) { int status; status = valkeyClusterAsyncCommand(cc, setCallback, (char *)"THE_ID", - "SET %s %s", "key", "value"); + "SET %s %s", "key", "value"); if (status != VALKEY_OK) { printf("error: err=%d errstr=%s\n", cc->err, cc->errstr); } status = valkeyClusterAsyncCommand(cc, getCallback, (char *)"THE_ID", - "GET %s", "key"); + "GET %s", "key"); if (status != VALKEY_OK) { printf("error: err=%d errstr=%s\n", cc->err, cc->errstr); } status = valkeyClusterAsyncCommand(cc, setCallback, (char *)"THE_ID", - "SET %s %s", "key2", "value2"); + "SET %s %s", "key2", "value2"); if (status != VALKEY_OK) { printf("error: err=%d errstr=%s\n", cc->err, cc->errstr); } status = valkeyClusterAsyncCommand(cc, getCallback, (char *)"THE_ID", - "GET %s", "key2"); + "GET %s", "key2"); if (status != VALKEY_OK) { printf("error: err=%d errstr=%s\n", cc->err, cc->errstr); } diff --git a/libvalkeycluster/examples/src/example_tls.c b/libvalkeycluster/examples/src/example_tls.c index 75cc591c..820a42a2 100644 --- a/libvalkeycluster/examples/src/example_tls.c +++ b/libvalkeycluster/examples/src/example_tls.c @@ -1,9 +1,9 @@ +#include +#include #include #include #include #include -#include -#include #define CLUSTER_NODE_TLS "127.0.0.1:7301" @@ -16,7 +16,7 @@ int main(int argc, char **argv) { valkeyInitOpenSSL(); ssl = valkeyCreateSSLContext("ca.crt", NULL, "client.crt", "client.key", - NULL, &ssl_error); + NULL, &ssl_error); if (!ssl) { printf("SSL Context error: %s\n", valkeySSLContextGetError(ssl_error)); exit(1); @@ -46,7 +46,8 @@ int main(int argc, char **argv) { printf("SET: %s\n", reply->str); freeReplyObject(reply); - valkeyReply *reply2 = (valkeyReply *)valkeyClusterCommand(cc, "GET %s", "key"); + valkeyReply *reply2 = + (valkeyReply *)valkeyClusterCommand(cc, "GET %s", "key"); if (!reply2) { printf("Reply missing: %s\n", cc->errstr); exit(-1); diff --git a/libvalkeycluster/tests/clusterclient_async.c b/libvalkeycluster/tests/clusterclient_async.c index 3a35a199..8f19589a 100644 --- a/libvalkeycluster/tests/clusterclient_async.c +++ b/libvalkeycluster/tests/clusterclient_async.c @@ -34,8 +34,8 @@ */ #include "adapters/libevent.h" -#include "valkeycluster.h" #include "test_utils.h" +#include "valkeycluster.h" #include #include #include @@ -83,7 +83,7 @@ void replyCallback(valkeyClusterAsyncContext *acc, void *r, void *privdata) { if (resend_failed_cmd) { printf("resend '%s'\n", cmd_history[cmd_id]); if (valkeyClusterAsyncCommand(acc, replyCallback, (void *)cmd_id, - cmd_history[cmd_id]) != VALKEY_OK) + cmd_history[cmd_id]) != VALKEY_OK) printf("send error\n"); return; } diff --git a/libvalkeycluster/tests/clusterclient_reconnect_async.c b/libvalkeycluster/tests/clusterclient_reconnect_async.c index e6b6b8de..e0ed7618 100644 --- a/libvalkeycluster/tests/clusterclient_reconnect_async.c +++ b/libvalkeycluster/tests/clusterclient_reconnect_async.c @@ -10,8 +10,8 @@ */ #include "adapters/libevent.h" -#include "valkeycluster.h" #include "test_utils.h" +#include "valkeycluster.h" #include #include #include @@ -29,7 +29,8 @@ void connectToValkey(valkeyClusterAsyncContext *acc) { int status = valkeyClusterConnect2(acc->cc); if (status == VALKEY_OK) { // cluster mode - } else if (acc->cc->err && strcmp(acc->cc->errstr, VALKEY_ENOCLUSTER) == 0) { + } else if (acc->cc->err && + strcmp(acc->cc->errstr, VALKEY_ENOCLUSTER) == 0) { printf("[no cluster]\n"); acc->cc->err = 0; memset(acc->cc->errstr, '\0', strlen(acc->cc->errstr)); @@ -81,7 +82,7 @@ void sendNextCommand(int fd, short kind, void *arg) { // coverity[tainted_scalar] int status = valkeyClusterAsyncCommandToNode(acc, node, replyCallback, - NULL, command); + NULL, command); ASSERT_MSG(status == VALKEY_OK, acc->errstr); } else { // disconnect if nothing is left to read from stdin diff --git a/libvalkeycluster/tests/ct_async.c b/libvalkeycluster/tests/ct_async.c index af8789e9..27eae289 100644 --- a/libvalkeycluster/tests/ct_async.c +++ b/libvalkeycluster/tests/ct_async.c @@ -1,6 +1,6 @@ #include "adapters/libevent.h" -#include "valkeycluster.h" #include "test_utils.h" +#include "valkeycluster.h" #include #include #include @@ -48,20 +48,20 @@ void eventCallback(const valkeyClusterContext *cc, int event, void *privdata) { if (event == VALKEYCLUSTER_EVENT_READY) { int status; status = valkeyClusterAsyncCommand(acc, setCallback, (char *)"ID", - "SET key12345 value"); + "SET key12345 value"); ASSERT_MSG(status == VALKEY_OK, acc->errstr); /* This command will trigger a disconnect in its reply callback. */ status = valkeyClusterAsyncCommand(acc, getCallback, (char *)"ID", - "GET key12345"); + "GET key12345"); ASSERT_MSG(status == VALKEY_OK, acc->errstr); status = valkeyClusterAsyncCommand(acc, setCallback, (char *)"ID", - "SET key23456 value2"); + "SET key23456 value2"); ASSERT_MSG(status == VALKEY_OK, acc->errstr); status = valkeyClusterAsyncCommand(acc, getCallback, (char *)"ID", - "GET key23456"); + "GET key23456"); ASSERT_MSG(status == VALKEY_OK, acc->errstr); } } diff --git a/libvalkeycluster/tests/ct_async_glib.c b/libvalkeycluster/tests/ct_async_glib.c index 44bd160c..fb1609f4 100644 --- a/libvalkeycluster/tests/ct_async_glib.c +++ b/libvalkeycluster/tests/ct_async_glib.c @@ -1,6 +1,6 @@ #include "adapters/glib.h" -#include "valkeycluster.h" #include "test_utils.h" +#include "valkeycluster.h" #include #define CLUSTER_NODE "127.0.0.1:7000" diff --git a/libvalkeycluster/tests/ct_async_libev.c b/libvalkeycluster/tests/ct_async_libev.c index 59663e86..27559e5b 100644 --- a/libvalkeycluster/tests/ct_async_libev.c +++ b/libvalkeycluster/tests/ct_async_libev.c @@ -1,6 +1,6 @@ #include "adapters/libev.h" -#include "valkeycluster.h" #include "test_utils.h" +#include "valkeycluster.h" #include #define CLUSTER_NODE "127.0.0.1:7000" @@ -47,7 +47,7 @@ int main(int argc, char **argv) { valkeyClusterAsyncSetDisconnectCallback(acc, disconnectCallback); status = valkeyClusterAsyncCommand(acc, setCallback, (char *)"ID", - "SET key value"); + "SET key value"); ASSERT_MSG(status == VALKEY_OK, acc->errstr); status = diff --git a/libvalkeycluster/tests/ct_async_libuv.c b/libvalkeycluster/tests/ct_async_libuv.c index beeb17c8..8b9e9148 100644 --- a/libvalkeycluster/tests/ct_async_libuv.c +++ b/libvalkeycluster/tests/ct_async_libuv.c @@ -1,6 +1,6 @@ #include "adapters/libuv.h" -#include "valkeycluster.h" #include "test_utils.h" +#include "valkeycluster.h" #include #define CLUSTER_NODE "127.0.0.1:7000" @@ -48,7 +48,7 @@ int main(int argc, char **argv) { valkeyClusterAsyncSetDisconnectCallback(acc, disconnectCallback); status = valkeyClusterAsyncCommand(acc, setCallback, (char *)"ID", - "SET key value"); + "SET key value"); ASSERT_MSG(status == VALKEY_OK, acc->errstr); status = diff --git a/libvalkeycluster/tests/ct_commands.c b/libvalkeycluster/tests/ct_commands.c index 33acaaec..5281f7f6 100644 --- a/libvalkeycluster/tests/ct_commands.c +++ b/libvalkeycluster/tests/ct_commands.c @@ -1,5 +1,5 @@ -#include "valkeycluster.h" #include "test_utils.h" +#include "valkeycluster.h" #include "win32.h" #include #include @@ -26,7 +26,8 @@ void test_exists(valkeyClusterContext *cc) { CHECK_REPLY_OK(cc, reply); freeReplyObject(reply); - reply = (valkeyReply *)valkeyClusterCommand(cc, "EXISTS key1 key2 nosuchkey"); + reply = + (valkeyReply *)valkeyClusterCommand(cc, "EXISTS key1 key2 nosuchkey"); CHECK_REPLY_INT(cc, reply, 2); freeReplyObject(reply); } @@ -118,8 +119,8 @@ void test_hset_hget_hdel_hexists(valkeyClusterContext *cc) { freeReplyObject(reply); // Set second hash field - reply = - (valkeyReply *)valkeyClusterCommand(cc, "HSET myhash field3 hsetvalue3"); + reply = (valkeyReply *)valkeyClusterCommand( + cc, "HSET myhash field3 hsetvalue3"); CHECK_REPLY_INT(cc, reply, 1); // Set 1 field freeReplyObject(reply); @@ -179,7 +180,7 @@ void test_eval(valkeyClusterContext *cc) { // Single key, string response reply = (valkeyReply *)valkeyClusterCommand(cc, "eval %s 1 %s", - "return KEYS[1]", "key1"); + "return KEYS[1]", "key1"); CHECK_REPLY_STR(cc, reply, "key1"); freeReplyObject(reply); @@ -328,12 +329,14 @@ void test_xgroup(valkeyClusterContext *cc) { CHECK_REPLY_TYPE(r, VALKEY_REPLY_INTEGER); freeReplyObject(r); - r = valkeyClusterCommand(cc, "XGROUP CREATE mystream consumer-group-name 0"); + r = valkeyClusterCommand(cc, + "XGROUP CREATE mystream consumer-group-name 0"); CHECK_REPLY_OK(cc, r); freeReplyObject(r); /* Attempting to create an already existing group gives error */ - r = valkeyClusterCommand(cc, "XGROUP CREATE mystream consumer-group-name 0"); + r = valkeyClusterCommand(cc, + "XGROUP CREATE mystream consumer-group-name 0"); CHECK_REPLY_ERROR(cc, r, "BUSYGROUP"); freeReplyObject(r); @@ -382,7 +385,8 @@ void test_xinfo(valkeyClusterContext *cc) { CHECK_REPLY_TYPE(r, VALKEY_REPLY_ARRAY); freeReplyObject(r); - r = valkeyClusterCommand(cc, "XINFO CONSUMERS mystream consumer-group-name"); + r = valkeyClusterCommand(cc, + "XINFO CONSUMERS mystream consumer-group-name"); CHECK_REPLY_TYPE(r, VALKEY_REPLY_ARRAY); freeReplyObject(r); } diff --git a/libvalkeycluster/tests/ct_connection.c b/libvalkeycluster/tests/ct_connection.c index 1dd00c80..feefdc29 100644 --- a/libvalkeycluster/tests/ct_connection.c +++ b/libvalkeycluster/tests/ct_connection.c @@ -1,6 +1,6 @@ #include "adapters/libevent.h" -#include "valkeycluster.h" #include "test_utils.h" +#include "valkeycluster.h" #include #include @@ -588,7 +588,7 @@ void test_async_command_timeout(void) { ExpectedResult r = { .noreply = true, .errstr = "Timeout", .disconnect = true}; status = valkeyClusterAsyncCommandToNode(acc, node, commandCallback, &r, - "DEBUG SLEEP 0.2"); + "DEBUG SLEEP 0.2"); assert(status == VALKEY_OK); event_base_dispatch(base); diff --git a/libvalkeycluster/tests/ct_connection_ipv6.c b/libvalkeycluster/tests/ct_connection_ipv6.c index e97c7238..7facccd5 100644 --- a/libvalkeycluster/tests/ct_connection_ipv6.c +++ b/libvalkeycluster/tests/ct_connection_ipv6.c @@ -1,5 +1,5 @@ -#include "valkeycluster.h" #include "test_utils.h" +#include "valkeycluster.h" #include "win32.h" #include #include diff --git a/libvalkeycluster/tests/ct_out_of_memory_handling.c b/libvalkeycluster/tests/ct_out_of_memory_handling.c index d6b2d174..a7c7ba68 100644 --- a/libvalkeycluster/tests/ct_out_of_memory_handling.c +++ b/libvalkeycluster/tests/ct_out_of_memory_handling.c @@ -25,8 +25,8 @@ * and error of running with increased/decreased `i` until the edge is found. */ #include "adapters/libevent.h" -#include "valkeycluster.h" #include "test_utils.h" +#include "valkeycluster.h" #include "win32.h" #include #include @@ -397,13 +397,13 @@ void test_alloc_failure_handling(void) { /* Migrate slot */ reply = valkeyClusterCommandToNode(cc, srcNode, - "CLUSTER SETSLOT %d MIGRATING %s", - slot, replyDstId->str); + "CLUSTER SETSLOT %d MIGRATING %s", + slot, replyDstId->str); CHECK_REPLY_OK(cc, reply); freeReplyObject(reply); reply = valkeyClusterCommandToNode(cc, dstNode, - "CLUSTER SETSLOT %d IMPORTING %s", - slot, replySrcId->str); + "CLUSTER SETSLOT %d IMPORTING %s", + slot, replySrcId->str); CHECK_REPLY_OK(cc, reply); freeReplyObject(reply); reply = valkeyClusterCommandToNode( @@ -464,13 +464,13 @@ void test_alloc_failure_handling(void) { * during these final steps by allowing a high number of allocations. */ prepare_allocation_test(cc, 1000); reply = valkeyClusterCommandToNode(cc, dstNode, - "CLUSTER SETSLOT %d MIGRATING %s", - slot, replySrcId->str); + "CLUSTER SETSLOT %d MIGRATING %s", + slot, replySrcId->str); CHECK_REPLY_OK(cc, reply); freeReplyObject(reply); reply = valkeyClusterCommandToNode(cc, srcNode, - "CLUSTER SETSLOT %d IMPORTING %s", - slot, replyDstId->str); + "CLUSTER SETSLOT %d IMPORTING %s", + slot, replyDstId->str); CHECK_REPLY_OK(cc, reply); freeReplyObject(reply); reply = valkeyClusterCommandToNode( diff --git a/libvalkeycluster/tests/ct_pipeline.c b/libvalkeycluster/tests/ct_pipeline.c index 65d39999..a38c7dd8 100644 --- a/libvalkeycluster/tests/ct_pipeline.c +++ b/libvalkeycluster/tests/ct_pipeline.c @@ -1,6 +1,6 @@ #include "adapters/libevent.h" -#include "valkeycluster.h" #include "test_utils.h" +#include "valkeycluster.h" #include #include @@ -69,7 +69,8 @@ void test_pipeline_with_multinode_commands(void) { status = valkeyClusterConnect2(cc); ASSERT_MSG(status == VALKEY_OK, cc->errstr); - status = valkeyClusterAppendCommand(cc, "MSET key1 Hello key2 World key3 !"); + status = + valkeyClusterAppendCommand(cc, "MSET key1 Hello key2 World key3 !"); ASSERT_MSG(status == VALKEY_OK, cc->errstr); status = valkeyClusterAppendCommand(cc, "MGET key1 key2 key3"); @@ -139,11 +140,13 @@ void test_async_pipeline(void) { assert(status == VALKEY_OK); ExpectedResult r1 = {.type = VALKEY_REPLY_STATUS, .str = "OK"}; - status = valkeyClusterAsyncCommand(acc, commandCallback, &r1, "SET foo six"); + status = + valkeyClusterAsyncCommand(acc, commandCallback, &r1, "SET foo six"); ASSERT_MSG(status == VALKEY_OK, acc->errstr); ExpectedResult r2 = {.type = VALKEY_REPLY_STATUS, .str = "OK"}; - status = valkeyClusterAsyncCommand(acc, commandCallback, &r2, "SET bar ten"); + status = + valkeyClusterAsyncCommand(acc, commandCallback, &r2, "SET bar ten"); ASSERT_MSG(status == VALKEY_OK, acc->errstr); ExpectedResult r3 = {.type = VALKEY_REPLY_STRING, .str = "six"}; diff --git a/libvalkeycluster/tests/ct_specific_nodes.c b/libvalkeycluster/tests/ct_specific_nodes.c index 6119c59a..b30c0e85 100644 --- a/libvalkeycluster/tests/ct_specific_nodes.c +++ b/libvalkeycluster/tests/ct_specific_nodes.c @@ -1,6 +1,6 @@ #include "adapters/libevent.h" -#include "valkeycluster.h" #include "test_utils.h" +#include "valkeycluster.h" #include #include @@ -120,8 +120,8 @@ void test_streams(valkeyClusterContext *cc) { freeReplyObject(reply); /* Read from the stream */ - reply = - valkeyClusterCommandToNode(cc, node, "XREAD COUNT 2 STREAMS mystream 0"); + reply = valkeyClusterCommandToNode(cc, node, + "XREAD COUNT 2 STREAMS mystream 0"); CHECK_REPLY_ARRAY(cc, reply, 1); /* Reply from a single stream */ /* Verify the reply from stream */ @@ -154,7 +154,7 @@ void test_streams(valkeyClusterContext *cc) { /* Create a consumer group */ reply = valkeyClusterCommandToNode(cc, node, - "XGROUP CREATE mystream mygroup1 0"); + "XGROUP CREATE mystream mygroup1 0"); CHECK_REPLY_OK(cc, reply); freeReplyObject(reply); @@ -167,9 +167,10 @@ void test_streams(valkeyClusterContext *cc) { } /* Blocking read of consumer group */ - reply = valkeyClusterCommandToNode(cc, node, - "XREADGROUP GROUP mygroup1 myconsumer123 " - "COUNT 2 BLOCK 200 STREAMS mystream 0"); + reply = + valkeyClusterCommandToNode(cc, node, + "XREADGROUP GROUP mygroup1 myconsumer123 " + "COUNT 2 BLOCK 200 STREAMS mystream 0"); CHECK_REPLY_TYPE(reply, VALKEY_REPLY_ARRAY); freeReplyObject(reply); @@ -344,7 +345,7 @@ void test_async_to_single_node(void) { ExpectedResult r1 = {.type = VALKEY_REPLY_INTEGER, .disconnect = true}; status = valkeyClusterAsyncCommandToNode(acc, node, commandCallback, &r1, - "DBSIZE"); + "DBSIZE"); ASSERT_MSG(status == VALKEY_OK, acc->errstr); event_base_dispatch(base); @@ -416,9 +417,9 @@ void test_async_command_argv_to_single_node(void) { assert(node); ExpectedResult r1 = {.type = VALKEY_REPLY_INTEGER, .disconnect = true}; - status = valkeyClusterAsyncCommandArgvToNode(acc, node, commandCallback, &r1, - 1, (const char *[]){"DBSIZE"}, - (size_t[]){6}); + status = valkeyClusterAsyncCommandArgvToNode( + acc, node, commandCallback, &r1, 1, (const char *[]){"DBSIZE"}, + (size_t[]){6}); ASSERT_MSG(status == VALKEY_OK, acc->errstr); event_base_dispatch(base); @@ -452,15 +453,16 @@ void test_async_to_all_nodes(void) { valkeyClusterNode *node; while ((node = valkeyClusterNodeNext(&ni)) != NULL) { - status = valkeyClusterAsyncCommandToNode(acc, node, commandCallback, &r1, - "DBSIZE"); + status = valkeyClusterAsyncCommandToNode(acc, node, commandCallback, + &r1, "DBSIZE"); ASSERT_MSG(status == VALKEY_OK, acc->errstr); } // Normal command to trigger disconnect ExpectedResult r2 = { .type = VALKEY_REPLY_STATUS, .str = "OK", .disconnect = true}; - status = valkeyClusterAsyncCommand(acc, commandCallback, &r2, "SET foo bar"); + status = + valkeyClusterAsyncCommand(acc, commandCallback, &r2, "SET foo bar"); event_base_dispatch(base); @@ -490,24 +492,24 @@ void test_async_transaction(void) { ExpectedResult r1 = {.type = VALKEY_REPLY_STATUS, .str = "OK"}; status = valkeyClusterAsyncCommandToNode(acc, node, commandCallback, &r1, - "MULTI"); + "MULTI"); ASSERT_MSG(status == VALKEY_OK, acc->errstr); ExpectedResult r2 = {.type = VALKEY_REPLY_STATUS, .str = "QUEUED"}; status = valkeyClusterAsyncCommandToNode(acc, node, commandCallback, &r2, - "SET foo 99"); + "SET foo 99"); ASSERT_MSG(status == VALKEY_OK, acc->errstr); ExpectedResult r3 = {.type = VALKEY_REPLY_STATUS, .str = "QUEUED"}; status = valkeyClusterAsyncCommandToNode(acc, node, commandCallback, &r3, - "INCR foo"); + "INCR foo"); ASSERT_MSG(status == VALKEY_OK, acc->errstr); /* The EXEC command will return an array with result from 2 queued commands. */ ExpectedResult r4 = { .type = VALKEY_REPLY_ARRAY, .elements = 2, .disconnect = true}; status = valkeyClusterAsyncCommandToNode(acc, node, commandCallback, &r4, - "EXEC "); + "EXEC "); ASSERT_MSG(status == VALKEY_OK, acc->errstr); event_base_dispatch(base); diff --git a/libvalkeycluster/tests/main_async_tls.c b/libvalkeycluster/tests/main_async_tls.c index 75c204e7..f239e107 100644 --- a/libvalkeycluster/tests/main_async_tls.c +++ b/libvalkeycluster/tests/main_async_tls.c @@ -59,7 +59,7 @@ int main(int argc, char **argv) { valkeyInitOpenSSL(); ssl = valkeyCreateSSLContext("ca.crt", NULL, "client.crt", "client.key", - NULL, &ssl_error); + NULL, &ssl_error); if (!ssl) { printf("SSL Context error: %s\n", valkeySSLContextGetError(ssl_error)); exit(1); @@ -84,13 +84,13 @@ int main(int argc, char **argv) { int status; status = valkeyClusterAsyncCommand(acc, setCallback, (char *)"THE_ID", - "SET %s %s", "key", "value"); + "SET %s %s", "key", "value"); if (status != VALKEY_OK) { printf("error: err=%d errstr=%s\n", acc->err, acc->errstr); } status = valkeyClusterAsyncCommand(acc, getCallback, (char *)"THE_ID", - "GET %s", "key"); + "GET %s", "key"); if (status != VALKEY_OK) { printf("error: err=%d errstr=%s\n", acc->err, acc->errstr); } diff --git a/libvalkeycluster/tests/main_tls.c b/libvalkeycluster/tests/main_tls.c index 374c9ba5..d7e28476 100644 --- a/libvalkeycluster/tests/main_tls.c +++ b/libvalkeycluster/tests/main_tls.c @@ -14,7 +14,7 @@ int main(int argc, char **argv) { valkeyInitOpenSSL(); ssl = valkeyCreateSSLContext("ca.crt", NULL, "client.crt", "client.key", - NULL, &ssl_error); + NULL, &ssl_error); if (!ssl) { printf("SSL Context error: %s\n", valkeySSLContextGetError(ssl_error)); exit(1); @@ -43,7 +43,8 @@ int main(int argc, char **argv) { printf("SET: %s\n", reply->str); freeReplyObject(reply); - valkeyReply *reply2 = (valkeyReply *)valkeyClusterCommand(cc, "GET %s", "key"); + valkeyReply *reply2 = + (valkeyReply *)valkeyClusterCommand(cc, "GET %s", "key"); if (!reply2) { printf("Reply missing: %s\n", cc->errstr); exit(-1); diff --git a/libvalkeycluster/tests/test_utils.h b/libvalkeycluster/tests/test_utils.h index 04a66e0f..85dba3ae 100644 --- a/libvalkeycluster/tests/test_utils.h +++ b/libvalkeycluster/tests/test_utils.h @@ -18,7 +18,7 @@ #define CHECK_REPLY_STATUS(_ctx, _reply, _str) \ { \ CHECK_REPLY(_ctx, _reply); \ - CHECK_REPLY_TYPE(_reply, VALKEY_REPLY_STATUS); \ + CHECK_REPLY_TYPE(_reply, VALKEY_REPLY_STATUS); \ ASSERT_MSG((strcmp(_reply->str, _str) == 0), _ctx->errstr); \ } @@ -31,34 +31,34 @@ #define CHECK_REPLY_INT(_ctx, _reply, _value) \ { \ CHECK_REPLY(_ctx, _reply); \ - CHECK_REPLY_TYPE(_reply, VALKEY_REPLY_INTEGER); \ + CHECK_REPLY_TYPE(_reply, VALKEY_REPLY_INTEGER); \ ASSERT_MSG((_reply->integer == _value), _ctx->errstr); \ } #define CHECK_REPLY_STR(_ctx, _reply, _str) \ { \ CHECK_REPLY(_ctx, _reply); \ - CHECK_REPLY_TYPE(_reply, VALKEY_REPLY_STRING); \ + CHECK_REPLY_TYPE(_reply, VALKEY_REPLY_STRING); \ ASSERT_MSG((strcmp(_reply->str, _str) == 0), _ctx->errstr); \ } #define CHECK_REPLY_ARRAY(_ctx, _reply, _num_of_elements) \ { \ CHECK_REPLY(_ctx, _reply); \ - CHECK_REPLY_TYPE(_reply, VALKEY_REPLY_ARRAY); \ + CHECK_REPLY_TYPE(_reply, VALKEY_REPLY_ARRAY); \ ASSERT_MSG(_reply->elements == _num_of_elements, _ctx->errstr); \ } #define CHECK_REPLY_NIL(_ctx, _reply) \ { \ CHECK_REPLY(_ctx, _reply); \ - CHECK_REPLY_TYPE(_reply, VALKEY_REPLY_NIL); \ + CHECK_REPLY_TYPE(_reply, VALKEY_REPLY_NIL); \ } #define CHECK_REPLY_ERROR(_ctx, _reply, _str) \ { \ CHECK_REPLY(_ctx, _reply); \ - CHECK_REPLY_TYPE(_reply, VALKEY_REPLY_ERROR); \ + CHECK_REPLY_TYPE(_reply, VALKEY_REPLY_ERROR); \ ASSERT_MSG((strncmp(_reply->str, _str, strlen(_str)) == 0), \ _ctx->errstr); \ } @@ -73,5 +73,5 @@ struct valkeyClusterContext; -void load_valkey_version(valkeyClusterContext *cc); +void load_valkey_version(struct valkeyClusterContext *cc); int valkey_version_less_than(int major, int minor); diff --git a/libvalkeycluster/tests/ut_parse_cmd.c b/libvalkeycluster/tests/ut_parse_cmd.c index 4f5deb7d..8cb0f55c 100644 --- a/libvalkeycluster/tests/ut_parse_cmd.c +++ b/libvalkeycluster/tests/ut_parse_cmd.c @@ -1,9 +1,9 @@ /* Some unit tests that don't require Valkey to be running. */ #include "command.h" -#include "vkarray.h" -#include "valkeycluster.h" #include "test_utils.h" +#include "valkeycluster.h" +#include "vkarray.h" #include "win32.h" #include #include @@ -151,8 +151,8 @@ void test_valkey_parse_cmd_xreadgroup_ok(void) { void test_valkey_parse_cmd_xread_ok(void) { struct cmd *c = command_get(); - int len = valkeyFormatCommand(&c->cmd, - "XREAD BLOCK 42 STREAMS mystream another $ $"); + int len = valkeyFormatCommand( + &c->cmd, "XREAD BLOCK 42 STREAMS mystream another $ $"); ASSERT_MSG(len >= 0, "Format command error"); c->clen = len; valkey_parse_cmd(c); diff --git a/libvalkeycluster/valkeycluster.c b/libvalkeycluster/valkeycluster.c index 5ba32692..0977a218 100644 --- a/libvalkeycluster/valkeycluster.c +++ b/libvalkeycluster/valkeycluster.c @@ -34,16 +34,16 @@ #include #include #include -#include #include #include #include +#include #include "adlist.h" #include "command.h" #include "dict.h" -#include "vkarray.h" #include "valkeycluster.h" +#include "vkarray.h" #include "vkutil.h" #include "win32.h" @@ -198,7 +198,7 @@ static unsigned int keyHashSlot(char *key, int keylen) { } static void __valkeyClusterSetError(valkeyClusterContext *cc, int type, - const char *str) { + const char *str) { size_t len; if (cc == NULL) { @@ -226,8 +226,8 @@ static int cluster_reply_error_type(valkeyReply *reply) { if (reply->type == VALKEY_REPLY_ERROR) { if ((int)strlen(VALKEY_ERROR_MOVED) < reply->len && - memcmp(reply->str, VALKEY_ERROR_MOVED, strlen(VALKEY_ERROR_MOVED)) == - 0) { + memcmp(reply->str, VALKEY_ERROR_MOVED, + strlen(VALKEY_ERROR_MOVED)) == 0) { return CLUSTER_ERR_MOVED; } else if ((int)strlen(VALKEY_ERROR_ASK) < reply->len && memcmp(reply->str, VALKEY_ERROR_ASK, @@ -415,7 +415,7 @@ static int authenticate(valkeyClusterContext *cc, valkeyContext *c) { if (reply == NULL) { __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "Command AUTH reply error (NULL)"); + "Command AUTH reply error (NULL)"); goto error; } @@ -437,9 +437,9 @@ static int authenticate(valkeyClusterContext *cc, valkeyContext *c) { * Return a new node with the "cluster slots" command reply. */ static valkeyClusterNode *node_get_with_slots(valkeyClusterContext *cc, - valkeyReply *host_elem, - valkeyReply *port_elem, - uint8_t role) { + valkeyReply *host_elem, + valkeyReply *port_elem, + uint8_t role) { valkeyClusterNode *node = NULL; if (host_elem == NULL || port_elem == NULL) { @@ -448,22 +448,22 @@ 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."); + "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."); + "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."); + "Command(cluster slots) reply error: " + "node port is not valid."); goto error; } @@ -516,8 +516,8 @@ static valkeyClusterNode *node_get_with_slots(valkeyClusterContext *cc, * Return a new node with the "cluster nodes" command reply. */ static valkeyClusterNode *node_get_with_nodes(valkeyClusterContext *cc, - sds *node_infos, int info_count, - uint8_t role) { + sds *node_infos, int info_count, + uint8_t role) { char *p = NULL; valkeyClusterNode *node = NULL; @@ -658,14 +658,15 @@ 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"); + "two masters have the same name"); return VALKEY_ERR; } else if (node->role == VALKEY_ROLE_MASTER && node_old->role == VALKEY_ROLE_SLAVE) { @@ -748,17 +749,18 @@ 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."); + "Command(cluster slots) reply error: " + "reply is not an array."); goto error; } for (i = 0; i < reply->elements; i++) { elem_slots = reply->element[i]; - if (elem_slots->type != VALKEY_REPLY_ARRAY || elem_slots->elements < 3) { + 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."); + "Command(cluster slots) reply error: " + "first sub_reply is not an array."); goto error; } @@ -956,7 +958,7 @@ dict *parse_cluster_nodes(valkeyClusterContext *cc, char *str, int str_len, if (count_part < 8) { __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "split cluster nodes error"); + "split cluster nodes error"); goto error; } @@ -1136,8 +1138,8 @@ dict *parse_cluster_nodes(valkeyClusterContext *cc, char *str, int str_len, // add slave node else if ((flags & VALKEYCLUSTER_FLAG_ADD_SLAVE) && (role_len >= 5 && memcmp(role, "slave", 5) == 0)) { - slave = - node_get_with_nodes(cc, part, count_part, VALKEY_ROLE_SLAVE); + slave = node_get_with_nodes(cc, part, count_part, + VALKEY_ROLE_SLAVE); if (slave == NULL) { goto error; } @@ -1246,12 +1248,12 @@ static int handleClusterNodesReply(valkeyClusterContext *cc, valkeyContext *c) { if (result != VALKEY_OK) { if (c->err == VALKEY_ERR_TIMEOUT) { __valkeyClusterSetError(cc, c->err, - "Command (cluster nodes) reply error " - "(socket timeout)"); + "Command (cluster nodes) reply error " + "(socket timeout)"); } else { __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "Command (cluster nodes) reply error " - "(NULL)."); + "Command (cluster nodes) reply error " + "(NULL)."); } return VALKEY_ERR; } else if (reply->type != VALKEY_REPLY_STRING) { @@ -1259,8 +1261,8 @@ static int handleClusterNodesReply(valkeyClusterContext *cc, valkeyContext *c) { __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, reply->str); } else { __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "Command(cluster nodes) reply error: " - "type is not string."); + "Command(cluster nodes) reply error: " + "type is not string."); } freeReplyObject(reply); return VALKEY_ERR; @@ -1285,8 +1287,8 @@ static int clusterUpdateRouteHandleReply(valkeyClusterContext *cc, /** * Update route with the "cluster nodes" or "cluster slots" command reply. */ -static int cluster_update_route_by_addr(valkeyClusterContext *cc, const char *ip, - int port) { +static int cluster_update_route_by_addr(valkeyClusterContext *cc, + const char *ip, int port) { valkeyContext *c = NULL; if (cc == NULL) { @@ -1365,7 +1367,7 @@ static int updateNodesAndSlotmap(valkeyClusterContext *cc, dict *nodes) { valkeyClusterNode *master = dictGetEntryVal(de); if (master->role != VALKEY_ROLE_MASTER) { __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "Node role must be master"); + "Node role must be master"); goto error; } @@ -1381,13 +1383,13 @@ static int updateNodesAndSlotmap(valkeyClusterContext *cc, dict *nodes) { 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"); + "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"); + "Different node holds same slot"); goto error; } table[i] = master; @@ -1420,7 +1422,8 @@ static int updateNodesAndSlotmap(valkeyClusterContext *cc, dict *nodes) { cc->event_privdata); if (cc->route_version == 1) { /* Special event the first time the slotmap was updated. */ - cc->event_callback(cc, VALKEYCLUSTER_EVENT_READY, cc->event_privdata); + cc->event_callback(cc, VALKEYCLUSTER_EVENT_READY, + cc->event_privdata); } } cc->need_update_route = 0; @@ -1472,7 +1475,8 @@ 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; @@ -1548,7 +1552,7 @@ static int _valkeyClusterConnect2(valkeyClusterContext *cc) { if (cc->nodes == NULL || dictSize(cc->nodes) == 0) { __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "servers address does not set up"); + "servers address does not set up"); return VALKEY_ERR; } @@ -1559,7 +1563,7 @@ static int _valkeyClusterConnect2(valkeyClusterContext *cc) { * 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) { + const char *addrs) { int ret; @@ -1588,8 +1592,8 @@ valkeyClusterContext *valkeyClusterConnect(const char *addrs, int flags) { } valkeyClusterContext *valkeyClusterConnectWithTimeout(const char *addrs, - const struct timeval tv, - int flags) { + const struct timeval tv, + int flags) { valkeyClusterContext *cc; cc = valkeyClusterContextInit(); @@ -1669,7 +1673,7 @@ 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"); + "server port is incorrect"); goto error; } @@ -1712,7 +1716,8 @@ int valkeyClusterSetOptionAddNode(valkeyClusterContext *cc, const char *addr) { return VALKEY_ERR; } -int valkeyClusterSetOptionAddNodes(valkeyClusterContext *cc, const char *addrs) { +int valkeyClusterSetOptionAddNodes(valkeyClusterContext *cc, + const char *addrs) { int ret; sds *address = NULL; int address_count = 0; @@ -1731,8 +1736,8 @@ int valkeyClusterSetOptionAddNodes(valkeyClusterContext *cc, const char *addrs) if (address_count <= 0) { __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "invalid server addresses (example format: " - "127.0.0.1:1234,127.0.0.2:5678)"); + "invalid server addresses (example format: " + "127.0.0.1:1234,127.0.0.2:5678)"); sdsfreesplitres(address, address_count); return VALKEY_ERR; } @@ -1773,7 +1778,7 @@ int valkeyClusterSetOptionConnectNonBlock(valkeyClusterContext *cc) { * empty string or a null pointer. */ int valkeyClusterSetOptionUsername(valkeyClusterContext *cc, - const char *username) { + const char *username) { if (cc == NULL) { return VALKEY_ERR; } @@ -1799,7 +1804,7 @@ int valkeyClusterSetOptionUsername(valkeyClusterContext *cc, * Valkey instances. (See Valkey AUTH command) */ int valkeyClusterSetOptionPassword(valkeyClusterContext *cc, - const char *password) { + const char *password) { if (cc == NULL) { return VALKEY_ERR; @@ -1855,7 +1860,7 @@ int valkeyClusterSetOptionRouteUseSlots(valkeyClusterContext *cc) { } int valkeyClusterSetOptionConnectTimeout(valkeyClusterContext *cc, - const struct timeval tv) { + const struct timeval tv) { if (cc == NULL) { return VALKEY_ERR; @@ -1875,7 +1880,7 @@ int valkeyClusterSetOptionConnectTimeout(valkeyClusterContext *cc, } int valkeyClusterSetOptionTimeout(valkeyClusterContext *cc, - const struct timeval tv) { + const struct timeval tv) { if (cc == NULL) { return VALKEY_ERR; } @@ -1936,7 +1941,7 @@ int valkeyClusterSetOptionTimeout(valkeyClusterContext *cc, } int valkeyClusterSetOptionMaxRetry(valkeyClusterContext *cc, - int max_retry_count) { + int max_retry_count) { if (cc == NULL || max_retry_count <= 0) { return VALKEY_ERR; } @@ -1955,7 +1960,8 @@ int valkeyClusterConnect2(valkeyClusterContext *cc) { return _valkeyClusterConnect2(cc); } -valkeyContext *ctx_get_by_node(valkeyClusterContext *cc, valkeyClusterNode *node) { +valkeyContext *ctx_get_by_node(valkeyClusterContext *cc, + valkeyClusterNode *node) { valkeyContext *c = NULL; if (node == NULL) { return NULL; @@ -2022,7 +2028,7 @@ valkeyContext *ctx_get_by_node(valkeyClusterContext *cc, valkeyClusterNode *node } static valkeyClusterNode *node_get_by_table(valkeyClusterContext *cc, - uint32_t slot_num) { + uint32_t slot_num) { if (cc == NULL) { return NULL; } @@ -2039,7 +2045,7 @@ static valkeyClusterNode *node_get_by_table(valkeyClusterContext *cc, if (cc->table[slot_num] == NULL) { __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "slot not served by any node"); + "slot not served by any node"); return NULL; } @@ -2053,7 +2059,7 @@ static valkeyClusterNode *node_get_by_table(valkeyClusterContext *cc, * the reply (or replies in pub/sub). */ static int __valkeyClusterAppendCommand(valkeyClusterContext *cc, - struct cmd *command) { + struct cmd *command) { valkeyClusterNode *node; valkeyContext *c = NULL; @@ -2087,8 +2093,8 @@ static int __valkeyClusterAppendCommand(valkeyClusterContext *cc, /* Helper functions for the valkeyClusterGetReply* family of functions. */ static int __valkeyClusterGetReplyFromNode(valkeyClusterContext *cc, - valkeyClusterNode *node, - void **reply) { + valkeyClusterNode *node, + void **reply) { valkeyContext *c; if (cc == NULL || node == NULL || reply == NULL) @@ -2121,7 +2127,7 @@ static int __valkeyClusterGetReplyFromNode(valkeyClusterContext *cc, } static int __valkeyClusterGetReply(valkeyClusterContext *cc, int slot_num, - void **reply) { + void **reply) { valkeyClusterNode *node; if (cc == NULL || slot_num < 0 || reply == NULL) @@ -2138,8 +2144,8 @@ static int __valkeyClusterGetReply(valkeyClusterContext *cc, int slot_num, /* 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, - valkeyReply *reply, - int *slotptr) { + valkeyReply *reply, + int *slotptr) { valkeyClusterNode *node = NULL; sds *part = NULL; int part_len = 0; @@ -2151,7 +2157,8 @@ 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; } @@ -2164,7 +2171,7 @@ static valkeyClusterNode *getNodeFromRedirectReply(valkeyClusterContext *cc, * IPv6 addresses can contain ':' */ if ((p = strrchr(part[2], IP_PORT_SEPARATOR)) == NULL) { __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "port separator missing in redirect"); + "port separator missing in redirect"); goto done; } // p includes separator @@ -2172,7 +2179,7 @@ static valkeyClusterNode *getNodeFromRedirectReply(valkeyClusterContext *cc, /* Empty endpoint not supported yet */ if (p - part[2] == 0) { __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "endpoint missing in redirect"); + "endpoint missing in redirect"); goto done; } @@ -2225,7 +2232,7 @@ static valkeyClusterNode *getNodeFromRedirectReply(valkeyClusterContext *cc, } static void *valkey_cluster_command_execute(valkeyClusterContext *cc, - struct cmd *command) { + struct cmd *command) { void *reply = NULL; valkeyClusterNode *node; valkeyContext *c = NULL; @@ -2299,7 +2306,7 @@ static void *valkey_cluster_command_execute(valkeyClusterContext *cc, cc->retry_count++; if (cc->retry_count > cc->max_retry_count) { __valkeyClusterSetError(cc, VALKEY_ERR_CLUSTER_TOO_MANY_RETRIES, - "too many cluster retries"); + "too many cluster retries"); goto error; } @@ -2453,7 +2460,7 @@ static int command_pre_fragment(valkeyClusterContext *cc, struct cmd *command, if (slot_num < 0 || slot_num >= VALKEYCLUSTER_SLOTS) { __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "keyHashSlot return error"); + "keyHashSlot return error"); goto done; } @@ -2713,8 +2720,8 @@ static int command_pre_fragment(valkeyClusterContext *cc, struct cmd *command, return -1; // failing slot_num } -static void *command_post_fragment(valkeyClusterContext *cc, struct cmd *command, - hilist *commands) { +static void *command_post_fragment(valkeyClusterContext *cc, + struct cmd *command, hilist *commands) { struct cmd *sub_command; listNode *list_node; valkeyReply *reply = NULL, *sub_reply; @@ -2734,25 +2741,29 @@ static void *command_post_fragment(valkeyClusterContext *cc, struct cmd *command if (command->type == CMD_REQ_VALKEY_MGET) { if (reply->type != VALKEY_REPLY_ARRAY) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "reply type error"); + __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "reply type error"); return NULL; } } else if (command->type == CMD_REQ_VALKEY_DEL) { if (reply->type != VALKEY_REPLY_INTEGER) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "reply type error"); + __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "reply type error"); return NULL; } count += reply->integer; } else if (command->type == CMD_REQ_VALKEY_EXISTS) { if (reply->type != VALKEY_REPLY_INTEGER) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "reply type error"); + __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "reply type error"); return NULL; } count += reply->integer; } else if (command->type == CMD_REQ_VALKEY_MSET) { if (reply->type != VALKEY_REPLY_STATUS || reply->len != 2 || strcmp(reply->str, VALKEY_STATUS_OK) != 0) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "reply type error"); + __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "reply type error"); return NULL; } } else { @@ -2784,7 +2795,7 @@ static void *command_post_fragment(valkeyClusterContext *cc, struct cmd *command if (sub_reply == NULL) { freeReplyObject(reply); __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "sub reply is null"); + "sub reply is null"); return NULL; } @@ -2794,7 +2805,7 @@ static void *command_post_fragment(valkeyClusterContext *cc, struct cmd *command if (sub_reply->elements == 0) { freeReplyObject(reply); __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "sub reply elements error"); + "sub reply elements error"); return NULL; } @@ -2882,7 +2893,8 @@ static int command_format_by_slot(valkeyClusterContext *cc, struct cmd *command, } /* Deprecated function, replaced with valkeyClusterSetOptionMaxRetry() */ -void valkeyClusterSetMaxRedirect(valkeyClusterContext *cc, int max_retry_count) { +void valkeyClusterSetMaxRedirect(valkeyClusterContext *cc, + int max_retry_count) { if (cc == NULL || max_retry_count <= 0) { return; } @@ -2891,8 +2903,8 @@ void valkeyClusterSetMaxRedirect(valkeyClusterContext *cc, int max_retry_count) } int valkeyClusterSetConnectCallback(valkeyClusterContext *cc, - void(fn)(const valkeyContext *c, - int status)) { + void(fn)(const valkeyContext *c, + int status)) { if (cc->on_connect == NULL) { cc->on_connect = fn; return VALKEY_OK; @@ -2901,9 +2913,9 @@ int valkeyClusterSetConnectCallback(valkeyClusterContext *cc, } int valkeyClusterSetEventCallback(valkeyClusterContext *cc, - void(fn)(const valkeyClusterContext *cc, - int event, void *privdata), - void *privdata) { + void(fn)(const valkeyClusterContext *cc, + int event, void *privdata), + void *privdata) { if (cc->event_callback == NULL) { cc->event_callback = fn; cc->event_privdata = privdata; @@ -2913,7 +2925,7 @@ int valkeyClusterSetEventCallback(valkeyClusterContext *cc, } void *valkeyClusterFormattedCommand(valkeyClusterContext *cc, char *cmd, - int len) { + int len) { valkeyReply *reply = NULL; int slot_num; struct cmd *command = NULL, *sub_command; @@ -2949,7 +2961,8 @@ void *valkeyClusterFormattedCommand(valkeyClusterContext *cc, char *cmd, if (slot_num < 0) { goto error; } else if (slot_num >= VALKEYCLUSTER_SLOTS) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "slot_num is out of range"); + __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "slot_num is out of range"); goto error; } @@ -3008,7 +3021,7 @@ void *valkeyClusterFormattedCommand(valkeyClusterContext *cc, char *cmd, } void *valkeyClustervCommand(valkeyClusterContext *cc, const char *format, - va_list ap) { + va_list ap) { valkeyReply *reply; char *cmd; int len; @@ -3045,8 +3058,9 @@ void *valkeyClusterCommand(valkeyClusterContext *cc, const char *format, ...) { return reply; } -void *valkeyClusterCommandToNode(valkeyClusterContext *cc, valkeyClusterNode *node, - const char *format, ...) { +void *valkeyClusterCommandToNode(valkeyClusterContext *cc, + valkeyClusterNode *node, const char *format, + ...) { valkeyContext *c; va_list ap; int ret; @@ -3102,7 +3116,7 @@ void *valkeyClusterCommandToNode(valkeyClusterContext *cc, valkeyClusterNode *no } void *valkeyClusterCommandArgv(valkeyClusterContext *cc, int argc, - const char **argv, const size_t *argvlen) { + const char **argv, const size_t *argvlen) { valkeyReply *reply = NULL; char *cmd; int len; @@ -3121,7 +3135,7 @@ void *valkeyClusterCommandArgv(valkeyClusterContext *cc, int argc, } int valkeyClusterAppendFormattedCommand(valkeyClusterContext *cc, char *cmd, - int len) { + int len) { int slot_num; struct cmd *command = NULL, *sub_command; hilist *commands = NULL; @@ -3155,7 +3169,8 @@ int valkeyClusterAppendFormattedCommand(valkeyClusterContext *cc, char *cmd, if (slot_num < 0) { goto error; } else if (slot_num >= VALKEYCLUSTER_SLOTS) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "slot_num is out of range"); + __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "slot_num is out of range"); goto error; } @@ -3214,7 +3229,7 @@ int valkeyClusterAppendFormattedCommand(valkeyClusterContext *cc, char *cmd, } int valkeyClustervAppendCommand(valkeyClusterContext *cc, const char *format, - va_list ap) { + va_list ap) { int ret; char *cmd; int len; @@ -3236,7 +3251,7 @@ int valkeyClustervAppendCommand(valkeyClusterContext *cc, const char *format, } int valkeyClusterAppendCommand(valkeyClusterContext *cc, const char *format, - ...) { + ...) { int ret; va_list ap; @@ -3253,8 +3268,8 @@ int valkeyClusterAppendCommand(valkeyClusterContext *cc, const char *format, } int valkeyClusterAppendCommandToNode(valkeyClusterContext *cc, - valkeyClusterNode *node, const char *format, - ...) { + valkeyClusterNode *node, + const char *format, ...) { valkeyContext *c; va_list ap; struct cmd *command = NULL; @@ -3320,7 +3335,7 @@ int valkeyClusterAppendCommandToNode(valkeyClusterContext *cc, } int valkeyClusterAppendCommandArgv(valkeyClusterContext *cc, int argc, - const char **argv, const size_t *argvlen) { + const char **argv, const size_t *argvlen) { int ret; char *cmd; int len; @@ -3442,7 +3457,7 @@ 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"); + "command in the requests list is null"); goto error; } @@ -3460,10 +3475,10 @@ int valkeyClusterGetReply(valkeyClusterContext *cc, void **reply) { if (de != NULL) { listDelNode(cc->requests, list_command); return __valkeyClusterGetReplyFromNode(cc, dictGetEntryVal(de), - reply); + reply); } else { __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "command was sent to a now unknown node"); + "command was sent to a now unknown node"); goto error; } } @@ -3471,7 +3486,7 @@ int valkeyClusterGetReply(valkeyClusterContext *cc, void **reply) { commands = command->sub_commands; if (commands == NULL) { __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "sub_commands in command is null"); + "sub_commands in command is null"); goto error; } @@ -3483,14 +3498,15 @@ int valkeyClusterGetReply(valkeyClusterContext *cc, void **reply) { while ((list_sub_command = listNext(&li)) != NULL) { sub_command = list_sub_command->value; if (sub_command == NULL) { - __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, "sub_command is null"); + __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, + "sub_command is null"); goto error; } slot_num = sub_command->slot_num; if (slot_num < 0) { __valkeyClusterSetError(cc, VALKEY_ERR_OTHER, - "sub_command slot_num is less then zero"); + "sub_command slot_num is less then zero"); goto error; } @@ -3562,8 +3578,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; @@ -3628,7 +3644,7 @@ static void unlinkAsyncContextAndNode(void *data) { } valkeyAsyncContext *actx_get_by_node(valkeyClusterAsyncContext *acc, - valkeyClusterNode *node) { + valkeyClusterNode *node) { valkeyAsyncContext *ac; int ret; @@ -3655,7 +3671,7 @@ valkeyAsyncContext *actx_get_by_node(valkeyClusterAsyncContext *acc, if (node->host == NULL || node->port <= 0) { __valkeyClusterAsyncSetError(acc, VALKEY_ERR_OTHER, - "node host or port is error"); + "node host or port is error"); return NULL; } @@ -3689,10 +3705,10 @@ valkeyAsyncContext *actx_get_by_node(valkeyClusterAsyncContext *acc, if (acc->cc->password != NULL) { if (acc->cc->username != NULL) { ret = valkeyAsyncCommand(ac, NULL, NULL, "AUTH %s %s", - acc->cc->username, acc->cc->password); + acc->cc->username, acc->cc->password); } else { - ret = - valkeyAsyncCommand(ac, NULL, NULL, "AUTH %s", acc->cc->password); + ret = valkeyAsyncCommand(ac, NULL, NULL, "AUTH %s", + acc->cc->password); } if (ret != VALKEY_OK) { @@ -3706,7 +3722,7 @@ valkeyAsyncContext *actx_get_by_node(valkeyClusterAsyncContext *acc, ret = acc->attach_fn(ac, acc->adapter); if (ret != VALKEY_OK) { __valkeyClusterAsyncSetError(acc, VALKEY_ERR_OTHER, - "Failed to attach event adapter"); + "Failed to attach event adapter"); valkeyAsyncFree(ac); return NULL; } @@ -3714,8 +3730,7 @@ valkeyAsyncContext *actx_get_by_node(valkeyClusterAsyncContext *acc, if (acc->onConnect) { valkeyAsyncSetConnectCallback(ac, acc->onConnect); - } - else if (acc->onConnectNC) { + } else if (acc->onConnectNC) { valkeyAsyncSetConnectCallbackNC(ac, acc->onConnectNC); } @@ -3749,7 +3764,7 @@ valkeyClusterAsyncContext *valkeyClusterAsyncContextInit(void) { } valkeyClusterAsyncContext *valkeyClusterAsyncConnect(const char *addrs, - int flags) { + int flags) { valkeyClusterContext *cc; valkeyClusterAsyncContext *acc; @@ -3777,7 +3792,7 @@ int valkeyClusterAsyncConnect2(valkeyClusterAsyncContext *acc) { } int valkeyClusterAsyncSetConnectCallback(valkeyClusterAsyncContext *acc, - valkeyConnectCallback *fn) { + valkeyConnectCallback *fn) { if (acc->onConnect != NULL) return VALKEY_ERR; if (acc->onConnectNC != NULL) @@ -3787,7 +3802,7 @@ int valkeyClusterAsyncSetConnectCallback(valkeyClusterAsyncContext *acc, } int valkeyClusterAsyncSetConnectCallbackNC(valkeyClusterAsyncContext *acc, - valkeyConnectCallbackNC *fn) { + valkeyConnectCallbackNC *fn) { if (acc->onConnectNC != NULL || acc->onConnect != NULL) { return VALKEY_ERR; } @@ -3796,7 +3811,7 @@ int valkeyClusterAsyncSetConnectCallbackNC(valkeyClusterAsyncContext *acc, } int valkeyClusterAsyncSetDisconnectCallback(valkeyClusterAsyncContext *acc, - valkeyDisconnectCallback *fn) { + valkeyDisconnectCallback *fn) { if (acc->onDisconnect == NULL) { acc->onDisconnect = fn; return VALKEY_OK; @@ -3805,7 +3820,8 @@ int valkeyClusterAsyncSetDisconnectCallback(valkeyClusterAsyncContext *acc, } /* Reply callback function for CLUSTER SLOTS */ -void clusterSlotsReplyCallback(valkeyAsyncContext *ac, void *r, void *privdata) { +void clusterSlotsReplyCallback(valkeyAsyncContext *ac, void *r, + void *privdata) { UNUSED(ac); valkeyReply *reply = (valkeyReply *)r; valkeyClusterAsyncContext *acc = (valkeyClusterAsyncContext *)privdata; @@ -3825,7 +3841,8 @@ void clusterSlotsReplyCallback(valkeyAsyncContext *ac, void *r, void *privdata) } /* Reply callback function for CLUSTER NODES */ -void clusterNodesReplyCallback(valkeyAsyncContext *ac, void *r, void *privdata) { +void clusterNodesReplyCallback(valkeyAsyncContext *ac, void *r, + void *privdata) { UNUSED(ac); valkeyReply *reply = (valkeyReply *)r; valkeyClusterAsyncContext *acc = (valkeyClusterAsyncContext *)privdata; @@ -3900,7 +3917,8 @@ 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; } @@ -3919,10 +3937,10 @@ static int updateSlotMapAsync(valkeyClusterAsyncContext *acc, int status; if (acc->cc->flags & VALKEYCLUSTER_FLAG_ROUTE_USE_SLOTS) { status = valkeyAsyncCommand(ac, clusterSlotsReplyCallback, acc, - VALKEY_COMMAND_CLUSTER_SLOTS); + VALKEY_COMMAND_CLUSTER_SLOTS); } else { status = valkeyAsyncCommand(ac, clusterNodesReplyCallback, acc, - VALKEY_COMMAND_CLUSTER_NODES); + VALKEY_COMMAND_CLUSTER_NODES); } if (status == VALKEY_OK) { @@ -3946,7 +3964,7 @@ static void throttledUpdateSlotMapAsync(valkeyClusterAsyncContext *acc, } static void valkeyClusterAsyncCallback(valkeyAsyncContext *ac, void *r, - void *privdata) { + void *privdata) { int ret; valkeyReply *reply = r; cluster_async_data *cad = privdata; @@ -3998,8 +4016,9 @@ 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; } @@ -4034,7 +4053,8 @@ static void valkeyClusterAsyncCallback(valkeyAsyncContext *ac, void *r, goto done; } - ret = valkeyAsyncCommand(ac_retry, NULL, NULL, VALKEY_COMMAND_ASKING); + ret = + valkeyAsyncCommand(ac_retry, NULL, NULL, VALKEY_COMMAND_ASKING); if (ret != VALKEY_OK) { goto error; } @@ -4079,7 +4099,7 @@ static void valkeyClusterAsyncCallback(valkeyAsyncContext *ac, void *r, retry: ret = valkeyAsyncFormattedCommand(ac_retry, valkeyClusterAsyncCallback, cad, - command->cmd, command->clen); + command->cmd, command->clen); if (ret != VALKEY_OK) { goto error; } @@ -4092,8 +4112,8 @@ static void valkeyClusterAsyncCallback(valkeyAsyncContext *ac, void *r, } int valkeyClusterAsyncFormattedCommand(valkeyClusterAsyncContext *acc, - valkeyClusterCallbackFn *fn, - void *privdata, char *cmd, int len) { + valkeyClusterCallbackFn *fn, + void *privdata, char *cmd, int len) { valkeyClusterContext *cc; int status = VALKEY_OK; @@ -4146,7 +4166,7 @@ int valkeyClusterAsyncFormattedCommand(valkeyClusterAsyncContext *acc, goto error; } else if (slot_num >= VALKEYCLUSTER_SLOTS) { __valkeyClusterAsyncSetError(acc, VALKEY_ERR_OTHER, - "slot_num is out of range"); + "slot_num is out of range"); goto error; } @@ -4186,8 +4206,8 @@ int valkeyClusterAsyncFormattedCommand(valkeyClusterAsyncContext *acc, cad->callback = fn; cad->privdata = privdata; - status = valkeyAsyncFormattedCommand(ac, valkeyClusterAsyncCallback, cad, cmd, - len); + status = valkeyAsyncFormattedCommand(ac, valkeyClusterAsyncCallback, cad, + cmd, len); if (status != VALKEY_OK) { goto error; } @@ -4211,10 +4231,10 @@ int valkeyClusterAsyncFormattedCommand(valkeyClusterAsyncContext *acc, } int valkeyClusterAsyncFormattedCommandToNode(valkeyClusterAsyncContext *acc, - valkeyClusterNode *node, - valkeyClusterCallbackFn *fn, - void *privdata, char *cmd, - int len) { + valkeyClusterNode *node, + valkeyClusterCallbackFn *fn, + void *privdata, char *cmd, + int len) { valkeyClusterContext *cc; valkeyAsyncContext *ac; int status; @@ -4261,8 +4281,8 @@ int valkeyClusterAsyncFormattedCommandToNode(valkeyClusterAsyncContext *acc, cad->privdata = privdata; cad->retry_count = NO_RETRY; - status = valkeyAsyncFormattedCommand(ac, valkeyClusterAsyncCallback, cad, cmd, - len); + status = valkeyAsyncFormattedCommand(ac, valkeyClusterAsyncCallback, cad, + cmd, len); if (status != VALKEY_OK) goto error; @@ -4278,8 +4298,8 @@ int valkeyClusterAsyncFormattedCommandToNode(valkeyClusterAsyncContext *acc, } int valkeyClustervAsyncCommand(valkeyClusterAsyncContext *acc, - valkeyClusterCallbackFn *fn, void *privdata, - const char *format, va_list ap) { + valkeyClusterCallbackFn *fn, void *privdata, + const char *format, va_list ap) { int ret; char *cmd; int len; @@ -4294,7 +4314,7 @@ int valkeyClustervAsyncCommand(valkeyClusterAsyncContext *acc, return VALKEY_ERR; } else if (len == -2) { __valkeyClusterAsyncSetError(acc, VALKEY_ERR_OTHER, - "Invalid format string"); + "Invalid format string"); return VALKEY_ERR; } @@ -4306,8 +4326,8 @@ int valkeyClustervAsyncCommand(valkeyClusterAsyncContext *acc, } int valkeyClusterAsyncCommand(valkeyClusterAsyncContext *acc, - valkeyClusterCallbackFn *fn, void *privdata, - const char *format, ...) { + valkeyClusterCallbackFn *fn, void *privdata, + const char *format, ...) { int ret; va_list ap; @@ -4319,9 +4339,9 @@ int valkeyClusterAsyncCommand(valkeyClusterAsyncContext *acc, } int valkeyClusterAsyncCommandToNode(valkeyClusterAsyncContext *acc, - valkeyClusterNode *node, - valkeyClusterCallbackFn *fn, void *privdata, - const char *format, ...) { + valkeyClusterNode *node, + valkeyClusterCallbackFn *fn, void *privdata, + const char *format, ...) { int ret; va_list ap; int len; @@ -4337,20 +4357,20 @@ int valkeyClusterAsyncCommandToNode(valkeyClusterAsyncContext *acc, return VALKEY_ERR; } else if (len == -2) { __valkeyClusterAsyncSetError(acc, VALKEY_ERR_OTHER, - "Invalid format string"); + "Invalid format string"); return VALKEY_ERR; } ret = valkeyClusterAsyncFormattedCommandToNode(acc, node, fn, privdata, cmd, - len); + len); vk_free(cmd); return ret; } int valkeyClusterAsyncCommandArgv(valkeyClusterAsyncContext *acc, - valkeyClusterCallbackFn *fn, void *privdata, - int argc, const char **argv, - const size_t *argvlen) { + valkeyClusterCallbackFn *fn, void *privdata, + int argc, const char **argv, + const size_t *argvlen) { int ret; char *cmd; int len; @@ -4369,11 +4389,11 @@ int valkeyClusterAsyncCommandArgv(valkeyClusterAsyncContext *acc, } int valkeyClusterAsyncCommandArgvToNode(valkeyClusterAsyncContext *acc, - valkeyClusterNode *node, - valkeyClusterCallbackFn *fn, - void *privdata, int argc, - const char **argv, - const size_t *argvlen) { + valkeyClusterNode *node, + valkeyClusterCallbackFn *fn, + void *privdata, int argc, + const char **argv, + const size_t *argvlen) { int ret; char *cmd; @@ -4386,7 +4406,7 @@ int valkeyClusterAsyncCommandArgvToNode(valkeyClusterAsyncContext *acc, } ret = valkeyClusterAsyncFormattedCommandToNode(acc, node, fn, privdata, cmd, - len); + len); vk_free(cmd); @@ -4441,7 +4461,7 @@ void valkeyClusterAsyncFree(valkeyClusterAsyncContext *acc) { /* Initiate an iterator for iterating over current cluster nodes */ void valkeyClusterInitNodeIterator(valkeyClusterNodeIterator *iter, - valkeyClusterContext *cc) { + valkeyClusterContext *cc) { iter->cc = cc; iter->route_version = cc->route_version; dictInitIterator(&iter->di, cc->nodes); @@ -4477,6 +4497,7 @@ unsigned int valkeyClusterGetSlotByKey(char *key) { } /* Get node that handles given key string, which can include hash tags */ -valkeyClusterNode *valkeyClusterGetNodeByKey(valkeyClusterContext *cc, char *key) { +valkeyClusterNode *valkeyClusterGetNodeByKey(valkeyClusterContext *cc, + char *key) { return node_get_by_table(cc, keyHashSlot(key, strlen(key))); } diff --git a/libvalkeycluster/valkeycluster.h b/libvalkeycluster/valkeycluster.h index 4c38020c..a5c92fc7 100644 --- a/libvalkeycluster/valkeycluster.h +++ b/libvalkeycluster/valkeycluster.h @@ -77,8 +77,8 @@ struct valkeyClusterAsyncContext; typedef int(adapterAttachFn)(valkeyAsyncContext *, void *); typedef int(sslInitFn)(valkeyContext *, void *); -typedef void(valkeyClusterCallbackFn)(struct valkeyClusterAsyncContext *, void *, - void *); +typedef void(valkeyClusterCallbackFn)(struct valkeyClusterAsyncContext *, + void *, void *); typedef struct valkeyClusterNode { sds name; sds addr; @@ -122,8 +122,8 @@ typedef struct valkeyClusterContext { char *username; /* Authenticate using user */ char *password; /* Authentication password */ - struct dict *nodes; /* Known valkeyClusterNode's */ - uint64_t route_version; /* Increased when the node lookup table changes */ + struct dict *nodes; /* Known valkeyClusterNode's */ + uint64_t route_version; /* Increased when the node lookup table changes */ valkeyClusterNode **table; /* valkeyClusterNode lookup table */ struct hilist *requests; /* Outstanding commands (Pipelining) */ @@ -176,8 +176,8 @@ typedef struct valkeyClusterNodeIterator { valkeyClusterContext *valkeyClusterConnect(const char *addrs, int flags); valkeyClusterContext *valkeyClusterConnectWithTimeout(const char *addrs, - const struct timeval tv, - int flags); + const struct timeval tv, + int flags); int valkeyClusterConnect2(valkeyClusterContext *cc); valkeyClusterContext *valkeyClusterContextInit(void); @@ -191,20 +191,21 @@ int valkeyClusterSetOptionConnectBlock(valkeyClusterContext *cc); /* Deprecated function, option has no effect. */ int valkeyClusterSetOptionConnectNonBlock(valkeyClusterContext *cc); int valkeyClusterSetOptionUsername(valkeyClusterContext *cc, - const char *username); + const char *username); int valkeyClusterSetOptionPassword(valkeyClusterContext *cc, - const char *password); + const char *password); int valkeyClusterSetOptionParseSlaves(valkeyClusterContext *cc); int valkeyClusterSetOptionParseOpenSlots(valkeyClusterContext *cc); int valkeyClusterSetOptionRouteUseSlots(valkeyClusterContext *cc); int valkeyClusterSetOptionConnectTimeout(valkeyClusterContext *cc, - const struct timeval tv); + const struct timeval tv); int valkeyClusterSetOptionTimeout(valkeyClusterContext *cc, - const struct timeval tv); -int valkeyClusterSetOptionMaxRetry(valkeyClusterContext *cc, int max_retry_count); + const struct timeval tv); +int valkeyClusterSetOptionMaxRetry(valkeyClusterContext *cc, + int max_retry_count); /* Deprecated function, replaced with valkeyClusterSetOptionMaxRetry() */ void valkeyClusterSetMaxRedirect(valkeyClusterContext *cc, - int max_redirect_count); + int max_redirect_count); /* A hook for connect and reconnect attempts, e.g. for applying additional * socket options. This is called just after connect, before TLS handshake and * Valkey authentication. @@ -216,13 +217,14 @@ void valkeyClusterSetMaxRedirect(valkeyClusterContext *cc, * `VALKEY_ERR`. The `err` field in the `valkeyContext` can be used to find out * the cause of the error. */ int valkeyClusterSetConnectCallback(valkeyClusterContext *cc, - void(fn)(const valkeyContext *c, int status)); + void(fn)(const valkeyContext *c, + int status)); /* A hook for events. */ int valkeyClusterSetEventCallback(valkeyClusterContext *cc, - void(fn)(const valkeyClusterContext *cc, - int event, void *privdata), - void *privdata); + void(fn)(const valkeyClusterContext *cc, + int event, void *privdata), + void *privdata); /* Blocking * The following functions will block for a reply, or return NULL if there was @@ -231,16 +233,18 @@ int valkeyClusterSetEventCallback(valkeyClusterContext *cc, /* Variadic commands (like printf) */ void *valkeyClusterCommand(valkeyClusterContext *cc, const char *format, ...); -void *valkeyClusterCommandToNode(valkeyClusterContext *cc, valkeyClusterNode *node, - const char *format, ...); +void *valkeyClusterCommandToNode(valkeyClusterContext *cc, + valkeyClusterNode *node, const char *format, + ...); /* Variadic using va_list */ void *valkeyClustervCommand(valkeyClusterContext *cc, const char *format, - va_list ap); + va_list ap); /* Using argc and argv */ void *valkeyClusterCommandArgv(valkeyClusterContext *cc, int argc, - const char **argv, const size_t *argvlen); + const char **argv, const size_t *argvlen); /* Send a Valkey protocol encoded string */ -void *valkeyClusterFormattedCommand(valkeyClusterContext *cc, char *cmd, int len); +void *valkeyClusterFormattedCommand(valkeyClusterContext *cc, char *cmd, + int len); /* Pipelining * The following functions will write a command to the output buffer. @@ -249,19 +253,20 @@ void *valkeyClusterFormattedCommand(valkeyClusterContext *cc, char *cmd, int len */ /* Variadic commands (like printf) */ -int valkeyClusterAppendCommand(valkeyClusterContext *cc, const char *format, ...); +int valkeyClusterAppendCommand(valkeyClusterContext *cc, const char *format, + ...); int valkeyClusterAppendCommandToNode(valkeyClusterContext *cc, - valkeyClusterNode *node, const char *format, - ...); + valkeyClusterNode *node, + const char *format, ...); /* Variadic using va_list */ int valkeyClustervAppendCommand(valkeyClusterContext *cc, const char *format, - va_list ap); + va_list ap); /* Using argc and argv */ int valkeyClusterAppendCommandArgv(valkeyClusterContext *cc, int argc, - const char **argv, const size_t *argvlen); + const char **argv, const size_t *argvlen); /* Use a Valkey protocol encoded string as command */ int valkeyClusterAppendFormattedCommand(valkeyClusterContext *cc, char *cmd, - int len); + int len); /* Flush output buffer and return first reply */ int valkeyClusterGetReply(valkeyClusterContext *cc, void **reply); @@ -272,7 +277,8 @@ void valkeyClusterReset(valkeyClusterContext *cc); int valkeyClusterUpdateSlotmap(valkeyClusterContext *cc); /* Internal functions */ -valkeyContext *ctx_get_by_node(valkeyClusterContext *cc, valkeyClusterNode *node); +valkeyContext *ctx_get_by_node(valkeyClusterContext *cc, + valkeyClusterNode *node); struct dict *parse_cluster_nodes(valkeyClusterContext *cc, char *str, int str_len, int flags); struct dict *parse_cluster_slots(valkeyClusterContext *cc, valkeyReply *reply, @@ -286,62 +292,64 @@ valkeyClusterAsyncContext *valkeyClusterAsyncContextInit(void); void valkeyClusterAsyncFree(valkeyClusterAsyncContext *acc); int valkeyClusterAsyncSetConnectCallback(valkeyClusterAsyncContext *acc, - valkeyConnectCallback *fn); + valkeyConnectCallback *fn); int valkeyClusterAsyncSetConnectCallbackNC(valkeyClusterAsyncContext *acc, - valkeyConnectCallbackNC *fn); + valkeyConnectCallbackNC *fn); int valkeyClusterAsyncSetDisconnectCallback(valkeyClusterAsyncContext *acc, - valkeyDisconnectCallback *fn); + valkeyDisconnectCallback *fn); /* Connect and update slotmap, will block until complete. */ valkeyClusterAsyncContext *valkeyClusterAsyncConnect(const char *addrs, - int flags); + int flags); /* Connect and update slotmap asynchronously using configured event engine. */ int valkeyClusterAsyncConnect2(valkeyClusterAsyncContext *acc); void valkeyClusterAsyncDisconnect(valkeyClusterAsyncContext *acc); /* Commands */ int valkeyClusterAsyncCommand(valkeyClusterAsyncContext *acc, - valkeyClusterCallbackFn *fn, void *privdata, - const char *format, ...); + valkeyClusterCallbackFn *fn, void *privdata, + const char *format, ...); int valkeyClusterAsyncCommandToNode(valkeyClusterAsyncContext *acc, - valkeyClusterNode *node, - valkeyClusterCallbackFn *fn, void *privdata, - const char *format, ...); + valkeyClusterNode *node, + valkeyClusterCallbackFn *fn, void *privdata, + const char *format, ...); int valkeyClustervAsyncCommand(valkeyClusterAsyncContext *acc, - valkeyClusterCallbackFn *fn, void *privdata, - const char *format, va_list ap); + valkeyClusterCallbackFn *fn, void *privdata, + const char *format, va_list ap); int valkeyClusterAsyncCommandArgv(valkeyClusterAsyncContext *acc, - valkeyClusterCallbackFn *fn, void *privdata, - int argc, const char **argv, - const size_t *argvlen); + valkeyClusterCallbackFn *fn, void *privdata, + int argc, const char **argv, + const size_t *argvlen); int valkeyClusterAsyncCommandArgvToNode(valkeyClusterAsyncContext *acc, - valkeyClusterNode *node, - valkeyClusterCallbackFn *fn, - void *privdata, int argc, - const char **argv, - const size_t *argvlen); + valkeyClusterNode *node, + valkeyClusterCallbackFn *fn, + void *privdata, int argc, + const char **argv, + const size_t *argvlen); /* Use a Valkey protocol encoded string as command */ int valkeyClusterAsyncFormattedCommand(valkeyClusterAsyncContext *acc, - valkeyClusterCallbackFn *fn, - void *privdata, char *cmd, int len); + valkeyClusterCallbackFn *fn, + void *privdata, char *cmd, int len); int valkeyClusterAsyncFormattedCommandToNode(valkeyClusterAsyncContext *acc, - valkeyClusterNode *node, - valkeyClusterCallbackFn *fn, - void *privdata, char *cmd, int len); + valkeyClusterNode *node, + valkeyClusterCallbackFn *fn, + void *privdata, char *cmd, + int len); /* Internal functions */ valkeyAsyncContext *actx_get_by_node(valkeyClusterAsyncContext *acc, - valkeyClusterNode *node); + valkeyClusterNode *node); /* Cluster node iterator functions */ void valkeyClusterInitNodeIterator(valkeyClusterNodeIterator *iter, - valkeyClusterContext *cc); + valkeyClusterContext *cc); valkeyClusterNode *valkeyClusterNodeNext(valkeyClusterNodeIterator *iter); /* Helper functions */ unsigned int valkeyClusterGetSlotByKey(char *key); -valkeyClusterNode *valkeyClusterGetNodeByKey(valkeyClusterContext *cc, char *key); +valkeyClusterNode *valkeyClusterGetNodeByKey(valkeyClusterContext *cc, + char *key); #ifdef __cplusplus } diff --git a/libvalkeycluster/valkeycluster_ssl.c b/libvalkeycluster/valkeycluster_ssl.c index 49b7324a..889cd238 100644 --- a/libvalkeycluster/valkeycluster_ssl.c +++ b/libvalkeycluster/valkeycluster_ssl.c @@ -29,12 +29,12 @@ #include "valkeycluster_ssl.h" static int valkeyClusterInitiateSSLWithContext(valkeyContext *c, - void *valkey_ssl_ctx) { + void *valkey_ssl_ctx) { return valkeyInitiateSSLWithContext(c, valkey_ssl_ctx); } int valkeyClusterSetOptionEnableSSL(valkeyClusterContext *cc, - valkeySSLContext *ssl) { + valkeySSLContext *ssl) { if (cc == NULL || ssl == NULL) { return VALKEY_ERR; } diff --git a/libvalkeycluster/valkeycluster_ssl.h b/libvalkeycluster/valkeycluster_ssl.h index 4520cdb2..875d9d83 100644 --- a/libvalkeycluster/valkeycluster_ssl.h +++ b/libvalkeycluster/valkeycluster_ssl.h @@ -40,7 +40,7 @@ extern "C" { * Configuration option to enable SSL/TLS negotiation on a context. */ int valkeyClusterSetOptionEnableSSL(valkeyClusterContext *cc, - valkeySSLContext *ssl); + valkeySSLContext *ssl); #ifdef __cplusplus } diff --git a/libvalkeycluster/vkarray.c b/libvalkeycluster/vkarray.c index f599d6c1..cfc3e64c 100644 --- a/libvalkeycluster/vkarray.c +++ b/libvalkeycluster/vkarray.c @@ -29,8 +29,8 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include #include +#include #include "vkarray.h" #include "vkutil.h" diff --git a/libvalkeycluster/vkutil.c b/libvalkeycluster/vkutil.c index 2173a551..7d90a2f5 100644 --- a/libvalkeycluster/vkutil.c +++ b/libvalkeycluster/vkutil.c @@ -30,12 +30,12 @@ */ #include #include -#include #include #include #include #include #include +#include #ifndef _WIN32 #include