[CLIENT-3106] aerospike.exception: create a Python dict that maps as_status error codes to Aerospike exception classes to speed up raising exceptions

src/include/conversions.h

@@ -149,8 +149,6 @@ as_status bins_to_pyobject(AerospikeClient *self, as_error *err,
                            const as_record *rec, PyObject **obj,
                            bool cnvt_list_to_map);
 
-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,

src/include/exceptions.h

@@ -18,7 +18,13 @@
 
 #include <Python.h>
 
+typedef struct {
+    const char *attr_name;
+    PyObject *py_value;
+} as_exc_extra_info;
+
 PyObject *AerospikeException_New(void);
-void raise_exception(as_error *err);
-PyObject *raise_exception_old(as_error *err);
+int raise_exception(as_error *err);
+int raise_exception_with_api_call_extra_info(as_error *err,
+                                             as_exc_extra_info *extra_info);
 void remove_exception(as_error *err);

src/main/client/apply.c

@@ -168,23 +168,12 @@ PyObject *AerospikeClient_Apply_Invoke(AerospikeClient *self, PyObject *py_key,
     as_val_destroy(result);
 
     if (err.code != AEROSPIKE_OK) {
-        PyObject *py_err = NULL;
-        error_to_pyobject(&err, &py_err);
-        PyObject *exception_type = raise_exception_old(&err);
-        if (PyObject_HasAttrString(exception_type, "key")) {
-            PyObject_SetAttrString(exception_type, "key", py_key);
-        }
-        if (PyObject_HasAttrString(exception_type, "bin")) {
-            PyObject_SetAttrString(exception_type, "bin", Py_None);
-        }
-        if (PyObject_HasAttrString(exception_type, "module")) {
-            PyObject_SetAttrString(exception_type, "module", py_module);
-        }
-        if (PyObject_HasAttrString(exception_type, "func")) {
-            PyObject_SetAttrString(exception_type, "func", py_function);
-        }
-        PyErr_SetObject(exception_type, py_err);
-        Py_DECREF(py_err);
+        as_exc_extra_info extra_info[] = {{"key", py_key},
+                                          {"bin", Py_None},
+                                          {"module", py_module},
+                                          {"func", py_function},
+                                          {0}};
+        raise_exception_with_api_call_extra_info(&err, extra_info);
         return NULL;
     }
 

src/main/client/batch_get_ops.c

@@ -80,7 +80,8 @@ static bool batch_read_operate_cb(const as_batch_read *results, uint32_t n,
             bins_to_pyobject(data->client, &err, rec, &py_rec_bins, false);
         }
         else {
-            py_rec_meta = raise_exception_old(&err);
+            // TODO: for now just ignore error code
+            raise_exception(&err);
             Py_INCREF(Py_None);
             py_rec_bins = Py_None;
         }

src/main/client/exists.c

@@ -136,17 +136,9 @@ extern PyObject *AerospikeClient_Exists_Invoke(AerospikeClient *self,
     }
 
     if (err.code != AEROSPIKE_OK) {
-        PyObject *py_err = NULL;
-        error_to_pyobject(&err, &py_err);
-        PyObject *exception_type = raise_exception_old(&err);
-        if (PyObject_HasAttrString(exception_type, "key")) {
-            PyObject_SetAttrString(exception_type, "key", py_key);
-        }
-        if (PyObject_HasAttrString(exception_type, "bin")) {
-            PyObject_SetAttrString(exception_type, "bin", Py_None);
-        }
-        PyErr_SetObject(exception_type, py_err);
-        Py_DECREF(py_err);
+        as_exc_extra_info extra_info[] = {
+            {"key", py_key}, {"bin", Py_None}, {0}};
+        raise_exception_with_api_call_extra_info(&err, extra_info);
     }
 
     return py_result;

src/main/client/exists_many.c

@@ -268,17 +268,9 @@ static PyObject *AerospikeClient_Exists_Many_Invoke(AerospikeClient *self,
     }
 
     if (err.code != AEROSPIKE_OK) {
-        PyObject *py_err = NULL;
-        error_to_pyobject(&err, &py_err);
-        PyObject *exception_type = raise_exception_old(&err);
-        if (PyObject_HasAttrString(exception_type, "key")) {
-            PyObject_SetAttrString(exception_type, "key", py_keys);
-        }
-        if (PyObject_HasAttrString(exception_type, "bin")) {
-            PyObject_SetAttrString(exception_type, "bin", Py_None);
-        }
-        PyErr_SetObject(exception_type, py_err);
-        Py_DECREF(py_err);
+        as_exc_extra_info extra_info[] = {
+            {"key", py_keys}, {"bin", Py_None}, {0}};
+        raise_exception_with_api_call_extra_info(&err, extra_info);
         return NULL;
     }
 

src/main/client/get.c

@@ -133,17 +133,9 @@ PyObject *AerospikeClient_Get_Invoke(AerospikeClient *self, PyObject *py_key,
     }
 
     if (err.code != AEROSPIKE_OK) {
-        PyObject *py_err = NULL;
-        error_to_pyobject(&err, &py_err);
-        PyObject *exception_type = raise_exception_old(&err);
-        if (PyObject_HasAttrString(exception_type, "key")) {
-            PyObject_SetAttrString(exception_type, "key", py_key);
-        }
-        if (PyObject_HasAttrString(exception_type, "bin")) {
-            PyObject_SetAttrString(exception_type, "bin", Py_None);
-        }
-        PyErr_SetObject(exception_type, py_err);
-        Py_DECREF(py_err);
+        as_exc_extra_info extra_info[] = {
+            {"key", py_key}, {"bin", Py_None}, {0}};
+        raise_exception_with_api_call_extra_info(&err, extra_info);
         return NULL;
     }
 

src/main/client/get_many.c

@@ -182,17 +182,9 @@ static PyObject *AerospikeClient_Get_Many_Invoke(AerospikeClient *self,
     }
 
     if (err.code != AEROSPIKE_OK) {
-        PyObject *py_err = NULL;
-        error_to_pyobject(&err, &py_err);
-        PyObject *exception_type = raise_exception_old(&err);
-        if (PyObject_HasAttrString(exception_type, "key")) {
-            PyObject_SetAttrString(exception_type, "key", py_keys);
-        }
-        if (PyObject_HasAttrString(exception_type, "bin")) {
-            PyObject_SetAttrString(exception_type, "bin", Py_None);
-        }
-        PyErr_SetObject(exception_type, py_err);
-        Py_DECREF(py_err);
+        as_exc_extra_info extra_info[] = {
+            {"key", py_keys}, {"bin", Py_None}, {0}};
+        raise_exception_with_api_call_extra_info(&err, extra_info);
         return NULL;
     }
 

src/main/client/info.c

@@ -95,27 +95,21 @@ static bool AerospikeClient_InfoAll_each(as_error *err, const as_node *node,
     Py_DECREF(py_res);
 
 CLEANUP:
-    if (udata_ptr->error.code != AEROSPIKE_OK) {
-        PyObject *py_err = NULL;
-        error_to_pyobject(&udata_ptr->error, &py_err);
-        PyObject *exception_type = raise_exception_old(&udata_ptr->error);
-        PyErr_SetObject(exception_type, py_err);
-        Py_DECREF(py_err);
-        PyGILState_Release(gil_state);
-        return false;
-    }
-    if (err->code != AEROSPIKE_OK) {
-        PyObject *py_err = NULL;
-        error_to_pyobject(err, &py_err);
-        PyObject *exception_type = raise_exception_old(err);
-        PyErr_SetObject(exception_type, py_err);
-        Py_DECREF(py_err);
-        PyGILState_Release(gil_state);
-        return false;
+    bool result = true;
+    if (udata_ptr->error.code != AEROSPIKE_OK || err->code != AEROSPIKE_OK) {
+        as_error *error;
+        if (udata_ptr->error.code != AEROSPIKE_OK) {
+            error = &udata_ptr->error;
+        }
+        else {
+            error = err;
+        }
+        raise_exception(error);
+        result = false;
     }
 
     PyGILState_Release(gil_state);
-    return true;
+    return result;
 }
 
 /**
@@ -209,12 +203,7 @@ static PyObject *AerospikeClient_InfoAll_Invoke(AerospikeClient *self,
         Py_DECREF(py_ustr);
     }
     if (info_callback_udata.error.code != AEROSPIKE_OK) {
-        PyObject *py_err = NULL;
-        error_to_pyobject(&info_callback_udata.error, &py_err);
-        PyObject *exception_type =
-            raise_exception_old(&info_callback_udata.error);
-        PyErr_SetObject(exception_type, py_err);
-        Py_DECREF(py_err);
+        raise_exception(&info_callback_udata.error);
         if (py_nodes) {
             Py_DECREF(py_nodes);
         }

src/main/client/operate.c

@@ -76,17 +76,9 @@ static inline bool isExprOp(int op);
 
 #define EXCEPTION_ON_ERROR()                                                   \
     if (err.code != AEROSPIKE_OK) {                                            \
-        PyObject *py_err = NULL;                                               \
-        error_to_pyobject(&err, &py_err);                                      \
-        PyObject *exception_type = raise_exception_old(&err);                  \
-        if (PyObject_HasAttrString(exception_type, "key")) {                   \
-            PyObject_SetAttrString(exception_type, "key", py_key);             \
-        }                                                                      \
-        if (PyObject_HasAttrString(exception_type, "bin")) {                   \
-            PyObject_SetAttrString(exception_type, "bin", py_bin);             \
-        }                                                                      \
-        PyErr_SetObject(exception_type, py_err);                               \
-        Py_DECREF(py_err);                                                     \
+        as_exc_extra_info extra_info[] = {                                     \
+            {"key", py_key}, {"bin", py_bin}, {0}};                            \
+        raise_exception_with_api_call_extra_info(&err, extra_info);            \
         return NULL;                                                           \
     }
 
@@ -1203,14 +1195,8 @@ PyObject *AerospikeClient_OperateOrdered(AerospikeClient *self, PyObject *args,
 
 CLEANUP:
     if (err.code != AEROSPIKE_OK) {
-        PyObject *py_err = NULL;
-        error_to_pyobject(&err, &py_err);
-        PyObject *exception_type = raise_exception_old(&err);
-        if (PyObject_HasAttrString(exception_type, "key")) {
-            PyObject_SetAttrString(exception_type, "key", py_key);
-        }
-        PyErr_SetObject(exception_type, py_err);
-        Py_DECREF(py_err);
+        as_exc_extra_info extra_info[] = {{"key", py_key}, {0}};
+        raise_exception_with_api_call_extra_info(&err, extra_info);
         return NULL;
     }
     return py_result;