[CLIENT-2383] Fix bug where Query.where() and client.index_cdt_create() do not accept a list of contexts

src/include/client.h

@@ -368,7 +368,7 @@ PyObject *AerospikeClient_Index_Expr_Create(AerospikeClient *self,
 /**
  * Create secondary cdt index
  *
- *		client.index_cdt_create(namespace, set, bin, index_name, ctx, policy)
+ *		client.index_cdt_create(namespace, set, bin, index_type, index_datatype, index_name, ctx, policy)
  *
  */
 PyObject *AerospikeClient_Index_Cdt_Create(AerospikeClient *self,

src/include/exceptions.h

@@ -23,7 +23,6 @@ void raise_exception(as_error *err);
 void raise_exception_base(as_error *err, PyObject *py_key, PyObject *py_bin,
                           PyObject *py_module, PyObject *py_func,
                           PyObject *py_name);
-PyObject *raise_exception_old(as_error *err);
 void remove_exception(as_error *err);
 void set_aerospike_exc_attrs_using_tuple_of_attrs(PyObject *py_exc,
                                                   PyObject *py_tuple);

src/main/client/sec_index.c

@@ -191,6 +191,8 @@ PyObject *AerospikeClient_Index_Expr_Create(AerospikeClient *self,
                                                 data_type, NULL, expr);
 }
 
+#define CTX_PARSE_ERROR_MESSAGE "Unable to parse ctx"
+
 /**
  *******************************************************************************************************
  * Creates a cdt index for a bin in the Aerospike DB.
@@ -219,9 +221,12 @@ PyObject *AerospikeClient_Index_Cdt_Create(AerospikeClient *self,
     PyObject *py_indextype = NULL;
     PyObject *py_datatype = NULL;
     PyObject *py_name = NULL;
+
     PyObject *py_ctx = NULL;
     as_cdt_ctx ctx;
     bool ctx_in_use = false;
+    PyObject *py_ctx_dict = NULL;
+
     PyObject *py_obj = NULL;
     as_index_datatype data_type;
     as_index_type index_type;
@@ -247,31 +252,43 @@ PyObject *AerospikeClient_Index_Cdt_Create(AerospikeClient *self,
         goto CLEANUP;
     }
 
+    // TODO: this should be refactored by using a new helper function to parse a ctx list instead of get_cdt_ctx()
+    // which only parses a dictionary containing a ctx list
+    py_ctx_dict = PyDict_New();
+    if (!py_ctx_dict) {
+        as_error_update(&err, AEROSPIKE_ERR_CLIENT, CTX_PARSE_ERROR_MESSAGE);
+        goto CLEANUP;
+    }
+    int retval = PyDict_SetItemString(py_ctx_dict, "ctx", py_ctx);
+    if (retval == -1) {
+        Py_DECREF(py_ctx_dict);
+        as_error_update(&err, AEROSPIKE_ERR_CLIENT, CTX_PARSE_ERROR_MESSAGE);
+        goto CLEANUP;
+    }
+
     as_static_pool static_pool;
     memset(&static_pool, 0, sizeof(static_pool));
 
-    if (get_cdt_ctx(self, &err, &ctx, py_ctx, &ctx_in_use, &static_pool,
+    if (get_cdt_ctx(self, &err, &ctx, py_ctx_dict, &ctx_in_use, &static_pool,
                     SERIALIZER_PYTHON) != AEROSPIKE_OK) {
         goto CLEANUP;
     }
-    if (!ctx_in_use) {
-        goto CLEANUP;
-    }
 
+    // Even if this call fails, it will raise its own exception
+    // and the err object here will not be set. We don't raise an exception twice
     py_obj = createIndexWithDataAndCollectionType(
         self, py_policy, py_ns, py_set, py_bin, py_name, index_type, data_type,
         &ctx, NULL);
 
     as_cdt_ctx_destroy(&ctx);
 
-    return py_obj;
-
 CLEANUP:
-    if (py_obj == NULL) {
+    Py_XDECREF(py_ctx_dict);
+
+    if (err.code != AEROSPIKE_OK) {
         raise_exception_base(&err, Py_None, Py_None, Py_None, Py_None, py_name);
         return NULL;
     }
-
     return py_obj;
 }
 

src/main/query/where.c

@@ -42,6 +42,8 @@ int64_t pyobject_to_int64(PyObject *py_obj)
     }
 }
 
+#define CTX_PARSE_ERROR_MESSAGE "Unable to parse ctx"
+
 // py_bin, py_val1, pyval2 are guaranteed to be non-NULL
 // The rest of the PyObject parameters can be NULL and are optional.
 // 3 cases for these optional parameters:
@@ -58,18 +60,41 @@ static int AerospikeQuery_Where_Add(AerospikeQuery *self, PyObject *py_ctx,
 {
     as_error err;
     as_error_init(&err);
+
+    // TODO: does static pool go out of scope?
+    as_static_pool static_pool;
+    memset(&static_pool, 0, sizeof(static_pool));
+
     as_cdt_ctx *pctx = NULL;
     bool ctx_in_use = false;
+    // Used to pass ctx into get_cdt_ctx() helper
+    // Declared here to make cleanup logic simpler
+    PyObject *py_ctx_dict = NULL;
+
+    // Ctx is an optional parameter
+    if (py_ctx && !Py_IsNone(py_ctx)) {
+        // If user wanted to pass in an actual ctx
+
+        // Glue code to pass into get_cdt_ctx()
+        py_ctx_dict = PyDict_New();
+        if (!py_ctx_dict) {
+            as_error_update(&err, AEROSPIKE_ERR_CLIENT,
+                            CTX_PARSE_ERROR_MESSAGE);
+            goto error;
+        }
+        int retval = PyDict_SetItemString(py_ctx_dict, "ctx", py_ctx);
+        if (retval == -1) {
+            as_error_update(&err, AEROSPIKE_ERR_CLIENT,
+                            CTX_PARSE_ERROR_MESSAGE);
+            goto CLEANUP_PY_CTX_DICT_ON_ERROR;
+        }
 
-    if (py_ctx) {
-        // TODO: does static pool go out of scope?
-        as_static_pool static_pool;
-        memset(&static_pool, 0, sizeof(static_pool));
         pctx = cf_malloc(sizeof(as_cdt_ctx));
         memset(pctx, 0, sizeof(as_cdt_ctx));
-        if (get_cdt_ctx(self->client, &err, pctx, py_ctx, &ctx_in_use,
+
+        if (get_cdt_ctx(self->client, &err, pctx, py_ctx_dict, &ctx_in_use,
                         &static_pool, SERIALIZER_PYTHON) != AEROSPIKE_OK) {
-            return err.code;
+            goto CLEANUP_AS_CTX_ON_ERROR;
         }
     }
 
@@ -78,7 +103,7 @@ static int AerospikeQuery_Where_Add(AerospikeQuery *self, PyObject *py_ctx,
         as_status status = as_exp_new_from_pyobject(self->client, py_expr,
                                                     &exp_list, &err, true);
         if (status != AEROSPIKE_OK) {
-            goto CLEANUP_CTX_ON_ERROR;
+            goto CLEANUP_AS_CTX_ON_ERROR;
         }
     }
 
@@ -286,7 +311,7 @@ static int AerospikeQuery_Where_Add(AerospikeQuery *self, PyObject *py_ctx,
         as_exp_destroy(exp_list);
     }
 
-CLEANUP_CTX_ON_ERROR:
+CLEANUP_AS_CTX_ON_ERROR:
     // The ctx ends up not being used by as_query
     if (ctx_in_use) {
         as_cdt_ctx_destroy(pctx);
@@ -295,6 +320,10 @@ static int AerospikeQuery_Where_Add(AerospikeQuery *self, PyObject *py_ctx,
         cf_free(pctx);
     }
 
+CLEANUP_PY_CTX_DICT_ON_ERROR:
+    Py_XDECREF(py_ctx_dict);
+
+error:
     return 1;
 }
 

test/new_tests/test_base_class.py

@@ -178,9 +178,10 @@ def get_new_connection(add_config=None):
                 if res is not None:
                     break
             res = res.split(".")
-            # major_ver = res[0]
-            # minor_ver = res[1]
-            # print("major_ver:", major_ver, "minor_ver:", minor_ver)
+            TestBaseClass.major_ver = res[0]
+            TestBaseClass.minor_ver = res[1]
+            # print("major_ver:", TestBaseClass.major_ver, "minor_ver:", TestBaseClass.minor_ver)
+
         return client
 
     @staticmethod