ArraySchemaEvolution Check Context Last Error (#1335)

Author: Vivian Nguyen

HISTORY.md

@@ -3,6 +3,7 @@
 ## API Changes
 * Addition of `Array.upgrade_version` to upgrade array to latest version [#1334](https://github.com/TileDB-Inc/TileDB-Py/pull/1334)
 * Attributes in query conditions no longer need to be passed to `Array.query`'s `attr` arg [#1333](https://github.com/TileDB-Inc/TileDB-Py/pull/1333)
+* `ArraySchemaEvolution` checks context's last error for error message [#1335](https://github.com/TileDB-Inc/TileDB-Py/pull/1335)
 
 # TileDB-Py 0.17.4 Release Notes
 

tiledb/schema_evolution.cc

@@ -1,5 +1,4 @@
 #include <pybind11/pybind11.h>
-//#include <tiledb/tiledb_experimental>
 #include <tiledb/tiledb.h>
 #include <tiledb/tiledb_experimental.h>
 
@@ -17,6 +16,37 @@ typedef struct {
 
 using ArraySchemaEvolution = PyArraySchemaEvolution;
 
+void _throw_tiledb_error(tiledb_error_t *err_ptr) {
+  const char *err_msg_ptr = NULL;
+  int ret = tiledb_error_message(err_ptr, &err_msg_ptr);
+  if (ret != TILEDB_OK) {
+    tiledb_error_free(&err_ptr);
+    if (ret == TILEDB_OOM) {
+      throw std::bad_alloc();
+    }
+    TPY_ERROR_LOC("error retrieving error message");
+  }
+
+  TPY_ERROR_LOC(std::string(err_msg_ptr));
+}
+
+void _throw_ctx_err(tiledb_ctx_t *ctx_ptr, int rc) {
+  if (rc == TILEDB_OK)
+    return;
+  if (rc == TILEDB_OOM)
+    throw std::bad_alloc();
+
+  tiledb_error_t *err_ptr = NULL;
+  int ret = tiledb_ctx_get_last_error(ctx_ptr, &err_ptr);
+  if (ret != TILEDB_OK) {
+    tiledb_error_free(&err_ptr);
+    if (ret == TILEDB_OOM)
+      throw std::bad_alloc();
+    TPY_ERROR_LOC("error retrieving error object from ctx");
+  }
+  _throw_tiledb_error(err_ptr);
+}
+
 void init_schema_evolution(py::module &m) {
   py::class_<ArraySchemaEvolution>(m, "ArraySchemaEvolution")
       .def(py::init([](py::object ctx_py) {
@@ -27,7 +57,7 @@ void init_schema_evolution(py::module &m) {
         tiledb_array_schema_evolution_t *evol_p;
         int rc = tiledb_array_schema_evolution_alloc(ctx_c, &evol_p);
         if (rc != TILEDB_OK) {
-          TPY_ERROR_LOC("Failed to allocate ArraySchemaEvolution");
+          _throw_ctx_err(ctx_c, rc);
         }
 
         return new PyArraySchemaEvolution({ctx_c, evol_p});
@@ -42,22 +72,21 @@ void init_schema_evolution(py::module &m) {
              int rc = tiledb_array_schema_evolution_add_attribute(
                  inst.ctx_, inst.evol_, attr_c);
              if (rc != TILEDB_OK) {
-               TPY_ERROR_LOC("Failed to add attribute to ArraySchemaEvolution");
+               _throw_ctx_err(inst.ctx_, rc);
              }
            })
       .def("drop_attribute",
            [](ArraySchemaEvolution &inst, std::string attr_name) {
              int rc = tiledb_array_schema_evolution_drop_attribute(
                  inst.ctx_, inst.evol_, attr_name.c_str());
              if (rc != TILEDB_OK) {
-               TPY_ERROR_LOC(
-                   "Failed to drop attribute from ArraySchemaEvolution");
+               _throw_ctx_err(inst.ctx_, rc);
              }
            })
       .def("array_evolve", [](ArraySchemaEvolution &inst, std::string uri) {
         int rc = tiledb_array_evolve(inst.ctx_, uri.c_str(), inst.evol_);
         if (rc != TILEDB_OK) {
-          TPY_ERROR_LOC("Failed to drop attribute from ArraySchemaEvolution");
+          _throw_ctx_err(inst.ctx_, rc);
         }
       });
 }

tiledb/tests/test_schema_evolution.py

@@ -36,6 +36,11 @@ def test_schema_evolution(tmp_path):
 
     newattr = tiledb.Attr("a3", dtype=np.int8)
     se.add_attribute(newattr)
+
+    with pytest.raises(tiledb.TileDBError) as excinfo:
+        se.add_attribute(newattr)
+    assert "Input attribute name is already there" in str(excinfo.value)
+
     se.array_evolve(uri)
 
     data2 = {