iterating [skip ci]

TileDB-Inc · Aug 29, 2024 · 3fd2a2b · 3fd2a2b
1 parent 618e7ee
commit 3fd2a2b
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 11 deletions.
diff --git a/test/src/unit-capi-enumerations.cc b/test/src/unit-capi-enumerations.cc
@@ -117,3 +117,5 @@ TEST_CASE(
   rc = tiledb_array_get_enumeration(ctx, array, nullptr, &enmr);
   REQUIRE(rc == TILEDB_ERR);
 }
+
+// XXX TOUCH
diff --git a/test/src/unit-cppapi-enumerations.cc b/test/src/unit-cppapi-enumerations.cc
@@ -750,3 +750,5 @@ void CPPEnumerationFx::rm_array() {
     vfs_.remove_dir(uri_);
   }
 }
+
+// XXX TOUCH
diff --git a/test/src/unit-rest-enumerations.cc b/test/src/unit-rest-enumerations.cc
@@ -206,3 +206,5 @@ void RESTEnumerationFx::create_array(const std::string& array_name) {
   query.finalize();
   array.close();
 }
+
+// XXX TOUCH
diff --git a/tiledb/api/c_api/array_schema/array_schema_api.cc b/tiledb/api/c_api/array_schema/array_schema_api.cc
@@ -98,9 +98,9 @@ capi_return_t tiledb_array_schema_alloc(
 capi_return_t tiledb_array_schema_alloc_at_timestamp(
     tiledb_ctx_t* ctx,
     tiledb_array_type_t array_type,
-    tiledb_array_schema_t** array_schema,
     uint64_t t1,
-    uint64_t t2) {
+    uint64_t t2,
+    tiledb_array_schema_t** array_schema) {
   ensure_output_pointer_is_valid(array_schema);
 
   // Create ArraySchema object
@@ -480,12 +480,12 @@ CAPI_INTERFACE(
     array_schema_alloc_at_timestamp,
     tiledb_ctx_t* ctx,
     tiledb_array_type_t array_type,
-    tiledb_array_schema_t** array_schema,
     uint64_t t1,
-    uint64_t t2) {
+    uint64_t t2,
+    tiledb_array_schema_t** array_schema) {
   return api_entry_with_context<
       tiledb::api::tiledb_array_schema_alloc_at_timestamp>(
-      ctx, array_type, array_schema, t1, t2);
+      ctx, array_type, t1, t2, array_schema);
 }
 
 CAPI_INTERFACE_VOID(array_schema_free, tiledb_array_schema_t** array_schema) {

diff --git a/tiledb/api/c_api/array_schema/array_schema_api_external.h b/tiledb/api/c_api/array_schema/array_schema_api_external.h
@@ -130,8 +130,8 @@ TILEDB_EXPORT capi_return_t tiledb_array_schema_alloc(
  * tiledb_array_schema_t* array_schema;
  * uint64_t t1 = 10;
  * uint64_t t2 = 20;
- * tiledb_array_schema_alloc_at_timestamp(ctx, TILEDB_DENSE, &array_schema, t1,
- * t2);
+ * tiledb_array_schema_alloc_at_timestamp(ctx, TILEDB_DENSE, t1, t2,
+ * &array_schema);
  * @endcode
  *
  * @param[in] ctx The TileDB context.
@@ -142,9 +142,9 @@ TILEDB_EXPORT capi_return_t tiledb_array_schema_alloc(
 TILEDB_EXPORT capi_return_t tiledb_array_schema_alloc_at_timestamp(
     tiledb_ctx_t* ctx,
     tiledb_array_type_t array_type,
-    tiledb_array_schema_t** array_schema,
     uint64_t t1,
-    uint64_t t2);
+    uint64_t t2,
+    tiledb_array_schema_t** array_schema) TILEDB_NOEXCEPT;
 
 /**
  * Destroys an array schema, freeing associated memory.

diff --git a/tiledb/api/c_api/enumeration/test/unit_capi_enumeration.cc b/tiledb/api/c_api/enumeration/test/unit_capi_enumeration.cc
@@ -469,3 +469,5 @@ TEST_CASE(
     REQUIRE(rc == TILEDB_ERR);
   }
 }
+
+// XXX TOUCH
diff --git a/tiledb/sm/cpp_api/array_schema.h b/tiledb/sm/cpp_api/array_schema.h
@@ -117,9 +117,9 @@ class ArraySchema : public Schema {
       ctx.handle_error(tiledb_array_schema_alloc_at_timestamp(
           ctx.ptr().get(),
           type,
-          &schema,
           timestamp_range.value().first,
-          timestamp_range.value().second));
+          timestamp_range.value().second,
+          &schema));
     } else {
       ctx.handle_error(
           tiledb_array_schema_alloc(ctx.ptr().get(), type, &schema));