From c2b6dbab3a3ea951e08be3c83a9b7cbb038721a9 Mon Sep 17 00:00:00 2001 From: Julian Nguyen <109386615+juliannguyen4@users.noreply.github.com> Date: Mon, 18 Aug 2025 16:26:34 -0700 Subject: [PATCH 01/13] clean up dead code --- src/include/conversions.h | 3 --- src/main/conversions.c | 41 --------------------------------------- 2 files changed, 44 deletions(-) diff --git a/src/include/conversions.h b/src/include/conversions.h index 44c53bc0fe..ddd8176561 100644 --- a/src/include/conversions.h +++ b/src/include/conversions.h @@ -127,9 +127,6 @@ as_status record_to_pyobject(AerospikeClient *self, as_error *err, const as_record *rec, const as_key *key, PyObject **obj); -as_status record_to_resultpyobject(AerospikeClient *self, as_error *err, - const as_record *rec, PyObject **obj); - as_status operate_bins_to_pyobject(AerospikeClient *self, as_error *err, const as_record *rec, PyObject **py_bins); diff --git a/src/main/conversions.c b/src/main/conversions.c index 142dc485d2..f066a10790 100644 --- a/src/main/conversions.c +++ b/src/main/conversions.c @@ -2007,47 +2007,6 @@ as_status do_record_to_pyobject(AerospikeClient *self, as_error *err, return err->code; } -as_status record_to_resultpyobject(AerospikeClient *self, as_error *err, - const as_record *rec, PyObject **obj) -{ - as_error_reset(err); - *obj = NULL; - - if (!rec) { - return as_error_update(err, AEROSPIKE_ERR_CLIENT, "record is null"); - } - - PyObject *py_rec = NULL; - PyObject *py_rec_meta = NULL; - PyObject *py_rec_bins = NULL; - - if (metadata_to_pyobject(err, rec, &py_rec_meta) != AEROSPIKE_OK) { - return err->code; - } - - if (bins_to_pyobject(self, err, rec, &py_rec_bins, false) != AEROSPIKE_OK) { - Py_CLEAR(py_rec_meta); - return err->code; - } - - if (!py_rec_meta) { - Py_INCREF(Py_None); - py_rec_meta = Py_None; - } - - if (!py_rec_bins) { - Py_INCREF(Py_None); - py_rec_bins = Py_None; - } - - py_rec = PyTuple_New(2); - PyTuple_SetItem(py_rec, 0, py_rec_meta); - PyTuple_SetItem(py_rec, 1, py_rec_bins); - - *obj = py_rec; - return err->code; -} - as_status record_to_pyobject(AerospikeClient *self, as_error *err, const as_record *rec, const as_key *key, PyObject **obj) From 41803b05afde4e3b3af1766e76d96129c930294d Mon Sep 17 00:00:00 2001 From: Julian Nguyen <109386615+juliannguyen4@users.noreply.github.com> Date: Wed, 22 Oct 2025 17:12:12 -0700 Subject: [PATCH 02/13] unused declaration --- src/include/conversions.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/include/conversions.h b/src/include/conversions.h index 00835e5047..ead713be4b 100644 --- a/src/include/conversions.h +++ b/src/include/conversions.h @@ -148,11 +148,6 @@ as_status bins_to_pyobject(AerospikeClient *self, as_error *err, void error_to_pyobject(const as_error *err, PyObject **obj); -as_status pyobject_to_astype_write(AerospikeClient *self, as_error *err, - PyObject *py_value, as_val **val, - as_static_pool *static_pool, - int serializer_type); - as_status as_privilege_to_pyobject(as_error *err, as_privilege privileges[], PyObject *py_as_privilege, int privilege_size); From fc7e746d40d6b8ee5c9745170b190f81537a1b00 Mon Sep 17 00:00:00 2001 From: Julian Nguyen <109386615+juliannguyen4@users.noreply.github.com> Date: Mon, 10 Nov 2025 11:20:18 -0800 Subject: [PATCH 03/13] Remove dead code that was only used prior to python client 2.1.3 --- src/include/conversions.h | 10 ---- src/main/conversions.c | 104 ++------------------------------------ 2 files changed, 3 insertions(+), 111 deletions(-) diff --git a/src/include/conversions.h b/src/include/conversions.h index a2e83c6ff5..8173546e6f 100644 --- a/src/include/conversions.h +++ b/src/include/conversions.h @@ -120,10 +120,6 @@ as_status map_to_pyobject(AerospikeClient *self, as_error *err, as_status list_to_pyobject(AerospikeClient *self, as_error *err, const as_list *list, PyObject **py_list); -as_status as_list_of_map_to_py_tuple_list(AerospikeClient *self, as_error *err, - const as_list *list, - PyObject **py_list); - as_status record_to_pyobject(AerospikeClient *self, as_error *err, const as_record *rec, const as_key *key, PyObject **obj); @@ -131,12 +127,6 @@ as_status record_to_pyobject(AerospikeClient *self, as_error *err, as_status operate_bins_to_pyobject(AerospikeClient *self, as_error *err, const as_record *rec, PyObject **py_bins); -as_status record_to_pyobject_cnvt_list_to_map(AerospikeClient *self, - as_error *err, - const as_record *rec, - const as_key *key, - PyObject **obj); - as_status key_to_pyobject(as_error *err, const as_key *key, PyObject **obj); as_status metadata_to_pyobject(as_error *err, const as_record *rec, diff --git a/src/main/conversions.c b/src/main/conversions.c index 6cf292eddf..b2120b5588 100644 --- a/src/main/conversions.c +++ b/src/main/conversions.c @@ -1669,12 +1669,7 @@ as_status do_val_to_pyobject(AerospikeClient *self, as_error *err, as_list *l = as_list_fromval((as_val *)val); if (l) { PyObject *py_list = NULL; - if (cnvt_list_to_map) { - as_list_of_map_to_py_tuple_list(self, err, l, &py_list); - } - else { - list_to_pyobject(self, err, l, &py_list); - } + list_to_pyobject(self, err, l, &py_list); if (err->code == AEROSPIKE_OK) { *py_val = py_list; } @@ -1738,76 +1733,6 @@ as_status val_to_pyobject(AerospikeClient *self, as_error *err, return do_val_to_pyobject(self, err, val, py_val, false); } -as_status val_to_pyobject_cnvt_list_to_map(AerospikeClient *self, as_error *err, - const as_val *val, PyObject **py_val) -{ - return do_val_to_pyobject(self, err, val, py_val, true); -} - -as_status as_list_of_map_to_py_tuple_list(AerospikeClient *self, as_error *err, - const as_list *list, - PyObject **py_list) -{ - PyObject *py_tuple = NULL; - - int size = as_list_size((as_list *)list); - - if (size % 2 != 0) { - return as_error_update(err, AEROSPIKE_ERR_CLIENT, - "Invalid key list of key/value pairs"); - } - - *py_list = PyList_New(0); - if (!*py_list) { - return as_error_update(err, AEROSPIKE_ERR_CLIENT, - "Failed to allocate memory for list."); - } - - for (int i = 0; i < size; i += 2) { - as_val *key = as_list_get(list, i); - as_val *value = as_list_get(list, i + 1); - - if (!key || !value) { - as_error_update(err, AEROSPIKE_ERR_CLIENT, - "Null object found in returned list"); - goto CLEANUP; - } - - PyObject *py_key = NULL; - PyObject *py_value = NULL; - - if (val_to_pyobject(self, err, key, &py_key) != AEROSPIKE_OK) { - goto CLEANUP; - } - if (val_to_pyobject(self, err, value, &py_value) != AEROSPIKE_OK) { - Py_XDECREF(py_key); - goto CLEANUP; - } - py_tuple = PyTuple_New(2); - - if (!py_tuple) { - as_error_update(err, AEROSPIKE_ERR_CLIENT, - "Failed to allocate memory for tuple"); - Py_XDECREF(py_key); - Py_XDECREF(py_value); - goto CLEANUP; - } - - PyTuple_SetItem(py_tuple, 0, py_key); - PyTuple_SetItem(py_tuple, 1, py_value); - - PyList_Append(*py_list, py_tuple); - Py_DECREF(py_tuple); - } - -CLEANUP: - if (err->code != AEROSPIKE_OK) { - Py_DECREF(*py_list); - } - - return err->code; -} - static bool list_to_pyobject_each(as_val *val, void *udata) { if (!val) { @@ -2008,14 +1933,6 @@ as_status record_to_pyobject(AerospikeClient *self, as_error *err, return do_record_to_pyobject(self, err, rec, key, obj, false); } -as_status record_to_pyobject_cnvt_list_to_map(AerospikeClient *self, - as_error *err, - const as_record *rec, - const as_key *key, PyObject **obj) -{ - return do_record_to_pyobject(self, err, rec, key, obj, true); -} - as_status key_to_pyobject(as_error *err, const as_key *key, PyObject **obj) { as_error_reset(err); @@ -2130,12 +2047,7 @@ static bool do_bins_to_pyobject_each(const char *name, const as_val *val, PyObject *py_bins = (PyObject *)convd->udata; PyObject *py_val = NULL; - if (cnvt_list_to_map) { - val_to_pyobject_cnvt_list_to_map(convd->client, err, val, &py_val); - } - else { - val_to_pyobject(convd->client, err, val, &py_val); - } + val_to_pyobject(convd->client, err, val, &py_val); if (err->code != AEROSPIKE_OK) { return false; @@ -2149,13 +2061,6 @@ static bool do_bins_to_pyobject_each(const char *name, const as_val *val, return true; } -static bool bins_to_pyobject_each_cnvt_list_to_map(const char *name, - const as_val *val, - void *udata) -{ - return do_bins_to_pyobject_each(name, val, udata, true); -} - static bool bins_to_pyobject_each(const char *name, const as_val *val, void *udata) { @@ -2178,10 +2083,7 @@ as_status bins_to_pyobject(AerospikeClient *self, as_error *err, conversion_data convd = { .err = err, .count = 0, .client = self, .udata = *py_bins}; - as_record_foreach(rec, - cnvt_list_to_map ? bins_to_pyobject_each_cnvt_list_to_map - : bins_to_pyobject_each, - &convd); + as_record_foreach(rec, bins_to_pyobject_each, &convd); if (err->code != AEROSPIKE_OK) { Py_DECREF(*py_bins); From c48dd48edcf19877bf6f394101d40b3bdb9681df Mon Sep 17 00:00:00 2001 From: Julian Nguyen <109386615+juliannguyen4@users.noreply.github.com> Date: Mon, 10 Nov 2025 11:27:26 -0800 Subject: [PATCH 04/13] rm bin_strict_type_checking --- src/include/conversions.h | 3 --- src/main/conversions.c | 35 ----------------------------------- 2 files changed, 38 deletions(-) diff --git a/src/include/conversions.h b/src/include/conversions.h index 8173546e6f..fa96481da9 100644 --- a/src/include/conversions.h +++ b/src/include/conversions.h @@ -162,9 +162,6 @@ void initialize_bin_for_strictypes(AerospikeClient *self, as_error *err, PyObject *py_value, as_binop *binop, char *bin, as_static_pool *static_pool); -as_status bin_strict_type_checking(AerospikeClient *self, as_error *err, - PyObject *py_bin, char **bin); - // Both as_operations and as_record have ttl and gen fields, // so we have ttl and gen as separate parameters instead of accepting either as_operations or as_record as_status check_and_set_meta(PyObject *py_meta, uint32_t *ttl_ref, diff --git a/src/main/conversions.c b/src/main/conversions.c index b2120b5588..f982c69fc5 100644 --- a/src/main/conversions.c +++ b/src/main/conversions.c @@ -2291,41 +2291,6 @@ void initialize_bin_for_strictypes(AerospikeClient *self, as_error *err, strcpy(binop_bin->name, bin); } -// TODO: dead code -as_status bin_strict_type_checking(AerospikeClient *self, as_error *err, - PyObject *py_bin, char **bin) -{ - as_error_reset(err); - - if (py_bin) { - if (PyUnicode_Check(py_bin)) { - *bin = (char *)PyUnicode_AsUTF8(py_bin); - } - else if (PyByteArray_Check(py_bin)) { - *bin = PyByteArray_AsString(py_bin); - } - else { - as_error_update(err, AEROSPIKE_ERR_PARAM, - "Bin name should be of type string"); - goto CLEANUP; - } - - if (self->strict_types) { - if (strlen(*bin) > AS_BIN_NAME_MAX_LEN) { - as_error_update( - err, AEROSPIKE_ERR_BIN_NAME, - "A bin name should not exceed 15 characters limit"); - } - } - } - -CLEANUP: - if (err->code != AEROSPIKE_OK) { - raise_exception(err); - } - return err->code; -} - /** ******************************************************************************************************* * This function checks for metadata and if present set it into the From 1c95dec2ea9743e72fcc31ab4a29b5ec49f1328f Mon Sep 17 00:00:00 2001 From: Julian Nguyen <109386615+juliannguyen4@users.noreply.github.com> Date: Mon, 10 Nov 2025 11:38:56 -0800 Subject: [PATCH 05/13] Rm --- src/include/conversions.h | 6 ---- src/main/conversions.c | 60 --------------------------------------- 2 files changed, 66 deletions(-) diff --git a/src/include/conversions.h b/src/include/conversions.h index fa96481da9..d1086a815f 100644 --- a/src/include/conversions.h +++ b/src/include/conversions.h @@ -168,12 +168,6 @@ as_status check_and_set_meta(PyObject *py_meta, uint32_t *ttl_ref, uint16_t *gen_ref, as_error *err, bool validate_keys); -as_status as_batch_read_results_to_pyobject(as_error *err, - AerospikeClient *client, - const as_batch_read *results, - uint32_t size, - PyObject **py_records); - as_status batch_read_records_to_pyobject(AerospikeClient *self, as_error *err, as_batch_read_records *records, PyObject **py_recs); diff --git a/src/main/conversions.c b/src/main/conversions.c index f982c69fc5..6850372568 100644 --- a/src/main/conversions.c +++ b/src/main/conversions.c @@ -2398,66 +2398,6 @@ as_status pyobject_to_index(AerospikeClient *self, as_error *err, return err->code; } -as_status as_batch_read_results_to_pyobject(as_error *err, - AerospikeClient *client, - const as_batch_read *results, - uint32_t size, - PyObject **py_records) -{ - *py_records = NULL; - PyObject *temp_py_recs = PyList_New(0); - - if (!temp_py_recs) { - return as_error_update(err, AEROSPIKE_ERR_CLIENT, - "Failed to allocate memory for batch results"); - } - - // Loop over results array - for (uint32_t i = 0; i < size; i++) { - PyObject *py_rec = NULL; - PyObject *py_key = NULL; - if (results[i].result == AEROSPIKE_OK) { - /* There was a record for the item, but we failed to convert it, probably a deserialize issue, error out */ - record_to_pyobject(client, err, &results[i].record, results[i].key, - &py_rec); - if (!py_rec || err->code != AEROSPIKE_OK) { - Py_XDECREF(temp_py_recs); - return err->code; - } - /* The record wasn't found, build a (key, None, None) tuple */ - } - else { - key_to_pyobject(err, results[i].key, &py_key); - if (!py_key || err->code != AEROSPIKE_OK) { - Py_XDECREF(temp_py_recs); - return err->code; - } - py_rec = Py_BuildValue("OOO", py_key, Py_None, Py_None); - Py_DECREF(py_key); - } - - if (!py_rec) { - /* This means that build value, failed, so we are in trouble*/ - Py_XDECREF(temp_py_recs); - return as_error_update( - err, AEROSPIKE_ERR_CLIENT, - "Failed to allocate memory for record entry"); - } - - if (PyList_Append(temp_py_recs, py_rec) != 0) { - Py_DECREF(py_rec); - Py_DECREF(temp_py_recs); - return as_error_update(err, AEROSPIKE_ERR_CLIENT, - "Failed to add record to results"); - } - Py_DECREF(py_rec); - } - - // Release Python State - *py_records = temp_py_recs; - return AEROSPIKE_OK; -} - as_status batch_read_records_to_pyobject(AerospikeClient *self, as_error *err, as_batch_read_records *records, PyObject **py_recs) From 79f462aad7444e2def97aeeb30a341b26a13e51f Mon Sep 17 00:00:00 2001 From: Julian Nguyen <109386615+juliannguyen4@users.noreply.github.com> Date: Mon, 10 Nov 2025 11:43:45 -0800 Subject: [PATCH 06/13] Rm --- src/include/conversions.h | 4 --- src/main/conversions.c | 54 --------------------------------------- 2 files changed, 58 deletions(-) diff --git a/src/include/conversions.h b/src/include/conversions.h index d1086a815f..c5e3e230a4 100644 --- a/src/include/conversions.h +++ b/src/include/conversions.h @@ -168,10 +168,6 @@ as_status check_and_set_meta(PyObject *py_meta, uint32_t *ttl_ref, uint16_t *gen_ref, as_error *err, bool validate_keys); -as_status batch_read_records_to_pyobject(AerospikeClient *self, as_error *err, - as_batch_read_records *records, - PyObject **py_recs); - as_status string_and_pyuni_from_pystring(PyObject *py_string, PyObject **pyuni_r, char **c_str_ptr, as_error *err); diff --git a/src/main/conversions.c b/src/main/conversions.c index 6850372568..b4d970807f 100644 --- a/src/main/conversions.c +++ b/src/main/conversions.c @@ -2398,60 +2398,6 @@ as_status pyobject_to_index(AerospikeClient *self, as_error *err, return err->code; } -as_status batch_read_records_to_pyobject(AerospikeClient *self, as_error *err, - as_batch_read_records *records, - PyObject **py_recs) -{ - *py_recs = PyList_New(0); - - if (!(*py_recs)) { - return as_error_update(err, AEROSPIKE_ERR_CLIENT, - "Failed to allocate return list of records"); - } - as_vector *list = &records->list; - for (uint32_t i = 0; i < list->size; i++) { - - as_batch_read_record *batch = as_vector_get(list, i); - PyObject *py_rec = NULL; - PyObject *py_key = NULL; - - /* There should be a record, so convert it to a tuple */ - if (batch->result == AEROSPIKE_OK) { - record_to_pyobject(self, err, &batch->record, &batch->key, &py_rec); - if (!py_rec || err->code != AEROSPIKE_OK) { - Py_CLEAR(*py_recs); - return err->code; - } - /* No record, convert to (key, None, None) */ - } - else { - key_to_pyobject(err, &batch->key, &py_key); - if (!py_key || err->code != AEROSPIKE_OK) { - Py_CLEAR(*py_recs); - return err->code; - } - py_rec = Py_BuildValue("OOO", py_key, Py_None, Py_None); - Py_DECREF(py_key); - if (!py_rec) { - as_error_update(err, AEROSPIKE_ERR_CLIENT, - "Failed to create a record tuple"); - Py_CLEAR(*py_recs); - return err->code; - } - } - - if (PyList_Append(*py_recs, py_rec) != 0) { - as_error_update(err, AEROSPIKE_ERR_CLIENT, - "Failed to add record tuple to return list"); - Py_XDECREF(py_rec); - Py_CLEAR(*py_recs); - return err->code; - } - Py_DECREF(py_rec); - } - return AEROSPIKE_OK; -} - /* This fetches a string from a Python String like. If it is a unicode in Python27, we need to convert it to a bytes like object first, and keep track of the intermediate object for later deletion. From 9caab147602f5b855f918a93a38da116e797e5bd Mon Sep 17 00:00:00 2001 From: Julian Nguyen <109386615+juliannguyen4@users.noreply.github.com> Date: Tue, 11 Nov 2025 08:40:18 -0800 Subject: [PATCH 07/13] Rm unused decl --- src/include/conversions.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/include/conversions.h b/src/include/conversions.h index c5e3e230a4..cb6cba0078 100644 --- a/src/include/conversions.h +++ b/src/include/conversions.h @@ -110,10 +110,6 @@ as_status as_record_init_from_pyobject(AerospikeClient *self, as_error *err, as_status val_to_pyobject(AerospikeClient *self, as_error *err, const as_val *val, PyObject **py_map); -as_status val_to_pyobject_cnvt_list_to_map(AerospikeClient *self, as_error *err, - const as_val *val, - PyObject **py_map); - as_status map_to_pyobject(AerospikeClient *self, as_error *err, const as_map *map, PyObject **py_map); From 9443032e78c21bb4e285e0780854298822d11e1b Mon Sep 17 00:00:00 2001 From: Julian Nguyen <109386615+juliannguyen4@users.noreply.github.com> Date: Tue, 11 Nov 2025 08:42:41 -0800 Subject: [PATCH 08/13] Rm unused parameter. --- src/include/conversions.h | 3 +-- src/main/conversions.c | 19 ++++++++----------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/include/conversions.h b/src/include/conversions.h index cb6cba0078..91504bf629 100644 --- a/src/include/conversions.h +++ b/src/include/conversions.h @@ -129,8 +129,7 @@ as_status metadata_to_pyobject(as_error *err, const as_record *rec, PyObject **obj); as_status bins_to_pyobject(AerospikeClient *self, as_error *err, - const as_record *rec, PyObject **obj, - bool cnvt_list_to_map); + const as_record *rec, PyObject **obj); void error_to_pyobject(const as_error *err, PyObject **obj); diff --git a/src/main/conversions.c b/src/main/conversions.c index b4d970807f..e6d128e81a 100644 --- a/src/main/conversions.c +++ b/src/main/conversions.c @@ -1605,8 +1605,7 @@ typedef struct { } conversion_data; as_status do_val_to_pyobject(AerospikeClient *self, as_error *err, - const as_val *val, PyObject **py_val, - bool cnvt_list_to_map) + const as_val *val, PyObject **py_val) { as_error_reset(err); switch (as_val_type(val)) { @@ -1730,7 +1729,7 @@ as_status do_val_to_pyobject(AerospikeClient *self, as_error *err, as_status val_to_pyobject(AerospikeClient *self, as_error *err, const as_val *val, PyObject **py_val) { - return do_val_to_pyobject(self, err, val, py_val, false); + return do_val_to_pyobject(self, err, val, py_val); } static bool list_to_pyobject_each(as_val *val, void *udata) @@ -1871,7 +1870,7 @@ as_status map_to_pyobject(AerospikeClient *self, as_error *err, as_status do_record_to_pyobject(AerospikeClient *self, as_error *err, const as_record *rec, const as_key *key, - PyObject **obj, bool cnvt_list_to_map) + PyObject **obj) { as_error_reset(err); *obj = NULL; @@ -1895,8 +1894,7 @@ as_status do_record_to_pyobject(AerospikeClient *self, as_error *err, return err->code; } - if (bins_to_pyobject(self, err, rec, &py_rec_bins, cnvt_list_to_map) != - AEROSPIKE_OK) { + if (bins_to_pyobject(self, err, rec, &py_rec_bins) != AEROSPIKE_OK) { Py_CLEAR(py_rec_key); Py_CLEAR(py_rec_meta); return err->code; @@ -1930,7 +1928,7 @@ as_status record_to_pyobject(AerospikeClient *self, as_error *err, const as_record *rec, const as_key *key, PyObject **obj) { - return do_record_to_pyobject(self, err, rec, key, obj, false); + return do_record_to_pyobject(self, err, rec, key, obj); } as_status key_to_pyobject(as_error *err, const as_key *key, PyObject **obj) @@ -2036,7 +2034,7 @@ as_status key_to_pyobject(as_error *err, const as_key *key, PyObject **obj) } static bool do_bins_to_pyobject_each(const char *name, const as_val *val, - void *udata, bool cnvt_list_to_map) + void *udata) { if (!name || !val) { return false; @@ -2064,12 +2062,11 @@ static bool do_bins_to_pyobject_each(const char *name, const as_val *val, static bool bins_to_pyobject_each(const char *name, const as_val *val, void *udata) { - return do_bins_to_pyobject_each(name, val, udata, false); + return do_bins_to_pyobject_each(name, val, udata); } as_status bins_to_pyobject(AerospikeClient *self, as_error *err, - const as_record *rec, PyObject **py_bins, - bool cnvt_list_to_map) + const as_record *rec, PyObject **py_bins) { as_error_reset(err); From fbf0819bfd92b747be10d0931687b6e33b22f672 Mon Sep 17 00:00:00 2001 From: Julian Nguyen <109386615+juliannguyen4@users.noreply.github.com> Date: Tue, 11 Nov 2025 08:46:45 -0800 Subject: [PATCH 09/13] Collapse do_.*_to_pyobject methods into the methods that call them --- src/main/conversions.c | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/src/main/conversions.c b/src/main/conversions.c index e6d128e81a..b9e446c5c4 100644 --- a/src/main/conversions.c +++ b/src/main/conversions.c @@ -1604,8 +1604,8 @@ typedef struct { void *udata; } conversion_data; -as_status do_val_to_pyobject(AerospikeClient *self, as_error *err, - const as_val *val, PyObject **py_val) +as_status val_to_pyobject(AerospikeClient *self, as_error *err, + const as_val *val, PyObject **py_val) { as_error_reset(err); switch (as_val_type(val)) { @@ -1726,12 +1726,6 @@ as_status do_val_to_pyobject(AerospikeClient *self, as_error *err, return err->code; } -as_status val_to_pyobject(AerospikeClient *self, as_error *err, - const as_val *val, PyObject **py_val) -{ - return do_val_to_pyobject(self, err, val, py_val); -} - static bool list_to_pyobject_each(as_val *val, void *udata) { if (!val) { @@ -1868,9 +1862,9 @@ as_status map_to_pyobject(AerospikeClient *self, as_error *err, return err->code; } -as_status do_record_to_pyobject(AerospikeClient *self, as_error *err, - const as_record *rec, const as_key *key, - PyObject **obj) +as_status record_to_pyobject(AerospikeClient *self, as_error *err, + const as_record *rec, const as_key *key, + PyObject **obj) { as_error_reset(err); *obj = NULL; @@ -1924,13 +1918,6 @@ as_status do_record_to_pyobject(AerospikeClient *self, as_error *err, return err->code; } -as_status record_to_pyobject(AerospikeClient *self, as_error *err, - const as_record *rec, const as_key *key, - PyObject **obj) -{ - return do_record_to_pyobject(self, err, rec, key, obj); -} - as_status key_to_pyobject(as_error *err, const as_key *key, PyObject **obj) { as_error_reset(err); @@ -2033,8 +2020,8 @@ as_status key_to_pyobject(as_error *err, const as_key *key, PyObject **obj) return err->code; } -static bool do_bins_to_pyobject_each(const char *name, const as_val *val, - void *udata) +static bool bins_to_pyobject_each(const char *name, const as_val *val, + void *udata) { if (!name || !val) { return false; @@ -2059,12 +2046,6 @@ static bool do_bins_to_pyobject_each(const char *name, const as_val *val, return true; } -static bool bins_to_pyobject_each(const char *name, const as_val *val, - void *udata) -{ - return do_bins_to_pyobject_each(name, val, udata); -} - as_status bins_to_pyobject(AerospikeClient *self, as_error *err, const as_record *rec, PyObject **py_bins) { From 54d28a7a724e2b6d03b27f081b8e9c94b93e9f34 Mon Sep 17 00:00:00 2001 From: Julian Nguyen <109386615+juliannguyen4@users.noreply.github.com> Date: Tue, 11 Nov 2025 09:02:23 -0800 Subject: [PATCH 10/13] Experimental: enable -Wall to see if this complains about unused parameters --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d8b352db06..9d70cc37f0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -89,7 +89,7 @@ jobs: - name: Build client run: python3 -m build env: - CFLAGS: '-Werror' + CFLAGS: '-Werror -Wall' - run: echo WHEEL_GH_ARTIFACT_NAME=wheel-${{ matrix.py-version }} >> $GITHUB_ENV From 151304d31e19013811da9eb7735850f12a43c83b Mon Sep 17 00:00:00 2001 From: Julian Nguyen <109386615+juliannguyen4@users.noreply.github.com> Date: Tue, 11 Nov 2025 09:07:11 -0800 Subject: [PATCH 11/13] Revert "Experimental: enable -Wall to see if this complains about unused parameters" This reverts commit 54d28a7a724e2b6d03b27f081b8e9c94b93e9f34. --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9d70cc37f0..d8b352db06 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -89,7 +89,7 @@ jobs: - name: Build client run: python3 -m build env: - CFLAGS: '-Werror -Wall' + CFLAGS: '-Werror' - run: echo WHEEL_GH_ARTIFACT_NAME=wheel-${{ matrix.py-version }} >> $GITHUB_ENV From 70229b95dc029b98351723ebbb270fcb9cd4fc0b Mon Sep 17 00:00:00 2001 From: Julian Nguyen <109386615+juliannguyen4@users.noreply.github.com> Date: Tue, 11 Nov 2025 09:10:50 -0800 Subject: [PATCH 12/13] Experimental: enable -Wextra to see if this complains about unused parameters --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d8b352db06..d4d136d266 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -89,7 +89,7 @@ jobs: - name: Build client run: python3 -m build env: - CFLAGS: '-Werror' + CFLAGS: '-Werror -Wextra' - run: echo WHEEL_GH_ARTIFACT_NAME=wheel-${{ matrix.py-version }} >> $GITHUB_ENV From fb81256de502e79aaa4d984fcc1bad249ecfc260 Mon Sep 17 00:00:00 2001 From: Julian Nguyen <109386615+juliannguyen4@users.noreply.github.com> Date: Tue, 11 Nov 2025 09:13:05 -0800 Subject: [PATCH 13/13] C client contains warnings we don't want to fix for now. Revert "Experimental: enable -Wextra to see if this complains about unused parameters" This reverts commit 70229b95dc029b98351723ebbb270fcb9cd4fc0b. --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d4d136d266..d8b352db06 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -89,7 +89,7 @@ jobs: - name: Build client run: python3 -m build env: - CFLAGS: '-Werror -Wextra' + CFLAGS: '-Werror' - run: echo WHEEL_GH_ARTIFACT_NAME=wheel-${{ matrix.py-version }} >> $GITHUB_ENV