From 5edde1e6fdf1e738e49a81d64eb6dadcfcc2cd94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Svensson?= Date: Tue, 17 Dec 2024 15:35:31 +0100 Subject: [PATCH] Rename callback options only used for the async API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use snakecase as rest of the options and prefix with async: - async_connect_cb - async_connect_nc_cb /* non-const callback */ - async_disconnect_cb Signed-off-by: Björn Svensson --- examples/cluster-async-tls.c | 4 ++-- examples/cluster-async.c | 4 ++-- examples/cluster-clientside-caching-async.c | 4 ++-- include/valkey/cluster.h | 6 +++--- src/cluster.c | 12 ++++++------ tests/clusterclient_async.c | 4 ++-- tests/ct_async.c | 4 ++-- tests/ct_async_glib.c | 4 ++-- tests/ct_async_libev.c | 4 ++-- tests/ct_async_libuv.c | 4 ++-- tests/ct_connection.c | 20 ++++++++++---------- tests/ct_out_of_memory_handling.c | 4 ++-- tests/ct_pipeline.c | 4 ++-- tests/ct_specific_nodes.c | 20 ++++++++++---------- 14 files changed, 49 insertions(+), 49 deletions(-) diff --git a/examples/cluster-async-tls.c b/examples/cluster-async-tls.c index 23c7fe1..3daa81c 100644 --- a/examples/cluster-async-tls.c +++ b/examples/cluster-async-tls.c @@ -68,8 +68,8 @@ int main(int argc, char **argv) { valkeyClusterOptions options = {0}; options.initial_nodes = CLUSTER_NODE_TLS; - options.onConnect = connectCallback; - options.onDisconnect = disconnectCallback; + options.async_connect_cb = connectCallback; + options.async_disconnect_cb = disconnectCallback; options.options = VALKEY_OPT_USE_CLUSTER_SLOTS; valkeyClusterSetOptionEnableTLS(&options, tls); diff --git a/examples/cluster-async.c b/examples/cluster-async.c index 77e6610..72fc5e7 100644 --- a/examples/cluster-async.c +++ b/examples/cluster-async.c @@ -53,8 +53,8 @@ int main(int argc, char **argv) { valkeyClusterOptions options = {0}; options.initial_nodes = "127.0.0.1:7000"; - options.onConnect = connectCallback; - options.onDisconnect = disconnectCallback; + options.async_connect_cb = connectCallback; + options.async_disconnect_cb = disconnectCallback; valkeyClusterSetOptionUseLibevent(&options, base); printf("Connecting...\n"); diff --git a/examples/cluster-clientside-caching-async.c b/examples/cluster-clientside-caching-async.c index 985a46f..865dcb5 100644 --- a/examples/cluster-clientside-caching-async.c +++ b/examples/cluster-clientside-caching-async.c @@ -144,8 +144,8 @@ int main(int argc, char **argv) { valkeyClusterOptions options = {0}; options.initial_nodes = CLUSTER_NODE; - options.onConnectNC = connectCallbackNC; - options.onDisconnect = disconnectCallback; + options.async_connect_nc_cb = connectCallbackNC; + options.async_disconnect_cb = disconnectCallback; valkeyClusterSetOptionUseLibevent(&options, base); valkeyClusterAsyncContext *acc = valkeyClusterAsyncContextInit(&options); diff --git a/include/valkey/cluster.h b/include/valkey/cluster.h index 5c1a006..884b6b3 100644 --- a/include/valkey/cluster.h +++ b/include/valkey/cluster.h @@ -180,9 +180,9 @@ typedef struct { void *attach_data; /* Async API callbacks. */ - valkeyConnectCallback *onConnect; - valkeyConnectCallbackNC *onConnectNC; - valkeyDisconnectCallback *onDisconnect; + valkeyConnectCallback *async_connect_cb; + valkeyConnectCallbackNC *async_connect_nc_cb; /* non-const callback */ + valkeyDisconnectCallback *async_disconnect_cb; } valkeyClusterOptions; /* diff --git a/src/cluster.c b/src/cluster.c index 01d2643..9381813 100644 --- a/src/cluster.c +++ b/src/cluster.c @@ -2803,14 +2803,14 @@ valkeyClusterAsyncContext *valkeyClusterAsyncContextInit(const valkeyClusterOpti return NULL; } - if (options->onConnect != NULL) { - acc->onConnect = options->onConnect; + if (options->async_connect_cb != NULL) { + acc->onConnect = options->async_connect_cb; } - if (options->onConnectNC != NULL) { - acc->onConnectNC = options->onConnectNC; + if (options->async_connect_nc_cb != NULL) { + acc->onConnectNC = options->async_connect_nc_cb; } - if (options->onDisconnect != NULL) { - acc->onDisconnect = options->onDisconnect; + if (options->async_disconnect_cb != NULL) { + acc->onDisconnect = options->async_disconnect_cb; } if (options->attach_fn != NULL) { acc->attach_fn = options->attach_fn; diff --git a/tests/clusterclient_async.c b/tests/clusterclient_async.c index 51b38fb..ef139d9 100644 --- a/tests/clusterclient_async.c +++ b/tests/clusterclient_async.c @@ -262,8 +262,8 @@ int main(int argc, char **argv) { options.event_callback = eventCallback; } if (show_connection_events) { - options.onConnect = connectCallback; - options.onDisconnect = disconnectCallback; + options.async_connect_cb = connectCallback; + options.async_disconnect_cb = disconnectCallback; } valkeyClusterSetOptionUseLibevent(&options, base); diff --git a/tests/ct_async.c b/tests/ct_async.c index 0b26810..4551168 100644 --- a/tests/ct_async.c +++ b/tests/ct_async.c @@ -72,8 +72,8 @@ int main(void) { valkeyClusterOptions options = {0}; options.initial_nodes = CLUSTER_NODE; - options.onConnect = connectCallback; - options.onDisconnect = disconnectCallback; + options.async_connect_cb = connectCallback; + options.async_disconnect_cb = disconnectCallback; valkeyClusterSetOptionUseLibevent(&options, base); valkeyClusterAsyncContext *acc = valkeyClusterAsyncContextInit(&options); diff --git a/tests/ct_async_glib.c b/tests/ct_async_glib.c index 7e64622..a8f9c12 100644 --- a/tests/ct_async_glib.c +++ b/tests/ct_async_glib.c @@ -44,8 +44,8 @@ int main(int argc, char **argv) { valkeyClusterOptions options = {0}; options.initial_nodes = CLUSTER_NODE; options.options = VALKEY_OPT_BLOCKING_INITIAL_UPDATE; - options.onConnect = connectCallback; - options.onDisconnect = disconnectCallback; + options.async_connect_cb = connectCallback; + options.async_disconnect_cb = disconnectCallback; valkeyClusterSetOptionUseGlib(&options, context); valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); diff --git a/tests/ct_async_libev.c b/tests/ct_async_libev.c index 5a94a6a..47a055d 100644 --- a/tests/ct_async_libev.c +++ b/tests/ct_async_libev.c @@ -38,8 +38,8 @@ int main(int argc, char **argv) { valkeyClusterOptions options = {0}; options.initial_nodes = CLUSTER_NODE; options.options = VALKEY_OPT_BLOCKING_INITIAL_UPDATE; - options.onConnect = connectCallback; - options.onDisconnect = disconnectCallback; + options.async_connect_cb = connectCallback; + options.async_disconnect_cb = disconnectCallback; valkeyClusterSetOptionUseLibev(&options, EV_DEFAULT); valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); diff --git a/tests/ct_async_libuv.c b/tests/ct_async_libuv.c index 89fbcab..668fae7 100644 --- a/tests/ct_async_libuv.c +++ b/tests/ct_async_libuv.c @@ -41,8 +41,8 @@ int main(int argc, char **argv) { valkeyClusterOptions options = {0}; options.initial_nodes = CLUSTER_NODE; options.options = VALKEY_OPT_BLOCKING_INITIAL_UPDATE; - options.onConnect = connectCallback; - options.onDisconnect = disconnectCallback; + options.async_connect_cb = connectCallback; + options.async_disconnect_cb = disconnectCallback; valkeyClusterSetOptionUseLibuv(&options, loop); valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); diff --git a/tests/ct_connection.c b/tests/ct_connection.c index d25f91e..ac7020a 100644 --- a/tests/ct_connection.c +++ b/tests/ct_connection.c @@ -295,8 +295,8 @@ void test_async_password_ok(void) { options.initial_nodes = CLUSTER_NODE_WITH_PASSWORD; options.options = VALKEY_OPT_BLOCKING_INITIAL_UPDATE; options.password = CLUSTER_PASSWORD; - options.onConnect = callbackExpectOk; - options.onDisconnect = callbackExpectOk; + options.async_connect_cb = callbackExpectOk; + options.async_disconnect_cb = callbackExpectOk; valkeyClusterSetOptionUseLibevent(&options, base); valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); @@ -352,8 +352,8 @@ void test_async_password_missing(void) { valkeyClusterOptions options = {0}; options.initial_nodes = CLUSTER_NODE_WITH_PASSWORD; options.options = VALKEY_OPT_BLOCKING_INITIAL_UPDATE; - options.onConnect = callbackExpectOk; - options.onDisconnect = callbackExpectOk; + options.async_connect_cb = callbackExpectOk; + options.async_disconnect_cb = callbackExpectOk; valkeyClusterSetOptionUseLibevent(&options, base); // Password not configured @@ -383,8 +383,8 @@ void test_async_username_ok(void) { valkeyClusterOptions options = {0}; options.initial_nodes = CLUSTER_NODE_WITH_PASSWORD; options.options = VALKEY_OPT_BLOCKING_INITIAL_UPDATE; - options.onConnect = callbackExpectOk; - options.onDisconnect = callbackExpectOk; + options.async_connect_cb = callbackExpectOk; + options.async_disconnect_cb = callbackExpectOk; options.username = "missing-user"; options.password = CLUSTER_PASSWORD; valkeyClusterSetOptionUseLibevent(&options, base); @@ -424,8 +424,8 @@ void test_async_multicluster(void) { valkeyClusterOptions options1 = {0}; options1.initial_nodes = CLUSTER_NODE; options1.options = VALKEY_OPT_BLOCKING_INITIAL_UPDATE; - options1.onConnect = callbackExpectOk; - options1.onDisconnect = callbackExpectOk; + options1.async_connect_cb = callbackExpectOk; + options1.async_disconnect_cb = callbackExpectOk; valkeyClusterSetOptionUseLibevent(&options1, base); // Connect to first cluster @@ -436,8 +436,8 @@ void test_async_multicluster(void) { options2.initial_nodes = CLUSTER_NODE_WITH_PASSWORD; options2.options = VALKEY_OPT_BLOCKING_INITIAL_UPDATE; options2.password = CLUSTER_PASSWORD; - options2.onConnect = callbackExpectOk; - options2.onDisconnect = callbackExpectOk; + options2.async_connect_cb = callbackExpectOk; + options2.async_disconnect_cb = callbackExpectOk; valkeyClusterSetOptionUseLibevent(&options2, base); // Connect to second cluster diff --git a/tests/ct_out_of_memory_handling.c b/tests/ct_out_of_memory_handling.c index f7d762f..277a0a4 100644 --- a/tests/ct_out_of_memory_handling.c +++ b/tests/ct_out_of_memory_handling.c @@ -448,8 +448,8 @@ void test_alloc_failure_handling_async(void) { valkeyClusterOptions options = {0}; options.initial_nodes = CLUSTER_NODE; - options.onConnect = callbackExpectOk; - options.onDisconnect = callbackExpectOk; + options.async_connect_cb = callbackExpectOk; + options.async_disconnect_cb = callbackExpectOk; options.options = VALKEY_OPT_USE_REPLICAS | VALKEY_OPT_BLOCKING_INITIAL_UPDATE; valkeyClusterSetOptionUseLibevent(&options, base); diff --git a/tests/ct_pipeline.c b/tests/ct_pipeline.c index e038177..c1a3b12 100644 --- a/tests/ct_pipeline.c +++ b/tests/ct_pipeline.c @@ -93,8 +93,8 @@ void test_async_pipeline(void) { valkeyClusterOptions options = {0}; options.initial_nodes = CLUSTER_NODE; options.options = VALKEY_OPT_BLOCKING_INITIAL_UPDATE; - options.onConnect = callbackExpectOk; - options.onDisconnect = callbackExpectOk; + options.async_connect_cb = callbackExpectOk; + options.async_disconnect_cb = callbackExpectOk; valkeyClusterSetOptionUseLibevent(&options, base); valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); diff --git a/tests/ct_specific_nodes.c b/tests/ct_specific_nodes.c index d61a0a5..5fb4ca1 100644 --- a/tests/ct_specific_nodes.c +++ b/tests/ct_specific_nodes.c @@ -321,8 +321,8 @@ void test_async_to_single_node(void) { options.options = VALKEY_OPT_USE_CLUSTER_SLOTS | VALKEY_OPT_BLOCKING_INITIAL_UPDATE; options.max_retry_count = 1; - options.onConnect = callbackExpectOk; - options.onDisconnect = callbackExpectOk; + options.async_connect_cb = callbackExpectOk; + options.async_disconnect_cb = callbackExpectOk; valkeyClusterSetOptionUseLibevent(&options, base); valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); @@ -352,8 +352,8 @@ void test_async_formatted_to_single_node(void) { options.options = VALKEY_OPT_USE_CLUSTER_SLOTS | VALKEY_OPT_BLOCKING_INITIAL_UPDATE; options.max_retry_count = 1; - options.onConnect = callbackExpectOk; - options.onDisconnect = callbackExpectOk; + options.async_connect_cb = callbackExpectOk; + options.async_disconnect_cb = callbackExpectOk; valkeyClusterSetOptionUseLibevent(&options, base); valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); @@ -384,8 +384,8 @@ void test_async_command_argv_to_single_node(void) { options.options = VALKEY_OPT_USE_CLUSTER_SLOTS | VALKEY_OPT_BLOCKING_INITIAL_UPDATE; options.max_retry_count = 1; - options.onConnect = callbackExpectOk; - options.onDisconnect = callbackExpectOk; + options.async_connect_cb = callbackExpectOk; + options.async_disconnect_cb = callbackExpectOk; valkeyClusterSetOptionUseLibevent(&options, base); valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); @@ -416,8 +416,8 @@ void test_async_to_all_nodes(void) { options.options = VALKEY_OPT_USE_CLUSTER_SLOTS | VALKEY_OPT_BLOCKING_INITIAL_UPDATE; options.max_retry_count = 1; - options.onConnect = callbackExpectOk; - options.onDisconnect = callbackExpectOk; + options.async_connect_cb = callbackExpectOk; + options.async_disconnect_cb = callbackExpectOk; valkeyClusterSetOptionUseLibevent(&options, base); valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); @@ -457,8 +457,8 @@ void test_async_transaction(void) { options.options = VALKEY_OPT_USE_CLUSTER_SLOTS | VALKEY_OPT_BLOCKING_INITIAL_UPDATE; options.max_retry_count = 1; - options.onConnect = callbackExpectOk; - options.onDisconnect = callbackExpectOk; + options.async_connect_cb = callbackExpectOk; + options.async_disconnect_cb = callbackExpectOk; valkeyClusterSetOptionUseLibevent(&options, base); valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options);