diff --git a/examples/utils/src/main/example_utils.c b/examples/utils/src/main/example_utils.c index aa53f2aee..0f4b37d5f 100644 --- a/examples/utils/src/main/example_utils.c +++ b/examples/utils/src/main/example_utils.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2008-2023 by Aerospike. + * Copyright 2008-2024 by Aerospike. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -476,7 +476,7 @@ example_log_callback(as_log_level level, const char * func, const char * file, u // Initialize asynchronous event loop // bool -example_create_event_loop() +example_create_event_loop(void) { #if AS_EVENT_LIB_DEFINED // Initialize logging. diff --git a/modules/common b/modules/common index 88eff22f1..3915be73c 160000 --- a/modules/common +++ b/modules/common @@ -1 +1 @@ -Subproject commit 88eff22f1cd35243e9167a9b306b63476432e336 +Subproject commit 3915be73c89b8dc0762da6c136dc5343201d0f9b diff --git a/src/apidocs/html/aerospike_logo.png b/src/apidocs/html/aerospike_logo.png index 67d45e2e3..857ca52cd 100644 Binary files a/src/apidocs/html/aerospike_logo.png and b/src/apidocs/html/aerospike_logo.png differ diff --git a/src/include/aerospike/as_event.h b/src/include/aerospike/as_event.h index d6d132267..261564152 100644 --- a/src/include/aerospike/as_event.h +++ b/src/include/aerospike/as_event.h @@ -1,5 +1,5 @@ /* - * Copyright 2008-2022 Aerospike, Inc. + * Copyright 2008-2024 Aerospike, Inc. * * Portions may be licensed to Aerospike, Inc. under one or more contributor * license agreements. @@ -377,7 +377,7 @@ as_event_loop_get_by_index(uint32_t index) * @ingroup async_events */ static inline as_event_loop* -as_event_loop_get() +as_event_loop_get(void) { // The last event loop points to the first event loop to create a circular linked list. // Not atomic because doesn't need to be exactly accurate. diff --git a/src/include/aerospike/as_policy.h b/src/include/aerospike/as_policy.h index cffc30600..186f83294 100644 --- a/src/include/aerospike/as_policy.h +++ b/src/include/aerospike/as_policy.h @@ -334,24 +334,24 @@ typedef enum as_policy_read_mode_sc_e { /** * Ensures this client will only see an increasing sequence of record versions. - * Server only reads from master. This is the default. + * Client only reads from master. This is the default. */ AS_POLICY_READ_MODE_SC_SESSION, /** - * Ensures ALL clients will only see an increasing sequence of record versions. - * Server only reads from master. + * Ensures all clients will only see an increasing sequence of record versions. + * Client only reads from master. */ AS_POLICY_READ_MODE_SC_LINEARIZE, /** - * Server may read from master or any full (non-migrating) replica. + * Client may read from master or any full (non-migrating) replica. * Increasing sequence of record versions is not guaranteed. */ AS_POLICY_READ_MODE_SC_ALLOW_REPLICA, /** - * Server may read from master or any full (non-migrating) replica or from unavailable + * Client may read from master or any full (non-migrating) replica or from unavailable * partitions. Increasing sequence of record versions is not guaranteed. */ AS_POLICY_READ_MODE_SC_ALLOW_UNAVAILABLE, diff --git a/src/include/aerospike/version.h b/src/include/aerospike/version.h index bb55c385e..107d07d7c 100644 --- a/src/include/aerospike/version.h +++ b/src/include/aerospike/version.h @@ -3,6 +3,6 @@ // N: minor // P: patch // B: build id -#define AEROSPIKE_CLIENT_VERSION 606020000L +#define AEROSPIKE_CLIENT_VERSION 606030000L extern char* aerospike_client_version; diff --git a/src/main/aerospike/aerospike_query.c b/src/main/aerospike/aerospike_query.c index dd8c28b45..4f9f945cc 100644 --- a/src/main/aerospike/aerospike_query.c +++ b/src/main/aerospike/aerospike_query.c @@ -873,7 +873,7 @@ as_query_command_init( write_attr |= AS_MSG_INFO2_RELAX_AP_LONG_QUERY; } - uint8_t info_attr = qb->is_new ? AS_MSG_INFO3_PARTITION_DONE : 0; + uint8_t info_attr = (qb->is_new || query->where.size == 0)? AS_MSG_INFO3_PARTITION_DONE : 0; p = as_command_write_header_read(cmd, base_policy, AS_POLICY_READ_MODE_AP_ONE, AS_POLICY_READ_MODE_SC_SESSION, -1, base_policy->total_timeout, qb->n_fields, qb->n_ops, diff --git a/src/main/aerospike/aerospike_scan.c b/src/main/aerospike/aerospike_scan.c index c6520548e..dbc0cf6f5 100644 --- a/src/main/aerospike/aerospike_scan.c +++ b/src/main/aerospike/aerospike_scan.c @@ -525,12 +525,9 @@ as_scan_command_init( read_attr |= AS_MSG_INFO1_GET_NOBINDATA; } - // Clusters that support partition queries also support not sending partition done messages. - int info_attr = cluster->has_partition_query? AS_MSG_INFO3_PARTITION_DONE : 0; - p = as_command_write_header_read(cmd, &policy->base, AS_POLICY_READ_MODE_AP_ONE, AS_POLICY_READ_MODE_SC_SESSION, -1, policy->base.total_timeout, sb->n_fields, n_ops, - read_attr, 0, info_attr); + read_attr, 0, AS_MSG_INFO3_PARTITION_DONE); } if (scan->ns[0]) { diff --git a/src/main/aerospike/as_async.c b/src/main/aerospike/as_async.c index 8898b2b9c..86e6839b2 100644 --- a/src/main/aerospike/as_async.c +++ b/src/main/aerospike/as_async.c @@ -32,7 +32,7 @@ void as_cluster_set_max_socket_idle(as_cluster* cluster, uint32_t max_socket_idle_sec); uint32_t -as_async_get_cluster_count() +as_async_get_cluster_count(void) { return as_load_uint32(&as_cluster_count); } diff --git a/src/main/aerospike/as_event.c b/src/main/aerospike/as_event.c index 346a49723..e50689043 100644 --- a/src/main/aerospike/as_event.c +++ b/src/main/aerospike/as_event.c @@ -307,7 +307,7 @@ as_event_loop_find(void* loop) } bool -as_event_close_loops() +as_event_close_loops(void) { if (! as_event_loops) { return false; @@ -341,7 +341,7 @@ as_event_close_loops() } void -as_event_destroy_loops() +as_event_destroy_loops(void) { #if defined(_MSC_VER) // Call WSACleanup() on event loops destroy on windows. @@ -1751,7 +1751,7 @@ create_connections_nowait(as_node* node, as_async_conn_pool* pools) } static bool -as_in_event_loops() +as_in_event_loops(void) { // Determine if current thread is an event loop thread. bool in_event_loop = false; diff --git a/src/main/aerospike/as_metrics_writer.c b/src/main/aerospike/as_metrics_writer.c index 4b6a9f141..3a0dc9a40 100644 --- a/src/main/aerospike/as_metrics_writer.c +++ b/src/main/aerospike/as_metrics_writer.c @@ -131,7 +131,7 @@ as_metrics_process_cpu_load_mem_usage(as_error* err, as_metrics_writer* mw, uint #include static double -as_metrics_process_mem_usage() +as_metrics_process_mem_usage(void) { struct task_basic_info t_info; mach_msg_type_number_t t_info_count = TASK_BASIC_INFO_COUNT; @@ -145,7 +145,7 @@ as_metrics_process_mem_usage() } static double -as_metrics_process_cpu_load() +as_metrics_process_cpu_load(void) { pid_t pid = getpid(); diff --git a/src/main/aerospike/as_pipe.c b/src/main/aerospike/as_pipe.c index 9a42a8ff7..271d6130a 100644 --- a/src/main/aerospike/as_pipe.c +++ b/src/main/aerospike/as_pipe.c @@ -287,7 +287,7 @@ get_buffer_size(const char* proc, int size) #endif int -as_pipe_get_send_buffer_size() +as_pipe_get_send_buffer_size(void) { #if defined(__linux__) return get_buffer_size("/proc/sys/net/core/wmem_max", PIPE_WRITE_BUFFER_SIZE); @@ -297,7 +297,7 @@ as_pipe_get_send_buffer_size() } int -as_pipe_get_recv_buffer_size() +as_pipe_get_recv_buffer_size(void) { #if defined(__linux__) return get_buffer_size("/proc/sys/net/core/rmem_max", PIPE_READ_BUFFER_SIZE); diff --git a/src/main/aerospike/as_shm_cluster.c b/src/main/aerospike/as_shm_cluster.c index 6f449c9c0..d199406eb 100644 --- a/src/main/aerospike/as_shm_cluster.c +++ b/src/main/aerospike/as_shm_cluster.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2023 Aerospike, Inc. + * Copyright 2008-2024 Aerospike, Inc. * * Portions may be licensed to Aerospike, Inc. under one or more contributor * license agreements. @@ -110,7 +110,7 @@ as_shm_dump_partition_tables(as_cluster_shm* cluster_shm) #if !defined(_MSC_VER) static size_t -as_shm_get_max_size() +as_shm_get_max_size(void) { #ifdef __linux__ char* fn = "/proc/sys/kernel/shmmax"; diff --git a/src/main/aerospike/as_socket.c b/src/main/aerospike/as_socket.c index b426424b7..ee0ba885f 100644 --- a/src/main/aerospike/as_socket.c +++ b/src/main/aerospike/as_socket.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2019 Aerospike, Inc. + * Copyright 2008-2024 Aerospike, Inc. * * Portions may be licensed to Aerospike, Inc. under one or more contributor * license agreements. @@ -326,7 +326,7 @@ as_socket_write_deadline( size_t pos = 0; as_status status = AEROSPIKE_OK; uint32_t timeout; - int try = 0; + //int try = 0; do { if (deadline > 0) { @@ -392,7 +392,7 @@ as_socket_write_deadline( } } - try++; + //try++; } while (pos < buf_len); @@ -429,7 +429,7 @@ as_socket_read_deadline( size_t pos = 0; as_status status = AEROSPIKE_OK; uint32_t timeout; - int try = 0; + //int try = 0; do { if (deadline > 0) { @@ -493,7 +493,7 @@ as_socket_read_deadline( } } - try++; + //try++; } while (pos < buf_len); diff --git a/src/main/aerospike/as_tls.c b/src/main/aerospike/as_tls.c index 69bcce9ac..e2d2ec223 100644 --- a/src/main/aerospike/as_tls.c +++ b/src/main/aerospike/as_tls.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2023 Aerospike, Inc. + * Copyright 2008-2024 Aerospike, Inc. * * Portions may be licensed to Aerospike, Inc. under one or more contributor * license agreements. @@ -233,7 +233,7 @@ threading_cleanup(void) #endif void -as_tls_check_init() +as_tls_check_init(void) { // Bail if we've already initialized. if (s_tls_inited) { @@ -306,7 +306,7 @@ as_tls_cleanup(void) } void -as_tls_thread_cleanup() +as_tls_thread_cleanup(void) { // Skip if we were never initialized. if (! s_tls_inited) { @@ -1491,7 +1491,7 @@ static void cert_blacklist_destroy(void* cbl) cf_free(cbp); } -static void manage_sigpipe() +static void manage_sigpipe(void) { #if !defined(_MSC_VER) // OpenSSL can encounter a SIGPIPE in the SSL_shutdown sequence. diff --git a/src/main/aerospike/as_udf.c b/src/main/aerospike/as_udf.c index 141614cfe..2010e2c5f 100644 --- a/src/main/aerospike/as_udf.c +++ b/src/main/aerospike/as_udf.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2018 Aerospike, Inc. + * Copyright 2008-2024 Aerospike, Inc. * * Portions may be licensed to Aerospike, Inc. under one or more contributor * license agreements. @@ -120,7 +120,7 @@ as_udf_file_init(as_udf_file * file) } as_udf_file* -as_udf_file_new() +as_udf_file_new(void) { as_udf_file * file = (as_udf_file *) cf_malloc(sizeof(as_udf_file)); if ( !file ) return file; diff --git a/src/main/aerospike/version.c b/src/main/aerospike/version.c index 24ef83ba5..95d9680c3 100644 --- a/src/main/aerospike/version.c +++ b/src/main/aerospike/version.c @@ -1 +1 @@ -char* aerospike_client_version = "6.6.2"; +char* aerospike_client_version = "6.6.3"; diff --git a/vs/aerospike-client-c-libevent.nuspec b/vs/aerospike-client-c-libevent.nuspec index 6d41af7d8..5b49c37c9 100644 --- a/vs/aerospike-client-c-libevent.nuspec +++ b/vs/aerospike-client-c-libevent.nuspec @@ -2,7 +2,7 @@ aerospike-client-c-libevent - 6.6.2 + 6.6.3 Aerospike C Client with libevent Aerospike Aerospike diff --git a/vs/aerospike-client-c-libuv.nuspec b/vs/aerospike-client-c-libuv.nuspec index 83cc147c6..1b9270552 100644 --- a/vs/aerospike-client-c-libuv.nuspec +++ b/vs/aerospike-client-c-libuv.nuspec @@ -2,7 +2,7 @@ aerospike-client-c-libuv - 6.6.2 + 6.6.3 Aerospike C Client with libuv Aerospike Aerospike diff --git a/vs/aerospike-client-c.nuspec b/vs/aerospike-client-c.nuspec index 4b821efcd..43998310e 100644 --- a/vs/aerospike-client-c.nuspec +++ b/vs/aerospike-client-c.nuspec @@ -2,7 +2,7 @@ aerospike-client-c - 6.6.2 + 6.6.3 Aerospike C Client Aerospike Aerospike